cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-26 14:48:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

Browse Source
This commit is contained in:
SandPoot
2024-03-15 19:21:39 -03:00
parent fb61c8d5eb 94000d357f
commit b76127c2d7
941 changed files with 2539 additions and 2517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/fields/fields.dm
+2 -2
View File
@@ -158,7 +158,7 @@
var/atom/_host = host
var/atom/new_host_loc = _host.loc
if(last_host_loc != new_host_loc)
INVOKE_ASYNC(src, .proc/recalculate_field)
INVOKE_ASYNC(src, PROC_REF(recalculate_field))
/datum/proximity_monitor/advanced/proc/post_setup_field()
@@ -310,7 +310,7 @@
UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)
listeningTo = null
if(!istype(current) && operating)
RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/on_mob_move)
RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_mob_move))
listeningTo = user
setup_debug_field()
else if(!operating)
code/modules/fields/infinite_void.dm
+3 -3
View File
@@ -31,7 +31,7 @@
if(G.summoner && locate(/obj/effect/proc_holder/spell/aoe_turf/domain_expansion) in G.summoner.mind.spell_list) //It would only make sense that a person's stand would also be immune.
immune[G] = TRUE
if(start)
INVOKE_ASYNC(src, .proc/domain_expansion)
INVOKE_ASYNC(src, PROC_REF(domain_expansion))
/obj/effect/domain_expansion/Destroy()
qdel(chronofield)
@@ -92,8 +92,8 @@
A.move_resist = INFINITY
global_frozen_atoms[A] = src
into_the_negative_zone(A)
RegisterSignal(A, COMSIG_MOVABLE_PRE_MOVE, .proc/unfreeze_atom)
RegisterSignal(A, COMSIG_ITEM_PICKUP, .proc/unfreeze_atom)
RegisterSignal(A, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(unfreeze_atom))
RegisterSignal(A, COMSIG_ITEM_PICKUP, PROC_REF(unfreeze_atom))
return TRUE
code/modules/fields/timestop.dm
+3 -3
View File
@@ -33,7 +33,7 @@
if(G.summoner && locate(/obj/effect/proc_holder/spell/aoe_turf/timestop) in G.summoner.mind.spell_list) //It would only make sense that a person's stand would also be immune.
immune[G] = TRUE
if(start)
INVOKE_ASYNC(src, .proc/timestop)
INVOKE_ASYNC(src, PROC_REF(timestop))
/obj/effect/timestop/Destroy()
qdel(chronofield)
@@ -100,8 +100,8 @@
A.move_resist = INFINITY
global_frozen_atoms[A] = src
into_the_negative_zone(A)
RegisterSignal(A, COMSIG_MOVABLE_PRE_MOVE, .proc/unfreeze_atom)
RegisterSignal(A, COMSIG_ITEM_PICKUP, .proc/unfreeze_atom)
RegisterSignal(A, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(unfreeze_atom))
RegisterSignal(A, COMSIG_ITEM_PICKUP, PROC_REF(unfreeze_atom))
return TRUE