mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
[MIRROR] bunch of unhandled refs (#9905)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
996493192a
commit
e6bb9c3f94
@@ -99,11 +99,9 @@
|
|||||||
return parent.return_network(reference)
|
return parent.return_network(reference)
|
||||||
|
|
||||||
/obj/machinery/atmospherics/pipe/Destroy()
|
/obj/machinery/atmospherics/pipe/Destroy()
|
||||||
//CHOMPEdit Begin
|
|
||||||
if(parent)
|
if(parent)
|
||||||
parent.members -= src
|
parent.members -= src
|
||||||
parent.edges -= src
|
parent.edges -= src
|
||||||
//CHOMPEdit End
|
|
||||||
QDEL_NULL(parent)
|
QDEL_NULL(parent)
|
||||||
if(air_temporary)
|
if(air_temporary)
|
||||||
loc.assume_air(air_temporary)
|
loc.assume_air(air_temporary)
|
||||||
|
|||||||
@@ -98,9 +98,6 @@ SUBSYSTEM_DEF(mobs)
|
|||||||
..()
|
..()
|
||||||
log_recent()
|
log_recent()
|
||||||
|
|
||||||
//CHOMPEdit Begin
|
|
||||||
//Mobs need to immediately removed from the SS list on Destroy
|
|
||||||
/mob/Destroy()
|
/mob/Destroy()
|
||||||
. = ..()
|
. = ..()
|
||||||
SSmobs.currentrun -= src
|
SSmobs.currentrun -= src
|
||||||
//CHOMPEdit End
|
|
||||||
|
|||||||
@@ -147,9 +147,6 @@ SUBSYSTEM_DEF(radiation)
|
|||||||
var/turf/epicentre = locate(round(world.maxx / 2), round(world.maxy / 2), source.z)
|
var/turf/epicentre = locate(round(world.maxx / 2), round(world.maxy / 2), source.z)
|
||||||
flat_radiate(epicentre, power, world.maxx, respect_maint)
|
flat_radiate(epicentre, power, world.maxx, respect_maint)
|
||||||
|
|
||||||
//CHOMPEdit Begin
|
|
||||||
//Putting this here so it can be promptly nuked if I ever redo the radiation subsystem
|
|
||||||
/mob/living/Destroy()
|
/mob/living/Destroy()
|
||||||
. = ..()
|
. = ..()
|
||||||
SSradiation.listeners -= src
|
SSradiation.listeners -= src
|
||||||
//CHOMPEdit End
|
|
||||||
|
|||||||
@@ -70,7 +70,7 @@
|
|||||||
|
|
||||||
/obj/machinery/camera/Destroy()
|
/obj/machinery/camera/Destroy()
|
||||||
if(isMotion())
|
if(isMotion())
|
||||||
unsense_proximity(callback = TYPE_PROC_REF(/atom,HasProximity)) // CHOMPEdit
|
unsense_proximity(callback = TYPE_PROC_REF(/atom,HasProximity))
|
||||||
deactivate(null, 0) //kick anyone viewing out
|
deactivate(null, 0) //kick anyone viewing out
|
||||||
if(assembly)
|
if(assembly)
|
||||||
qdel(assembly)
|
qdel(assembly)
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
break
|
break
|
||||||
component_parts.Remove(C)
|
component_parts.Remove(C)
|
||||||
C.forceMove(src.loc)
|
C.forceMove(src.loc)
|
||||||
C.Destroy()
|
qdel(C)
|
||||||
cur_coils--
|
cur_coils--
|
||||||
// Rebuild from mapper's coils
|
// Rebuild from mapper's coils
|
||||||
for(var/i = 1, i <= parts_found.len, i++)
|
for(var/i = 1, i <= parts_found.len, i++)
|
||||||
|
|||||||
@@ -39,16 +39,14 @@
|
|||||||
m.visible_message(span_notice("\The [m] tumbles out of \the [src]!"))
|
m.visible_message(span_notice("\The [m] tumbles out of \the [src]!"))
|
||||||
//VOREStation Add End
|
//VOREStation Add End
|
||||||
|
|
||||||
//CHOMPAdd Start possessed item cleanup
|
|
||||||
if(istype(src, /obj/item))
|
if(istype(src, /obj/item))
|
||||||
var/obj/item/I = src
|
var/obj/item/I = src
|
||||||
if(I.possessed_voice && I.possessed_voice.len)
|
if(I.possessed_voice && I.possessed_voice.len)
|
||||||
for(var/mob/living/voice/V in I.possessed_voice)
|
for(var/mob/living/voice/V in I.possessed_voice)
|
||||||
if(!V.tf_mob_holder)
|
if(!V.tf_mob_holder)
|
||||||
V.ghostize(0)
|
V.ghostize(0)
|
||||||
V.stat = DEAD //CHOMPAdd - Helps with autosleeving
|
V.stat = DEAD
|
||||||
V.Destroy()
|
qdel(V)
|
||||||
//CHOMPAdd End
|
|
||||||
|
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
|
|||||||
@@ -498,7 +498,9 @@ var/global/list/obj/item/pda/PDAs = list()
|
|||||||
|
|
||||||
/obj/item/pda/Destroy()
|
/obj/item/pda/Destroy()
|
||||||
PDAs -= src
|
PDAs -= src
|
||||||
if (src.id && !delete_id && src.id.loc == src) //CHOMPEdit
|
if(id.loc != src)
|
||||||
|
id = null
|
||||||
|
if (src.id && !delete_id)
|
||||||
src.id.forceMove(get_turf(src.loc))
|
src.id.forceMove(get_turf(src.loc))
|
||||||
else
|
else
|
||||||
QDEL_NULL(src.id)
|
QDEL_NULL(src.id)
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
shockdirs = list(turn(dir,90),turn(dir,-90))
|
shockdirs = list(turn(dir,90),turn(dir,-90))
|
||||||
|
|
||||||
/obj/machinery/containment_field/Destroy()
|
/obj/machinery/containment_field/Destroy()
|
||||||
unsense_proximity(callback = TYPE_PROC_REF(/atom,HasProximity)) // CHOMPEdit
|
unsense_proximity(callback = TYPE_PROC_REF(/atom,HasProximity))
|
||||||
if(FG1 && !FG1.clean_up)
|
if(FG1 && !FG1.clean_up)
|
||||||
FG1.cleanup()
|
FG1.cleanup()
|
||||||
if(FG2 && !FG2.clean_up)
|
if(FG2 && !FG2.clean_up)
|
||||||
|
|||||||
@@ -469,7 +469,7 @@
|
|||||||
impacted_mobs.Cut()
|
impacted_mobs.Cut()
|
||||||
impacted_mobs = null
|
impacted_mobs = null
|
||||||
|
|
||||||
QDEL_NULL(trajectory) //CHOMPEdit
|
QDEL_NULL(trajectory)
|
||||||
cleanup_beam_segments()
|
cleanup_beam_segments()
|
||||||
|
|
||||||
if(my_case)
|
if(my_case)
|
||||||
|
|||||||
Reference in New Issue
Block a user