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

[MIRROR] Signal Handler Preperation (#10917)

Browse Source 
Co-authored-by: Will <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-05-18 22:38:29 -07:00
committed by GitHub
parent b92212f9ee
commit 68e70a00ad
24 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/power/singularity/containment_field.dm
View File

@@ -53,7 +53,6 @@
shock(L)
/obj/machinery/containment_field/HasProximity(turf/T, datum/weakref/WF, old_loc)
SIGNAL_HANDLER
if(isnull(WF))
return
var/atom/movable/AM = WF.resolve()
@@ -83,9 +82,7 @@
var/atom/target = get_edge_target_turf(user, get_dir(src, get_step_away(user, src)))
user.throw_at(target, 200, 4)
sleep(20)
hasShocked = 0
VARSET_IN(src, hasShocked, FALSE, 2 SECONDS)
/obj/machinery/containment_field/proc/set_master(var/master1,var/master2)
if(!master1 || !master2)