cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes players not being immune to their own slime timestops

Browse Source
This commit is contained in:
YPO
2018-01-12 12:25:00 -07:00
parent e2edd31de6
commit ca688bc7cd
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/fields/timestop.dm
View File

@@ -18,12 +18,12 @@
/obj/effect/timestop/Initialize(mapload, radius, time, list/immune_atoms, start = TRUE) //Immune atoms assoc list atom = TRUE /obj/effect/timestop/Initialize(mapload, radius, time, list/immune_atoms, start = TRUE) //Immune atoms assoc list atom = TRUE
. = ..() . = ..()
if(immune_atoms)
immune = immune_atoms.Copy()
if(!isnull(time)) if(!isnull(time))
duration = time duration = time
if(!isnull(radius)) if(!isnull(radius))
freezerange = radius freezerange = radius
for(var/A in immune_atoms)
immune[A] = TRUE
for(var/mob/living/L in GLOB.player_list) for(var/mob/living/L in GLOB.player_list)
if(locate(/obj/effect/proc_holder/spell/aoe_turf/conjure/timestop) in L.mind.spell_list) //People who can stop time are immune to its effects if(locate(/obj/effect/proc_holder/spell/aoe_turf/conjure/timestop) in L.mind.spell_list) //People who can stop time are immune to its effects
immune[L] = TRUE immune[L] = TRUE

7
code/modules/reagents/chemistry/recipes/slime_extracts.dm
View File

@@ -552,10 +552,9 @@
required_other = 1 required_other = 1
/datum/chemical_reaction/slime/slimestop/on_reaction(datum/reagents/holder) /datum/chemical_reaction/slime/slimestop/on_reaction(datum/reagents/holder)
var/obj/effect/timestop/T = new /obj/effect/timestop var/turf/T = get_turf(holder.my_atom)
T.forceMove(get_turf(holder.my_atom)) var/list/M = list(get_mob_by_key(holder.my_atom.fingerprintslast))
T.immune += get_mob_by_key(holder.my_atom.fingerprintslast) new /obj/effect/timestop(T, null, null, M)
T.timestop()
..() ..()
/datum/chemical_reaction/slime/slimecamera /datum/chemical_reaction/slime/slimecamera