diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index bebeef0f542d..d4937a7c9a44 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -58,6 +58,8 @@ #define ACCESS_MAINT_TUNNELS "maint_tunnels" /// Access to get into APCs, engineering equipment lockers, typically mapped in for key power rooms across the station, engineering vending machines, emitters, and some other stuff. #define ACCESS_ENGINE_EQUIP "engine_equip" +/// Access to get into air alarms, atmos equipment lockers, potentially atmos storage rooms (like the gas storage room). +#define ACCESS_ATMOS_EQUIP "atmos_equip" /// Access to "construction" areas of the station. However, in mapping, it's used to get access to the front door and lathe room of the engineering department. #define ACCESS_CONSTRUCTION "construction" /// Access to the technical storage room (contains all the boards and other miscellaneous engineering gear). @@ -286,6 +288,7 @@ /// Departmental/general/common area accesses. Do not use direct, access via SSid_access.get_flag_access_list(ACCESS_FLAG_COMMON) #define COMMON_ACCESS list( \ ACCESS_ATMOSPHERICS, \ + ACCESS_ATMOS_EQUIP, \ ACCESS_AUX_BASE, \ ACCESS_BAR, \ ACCESS_BIT_DEN, \ @@ -483,6 +486,7 @@ /// Used to seed the accesses_by_region list in SSid_access. A list of all engineering regional accesses that are overseen by the CE. #define REGION_ACCESS_ENGINEERING list( \ ACCESS_ATMOSPHERICS, \ + ACCESS_ATMOS_EQUIP, \ ACCESS_AUX_BASE, \ ACCESS_CE, \ ACCESS_CONSTRUCTION, \ diff --git a/code/controllers/subsystem/id_access.dm b/code/controllers/subsystem/id_access.dm index 8fe9cc0df159..ebe14b86f6b4 100644 --- a/code/controllers/subsystem/id_access.dm +++ b/code/controllers/subsystem/id_access.dm @@ -279,6 +279,7 @@ SUBSYSTEM_DEF(id_access) desc_by_access["[ACCESS_CHAPEL_OFFICE]"] = "Chapel Office" desc_by_access["[ACCESS_TECH_STORAGE]"] = "Technical Storage" desc_by_access["[ACCESS_ATMOSPHERICS]"] = "Atmospherics" + desc_by_access["[ACCESS_ATMOS_EQUIP]"] = "Atmospherics Equipment" desc_by_access["[ACCESS_CREMATORIUM]"] = "Crematorium" desc_by_access["[ACCESS_ARMORY]"] = "Armory" desc_by_access["[ACCESS_CONSTRUCTION]"] = "Construction" diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index 9865ede38073..2f4b7fc9ce2d 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -111,6 +111,7 @@ sechud_icon_state = SECHUD_ATMOSPHERIC_TECHNICIAN minimal_access = list( ACCESS_ATMOSPHERICS, + ACCESS_ATMOS_EQUIP, ACCESS_AUX_BASE, ACCESS_CONSTRUCTION, ACCESS_ENGINEERING, @@ -346,6 +347,7 @@ extra_wildcard_access = list() minimal_access = list( ACCESS_ATMOSPHERICS, + ACCESS_ATMOS_EQUIP, ACCESS_AUX_BASE, ACCESS_BRIG_ENTRANCE, ACCESS_CE, @@ -1159,6 +1161,7 @@ ACCESS_ENGINEERING, ) elevated_access = list( + ACCESS_ATMOS_EQUIP, ACCESS_AUX_BASE, ACCESS_CONSTRUCTION, ACCESS_ENGINE_EQUIP, @@ -1241,6 +1244,7 @@ sechud_icon_state = SECHUD_STATION_ENGINEER minimal_access = list( ACCESS_AUX_BASE, + ACCESS_ATMOS_EQUIP, ACCESS_CONSTRUCTION, ACCESS_ENGINEERING, ACCESS_ENGINE_EQUIP, diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index a08e3faa9abf..2f7e3236b49c 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -423,22 +423,22 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/button/door, 24) /obj/machinery/button/door/incinerator_vent_atmos_main name = "turbine vent control" id = INCINERATOR_ATMOS_MAINVENT - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS) + req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ATMOS_EQUIP, ACCESS_MAINT_TUNNELS) /obj/machinery/button/door/incinerator_vent_atmos_aux name = "combustion chamber vent control" id = INCINERATOR_ATMOS_AUXVENT - req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS) + req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ATMOS_EQUIP, ACCESS_MAINT_TUNNELS) /obj/machinery/button/door/atmos_test_room_mainvent_1 name = "test chamber 1 vent control" id = TEST_ROOM_ATMOS_MAINVENT_1 - req_one_access = list(ACCESS_ATMOSPHERICS) + req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ATMOS_EQUIP) /obj/machinery/button/door/atmos_test_room_mainvent_2 name = "test chamber 2 vent control" id = TEST_ROOM_ATMOS_MAINVENT_2 - req_one_access = list(ACCESS_ATMOSPHERICS) + req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ATMOS_EQUIP) /obj/machinery/button/door/incinerator_vent_syndicatelava_main name = "turbine vent control" diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 9f1eed549546..2d2fc73d6327 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -269,7 +269,7 @@ if(!scanning.get_bodypart(BODY_ZONE_HEAD)) to_chat(user, span_warning("[scanning] doesn't have a head!")) return - if(light_power < 1) + if(light_power < 0.5) to_chat(user, span_warning("[src] isn't bright enough to see anything!")) return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 50ac111c865a..5b0214654501 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -81,7 +81,7 @@ /obj/structure/closet/secure_closet/atmospherics name = "atmospheric technician's locker" - req_access = list(ACCESS_ATMOSPHERICS) + req_access = list(ACCESS_ATMOS_EQUIP) icon_state = "atmos" /obj/structure/closet/secure_closet/atmospherics/PopulateContents() diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index ae001a646179..39aa0a393715 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -73,7 +73,7 @@ /// base sprite used for our icon states when smoothing /// BAAAASICALY the same as icon_state but is helpful to avoid duplicated work - var/fire_stage = "" + var/fire_stage = 1/*""*/ /** * Volume is the representation of how big and healthy a fire is. * Hotspot volume will be divided by turf volume to get the ratio for temperature setting on non bypassing mode. @@ -307,7 +307,7 @@ perform_exposure() if(bypassing) - set_fire_stage("heavy") + set_fire_stage(3/*"heavy"*/) if(!cold_fire) location.burn_tile() @@ -323,9 +323,9 @@ else if(volume > CELL_VOLUME*0.4) - set_fire_stage("medium") + set_fire_stage(2/*"medium"*/) else - set_fire_stage("light") + set_fire_stage(1/*"light"*/) if((visual_update_tick++ % 7) == 0) update_color() @@ -336,7 +336,7 @@ if(fire_stage == stage) return fire_stage = stage - icon_state = stage + icon_state = "[stage]" dir = pick(GLOB.cardinals) update_color() diff --git a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm index b8bff006ff86..6b9bf97fbf3a 100644 --- a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm +++ b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm @@ -8,7 +8,7 @@ idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.05 active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.02 power_channel = AREA_USAGE_ENVIRON - req_access = list(ACCESS_ENGINEERING) + req_access = list(ACCESS_ATMOS_EQUIP) max_integrity = 250 integrity_failure = 0.33 armor_type = /datum/armor/machinery_airalarm diff --git a/code/modules/cargo/packs/emergency.dm b/code/modules/cargo/packs/emergency.dm index b48ef268da68..acf43d8b94ea 100644 --- a/code/modules/cargo/packs/emergency.dm +++ b/code/modules/cargo/packs/emergency.dm @@ -63,7 +63,7 @@ name = "Firefighting Tank Backpack" desc = "Mow down fires with this high-capacity fire fighting tank backpack." cost = CARGO_CRATE_VALUE * 1.8 - access = ACCESS_ATMOSPHERICS + access = ACCESS_ATMOS_EQUIP contains = list(/obj/item/watertank/atmos) crate_name = "firefighting backpack crate" crate_type = /obj/structure/closet/crate/secure/engineering/atmos diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm index c1ec02157b70..9387eca7c478 100644 --- a/code/modules/cargo/packs/engineering.dm +++ b/code/modules/cargo/packs/engineering.dm @@ -123,7 +123,7 @@ desc = "Did someone let the air out of the shuttle again? We've got you covered. \ Contains two portable air pumps." cost = CARGO_CRATE_VALUE * 4.5 - access_view = ACCESS_ATMOSPHERICS + access_view = ACCESS_ATMOS_EQUIP contains = list(/obj/machinery/portable_atmospherics/pump = 2) crate_name = "portable air pump crate" crate_type = /obj/structure/closet/crate/secure/engineering/atmos @@ -132,7 +132,7 @@ name = "Portable Scrubber Crate" desc = "Clean up that pesky plasma leak with your very own set of two portable scrubbers." cost = CARGO_CRATE_VALUE * 4.5 - access_view = ACCESS_ATMOSPHERICS + access_view = ACCESS_ATMOS_EQUIP contains = list(/obj/machinery/portable_atmospherics/scrubber = 2) crate_name = "portable scrubber crate" crate_type = /obj/structure/closet/crate/secure/engineering/atmos @@ -141,7 +141,7 @@ name = "Huge Portable Scrubber Crate" desc = "A huge portable scrubber for huge atmospherics mistakes." cost = CARGO_CRATE_VALUE * 7.5 - access_view = ACCESS_ATMOSPHERICS + access_view = ACCESS_ATMOS_EQUIP contains = list(/obj/machinery/portable_atmospherics/scrubber/huge/movable/cargo) crate_name = "huge portable scrubber crate" crate_type = /obj/structure/closet/crate/large diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm index c208e2eea9ea..d2dd290ae673 100644 --- a/code/modules/mapping/access_helpers.dm +++ b/code/modules/mapping/access_helpers.dm @@ -121,6 +121,11 @@ access_list += ACCESS_ATMOSPHERICS return access_list +/obj/effect/mapping_helpers/airlock/access/any/engineering/atmos_equip/get_access() + var/list/access_list = ..() + access_list += ACCESS_ATMOS_EQUIP + return access_list + /obj/effect/mapping_helpers/airlock/access/any/engineering/tcoms/get_access() var/list/access_list = ..() access_list += ACCESS_TCOMMS @@ -602,6 +607,11 @@ access_list += ACCESS_ATMOSPHERICS return access_list +/obj/effect/mapping_helpers/airlock/access/all/engineering/atmos_equip/get_access() + var/list/access_list = ..() + access_list += ACCESS_ATMOS_EQUIP + return access_list + /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms/get_access() var/list/access_list = ..() access_list += ACCESS_TCOMMS