mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 12:41:09 +01:00
Del The World: Unit testing for hard deletes (#59612)
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
This commit is contained in:
co-authored by
SteelSlayer
parent
0304206af3
commit
cd576ab519
@@ -173,5 +173,7 @@
|
||||
return
|
||||
|
||||
/obj/effect/dummy/chameleon/Destroy()
|
||||
master.disrupt(0)
|
||||
if(master)
|
||||
master.disrupt(0)
|
||||
master = null
|
||||
return ..()
|
||||
|
||||
@@ -113,8 +113,9 @@
|
||||
/obj/structure/projected_forcefield/Destroy()
|
||||
visible_message(span_warning("[src] flickers and disappears!"))
|
||||
playsound(src,'sound/weapons/resonator_blast.ogg',25,TRUE)
|
||||
generator.current_fields -= src
|
||||
generator = null
|
||||
if(generator)
|
||||
generator.current_fields -= src
|
||||
generator = null
|
||||
return ..()
|
||||
|
||||
/obj/structure/projected_forcefield/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
|
||||
@@ -123,4 +124,5 @@
|
||||
/obj/structure/projected_forcefield/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
|
||||
if(sound_effect)
|
||||
play_attack_sound(damage_amount, damage_type, damage_flag)
|
||||
generator.shield_integrity = max(generator.shield_integrity - damage_amount, 0)
|
||||
if(generator)
|
||||
generator.shield_integrity = max(generator.shield_integrity - damage_amount, 0)
|
||||
|
||||
@@ -263,6 +263,9 @@
|
||||
|
||||
|
||||
/obj/item/food/deepfryholder/Initialize(mapload, obj/item/fried)
|
||||
if(!fried)
|
||||
stack_trace("A deepfried object was created with no fried target")
|
||||
return INITIALIZE_HINT_QDEL
|
||||
. = ..()
|
||||
name = fried.name //We'll determine the other stuff when it's actually removed
|
||||
appearance = fried.appearance
|
||||
|
||||
@@ -70,7 +70,8 @@
|
||||
/////////////////////////////////
|
||||
/obj/effect/payload_spawner/Initialize(mapload, type, numspawned)
|
||||
..()
|
||||
spawn_payload(type, numspawned)
|
||||
if(type && isnum(numspawned))
|
||||
spawn_payload(type, numspawned)
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
/obj/effect/payload_spawner/proc/spawn_payload(type, numspawned)
|
||||
|
||||
@@ -505,10 +505,11 @@
|
||||
/obj/item/borg/upgrade/defib/backpack/proc/on_defib_instance_qdel_or_moved(obj/item/defibrillator/D)
|
||||
SIGNAL_HANDLER
|
||||
defib_instance = null
|
||||
qdel(src)
|
||||
if(!QDELETED(src))
|
||||
qdel(src)
|
||||
|
||||
/obj/item/borg/upgrade/defib/backpack/Destroy()
|
||||
if(defib_instance)
|
||||
if(!QDELETED(defib_instance))
|
||||
QDEL_NULL(defib_instance)
|
||||
return ..()
|
||||
|
||||
|
||||
@@ -237,9 +237,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
|
||||
/obj/item/claymore/highlander/robot/Initialize()
|
||||
var/obj/item/robot_model/kiltkit = loc
|
||||
robot = kiltkit.loc
|
||||
. = ..()
|
||||
if(!istype(robot))
|
||||
qdel(src)
|
||||
return ..()
|
||||
return INITIALIZE_HINT_QDEL
|
||||
|
||||
/obj/item/claymore/highlander/robot/process()
|
||||
loc.layer = LARGE_MOB_LAYER
|
||||
|
||||
Reference in New Issue
Block a user