From 21beb6373f76edb2e042dc7d2c6b1142eb35dc2b Mon Sep 17 00:00:00 2001 From: MrDoomBringer Date: Tue, 3 Jul 2018 13:12:51 -0400 Subject: [PATCH] Fixes runtimes when using supplypod smite on ghosts and fixes supplypod-smite hotspot effects. (#38634) * ez pz lemin squizi * oooooooooh * I DIDNT COMPILE MY CODE * I DIDNT COMPILE MY CODE * cyberboss i love u tho --- .../crates_lockers/closets/secure/supplypod.dm | 12 +++++++----- code/modules/admin/verbs/randomverbs.dm | 5 +++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/supplypod.dm b/code/game/objects/structures/crates_lockers/closets/secure/supplypod.dm index 79af1e0bdc4..d99f07e41f7 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/supplypod.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/supplypod.dm @@ -32,7 +32,7 @@ desc = "A Nanotrasen Bluespace drop pod, this one has been marked with Central Command's designations. Teleports back to Centcom after delivery." icon_state = "centcompod" -/obj/structure/closet/supplypod/Initialize(mapload, var/SO) +/obj/structure/closet/supplypod/Initialize(mapload, SO) . = ..() if(istype(SO, /datum/supply_order)) SupplyOrder = SO//uses Supply Order passed from expressconsole into BDPtarget @@ -84,7 +84,7 @@ randomdir = FALSE icon_state = "supplypod_falling" -/obj/effect/temp_visual/DPfall/Initialize(var/dropLocation, var/podID) +/obj/effect/temp_visual/DPfall/Initialize(dropLocation, podID) if (podID == POD_STANDARD) icon_state = "supplypod_falling" name = "Supply Drop Pod" @@ -104,7 +104,7 @@ light_range = 2 var/obj/effect/temp_visual/fallingPod -/obj/effect/DPtarget/Initialize(mapload, var/SO, var/podID, var/target) +/obj/effect/DPtarget/Initialize(mapload, SO, podID) . = ..() var/delayTime = 17 //We're forcefully adminspawned, make it faster switch(podID) @@ -117,12 +117,12 @@ addtimer(CALLBACK(src, .proc/beginLaunch, SO, podID), delayTime)//standard pods take 3 seconds to come in, bluespace pods take 1.5 -/obj/effect/DPtarget/proc/beginLaunch(var/SO, var/podID) +/obj/effect/DPtarget/proc/beginLaunch(SO, podID) fallingPod = new /obj/effect/temp_visual/DPfall(drop_location(), podID) animate(fallingPod, pixel_z = 0, time = 3, easing = LINEAR_EASING)//make and animate a falling pod addtimer(CALLBACK(src, .proc/endLaunch, SO, podID), 3, TIMER_CLIENT_TIME)//fall 0.3seconds -/obj/effect/DPtarget/proc/endLaunch(var/SO, var/podID) +/obj/effect/DPtarget/proc/endLaunch(SO, podID) if(podID == POD_STANDARD) new /obj/structure/closet/supplypod(drop_location(), SO)//pod is created explosion(src,0,0,2, flame_range = 3) //less advanced equipment than bluespace pod, so larger explosion when landing @@ -132,6 +132,8 @@ else if(podID == POD_CENTCOM) new /obj/structure/closet/supplypod/bluespacepod/centcompod(drop_location(), SO)//CentCom supplypods dont create explosions; instead they directly deal 40 fire damage to people on the turf var/turf/T = get_turf(src) + playsound(src, "explosion", 80, 1) + new /obj/effect/hotspot(T) T.hotspot_expose(700, 50, 1)//same as fireball for(var/mob/living/M in T.contents) M.adjustFireLoss(40) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index e8afe623ee5..0184c4b34f8 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1356,8 +1356,9 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits alert("ERROR: Incorrect / improper path given.") return //send the pod - target.Stun(10)//takes 0.53 seconds for CentCom pod to land - new /obj/effect/DPtarget(get_turf(target), delivery, POD_CENTCOM, target) + if(iscarbon(target)) + target.Stun(10)//takes 0.53 seconds for CentCom pod to land + new /obj/effect/DPtarget(get_turf(target), delivery, POD_CENTCOM) var/msg = "[key_name_admin(usr)] punished [key_name_admin(target)] with [punishment]." message_admins(msg)