mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 19:47:47 +01:00
Fixes some bad Destroy()s (#17511)
* Fixes some bad Destroy()s Fixes some bad destroys on request of Kash, will need checking over that I've not misunderstood the instructions! This is all I had time to look through for now. Checked around 200-ish files. * The rest of them Found a quick way to look through them all * Update chicken.dm * fix that * don't abuse destroy * . * move this up --------- Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
@@ -133,7 +133,7 @@
|
||||
|
||||
/obj/structure/barricade/sandbag/Destroy()
|
||||
update_connections(1, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/barricade/sandbag/dismantle()
|
||||
update_connections(1, src)
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
if(remote_dial)
|
||||
remote_dial.my_turrets -= src
|
||||
remote_dial = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/prop/prism/proc/reset_rotation()
|
||||
var/degrees_to_rotate = -1 * degrees_from_north
|
||||
@@ -215,4 +215,4 @@
|
||||
for(var/obj/structure/prop/prism/P in my_turrets)
|
||||
P.remote_dial = null
|
||||
my_turrets = list()
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
/obj/structure/prop/nest/Destroy()
|
||||
den_mobs = null
|
||||
STOP_PROCESSING(SSobj, src)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/prop/nest/attack_hand(mob/living/user) // Used to tell the player that this isn't useful for anything.
|
||||
..()
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
var/obj/machinery/door/blast/puzzle/P = O
|
||||
P.locks -= src
|
||||
linked_objects -= P
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/prop/lock/proc/toggle_lock()
|
||||
enabled = !enabled
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
for(var/datum/beam/B in active_beams)
|
||||
QDEL_NULL(B)
|
||||
active_beams = null
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/cult/pylon/swarm/pylonhit(var/damage)
|
||||
if(!isbroken)
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
for(var/atom/movable/AM in contents)
|
||||
AM.loc = loc
|
||||
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
/obj/structure/windoor_assembly/Destroy()
|
||||
density = FALSE
|
||||
update_nearby_tiles()
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/windoor_assembly/update_icon()
|
||||
icon_state = "[facing]_[secure]windoor_assembly[state]"
|
||||
|
||||
Reference in New Issue
Block a user