From 94cad81cf6cbee2e1f62e5987e58ac7b6100555d Mon Sep 17 00:00:00 2001 From: oranges Date: Tue, 31 Oct 2017 12:21:52 +1300 Subject: [PATCH] Removes golem debug code that spams world --- .../mob/living/carbon/human/species_types/golems.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 10e2dedfd6..8655600673 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -47,8 +47,18 @@ /datum/species/golem/random/on_species_gain(mob/living/carbon/C, datum/species/old_species) ..() +<<<<<<< HEAD var/list/golem_types = typesof(/datum/species/golem) - src.type var/datum/species/golem/golem_type = pick(golem_types) +======= + if(!random_golem_types) + random_golem_types = subtypesof(/datum/species/golem) - type + for(var/V in random_golem_types) + var/datum/species/golem/G = V + if(!initial(G.random_eligible)) + random_golem_types -= G + var/datum/species/golem/golem_type = pick(random_golem_types) +>>>>>>> c6f1d6f... Merge pull request #32277 from YPOQ/patch-1 var/mob/living/carbon/human/H = C H.set_species(golem_type) to_chat(H, "[initial(golem_type.info_text)]")