shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4831 from Citadel-Station-13/upstream-merge-34374

Browse Source 
[MIRROR] Rocket Pods now require manual disassembly
This commit is contained in:
deathride58
2018-01-15 06:18:29 +00:00
committed by GitHub
parent 63660230cc 23b9d93cc9
commit 14ae9ace64
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/bsdroppod.dm
+2 -7
View File
@@ -3,7 +3,7 @@
//------------------------------------BLUESPACE DROP POD-------------------------------------// //------------------------------------BLUESPACE DROP POD-------------------------------------//
/obj/structure/closet/bsdroppod /obj/structure/closet/bsdroppod
name = "Bluespace Drop Pod" name = "Supply Drop Pod"
desc = "A Nanotrasen supply drop pod." desc = "A Nanotrasen supply drop pod."
icon = 'icons/obj/2x2.dmi' icon = 'icons/obj/2x2.dmi'
icon_state = "BDP" icon_state = "BDP"
@@ -43,11 +43,6 @@
SupplyOrder.generate(T)//not called during populateContents as supplyorder generation requires a turf SupplyOrder.generate(T)//not called during populateContents as supplyorder generation requires a turf
update_icon() update_icon()
playsound(src, open_sound, 15, 1, -3) playsound(src, open_sound, 15, 1, -3)
addtimer(CALLBACK(src, .proc/sparks), 30)//3 seconds after opening, make some sparks and delete
/obj/structure/closet/bsdroppod/proc/sparks()//sparks cant be called from addtimer
do_sparks(5, TRUE, src)
qdel(src)//no need for QDEL_IN if we already have a timer
/obj/structure/closet/bsdroppod/Destroy()//make some sparks b4 deletion /obj/structure/closet/bsdroppod/Destroy()//make some sparks b4 deletion
QDEL_NULL(SupplyOrder) QDEL_NULL(SupplyOrder)
@@ -89,4 +84,4 @@
/obj/effect/BDPtarget/Destroy() /obj/effect/BDPtarget/Destroy()
QDEL_NULL(fallingPod)//delete falling pod after animation's over QDEL_NULL(fallingPod)//delete falling pod after animation's over
return ..() return ..()