Removes golems entirely from the game.

_maps/shuttles/ferry_meat.dmm

@@ -43,9 +43,6 @@
 /obj/item/food/meat/slab/human/mutant/fly{
 	name = "flyman meat"
 	},
-/obj/item/food/meat/slab/human/mutant/golem/adamantine{
-	name = "golem meat"
-	},
 /obj/item/food/meat/slab/human/mutant/lizard{
 	name = "lizard meat"
 	},

code/__DEFINES/DNA.dm

@@ -92,7 +92,6 @@
 #define BLOOD_CLANS 21
 
 //organ slots
-#define ORGAN_SLOT_ADAMANTINE_RESONATOR "adamantine_resonator"
 #define ORGAN_SLOT_APPENDIX "appendix"
 #define ORGAN_SLOT_BRAIN "brain"
 #define ORGAN_SLOT_BRAIN_ANTIDROP "brain_antidrop"
@@ -171,7 +170,6 @@ GLOBAL_LIST_INIT(organ_process_order, list(
 	ORGAN_SLOT_LIVER,
 	ORGAN_SLOT_TONGUE,
 	ORGAN_SLOT_VOICE,
-	ORGAN_SLOT_ADAMANTINE_RESONATOR,
 	ORGAN_SLOT_HEART_AID,
 	ORGAN_SLOT_BRAIN_ANTIDROP,
 	ORGAN_SLOT_BRAIN_ANTISTUN,
@@ -185,34 +183,6 @@ GLOBAL_LIST_INIT(organ_process_order, list(
 	ORGAN_SLOT_XENO_NEUROTOXINGLAND,
 	ORGAN_SLOT_XENO_EGGSAC,))
 
-//Defines for Golem Species IDs
-#define SPECIES_GOLEM "golem"
-#define SPECIES_GOLEM_ADAMANTINE "a_golem"
-#define SPECIES_GOLEM_PLASMA "p_golem"
-#define SPECIES_GOLEM_DIAMOND "diamond_golem"
-#define SPECIES_GOLEM_GOLD "gold_golem"
-#define SPECIES_GOLEM_SILVER "silver_golem"
-#define SPECIES_GOLEM_PLASTEEL "plasteel_golem"
-#define SPECIES_GOLEM_TITANIUM "titanium_golem"
-#define SPECIES_GOLEM_PLASTITANIUM "plastitanium_golem"
-#define SPECIES_GOLEM_ALIEN "alloy_golem"
-#define SPECIES_GOLEM_WOOD "wood_golem"
-#define SPECIES_GOLEM_URANIUM "uranium_golem"
-#define SPECIES_GOLEM_SAND "sand_golem"
-#define SPECIES_GOLEM_GLASS "glass_golem"
-#define SPECIES_GOLEM_BLUESPACE "bluespace_golem"
-#define SPECIES_GOLEM_BANANIUM "ba_golem"
-#define SPECIES_GOLEM_CULT "cultgolem"
-#define SPECIES_GOLEM_CLOTH "clothgolem"
-#define SPECIES_GOLEM_PLASTIC "plastic_golem"
-#define SPECIES_GOLEM_BRONZE "bronze_golem"
-#define SPECIES_GOLEM_CARDBOARD "c_golem"
-#define SPECIES_GOLEM_LEATHER "leather_golem"
-#define SPECIES_GOLEM_DURATHREAD "d_golem"
-#define SPECIES_GOLEM_BONE "b_golem"
-#define SPECIES_GOLEM_SNOW "sn_golem"
-#define SPECIES_GOLEM_HYDROGEN "metallic_hydrogen_golem"
-
 // Defines for used in creating "perks" for the species preference pages.
 /// A key that designates UI icon displayed on the perk.
 #define SPECIES_PERK_ICON "ui_icon"

code/__DEFINES/admin.dm

@@ -128,7 +128,7 @@ GLOBAL_VAR_INIT(ghost_role_flags, (~0))
 //Flags that control what ways ghosts can get back into the round
 //ie fugitives, space dragon, etc. also includes dynamic midrounds as it's the same deal
 #define GHOSTROLE_MIDROUND_EVENT (1<<0)
-//ie ashwalkers, free golems, beach bums
+//ie ashwalkers, beach bums
 #define GHOSTROLE_SPAWNER (1<<1)
 //ie mind monkeys, sentience potion
 #define GHOSTROLE_STATION_SENTIENCE (1<<2)

code/__DEFINES/is_helpers.dm

@@ -68,7 +68,6 @@ GLOBAL_LIST_INIT(turfs_openspace, typecacheof(list(
 
 //Human sub-species
 #define isabductor(A) (is_species(A, /datum/species/abductor))
-#define isgolem(A) (is_species(A, /datum/species/golem))
 #define islizard(A) (is_species(A, /datum/species/lizard))
 #define isplasmaman(A) (is_species(A, /datum/species/plasmaman))
 #define ispodperson(A) (is_species(A, /datum/species/pod))

code/__DEFINES/role_preferences.dm

@@ -65,8 +65,6 @@
 #define ROLE_LAVALAND "Lavaland"
 
 #define ROLE_POSITRONIC_BRAIN "Positronic Brain"
-#define ROLE_FREE_GOLEM "Free Golem"
-#define ROLE_SERVANT_GOLEM "Servant Golem"
 #define ROLE_NUCLEAR_OPERATIVE "Nuclear Operative"
 #define ROLE_CLOWN_OPERATIVE "Clown Operative"
 #define ROLE_WIZARD_APPRENTICE "apprentice"

code/__DEFINES/wounds.dm

@@ -101,7 +101,7 @@ GLOBAL_LIST_INIT(global_all_wound_types, list(/datum/wound/blunt/critical, /datu
 
 // ~biology defines
 // What kind of biology we have, and what wounds we can suffer, mostly relies on the HAS_FLESH and HAS_BONE species traits on human species
-/// golems and androids, cannot suffer any wounds
+/// androids and such cannot suffer any wounds
 #define BIO_INORGANIC 0
 /// skeletons and plasmemes, can only suffer bone wounds, only needs mangled bone to be able to dismember
 #define BIO_JUST_BONE 1

code/_globalvars/lists/names.dm

@@ -14,7 +14,6 @@ GLOBAL_LIST_INIT(clown_names, world.file2list("strings/names/clown.txt"))
 GLOBAL_LIST_INIT(mime_names, world.file2list("strings/names/mime.txt"))
 GLOBAL_LIST_INIT(religion_names, world.file2list("strings/names/religion.txt"))
 GLOBAL_LIST_INIT(carp_names, world.file2list("strings/names/carp.txt"))
-GLOBAL_LIST_INIT(golem_names, world.file2list("strings/names/golem.txt"))
 GLOBAL_LIST_INIT(moth_first, world.file2list("strings/names/moth_first.txt"))
 GLOBAL_LIST_INIT(moth_last, world.file2list("strings/names/moth_last.txt"))
 GLOBAL_LIST_INIT(plasmaman_names, world.file2list("strings/names/plasmaman.txt"))

code/_globalvars/lists/poll_ignore.dm

@@ -10,7 +10,6 @@
 #define POLL_IGNORE_CONSTRUCT "construct"
 #define POLL_IGNORE_SPIDER "spider"
 #define POLL_IGNORE_ASHWALKER "ashwalker"
-#define POLL_IGNORE_GOLEM "golem"
 #define POLL_IGNORE_DRONE "drone"
 #define POLL_IGNORE_FUGITIVE "fugitive"
 #define POLL_IGNORE_PYROSLIME "slime"
@@ -33,7 +32,6 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list(
 	POLL_IGNORE_CONSTRUCT = "Construct",
 	POLL_IGNORE_SPIDER = "Spiders",
 	POLL_IGNORE_ASHWALKER = "Ashwalker eggs",
-	POLL_IGNORE_GOLEM = "Golems",
 	POLL_IGNORE_DRONE = "Drone shells",
 	POLL_IGNORE_FUGITIVE = "Fugitive Hunter",
 	POLL_IGNORE_PYROSLIME = "Slime",

code/_globalvars/phobias.dm

@@ -504,7 +504,6 @@ GLOBAL_LIST_INIT(phobia_species, list(
 		/datum/species/plasmaman,
 		/datum/species/skeleton,
 	)),
-	"the supernatural" = typecacheof(list(/datum/species/golem/runic)),
 ))
 
 /// Creates a regular expression to match against the given phobia

code/datums/diseases/advance/symptoms/itching.dm

@@ -51,7 +51,7 @@ BONUS
 	var/mob/living/carbon/M = A.affected_mob
 	var/picked_bodypart = pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG)
 	var/obj/item/bodypart/bodypart = M.get_bodypart(picked_bodypart)
-	if(bodypart && IS_ORGANIC_LIMB(bodypart) && !bodypart.is_pseudopart)  //robotic limbs will mean less scratching overall (why are golems able to damage themselves with self-scratching, but not androids? the world may never know)
+	if(bodypart && IS_ORGANIC_LIMB(bodypart) && !bodypart.is_pseudopart)  //robotic limbs will mean less scratching overall
 		var/can_scratch = scratch && !M.incapacitated()
 		M.visible_message("[can_scratch ? span_warning("[M] scratches [M.p_their()] [bodypart.name].") : ""]", span_warning("Your [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]"))
 		if(can_scratch)

code/datums/diseases/advance/symptoms/species.dm

@@ -27,7 +27,7 @@
 	severity = 0
 
 /datum/symptom/inorganic_adaptation/OnAdd(datum/disease/advance/A)
-	A.infectable_biotypes |= MOB_MINERAL //Mineral covers plasmamen and golems.
+	A.infectable_biotypes |= MOB_MINERAL //Mineral covers plasmamen.
 
 /datum/symptom/inorganic_adaptation/OnRemove(datum/disease/advance/A)
 	A.infectable_biotypes &= ~MOB_MINERAL

code/datums/elements/spooky.dm

@@ -37,7 +37,7 @@
 			H.Paralyze(15) //zombies can't resist the doot
 		C.Jitter(35)
 		C.stuttering = 20
-		if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
+		if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
 			C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live
 		to_chat(C, "<font color='red' size='4'><B>DOOT</B></font>")
 		INVOKE_ASYNC(src, .proc/spectral_change, H)
@@ -47,7 +47,7 @@
 		C.stuttering = 20
 
 /datum/element/spooky/proc/spectral_change(mob/living/carbon/human/H, mob/user)
-	if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
+	if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
 		H.Paralyze(20)
 		H.set_species(/datum/species/skeleton)
 		H.visible_message(span_warning("[H] has given up on life as a mortal."))

code/datums/mind.dm

@@ -57,7 +57,7 @@
 	var/datum/atom_hud/alternate_appearance/basic/antagonist_hud/antag_hud = null //this mind's antag HUD
 	var/holy_role = NONE //is this person a chaplain or admin role allowed to use bibles, Any rank besides 'NONE' allows for this.
 
-	var/mob/living/enslaved_to //If this mind's master is another mob (i.e. adamantine golems)
+	var/mob/living/enslaved_to //If this mind's master is another mob
 	var/datum/language_holder/language_holder
 	var/unconvertable = FALSE
 	var/late_joiner = FALSE

code/datums/ruins/icemoon.dm

@@ -124,14 +124,6 @@
 	description = "Into the jaws of the beast."
 	suffix = "icemoon_underground_wendigo_cave.dmm"
 
-/datum/map_template/ruin/icemoon/underground/free_golem
-	name = "Free Golem Ship"
-	id = "golem-ship"
-	description = "Lumbering humanoids, made out of precious metals, move inside this ship. They frequently leave to mine more minerals, which they somehow turn into more of them. \
-	Seem very intent on research and individual liberty, and also geology-based naming?"
-	prefix = "_maps/RandomRuins/AnywhereRuins/"
-	suffix = "golem_ship.dmm"
-
 /datum/map_template/ruin/icemoon/underground/mailroom
 	name = "Frozen-over Post Office"
 	id = "mailroom"

code/datums/ruins/lavaland.dm

@@ -63,16 +63,6 @@
 	cost = 20
 	allow_duplicates = FALSE
 
-/datum/map_template/ruin/lavaland/free_golem
-	name = "Free Golem Ship"
-	id = "golem-ship"
-	description = "Lumbering humanoids, made out of precious metals, move inside this ship. They frequently leave to mine more minerals, which they somehow turn into more of them. \
-	Seem very intent on research and individual liberty, and also geology-based naming?"
-	cost = 20
-	prefix = "_maps/RandomRuins/AnywhereRuins/"
-	suffix = "golem_ship.dmm"
-	allow_duplicates = FALSE
-
 /datum/map_template/ruin/lavaland/gaia
 	name = "Patch of Eden"
 	id = "gaia"

code/datums/status_effects/debuffs.dm

@@ -265,41 +265,6 @@
 	desc = "Your biological functions have halted. You could live forever this way, but it's pretty boring."
 	icon_state = "stasis"
 
-//GOLEM GANG
-
-//OTHER DEBUFFS
-/datum/status_effect/strandling //get it, strand as in durathread strand + strangling = strandling hahahahahahahahahahhahahaha i want to die
-	id = "strandling"
-	examine_text = "SUBJECTPRONOUN seems to be being choked by some durathread strands. You may be able to <b>cut</b> them off."
-	status_type = STATUS_EFFECT_UNIQUE
-	alert_type = /atom/movable/screen/alert/status_effect/strandling
-
-/datum/status_effect/strandling/on_apply()
-	ADD_TRAIT(owner, TRAIT_MAGIC_CHOKE, STATUS_EFFECT_TRAIT)
-	return ..()
-
-/datum/status_effect/strandling/on_remove()
-	REMOVE_TRAIT(owner, TRAIT_MAGIC_CHOKE, STATUS_EFFECT_TRAIT)
-	return ..()
-
-/atom/movable/screen/alert/status_effect/strandling
-	name = "Choking strand"
-	desc = "A magical strand of Durathread is wrapped around your neck, preventing you from breathing! Click this icon to remove the strand."
-	icon_state = "his_grace"
-	alerttooltipstyle = "hisgrace"
-
-/atom/movable/screen/alert/status_effect/strandling/Click(location, control, params)
-	. = ..()
-	if(!.)
-		return
-
-	to_chat(owner, span_notice("You attempt to remove the durathread strand from around your neck."))
-	if(do_after(owner, 3.5 SECONDS, owner))
-		if(isliving(owner))
-			var/mob/living/living_owner = owner
-			to_chat(living_owner, span_notice("You succesfuly remove the durathread strand."))
-			living_owner.remove_status_effect(/datum/status_effect/strandling)
-
 //OTHER DEBUFFS
 /datum/status_effect/pacify
 	id = "pacify"

code/game/area/areas/ruins/lavaland.dm

@@ -19,10 +19,6 @@
 /area/ruin/powered/gluttony
 	icon_state = "dk_yellow"
 
-/area/ruin/powered/golem_ship
-	name = "\improper Free Golem Ship"
-	icon_state = "dk_yellow"
-
 /area/ruin/powered/greed
 	icon_state = "dk_yellow"
 

code/game/machinery/scan_gate.dm

@@ -14,7 +14,6 @@
 #define SCANGATE_MOTH "moth"
 #define SCANGATE_JELLY "jelly"
 #define SCANGATE_POD "pod"
-#define SCANGATE_GOLEM "golem"
 #define SCANGATE_ZOMBIE "zombie"
 
 /obj/machinery/scanner_gate
@@ -155,8 +154,6 @@
 						scan_species = /datum/species/jelly
 					if(SCANGATE_POD)
 						scan_species = /datum/species/pod
-					if(SCANGATE_GOLEM)
-						scan_species = /datum/species/golem
 					if(SCANGATE_ZOMBIE)
 						scan_species = /datum/species/zombie
 				if(is_species(H, scan_species))
@@ -279,5 +276,4 @@
 #undef SCANGATE_MOTH
 #undef SCANGATE_JELLY
 #undef SCANGATE_POD
-#undef SCANGATE_GOLEM
 #undef SCANGATE_ZOMBIE

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -1162,10 +1162,6 @@
 		/obj/item/stack/sheet/glass = 1,
 		/obj/item/stock_parts/matter_bin = 3)
 
-/obj/item/circuitboard/machine/mining_equipment_vendor/golem
-	name = "Golem Ship Equipment Vendor (Machine Board)"
-	build_path = /obj/machinery/mineral/equipment_vendor/golem
-
 /obj/item/circuitboard/machine/ore_redemption
 	name = "Ore Redemption (Machine Board)"
 	greyscale_colors = CIRCUIT_COLOR_SUPPLY

code/game/objects/items/food/meat.dm

@@ -486,7 +486,7 @@
 	icon_state = "sashimi"
 	food_reagents = list(/datum/reagent/consumable/nutriment/protein = 10, /datum/reagent/consumable/capsaicin = 9, /datum/reagent/consumable/nutriment/vitamin = 4)
 	tastes = list("fish" = 1, "hot peppers" = 1)
-	foodtypes = SEAFOOD 
+	foodtypes = SEAFOOD
 	w_class = WEIGHT_CLASS_TINY
 	//total price of this dish is 20 and a small amount more for soy sauce, all of which are available at the orders console
 	venue_value = FOOD_PRICE_CHEAP
@@ -662,19 +662,6 @@
 	foodtypes = MEAT | RAW | TOXIC
 	venue_value = FOOD_MEAT_MUTANT_RARE
 
-/obj/item/food/meat/slab/human/mutant/golem
-	icon_state = "golemmeat"
-	desc = "Edible rocks, welcome to the future."
-	food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/iron = 3)
-	tastes = list("rock" = 1)
-	foodtypes = MEAT | RAW | GROSS
-	venue_value = FOOD_MEAT_MUTANT_RARE
-
-/obj/item/food/meat/slab/human/mutant/golem/adamantine
-	icon_state = "agolemmeat"
-	desc = "From the slime pen to the rune to the kitchen, science."
-	foodtypes = MEAT | RAW | GROSS
-
 /obj/item/food/meat/slab/human/mutant/lizard
 	icon_state = "lizardmeat"
 	desc = "Delicious dino damage."

code/game/objects/items/stacks/sheets/glass.dm

@@ -328,7 +328,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
 	var/hit_hand = ((user.active_hand_index % 2 == 0) ? "r_" : "l_") + "arm"
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
-		if(!H.gloves && !HAS_TRAIT(H, TRAIT_PIERCEIMMUNE)) // golems, etc
+		if(!H.gloves && !HAS_TRAIT(H, TRAIT_PIERCEIMMUNE))
 			to_chat(H, span_warning("[src] cuts into your hand!"))
 			H.apply_damage(force*0.5, BRUTE, hit_hand)
 

code/game/objects/items/stacks/sheets/mineral.dm

@@ -360,10 +360,6 @@ GLOBAL_LIST_INIT(snow_recipes, list ( \
  * Adamantine
 */
 
-
-GLOBAL_LIST_INIT(adamantine_recipes, list(
-	))
-
 /obj/item/stack/sheet/mineral/adamantine
 	name = "adamantine"
 	icon_state = "sheet-adamantine"
@@ -372,9 +368,8 @@ GLOBAL_LIST_INIT(adamantine_recipes, list(
 	mats_per_unit = list(/datum/material/adamantine=MINERAL_MATERIAL_AMOUNT)
 	merge_type = /obj/item/stack/sheet/mineral/adamantine
 
-/obj/item/stack/sheet/mineral/adamantine/get_main_recipes()
-	. = ..()
-	. += GLOB.adamantine_recipes
+/obj/item/stack/sheet/mineral/adamantine/twenty
+	amount = 20
 
 /*
  * Runite
@@ -390,7 +385,6 @@ GLOBAL_LIST_INIT(adamantine_recipes, list(
 	merge_type = /obj/item/stack/sheet/mineral/runite
 	material_type = /datum/material/runite
 
-
 /*
  * Mythril
  */

code/game/objects/items/storage/boxes.dm

@@ -1034,17 +1034,6 @@
 	for(var/i in 1 to 7)
 		new /obj/item/emptysandbag(src)
 
-/obj/item/storage/box/rndboards
-	name = "\proper the liberator's legacy"
-	desc = "A box containing a gift for worthy golems."
-	illustration = "scicircuit"
-
-/obj/item/storage/box/rndboards/PopulateContents()
-	new /obj/item/circuitboard/machine/protolathe/offstation(src)
-	new /obj/item/circuitboard/machine/destructive_analyzer(src)
-	new /obj/item/circuitboard/machine/circuit_imprinter/offstation(src)
-	new /obj/item/circuitboard/computer/rdconsole(src)
-
 /obj/item/storage/box/silver_sulf
 	name = "box of silver sulfadiazine patches"
 	desc = "Contains patches used to treat burns."

code/game/objects/items/tools/crowbar.dm

@@ -140,13 +140,6 @@
 		user.visible_message(span_notice("[user] cuts [attacked_carbon]'s restraints with [src]!"))
 		qdel(attacked_carbon.handcuffed)
 		return
-	else if(istype(attacked_carbon) && attacked_carbon.has_status_effect(/datum/status_effect/strandling) && tool_behaviour == TOOL_WIRECUTTER)
-		user.visible_message(span_notice("[user] attempts to cut the durathread strand from around [attacked_carbon]'s neck."))
-		if(do_after(user, 1.5 SECONDS, attacked_carbon))
-			user.visible_message(span_notice("[user] succesfully cuts the durathread strand from around [attacked_carbon]'s neck."))
-			attacked_carbon.remove_status_effect(/datum/status_effect/strandling)
-			playsound(loc, usesound, 50, TRUE, -1)
-		return
 	else
 		..()