cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes map element overwriting option (#31978)

Browse Source 
* Fixes vault overwriting option

* Saner method of looping

* Actually works nice now

* Makes this static for performance

* Some debug logging for how long a vault takes to load

* Here too

* Removing logging, for future PR

* Changing this to handle qdels better

* Fixes how vending machines do it too

* Requested changes

* Forgot this too

* And this

* APC cells

* Set this to null too

Co-authored-by: kanef <kanef9x@protonmail.com>
This commit is contained in:
kane-f
2022-02-11 10:32:44 +00:00
committed by GitHub
parent 998025428c
commit f801f7d0e8
7 changed files with 44 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/game/objects/structures/crates_lockers/closets.dm
View File

@@ -86,11 +86,6 @@
..()
take_contents()
// Fix for #383 - C4 deleting fridges with corpses
/obj/structure/closet/Destroy()
dump_contents()
..()
/obj/structure/closet/alter_health()
return get_turf(src)
@@ -340,6 +335,7 @@
for(var/atom/movable/A in src)//pulls everything else out of the locker and hits it with an explosion
A.forceMove(src.loc)
A.ex_act(severity++)
dump_contents()
qdel(src)
if(2)
if(prob(50))
@@ -350,6 +346,7 @@
for (var/atom/movable/A as mob|obj in src)
A.forceMove(src.loc)
A.ex_act(severity++)
dump_contents()
qdel(src)
if(3)
if(prob(5))
@@ -360,6 +357,7 @@
for(var/atom/movable/A as mob|obj in src)
A.forceMove(src.loc)
A.ex_act(severity++)
dump_contents()
qdel(src)
/obj/structure/closet/shuttle_act()
@@ -376,8 +374,7 @@
broken = 1
if(has_electronics)
dump_electronics()
for(var/atom/movable/A as mob|obj in src)
A.forceMove(src.loc)
dump_contents()
qdel(src)
return
@@ -428,8 +425,7 @@
broken = 1
if(has_electronics)
dump_electronics()
for(var/atom/movable/A as mob|obj in src)
A.forceMove(src.loc)
dump_contents()
qdel(src)
// this should probably use dump_contents()
@@ -439,8 +435,7 @@
broken = 1
if(has_electronics)
dump_electronics()
for(var/atom/movable/A as mob|obj in src)
A.forceMove(src.loc)
dump_contents()
qdel(src)
/obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -463,6 +458,7 @@
M.show_message("<span class='notice'>\The [src] has been cut apart by [user] with \the [WT].</span>", 1, "You hear welding.", 2)
if(has_electronics)
dump_electronics()
dump_contents()
qdel(src)
return
@@ -473,6 +469,7 @@
M.show_message("<span class='notice'>\The [src] has been dismantled by [user] with \the [WT].</span>", 1)
if(has_electronics)
dump_electronics()
dump_contents()
qdel(src)
return