From e158625bb8ebb24f874378538a9740d69168bbfe Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 26 May 2016 21:54:58 +0200 Subject: [PATCH 1/3] Goddammit --- code/__DEFINES/misc.dm | 1 + code/game/jobs/access.dm | 5 ++++- code/game/machinery/doors/airlock.dm | 4 +++- code/game/objects/items/control_wand.dm | 13 +++++++++++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 57d2198816f..0e38c05ddd1 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -239,6 +239,7 @@ #define REGION_ENGINEERING 5 #define REGION_SUPPLY 6 #define REGION_COMMAND 7 +#define REGION_COMMAND 8 //Matricies #define MATRIX_DEFAULT list(1, 0, 0, 0,\ diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index e3649f5e445..c7435a29df9 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -267,6 +267,8 @@ return list(access_mailsorting, access_mining, access_mining_station, access_mineral_storeroom, access_cargo, access_qm) if(REGION_COMMAND) //command return list(access_heads, access_RC_announce, access_keycard_auth, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_tcomsat, access_gateway, access_all_personal_lockers, access_heads_vault, access_blueshield, access_ntrep, access_hop, access_captain) + if(REGION_CENTCOMM) //because why the heck not + return get_all_centcom_access() + get_all_accesses() /proc/get_region_accesses_name(code) switch(code) @@ -286,6 +288,8 @@ return "Supply" if(REGION_COMMAND) //command return "Command" + if(REGION_CENTCOMM) //CC + return "CentComm" /proc/get_access_desc(A) @@ -600,4 +604,3 @@ proc/get_all_job_icons() //For all existing HUD icons return return "Unknown" //Return unknown if none of the above apply - diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index c131c55ee49..9c361225866 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -58,6 +58,7 @@ var/doorDeni = 'sound/machines/DeniedBeep.ogg' // i'm thinkin' Deni's var/boltUp = 'sound/machines/BoltsUp.ogg' var/boltDown = 'sound/machines/BoltsDown.ogg' + var/is_special = 0 /obj/machinery/door/airlock/command name = "Airlock" @@ -126,6 +127,7 @@ hackProof = 1 aiControlDisabled = 1 unacidable = 1 + is_special = 1 /obj/machinery/door/airlock/maintenance_hatch name = "Maintenance Hatch" @@ -304,6 +306,7 @@ desc = "A mysterious alien airlock with a complicated opening mechanism." hackProof = 1 icon = 'icons/obj/doors/Doorplasma.dmi' + is_special = 1 /obj/machinery/door/airlock/alien/bumpopen(mob/living/user as mob) if(istype(user,/mob/living/carbon/alien) || isrobot(user) || isAI(user)) @@ -799,7 +802,6 @@ About the new airlock wires panel: else return else if(istype(C, /obj/item/weapon/screwdriver)) - playsound(src.loc, 'sound/items/Screwdriver.ogg', 25, 1) src.p_open = !( src.p_open ) src.update_icon() else if(istype(C, /obj/item/weapon/wirecutters)) diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index 86f6fd5a74d..e0e5b904d71 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -31,6 +31,9 @@ /obj/item/weapon/door_remote/afterattack(obj/machinery/door/airlock/D, mob/user) if(!istype(D)) return + if(D.is_special) + to_chat(user, "[src] cannot access this kind of door!") + return if(!(D.arePowerSystemsOn())) to_chat(user, "[D] has no power!") return @@ -55,7 +58,7 @@ else D.emergency = 1 D.update_icon() - else + else if(!(D.is_special)) //so we don't get double messages for special doors to_chat(user, "[src] does not have access to this door.") /obj/item/weapon/door_remote/omni @@ -99,6 +102,12 @@ icon_state = "gangtool-white" region_access = REGION_GENERAL +/obj/item/weapon/door_remote/centcomm + name = "centcomm door remote" + desc = "High-ranking NT officials only." + icon_state = "gangtool-blue" + region_access = REGION_CENTCOMM + #undef WAND_OPEN #undef WAND_BOLT -#undef WAND_EMERGENCY \ No newline at end of file +#undef WAND_EMERGENCY From def7c93cd8b3961eaf18a4591854ead474c2aa40 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 26 May 2016 22:07:31 +0200 Subject: [PATCH 2/3] K --- code/game/objects/items/control_wand.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index e0e5b904d71..db7502313d1 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -58,8 +58,6 @@ else D.emergency = 1 D.update_icon() - else if(!(D.is_special)) //so we don't get double messages for special doors - to_chat(user, "[src] does not have access to this door.") /obj/item/weapon/door_remote/omni name = "omni door remote" From 182708c44558ddb622e28bb863770db8f89c32a2 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 26 May 2016 22:26:38 +0200 Subject: [PATCH 3/3] godhelpme --- code/__DEFINES/misc.dm | 4 ++-- code/game/objects/items/control_wand.dm | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 0e38c05ddd1..d375f63dd39 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -239,7 +239,7 @@ #define REGION_ENGINEERING 5 #define REGION_SUPPLY 6 #define REGION_COMMAND 7 -#define REGION_COMMAND 8 +#define REGION_CENTCOMM 8 //Matricies #define MATRIX_DEFAULT list(1, 0, 0, 0,\ @@ -250,4 +250,4 @@ #define MATRIX_GREYSCALE list(0.3, 0.3, 0.3, 0,\ 0.3, 0.3, 0.3, 0,\ 0.3, 0.3, 0.3, 0,\ - 0, 0, 0, 1) \ No newline at end of file + 0, 0, 0, 1) diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index db7502313d1..178f56912c1 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -58,6 +58,8 @@ else D.emergency = 1 D.update_icon() + else + to_chat(user, "[src] does not have access to this door.") /obj/item/weapon/door_remote/omni name = "omni door remote"