cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-25 05:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into reagentToDefines

Browse Source
This commit is contained in:
Kashargul
2024-12-06 21:57:14 +01:00
committed by GitHub
parent 429398bdd7 5092af9321
commit 939fcbb488
212 changed files with 5049 additions and 1312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/apc.dm
+2 -2
View File
@@ -685,7 +685,7 @@ GLOBAL_LIST_EMPTY(apcs)
// attack with hand - remove cell (if cover open) or interact with the APC
/obj/machinery/power/apc/verb/togglelock(mob/user as mob)
/obj/machinery/power/apc/proc/togglelock(mob/user)
if(emagged)
to_chat(user, "The panel is unresponsive.")
else if(opened)
@@ -873,7 +873,7 @@ GLOBAL_LIST_EMPTY(apcs)
// to_world("[area.power_equip]")
area.power_change()
/obj/machinery/power/apc/proc/can_use(mob/user as mob, var/loud = 0) //used by attack_hand() and Topic()
/obj/machinery/power/apc/proc/can_use(mob/user, var/loud = 0) //used by attack_hand() and Topic()
if(!user.client)
return 0
if(isobserver(user) && is_admin(user)) //This is to allow nanoUI interaction by ghost admins.
code/modules/power/singularity/singularity.dm
+1 -1
View File
@@ -366,7 +366,7 @@ GLOBAL_LIST_BOILERPLATE(all_singularities, /obj/singularity)
// VOREStation Edit Start
var/area/A = get_area(T)
if(A.forbid_singulo) //No going to dorms
if(A.flag_check(AREA_FORBID_SINGULO)) //No going to dorms
return 0
// VOREStation Edit End