cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15209 from SteelSlayer/spawn-removal

Browse Source 
Removes a bunch of spawn()'s
This commit is contained in:
Fox McCloud
2021-03-07 21:10:39 -05:00
committed by GitHub
parent 9d81bf1e55 7390afb598
commit 0dc46b7150
22 changed files with 82 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/diseases/advance/symptoms/shedding.dm
+12 -9
View File
@@ -36,15 +36,18 @@ BONUS
if(3, 4)
if(!(head_organ.h_style == "Bald") && !(head_organ.h_style == "Balding Hair"))
to_chat(H, "<span class='warning'>Your hair starts to fall out in clumps...</span>")
spawn(50)
head_organ.h_style = "Balding Hair"
H.update_hair()
addtimer(CALLBACK(src, .proc/change_hair, H, head_organ, null, "Balding Hair"), 5 SECONDS)
if(5)
if(!(head_organ.f_style == "Shaved") || !(head_organ.h_style == "Bald"))
to_chat(H, "<span class='warning'>Your hair starts to fall out in clumps...</span>")
spawn(50)
head_organ.f_style = "Shaved"
head_organ.h_style = "Bald"
H.update_hair()
H.update_fhair()
return
addtimer(CALLBACK(src, .proc/change_hair, H, head_organ, "Shaved", "Bald"), 5 SECONDS)
/datum/symptom/shedding/proc/change_hair(mob/living/carbon/human/H, obj/item/organ/external/head/head_organ, f_style, h_style)
if(!H || !head_organ)
return
if(f_style)
head_organ.f_style = f_style
H.update_fhair()
if(h_style)
head_organ.h_style = h_style
H.update_hair()
code/datums/helper_datums/teleport.dm
+5 -7
View File
@@ -84,14 +84,12 @@
/datum/teleport/proc/playSpecials(atom/location,datum/effect_system/effect,sound)
if(location)
if(effect)
spawn(-1)
src = null
effect.attach(location)
effect.start()
src = null
effect.attach(location)
effect.start()
if(sound)
spawn(-1)
src = null
playsound(location,sound,60,1)
src = null
playsound(location,sound,60,1)
return
//do the monkey dance
code/datums/spells/conjure.dm
+1 -3
View File
@@ -44,9 +44,7 @@
summoned_object.admin_spawned = TRUE
if(summon_lifespan)
spawn(summon_lifespan)
if(summoned_object)
qdel(summoned_object)
QDEL_IN(summoned_object, summon_lifespan)
else
switch(charge_type)
if("recharge")
code/datums/spells/knock.dm
+16 -12
View File
@@ -16,19 +16,23 @@
/obj/effect/proc_holder/spell/aoe_turf/knock/cast(list/targets, mob/user = usr)
for(var/turf/T in targets)
for(var/obj/machinery/door/door in T.contents)
spawn(1)
if(istype(door,/obj/machinery/door/airlock/hatch/gamma))
return
if(istype(door,/obj/machinery/door/airlock))
var/obj/machinery/door/airlock/A = door
A.unlock(1) //forced because it's magic!
door.open()
INVOKE_ASYNC(src, .proc/try_open_airlock, door)
for(var/obj/structure/closet/C in T.contents)
spawn(1)
if(istype(C, /obj/structure/closet/secure_closet))
var/obj/structure/closet/secure_closet/SC = C
SC.locked = 0
C.open()
INVOKE_ASYNC(src, .proc/try_open_closet, C)
/obj/effect/proc_holder/spell/aoe_turf/knock/proc/try_open_airlock(obj/machinery/door/door)
if(istype(door, /obj/machinery/door/airlock/hatch/gamma))
return
if(istype(door, /obj/machinery/door/airlock))
var/obj/machinery/door/airlock/A = door
A.unlock(TRUE) //forced because it's magic!
door.open()
/obj/effect/proc_holder/spell/aoe_turf/knock/proc/try_open_closet(obj/structure/closet/C)
if(istype(C, /obj/structure/closet/secure_closet))
var/obj/structure/closet/secure_closet/SC = C
SC.locked = FALSE
C.open()
/obj/effect/proc_holder/spell/aoe_turf/knock/greater
name = "Greater Knock"