mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-22 11:38:12 +01:00
bunch of unhandled refs (#16919)
* bunch of unhandled refs * fix that (#6)
This commit is contained in:
@@ -99,6 +99,9 @@
|
||||
return parent.return_network(reference)
|
||||
|
||||
/obj/machinery/atmospherics/pipe/Destroy()
|
||||
if(parent)
|
||||
parent.members -= src
|
||||
parent.edges -= src
|
||||
QDEL_NULL(parent)
|
||||
if(air_temporary)
|
||||
loc.assume_air(air_temporary)
|
||||
|
||||
@@ -92,3 +92,7 @@ SUBSYSTEM_DEF(mobs)
|
||||
/datum/controller/subsystem/mobs/critfail()
|
||||
..()
|
||||
log_recent()
|
||||
|
||||
/mob/Destroy()
|
||||
. = ..()
|
||||
SSmobs.currentrun -= src
|
||||
|
||||
@@ -146,3 +146,7 @@ SUBSYSTEM_DEF(radiation)
|
||||
return
|
||||
var/turf/epicentre = locate(round(world.maxx / 2), round(world.maxy / 2), source.z)
|
||||
flat_radiate(epicentre, power, world.maxx, respect_maint)
|
||||
|
||||
/mob/living/Destroy()
|
||||
. = ..()
|
||||
SSradiation.listeners -= src
|
||||
|
||||
@@ -70,7 +70,7 @@
|
||||
|
||||
/obj/machinery/camera/Destroy()
|
||||
if(isMotion())
|
||||
unsense_proximity(callback = /atom/proc/HasProximity)
|
||||
unsense_proximity(callback = TYPE_PROC_REF(/atom,HasProximity))
|
||||
deactivate(null, 0) //kick anyone viewing out
|
||||
if(assembly)
|
||||
qdel(assembly)
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
break
|
||||
component_parts.Remove(C)
|
||||
C.forceMove(src.loc)
|
||||
C.Destroy()
|
||||
qdel(C)
|
||||
cur_coils--
|
||||
// Rebuild from mapper's coils
|
||||
for(var/i = 1, i <= parts_found.len, i++)
|
||||
|
||||
@@ -39,6 +39,15 @@
|
||||
m.visible_message(span_notice("\The [m] tumbles out of \the [src]!"))
|
||||
//VOREStation Add End
|
||||
|
||||
if(istype(src, /obj/item))
|
||||
var/obj/item/I = src
|
||||
if(I.possessed_voice && I.possessed_voice.len)
|
||||
for(var/mob/living/voice/V in I.possessed_voice)
|
||||
if(!V.tf_mob_holder)
|
||||
V.ghostize(0)
|
||||
V.stat = DEAD
|
||||
qdel(V)
|
||||
|
||||
return ..()
|
||||
|
||||
/obj/Topic(href, href_list, var/datum/tgui_state/state = GLOB.tgui_default_state)
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
desc = "It's a burial receptacle for the dearly departed."
|
||||
icon = 'icons/obj/closets/coffin.dmi'
|
||||
|
||||
icon_state = "closed"
|
||||
icon_state = "closed_unlocked"
|
||||
seal_tool = /obj/item/tool/screwdriver
|
||||
breakout_sound = 'sound/weapons/tablehit1.ogg'
|
||||
closet_appearance = null // Special icon for us
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
flick("[icon_state]_hit", src)
|
||||
playsound(src, 'sound/effects/woodhit.ogg', 25, 1, -1)
|
||||
user.do_attack_animation(src)
|
||||
user.nutrition = user.nutrition - 5
|
||||
user.adjust_nutrition(-5)
|
||||
user.weight -= 0.25 * weightloss_power * (0.01 * user.weight_loss)
|
||||
to_chat(user, span_warning("You [pick(hit_message)] \the [src]."))
|
||||
|
||||
|
||||
@@ -491,7 +491,9 @@ var/global/list/obj/item/pda/PDAs = list()
|
||||
|
||||
/obj/item/pda/Destroy()
|
||||
PDAs -= src
|
||||
if (src.id && prob(100) && !delete_id) //IDs are kept in 90% of the cases //VOREStation Edit - 100% of the cases, excpet when specified otherwise
|
||||
if(id.loc != src)
|
||||
id = null
|
||||
if (src.id && !delete_id)
|
||||
src.id.forceMove(get_turf(src.loc))
|
||||
else
|
||||
QDEL_NULL(src.id)
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
shockdirs = list(turn(dir,90),turn(dir,-90))
|
||||
|
||||
/obj/machinery/containment_field/Destroy()
|
||||
unsense_proximity(callback = /atom/proc/HasProximity)
|
||||
unsense_proximity(callback = TYPE_PROC_REF(/atom,HasProximity))
|
||||
if(FG1 && !FG1.clean_up)
|
||||
FG1.cleanup()
|
||||
if(FG2 && !FG2.clean_up)
|
||||
|
||||
@@ -469,10 +469,8 @@
|
||||
impacted_mobs.Cut()
|
||||
impacted_mobs = null
|
||||
|
||||
trajectory = null
|
||||
beam_index = null
|
||||
beam_components = null
|
||||
|
||||
QDEL_NULL(trajectory)
|
||||
cleanup_beam_segments()
|
||||
|
||||
if(my_case)
|
||||
if(my_case.BB == src)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 898 B After Width: | Height: | Size: 921 B |
Reference in New Issue
Block a user