cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-10401

Browse Source
This commit is contained in:
Nadyr
2021-05-27 22:40:15 -04:00
committed by GitHub
parent e33c671a92 0f6f622cd9
commit 92e1743b5c
314 changed files with 43393 additions and 73332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/assembly/holder.dm
View File

@@ -66,9 +66,9 @@
/obj/item/device/assembly_holder/Moved(atom/old_loc, direction, forced = FALSE)
. = ..()
if(isturf(old_loc))
unsense_proximity(callback = .HasProximity, center = old_loc)
unsense_proximity(callback = /atom/proc/HasProximity, center = old_loc)
if(isturf(loc))
sense_proximity(callback = .HasProximity)
sense_proximity(callback = /atom/proc/HasProximity)
/obj/item/device/assembly_holder/HasProximity(turf/T, atom/movable/AM, old_loc)
if(a_left)

4
code/modules/assembly/proximity.dm
View File

@@ -90,9 +90,9 @@
/obj/item/device/assembly/prox_sensor/Moved(atom/old_loc, direction, forced = FALSE)
. = ..()
if(isturf(old_loc))
unsense_proximity(range = range, callback = .HasProximity, center = old_loc)
unsense_proximity(range = range, callback = /atom/proc/HasProximity, center = old_loc)
if(isturf(loc))
sense_proximity(range = range, callback = .HasProximity)
sense_proximity(range = range, callback = /atom/proc/HasProximity)
sense()
/obj/item/device/assembly/prox_sensor/tgui_interact(mob/user, datum/tgui/ui)