more side effects

shiptest-ss13 · Dec 13, 2024 · 4a0a951 · 4a0a951
1 parent 58a5829
commit 4a0a951
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
@@ -64,12 +64,9 @@
 		begin_processing()
 
 /obj/machinery/clonepod/Destroy()
-	var/mob/living/mob_occupant = occupant
-	go_out()
-	if(mob_occupant)
-		log_cloning("[key_name(mob_occupant)] ejected from [src] at [AREACOORD(src)] due to Destroy().")
 	QDEL_NULL(radio)
 	QDEL_NULL(countdown)
+	QDEL_NULL(occupant)
 	if(connected)
 		connected.DetachCloner(src)
 	QDEL_LIST(unattached_flesh)

diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm
@@ -12,10 +12,13 @@
 	var/list/stored_items = list()
 	var/obj/machinery/gulag_teleporter/linked_teleporter = null
 
-/obj/machinery/gulag_item_reclaimer/Destroy()
+/obj/machinery/gulag_item_reclaimer/deconstruct(disassembled)
 	for(var/i in contents)
 		var/obj/item/I = i
 		I.forceMove(get_turf(src))
+	return ..()
+
+/obj/machinery/gulag_item_reclaimer/Destroy()
 	if(linked_teleporter)
 		linked_teleporter.linked_reclaimer = null
 	return ..()

diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm
@@ -55,7 +55,7 @@
 		var/obj/item/coin/C = cointype
 		coinvalues["[cointype]"] = initial(C.value)
 
-/obj/machinery/computer/slot_machine/Destroy()
+/obj/machinery/computer/slot_machine/deconstruct(disassembled, mob/user)
 	if(balance)
 		give_payout(balance)
 	return ..()

diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
@@ -106,7 +106,7 @@
 	var/obj/S = sheet_path
 	sheet_name = initial(S.name)
 
-/obj/machinery/power/port_gen/pacman/Destroy()
+/obj/machinery/power/port_gen/pacman/deconstruct(disassembled)
 	DropFuel()
 	return ..()