cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-02 13:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Final merge

Browse Source 
Merge branch 'development-2' into development

# Conflicts:
#	baystation12.dme
#	code/_helpers/icons.dm
#	code/controllers/master_controller.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/computer3/laptop.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/floorlayer.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/mech_fabricator.dm
#	code/game/objects/effects/decals/contraband.dm
#	code/game/objects/explosion.dm
#	code/game/objects/items/robot/robot_upgrades.dm
#	code/game/objects/items/weapons/melee/misc.dm
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/window.dm
#	code/modules/clothing/spacesuits/rig/rig.dm
#	code/modules/clothing/suits/jobs.dm
#	code/modules/mob/freelook/update_triggers.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/human_movement.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/projectiles/ammunition/boxes.dm
#	nano/templates/sleeper.tmpl
This commit is contained in:
skull132
2016-11-12 00:10:21 +02:00
parent e9b688e1f6 127838b6d3
commit ee68f3c9d0
187 changed files with 6193 additions and 1183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/security levels/keycard authentication.dm
View File

@@ -70,6 +70,8 @@
dat += "<li><A href='?src=\ref[src];triggerevent=Grant Emergency Maintenance Access'>Grant Emergency Maintenance Access</A></li>"
dat += "<li><A href='?src=\ref[src];triggerevent=Revoke Emergency Maintenance Access'>Revoke Emergency Maintenance Access</A></li>"
dat += "<li><A href='?src=\ref[src];triggerevent=Cyborg Crisis Override'>Cyborg Crisis Override</A></li>"
dat += "<li><A href='?src=\ref[src];triggerevent=Disable Cyborg Crisis Override'>Disable Cyborg Crisis Override</A></li>"
dat += "</ul>"
user << browse(dat, "window=keycard_auth;size=500x250")
if(screen == 2)
@@ -149,6 +151,12 @@
if("Revoke Emergency Maintenance Access")
revoke_maint_all_access()
feedback_inc("alert_keycard_auth_maintRevoke",1)
if("Cyborg Crisis Override")
cyborg_crisis_override()
feedback_inc("alert_keycard_auth_borgCrisis",1)
if("Disable Cyborg Crisis Override")
disable_cyborg_crisis_override()
feedback_inc("alert_keycard_auth_borgDisable",1)
if("Emergency Response Team")
if(is_ert_blocked())
usr << "\red All emergency response teams are dispatched and can not be called at this time."
@@ -177,3 +185,15 @@ var/global/maint_all_access = 0
if(maint_all_access && src.check_access_list(list(access_maint_tunnels)))
return 1
return ..(M)
/proc/cyborg_crisis_override()
for(var/mob/living/silicon/robot/M in silicon_mob_list)
M.crisis_override = 1
world << "<font size=4 color='red'>Attention!</font>"
world << "<font color='red'>Cyborg crisis override has been activated, station bound cyborgs are allowed to select the combat module during code red.</font>"
/proc/disable_cyborg_crisis_override()
for(var/mob/living/silicon/robot/M in silicon_mob_list)
M.crisis_override = 0
world << "<font size=4 color='red'>Attention!</font>"
world << "<font color='red'>Cyborg crisis override has been deactivated, station bound cyborgs are no longer allowed to select the combat module.</font>"