cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 05:26:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge large polaris changes

Browse Source
This commit is contained in:
Arokha Sieyes
2017-03-02 22:44:17 -05:00
parent 520812ffb7 a0198fb947
commit 387f429e5e
213 changed files with 18973 additions and 17252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/secrets/admin_secrets/prison_warp.dm
+1 -1
View File
@@ -12,7 +12,7 @@
for(var/mob/living/carbon/human/H in mob_list)
var/turf/T = get_turf(H)
var/security = 0
if((T && T in config.admin_levels) || prisonwarped.Find(H))
if((T && T in using_map.admin_levels) || prisonwarped.Find(H))
//don't warp them if they aren't ready or are already there
continue
H.Paralyse(5)
code/modules/admin/secrets/fun_secrets/ghost_mode.dm
+1 -1
View File
@@ -30,7 +30,7 @@
step_rand(W)
var/area/A = get_area(M)
if(A.requires_power && !A.always_unpowered && A.power_light && (A.z in config.player_levels))
if(A.requires_power && !A.always_unpowered && A.power_light && (A.z in using_map.player_levels))
affected_areas |= get_area(M)
affected_mobs |= user