From 7ee7942aa4b0a5cbb9307ad9670e1fe3fb3288ab Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 25 Oct 2017 20:01:52 -0500 Subject: [PATCH] [MIRROR] [s] Fixes changling golem exploit (#3600) * Merge pull request #32061 from ShizCalev/ling-golem-exploit-fix Fixes changling golem exploit * [s] Fixes changling golem exploit --- .../mob/living/carbon/human/species_types/golems.dm | 9 +++++++++ 1 file changed, 9 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 97b88d7715..f6dac06eea 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -419,6 +419,7 @@ if(ishuman(C)) unstable_teleport = new unstable_teleport.Grant(C) + last_teleport = world.time /datum/species/golem/bluespace/on_species_loss(mob/living/carbon/C) if(unstable_teleport) @@ -479,6 +480,11 @@ var/banana_cooldown = 100 var/active = null +/datum/species/golem/bananium/on_species_gain(mob/living/carbon/C, datum/species/old_species) + ..() + last_banana = world.time + last_honk = world.time + /datum/species/golem/bananium/random_name(gender,unique,lastname) var/clown_name = pick(GLOB.clown_names) var/golem_name = "[uppertext(clown_name)]" @@ -553,10 +559,13 @@ . = ..() C.faction |= "cult" phase_shift = new + phase_shift.charge_counter = 0 C.AddSpell(phase_shift) abyssal_gaze = new + abyssal_gaze.charge_counter = 0 C.AddSpell(abyssal_gaze) dominate = new + dominate.charge_counter = 0 C.AddSpell(dominate) /datum/species/golem/runic/on_species_loss(mob/living/carbon/C)