Skip to content

Commit 8d2edcb

Browse files
authored
Qdel fixes (#8625)
* fixes qdel hints for guns, internal organs, and atmospheric and computer-type machinery * missed two * s0 much to miss * dismantle_wall no longer qdels turf
1 parent 372cabc commit 8d2edcb

File tree

9 files changed

+11
-9
lines changed

9 files changed

+11
-9
lines changed

code/ATMOSPHERICS/atmospherics.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Pipelines + Other Objects -> Pipe network
4848

4949
/obj/machinery/atmospherics/Destroy()
5050
GLOB.atmos_machinery -= src
51-
..()
51+
. = ..()
5252

5353
/obj/machinery/atmospherics/proc/atmos_init()
5454
return

code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
node2.disconnect(src)
5757
QDEL_NULL(network2)
5858
node2 = null
59-
..()
59+
. = ..()
6060

6161

6262
/obj/machinery/atmospherics/binary/atmos_init()

code/ATMOSPHERICS/components/unary/unary_base.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
node1.disconnect(src)
2929
QDEL_NULL(network)
3030
node1 = null
31-
..()
31+
. = ..()
3232

3333

3434
/obj/machinery/atmospherics/unary/atmos_init()

code/game/machinery/alarm.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1193,7 +1193,7 @@ FIRE ALARM
11931193

11941194
/obj/machinery/firealarm/Destroy()
11951195
GLOB.firealarm_list -= src
1196-
..()
1196+
. = ..()
11971197

11981198
/*
11991199
FIRE ALARM CIRCUIT

code/game/machinery/computer/computer.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
/obj/machinery/computer/Destroy()
2424
GLOB.computer_list -= src
25-
..()
25+
. = ..()
2626

2727
/obj/machinery/computer/Process()
2828
if(stat & (NOPOWER|BROKEN))

code/game/machinery/doors/door.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
/obj/machinery/door/Destroy()
5353
GLOB.all_doors -= src
54-
..()
54+
. = ..()
5555

5656
/obj/machinery/door/can_prevent_fall(above)
5757
return above ? density : null

code/game/turfs/simulated/walls.dm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@
6969
girder.is_low = is_low_wall
7070
girder.is_reinforced = is_reinforced
7171
girder.update_icon()
72-
qdel(src)
72+
remove_neighbour_connections()
73+
ChangeTurf(/turf/floor/plating)
74+
updateVisibility(src)
7375

7476
/turf/wall/get_matter()
7577
return list(MATERIAL_STEEL = 5)

code/modules/organs/internal/_internal.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
UnregisterSignal(src, COMSIG_IORGAN_ADD_WOUND)
5757
UnregisterSignal(src, COMSIG_IORGAN_REMOVE_WOUND)
5858
UnregisterSignal(src, COMSIG_IORGAN_REFRESH_SELF)
59-
..()
59+
. = ..()
6060

6161
/obj/item/organ/internal/removed()
6262
UnregisterSignal(parent, COMSIG_IORGAN_WOUND_COUNT)

code/modules/projectiles/gun.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
if(flashlight_attachment)
231231
flashlight_attachment.forceMove(get_turf(src))
232232
flashlight_attachment = null
233-
..()
233+
. = ..()
234234

235235
/obj/item/gun/proc/set_item_state(state, hands = TRUE, back = FALSE, onsuit = FALSE)
236236
var/wield_state

0 commit comments

Comments
 (0)