cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ERT-changes

Browse Source 
# Conflicts:
#	icons/mob/head.dmi
This commit is contained in:
Birdtalon
2018-09-30 14:53:32 +01:00
parent 26d720f74f c47df961d9
commit 1628467857
271 changed files with 2217 additions and 1483 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/security_levels/keycard authentication.dm
+1 -1
View File
@@ -17,7 +17,7 @@
var/ert_reason = "Reason for ERT"
anchored = 1
use_power = 1
use_power = IDLE_POWER_USE
idle_power_usage = 2
active_power_usage = 6
power_channel = ENVIRON