From 0816c1c077db58bc1f0197a06485f9be17b2b1cf Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Mon, 6 Feb 2017 19:46:08 +0400 Subject: [PATCH] moved define and changed for loop --- code/game/gamemodes/changeling/changeling.dm | 1 - code/game/gamemodes/changeling/powers/absorb.dm | 14 +++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index e09d31fa8bb..c25802d38fc 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -1,4 +1,3 @@ -#define LING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon","Zeta","Eta","Theta","Iota","Kappa","Lambda","Mu","Nu","Xi","Omicron","Pi","Rho","Sigma","Tau","Upsilon","Phi","Chi","Psi","Omega") /datum/game_mode diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index 7d0212a216b..06402a584b7 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -1,3 +1,5 @@ +#define LING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob + /obj/effect/proc_holder/changeling/absorbDNA name = "Absorb DNA" desc = "Absorb the DNA of our victim." @@ -26,8 +28,6 @@ var/mob/living/carbon/target = G.affecting return changeling.can_absorb_dna(user,target) - - /obj/effect/proc_holder/changeling/absorbDNA/sting_action(var/mob/user) var/datum/changeling/changeling = user.mind.changeling var/obj/item/weapon/grab/G = user.get_active_hand() @@ -72,10 +72,7 @@ if(target.say_log.len > LING_ABSORB_RECENT_SPEECH) recent_speech = target.say_log.Copy(target.say_log.len-LING_ABSORB_RECENT_SPEECH+1,0) //0 so len-LING_ARS+1 to end of list else - for(var/spoken_memory in target.say_log) - if(recent_speech.len >= LING_ABSORB_RECENT_SPEECH) - break - recent_speech += spoken_memory + recent_speech = target.say_log.Copy() if(recent_speech.len) user.mind.store_memory("Some of [target]'s speech patterns, we should study these to better impersonate them!") @@ -93,7 +90,6 @@ target.mind.changeling.absorbed_dna.len = 1 target.mind.changeling.absorbedcount = 0 - changeling.chem_charges=min(changeling.chem_charges+10, changeling.chem_storage) changeling.isabsorbing = 0 @@ -103,8 +99,6 @@ target.Drain() return 1 - - //Absorbs the target DNA. /datum/changeling/proc/absorb_dna(mob/living/carbon/T, var/mob/user) T.dna.real_name = T.real_name //Set this again, just to be sure that it's properly set. @@ -125,3 +119,5 @@ return absorbed_dna |= new_dna trim_dna() + +#undef LING_ABSORB_RECENT_SPEECH