diff --git a/code/game/objects/effects/proximity.dm b/code/game/objects/effects/proximity.dm index 5a38b29613b..cc3494c22d8 100644 --- a/code/game/objects/effects/proximity.dm +++ b/code/game/objects/effects/proximity.dm @@ -113,4 +113,5 @@ /obj/effect/abstract/proximity_checker/Crossed(atom/movable/AM) set waitfor = FALSE . = ..() - monitor.hasprox_receiver.HasProximity(AM) + if(monitor) + monitor.hasprox_receiver.HasProximity(AM) diff --git a/code/modules/fields/fields.dm b/code/modules/fields/fields.dm index 3e401051499..e8e677e4d68 100644 --- a/code/modules/fields/fields.dm +++ b/code/modules/fields/fields.dm @@ -78,7 +78,7 @@ /datum/proximity_monitor/advanced/proc/process_edge_turf(turf/T) -/datum/proximity_monitor/advanced/New() +/datum/proximity_monitor/advanced/New(atom/_host, range, _ignore_if_not_on_turf = TRUE) if(requires_processing) START_PROCESSING(SSfields, src) diff --git a/code/modules/fields/peaceborg_dampener.dm b/code/modules/fields/peaceborg_dampener.dm index 5a1f1491648..c743270d2f1 100644 --- a/code/modules/fields/peaceborg_dampener.dm +++ b/code/modules/fields/peaceborg_dampener.dm @@ -21,10 +21,10 @@ var/list/obj/projectile/staging use_host_turf = TRUE -/datum/proximity_monitor/advanced/peaceborg_dampener/New() +/datum/proximity_monitor/advanced/peaceborg_dampener/New(atom/_host, range, _ignore_if_not_on_turf = TRUE) tracked = list() staging = list() - ..() + return ..() /datum/proximity_monitor/advanced/peaceborg_dampener/Destroy() return ..()