diff --git a/SQL/paradise_schema.sql b/SQL/paradise_schema.sql index a447c7993ba..ead94c0ec9a 100644 --- a/SQL/paradise_schema.sql +++ b/SQL/paradise_schema.sql @@ -255,20 +255,15 @@ CREATE TABLE `player` ( `be_role` mediumtext, `default_slot` smallint(4) DEFAULT '1', `toggles` int(8) DEFAULT '383', + `toggles_2` int(8) DEFAULT '14', `sound` mediumint(8) DEFAULT '31', - `randomslot` tinyint(1) DEFAULT '0', `volume` smallint(4) DEFAULT '100', - `nanoui_fancy` smallint(4) DEFAULT '1', - `show_ghostitem_attack` smallint(4) DEFAULT '1', `lastchangelog` varchar(32) NOT NULL DEFAULT '0', - `windowflashing` smallint(4) DEFAULT '1', - `ghost_anonsay` tinyint(1) NOT NULL DEFAULT '0', `exp` mediumtext, `clientfps` smallint(4) DEFAULT '0', `atklog` smallint(4) DEFAULT '0', `fuid` bigint(20) NULL DEFAULT NULL, `fupdate` smallint(4) NULL DEFAULT '0', - `afk_watch` tinyint(1) NOT NULL DEFAULT '0', `parallax` tinyint(1) DEFAULT '8', PRIMARY KEY (`id`), UNIQUE KEY `ckey` (`ckey`) diff --git a/SQL/paradise_schema_prefixed.sql b/SQL/paradise_schema_prefixed.sql index 6096f0547e6..c8589a4c74c 100644 --- a/SQL/paradise_schema_prefixed.sql +++ b/SQL/paradise_schema_prefixed.sql @@ -254,20 +254,15 @@ CREATE TABLE `SS13_player` ( `be_role` mediumtext, `default_slot` smallint(4) DEFAULT '1', `toggles` int(8) DEFAULT '383', + `toggles_2` int(8) DEFAULT '14', `sound` mediumint(8) DEFAULT '31', - `randomslot` tinyint(1) DEFAULT '0', `volume` smallint(4) DEFAULT '100', - `nanoui_fancy` smallint(4) DEFAULT '1', - `show_ghostitem_attack` smallint(4) DEFAULT '1', `lastchangelog` varchar(32) NOT NULL DEFAULT '0', - `windowflashing` smallint(4) DEFAULT '1', - `ghost_anonsay` tinyint(1) NOT NULL DEFAULT '0', `exp` mediumtext, `clientfps` smallint(4) DEFAULT '0', `atklog` smallint(4) DEFAULT '0', `fuid` bigint(20) NULL DEFAULT NULL, `fupdate` smallint(4) NULL DEFAULT '0', - `afk_watch` tinyint(1) NOT NULL DEFAULT '0', `parallax` tinyint(1) DEFAULT '8', PRIMARY KEY (`id`), UNIQUE KEY `ckey` (`ckey`) diff --git a/SQL/updates/12-13.sql b/SQL/updates/12-13.sql new file mode 100644 index 00000000000..efa808d3cc7 --- /dev/null +++ b/SQL/updates/12-13.sql @@ -0,0 +1,22 @@ +#Updating the SQL from version 12 to version 13. -AffectedArc07 +#Modifying the player table to remove old columns and add a new bitflag column for toggles +#Includes conversion from old to new + +ALTER TABLE `player` ADD COLUMN `toggles_2` INT NULL DEFAULT '0' AFTER `toggles`; + +# The following lines will update the new toggles_2 column based on existing data +UPDATE `player` SET `toggles_2` = `toggles_2` + 1 WHERE `randomslot` = 1; +UPDATE `player` SET `toggles_2` = `toggles_2` + 2 WHERE `nanoui_fancy` = 1; +UPDATE `player` SET `toggles_2` = `toggles_2` + 4 WHERE `show_ghostitem_attack` = 1; +UPDATE `player` SET `toggles_2` = `toggles_2` + 8 WHERE `windowflashing` = 1; +UPDATE `player` SET `toggles_2` = `toggles_2` + 16 WHERE `ghost_anonsay` = 1; +UPDATE `player` SET `toggles_2` = `toggles_2` + 32 WHERE `afk_watch` = 1; + +# Remove the old columns +ALTER TABLE `player` + DROP COLUMN `randomslot`, + DROP COLUMN `nanoui_fancy`, + DROP COLUMN `show_ghostitem_attack`, + DROP COLUMN `windowflashing`, + DROP COLUMN `ghost_anonsay`, + DROP COLUMN `afk_watch`; diff --git a/_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm b/_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm new file mode 100644 index 00000000000..26d466a601c --- /dev/null +++ b/_maps/map_files/RandomRuins/SpaceRuins/golemtarget.dmm @@ -0,0 +1,982 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"x" = ( +/turf/simulated/mineral/random/high_chance, +/area/ruin/unpowered) +"H" = ( +/turf/simulated/floor/plating/asteroid/airless, +/area/ruin/unpowered) +"S" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 8; + height = 20; + id = "freegolem_space"; + name = "The middle of space"; + width = 16 + }, +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +x +H +x +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +H +x +x +x +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +x +x +x +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +a +x +x +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +a +x +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(11,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(14,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(15,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(18,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(21,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +x +a +a +"} +(22,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +x +x +x +a +"} +(23,1,1) = {" +a +a +a +x +H +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +x +x +x +a +"} +(24,1,1) = {" +a +a +x +x +x +H +a +a +a +a +a +a +a +a +a +a +S +a +a +a +a +a +a +a +a +x +x +x +x +x +"} +(25,1,1) = {" +a +a +a +x +x +x +H +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +x +x +x +x +"} +(26,1,1) = {" +a +a +a +a +x +x +H +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(27,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +H +x +x +x +x +a +a +a +a +a +a +a +a +a +a +a +"} +(28,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +H +x +x +x +x +x +a +a +a +a +a +a +a +a +a +a +a +"} +(29,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +x +H +x +x +a +a +a +a +a +a +a +a +a +a +a +a +"} +(30,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index 4361bd59785..d8d711001d0 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -9050,7 +9050,7 @@ dir = 8; dwidth = 8; height = 20; - id = "freegolem_z6"; + id = "freegolem_ussp"; name = "Near USSP Station"; width = 16 }, diff --git a/_maps/map_files/RandomZLevels/terrorspiders.dmm b/_maps/map_files/RandomZLevels/terrorspiders.dmm index 70597a56927..760daa77f1e 100644 --- a/_maps/map_files/RandomZLevels/terrorspiders.dmm +++ b/_maps/map_files/RandomZLevels/terrorspiders.dmm @@ -15,8 +15,15 @@ /turf/simulated/wall/rust, /area/awaymission/UO71/plaza) "ae" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + level = 1 + }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) "af" = ( @@ -53,8 +60,7 @@ "aj" = ( /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "floorgrime"; - tag = "icon-floorgrime (WEST)" + icon_state = "floorgrime" }, /area/awaymission/UO71/plaza) "ak" = ( @@ -137,7 +143,6 @@ /area/awaymission/UO71/plaza) "ax" = ( /obj/structure/chair/comfy/beige{ - tag = "icon-comfychair (EAST)"; icon_state = "comfychair"; dir = 4 }, @@ -225,7 +230,6 @@ /area/awaymission/UO71/plaza) "aH" = ( /obj/structure/chair/wood{ - tag = "icon-wooden_chair (NORTH)"; icon_state = "wooden_chair"; dir = 1 }, @@ -575,32 +579,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) -"bx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/wall, -/area/awaymission/UO71/plaza) -"by" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/awaymission/UO71/plaza) -"bz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/rust, -/area/awaymission/UO71/plaza) -"bA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 14; - tag = "icon-manifold-r-f (NORTH)" - }, -/turf/simulated/wall, -/area/awaymission/UO71/plaza) "bB" = ( /obj/machinery/door/airlock{ id_tag = "awaydormE2"; @@ -615,30 +593,16 @@ /obj/item/bedsheet, /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) -"bD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 14; - tag = "icon-manifold-r-f (NORTH)" - }, -/turf/simulated/wall/rust, -/area/awaymission/UO71/plaza) -"bE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - level = 1 - }, -/turf/simulated/wall, -/area/awaymission/UO71/plaza) "bF" = ( /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "bG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) "bH" = ( @@ -649,10 +613,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) -"bJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/awaymission/UO71/plaza) "bK" = ( /obj/effect/landmark/burnturf, /turf/simulated/floor/plating, @@ -661,12 +621,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "bM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "bN" = ( @@ -674,15 +640,19 @@ dir = 4 }, /obj/effect/landmark/damageturf, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "bO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - initialize_directions = 14; - tag = "icon-manifold-b-f (NORTH)" - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "bP" = ( @@ -693,13 +663,19 @@ req_access_txt = "0"; req_one_access_txt = "0" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "bQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 14 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "bR" = ( @@ -712,19 +688,14 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) -"bT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - initialize_directions = 14; - tag = "icon-manifold-b-f (NORTH)" - }, -/turf/simulated/floor/plating, -/area/awaymission/UO71/plaza) "bU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/effect/landmark/burnturf, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "bV" = ( @@ -739,20 +710,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/damageturf, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 14 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) -"bY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/rust, -/area/awaymission/UO71/plaza) "bZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + level = 1 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "ca" = ( @@ -760,20 +734,26 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "cb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "cc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "cd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark/damageturf, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "ce" = ( @@ -795,17 +775,9 @@ pixel_y = 23; req_access = null }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) "ch" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 7; - tag = "icon-manifold-b-f (WEST)" - }, /obj/structure/table/wood, /obj/machinery/newscaster{ pixel_x = -30; @@ -830,27 +802,6 @@ /obj/item/clothing/under/pj/blue, /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) -"cj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 7; - tag = "icon-manifold-b-f (WEST)" - }, -/obj/structure/closet/secure_closet{ - desc = "It's a secure locker for personnel. The first card swiped gains control."; - icon_broken = "cabinetdetective_broken"; - icon_closed = "cabinetdetective"; - icon_locked = "cabinetdetective_locked"; - icon_off = "cabinetdetective_broken"; - icon_opened = "cabinetdetective_open"; - icon_state = "cabinetdetective"; - locked = 0; - name = "personal closet"; - req_access_txt = "271" - }, -/obj/item/clothing/under/suit_jacket/female, -/turf/simulated/floor/carpet, -/area/awaymission/UO71/plaza) "ck" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/wood, @@ -870,18 +821,13 @@ pixel_y = 23; req_access = null }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/chair/wood{ - tag = "icon-wooden_chair (EAST)"; icon_state = "wooden_chair"; dir = 4 }, /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) "cm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/grille, /obj/effect/landmark/damageturf, /turf/simulated/floor/plating, @@ -897,6 +843,9 @@ }, /obj/effect/landmark/burnturf, /obj/effect/landmark/damageturf, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "cp" = ( @@ -908,21 +857,19 @@ dir = 4 }, /obj/effect/landmark/burnturf, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "cr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) "cs" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 - }, /obj/structure/chair/wood{ - tag = "icon-wooden_chair (NORTH)"; icon_state = "wooden_chair"; dir = 1 }, @@ -935,6 +882,10 @@ req_access_txt = "0"; specialfunctions = 4 }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 4; + on = 1 + }, /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) "ct" = ( @@ -952,10 +903,8 @@ /obj/structure/bed, /obj/item/bedsheet, /obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - external_pressure_bound = 101.325; - on = 1; - pressure_checks = 1 + dir = 4; + on = 1 }, /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) @@ -981,29 +930,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, -/area/awaymission/UO71/plaza) -"cx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 2 - }, -/turf/simulated/floor/plating, -/area/awaymission/UO71/plaza) -"cy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - initialize_directions = 14; - tag = "icon-manifold-b-f (NORTH)" - }, -/obj/effect/landmark/burnturf, -/turf/simulated/floor/plating, -/area/awaymission/UO71/plaza) -"cz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 14; - tag = "icon-manifold-r-f (NORTH)" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) @@ -1012,34 +940,30 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/awaymission/UO71/plaza) -"cB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - level = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/wall/rust, +/turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "cC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/portable_atmospherics/scrubber, -/turf/simulated/floor/plating, -/area/awaymission/UO71/plaza) -"cD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, -/obj/effect/landmark/burnturf, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "cE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/reagent_dispensers/fueltank, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + level = 1 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "cF" = ( @@ -1050,11 +974,6 @@ /obj/structure/grille, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) -"cH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/grille, -/turf/simulated/floor/plating, -/area/awaymission/UO71/plaza) "cI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock{ @@ -1070,18 +989,6 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) -"cK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall, -/area/awaymission/UO71/plaza) -"cL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall/rust, -/area/awaymission/UO71/plaza) "cM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock{ @@ -1093,17 +1000,11 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) "cN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/closet, /obj/item/poster/random_contraband, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "cO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/table, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil{ @@ -1123,32 +1024,18 @@ icon_state = "white" }, /area/awaymission/UO71/science) -"cP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/stack/rods, -/turf/simulated/floor/plating, -/area/awaymission/UO71/plaza) -"cQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plating, -/area/awaymission/UO71/plaza) "cR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/burnturf, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "cS" = ( /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ dir = 2; @@ -1157,27 +1044,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) -"cT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/awaymission/UO71/plaza) -"cU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall, -/area/awaymission/UO71/plaza) "cV" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -1200,8 +1077,7 @@ }, /turf/simulated/floor/plasteel{ dir = 2; - icon_state = "greencorner"; - tag = "icon-greencorner" + icon_state = "greencorner" }, /area/awaymission/UO71/plaza) "cY" = ( @@ -1250,10 +1126,12 @@ }, /area/awaymission/UO71/plaza) "dd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 7 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) "de" = ( @@ -1261,12 +1139,12 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark/damageturf, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "df" = ( @@ -1275,32 +1153,22 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) -"dg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel, -/area/awaymission/UO71/plaza) "dh" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" }, /area/awaymission/UO71/plaza) -"di" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plasteel, -/area/awaymission/UO71/plaza) "dj" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/sink{ pixel_y = 25 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "green" @@ -1313,6 +1181,9 @@ }, /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "green" @@ -1349,8 +1220,7 @@ "dn" = ( /obj/structure/disposalpipe/junction{ dir = 4; - icon_state = "pipe-j2"; - tag = "icon-pipe-j1 (WEST)" + icon_state = "pipe-j2" }, /turf/simulated/floor/plasteel{ dir = 1; @@ -1382,7 +1252,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sink{ pixel_y = 25 }, @@ -1439,11 +1308,6 @@ /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "dv" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 7; - tag = "icon-manifold-r-f (WEST)" - }, /obj/structure/chair, /obj/structure/reagent_dispensers/peppertank{ pixel_x = 0; @@ -1482,12 +1346,6 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) "dy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -1575,12 +1433,10 @@ /area/awaymission/UO71/plaza) "dJ" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "floorgrime"; - tag = "icon-floorgrime (WEST)" + icon_state = "floorgrime" }, /area/awaymission/UO71/plaza) "dK" = ( @@ -1603,9 +1459,6 @@ }, /area/awaymission/UO71/plaza) "dL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ name = "Security Checkpoint Maintenance"; req_access_txt = "271"; @@ -1613,32 +1466,6 @@ }, /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) -"dM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/awaymission/UO71/plaza) -"dN" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/awaymission/UO71/plaza) -"dO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1; - initialize_directions = 14; - tag = "icon-manifold-b-f (NORTH)" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "red" - }, -/area/awaymission/UO71/plaza) "dP" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -1684,16 +1511,6 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) -"dW" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 1; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, -/turf/simulated/floor/plasteel, -/area/awaymission/UO71/plaza) "dX" = ( /obj/structure/table, /obj/machinery/reagentgrinder, @@ -1703,7 +1520,6 @@ }, /area/awaymission/UO71/plaza) "dY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair/office/dark{ dir = 8 }, @@ -1718,7 +1534,6 @@ pixel_y = 0; req_access = null }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/security{ network = list("UO71") @@ -1743,10 +1558,19 @@ name = "Security Checkpoint"; req_access_txt = "271" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) "eb" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_scrubber{ + dir = 4; + on = 1; + scrub_N2O = 0; + scrub_Toxins = 0 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -1760,7 +1584,6 @@ /area/awaymission/UO71/plaza) "ed" = ( /obj/structure/chair/office{ - tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4 }, @@ -1779,7 +1602,6 @@ /area/awaymission/UO71/plaza) "eg" = ( /obj/structure/chair/office{ - tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8 }, @@ -1792,8 +1614,7 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "floorgrime"; - tag = "icon-floorgrime (WEST)" + icon_state = "floorgrime" }, /area/awaymission/UO71/plaza) "ei" = ( @@ -1807,7 +1628,6 @@ }, /area/awaymission/UO71/plaza) "ej" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table, /obj/machinery/recharger{ pixel_y = 4 @@ -1846,7 +1666,6 @@ /area/awaymission/UO71/plaza) "em" = ( /obj/structure/chair/office{ - tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4 }, @@ -1909,7 +1728,6 @@ /area/awaymission/UO71/plaza) "eu" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/radio/off, /obj/item/screwdriver{ pixel_y = 10 @@ -1917,25 +1735,34 @@ /obj/structure/sign/poster/official/safety_report{ pixel_y = -32 }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 4; + on = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, /area/awaymission/UO71/plaza) "ev" = ( /obj/structure/table, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" }, /area/awaymission/UO71/plaza) "ew" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" }, /area/awaymission/UO71/plaza) "ex" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" @@ -1951,8 +1778,7 @@ "ez" = ( /turf/simulated/floor/plasteel{ dir = 2; - icon_state = "greencorner"; - tag = "icon-greencorner" + icon_state = "greencorner" }, /area/awaymission/UO71/plaza) "eA" = ( @@ -2005,8 +1831,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -2019,8 +1844,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/extinguisher_cabinet{ pixel_x = 0; @@ -2037,8 +1861,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -2050,8 +1873,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -2062,8 +1884,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel{ dir = 6; @@ -2148,8 +1969,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -2167,8 +1987,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -2178,8 +1997,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/disposalpipe/segment{ dir = 1; @@ -2193,8 +2011,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -2202,10 +2019,8 @@ /turf/simulated/floor/plating, /area/awaymission/UO71/plaza) "eU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 7; - tag = "icon-manifold-r-f (WEST)" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) @@ -2227,6 +2042,9 @@ id_tag = "awaydorm3"; name = "Dorm 3" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) "eX" = ( @@ -2242,6 +2060,9 @@ req_access_txt = "0"; specialfunctions = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/carpet, /area/awaymission/UO71/plaza) "eY" = ( @@ -2253,8 +2074,7 @@ "eZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-r-f (NORTH)" + initialize_directions = 14 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/plaza) @@ -2355,8 +2175,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "floorgrime"; - tag = "icon-floorgrime (WEST)" + icon_state = "floorgrime" }, /area/awaymission/UO71/plaza) "fo" = ( @@ -2412,20 +2231,6 @@ icon_state = "showroomfloor" }, /area/awaymission/UO71/centralhall) -"fu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - level = 1 - }, -/turf/simulated/wall, -/area/awaymission/UO71/centralhall) -"fv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - level = 1 - }, -/turf/simulated/wall, -/area/awaymission/UO71/centralhall) "fw" = ( /obj/structure/sink/kitchen{ pixel_y = 28 @@ -2439,11 +2244,11 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "fy" = ( @@ -2451,6 +2256,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable, /obj/effect/landmark/burnturf, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "fz" = ( @@ -2481,19 +2287,26 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5; + level = 1 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "fD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + level = 1 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "fE" = ( @@ -2552,14 +2365,14 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "fL" = ( @@ -2602,9 +2415,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -2614,16 +2424,14 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "fV" = ( /obj/machinery/vending/dinnerware, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "fW" = ( @@ -2638,8 +2446,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "fX" = ( @@ -2652,8 +2459,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "fZ" = ( @@ -2661,8 +2467,7 @@ /obj/machinery/reagentgrinder, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "ga" = ( @@ -2673,12 +2478,12 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "gc" = ( @@ -2746,8 +2551,7 @@ "gk" = ( /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "gl" = ( @@ -2758,26 +2562,9 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) -"gm" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0; - tag = "" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/damageturf, -/turf/simulated/floor/plating, -/area/awaymission/UO71/centralhall) "gn" = ( /obj/machinery/gateway{ dir = 9 @@ -2895,7 +2682,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker/large{ pixel_x = -3; pixel_y = 3 @@ -2905,6 +2691,7 @@ pixel_y = 2 }, /obj/item/reagent_containers/dropper, +/obj/structure/table, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitehall" @@ -2919,6 +2706,11 @@ pixel_y = 0; req_access = null }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + on = 1 + }, +/mob/living/simple_animal/hostile/poison/terror_spider/gray, /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) "gD" = ( @@ -2929,6 +2721,10 @@ dir = 8; pixel_x = -24 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 7 + }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) "gE" = ( @@ -2996,8 +2792,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "gN" = ( @@ -3008,8 +2803,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "gO" = ( @@ -3017,8 +2811,7 @@ /obj/item/reagent_containers/food/snacks/applepie, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "gP" = ( @@ -3042,8 +2835,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "gQ" = ( @@ -3080,7 +2872,6 @@ scrub_Toxins = 0 }, /obj/structure/chair{ - tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8 }, @@ -3094,7 +2885,6 @@ /area/awaymission/UO71/mother) "gV" = ( /obj/structure/chair{ - tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8 }, @@ -3128,9 +2918,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -3186,7 +2973,6 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/gateway) "he" = ( -/obj/structure/table/glass, /obj/item/stock_parts/manipulator, /obj/item/stock_parts/manipulator, /obj/item/stock_parts/capacitor, @@ -3194,18 +2980,15 @@ /obj/item/stock_parts/micro_laser, /obj/item/stock_parts/micro_laser, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_pump{ + on = 1 + }, +/obj/structure/table, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitehall" }, /area/awaymission/UO71/science) -"hf" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, -/mob/living/simple_animal/hostile/poison/terror_spider/gray, -/turf/simulated/floor/plasteel, -/area/awaymission/UO71/centralhall) "hg" = ( /obj/structure/table, /obj/item/trash/chips, @@ -3215,7 +2998,6 @@ /area/awaymission/UO71/centralhall) "hh" = ( /obj/structure/chair{ - tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8 }, @@ -3278,8 +3060,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "ho" = ( @@ -3289,8 +3070,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "hp" = ( @@ -3300,8 +3080,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "hq" = ( @@ -3309,8 +3088,7 @@ /obj/item/reagent_containers/food/snacks/mint, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "hr" = ( @@ -3331,8 +3109,7 @@ /obj/item/book/manual/chef_recipes, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "ht" = ( @@ -3340,15 +3117,14 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; - initialize_directions = 11; - tag = "icon-manifold-b-f (EAST)" + initialize_directions = 11 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "hu" = ( @@ -3391,7 +3167,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair{ - tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8 }, @@ -3401,7 +3176,6 @@ /area/awaymission/UO71/gateway) "hy" = ( /obj/structure/chair{ - tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8 }, @@ -3433,6 +3207,9 @@ dir = 8; pixel_x = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/vault, /area/awaymission/UO71/prince) "hE" = ( @@ -3444,10 +3221,17 @@ pixel_y = 0; req_access = null }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/vault, /area/awaymission/UO71/prince) "hF" = ( /obj/machinery/r_n_d/circuit_imprinter, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/science) "hG" = ( @@ -3457,18 +3241,24 @@ /turf/simulated/floor/vault, /area/awaymission/UO71/mother) "hH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/awaymission/UO71/science) "hI" = ( -/obj/structure/table/glass, /obj/item/stack/sheet/glass, /obj/item/stack/sheet/glass, /obj/item/stack/sheet/glass, /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/matter_bin, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/table, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitehall" @@ -3487,7 +3277,6 @@ /area/awaymission/UO71/centralhall) "hL" = ( /obj/structure/chair{ - tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8 }, @@ -3525,8 +3314,7 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "hQ" = ( @@ -3534,8 +3322,7 @@ /obj/item/kitchen/rollingpin, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "hR" = ( @@ -3545,8 +3332,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "hS" = ( @@ -3601,8 +3387,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/door/window{ dir = 2; @@ -3619,7 +3404,6 @@ "hZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair{ - tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8 }, @@ -3647,27 +3431,17 @@ /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/awaymission/UO71/gateway) -"id" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/wall/r_wall, -/area/awaymission/UO71/prince) -"ie" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0; - welded = 1 - }, -/turf/simulated/floor/vault, -/area/awaymission/UO71/prince) "if" = ( /obj/machinery/light/small, /turf/simulated/floor/vault, /area/awaymission/UO71/prince) "ig" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/science) "ih" = ( @@ -3695,9 +3469,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -3762,8 +3533,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "iq" = ( @@ -3773,8 +3543,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "ir" = ( @@ -3796,8 +3565,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "is" = ( @@ -3805,8 +3573,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -3815,6 +3582,9 @@ dir = 4 }, /obj/effect/landmark/damageturf, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "it" = ( @@ -3841,8 +3611,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/gateway) @@ -3862,10 +3631,6 @@ /area/awaymission/UO71/gateway) "iz" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id_tag = "UO71_biohazard"; - name = "biohazard containment door" - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -3901,7 +3666,6 @@ "iE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/chair{ - tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8 }, @@ -3909,16 +3673,11 @@ icon_state = "dark" }, /area/awaymission/UO71/gateway) -"iF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, -/area/awaymission/UO71/mother) "iG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/chair{ - tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8 }, @@ -3937,47 +3696,15 @@ icon_state = "white" }, /area/awaymission/UO71/gateway) -"iI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/awaymission/UO71/prince) "iJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-r-f (NORTH)" + initialize_directions = 14 }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/awaymission/UO71/gateway) -"iK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/wall/r_wall, -/area/awaymission/UO71/prince) -"iL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 2 - }, -/turf/simulated/wall/r_wall, -/area/awaymission/UO71/prince) -"iM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 2 - }, -/turf/simulated/mineral/random/labormineral, -/area/awaymission/UO71/outside) -"iN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 2 - }, -/turf/simulated/wall/rust, -/area/awaymission/UO71/centralhall) "iO" = ( /obj/structure/window/reinforced{ dir = 1 @@ -3985,7 +3712,6 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/mother) "iP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, @@ -3997,15 +3723,6 @@ icon_state = "white" }, /area/awaymission/UO71/science) -"iQ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/awaymission/UO71/science) "iR" = ( /obj/structure/window/reinforced{ dir = 1 @@ -4053,8 +3770,7 @@ /obj/structure/disposalpipe/junction, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "iW" = ( @@ -4070,8 +3786,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "iX" = ( @@ -4087,8 +3802,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/centralhall) "iY" = ( @@ -4098,6 +3812,7 @@ icon_state = "0-2"; d2 = 2 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "iZ" = ( @@ -4149,8 +3864,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; - initialize_directions = 7; - tag = "icon-manifold-b-f (WEST)" + initialize_directions = 7 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -4178,18 +3892,13 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; - initialize_directions = 7; - tag = "icon-manifold-b-f (WEST)" + initialize_directions = 7 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/awaymission/UO71/centralhall) -"ji" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall, -/area/awaymission/UO71/science) "jj" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 1; @@ -4212,25 +3921,10 @@ icon_state = "white" }, /area/awaymission/UO71/gateway) -"jl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/mineral/random/labormineral, -/area/awaymission/UO71/outside) -"jm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 2 - }, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/awaymission/UO71/outside) "jn" = ( /turf/simulated/floor/plasteel, /area/awaymission/UO71/mother) "jo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table, /obj/item/folder/white, /obj/item/disk/tech_disk{ @@ -4245,6 +3939,7 @@ "jp" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -4293,18 +3988,6 @@ icon_state = "bar" }, /area/awaymission/UO71/centralhall) -"jw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/awaymission/UO71/centralhall) -"jx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/rust, -/area/awaymission/UO71/centralhall) "jy" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/cans/beer, @@ -4312,12 +3995,6 @@ icon_state = "bar" }, /area/awaymission/UO71/centralhall) -"jz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/wall, -/area/awaymission/UO71/centralhall) "jA" = ( /obj/machinery/camera{ c_tag = "Bar"; @@ -4332,15 +4009,11 @@ "jB" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 7; - tag = "icon-manifold-r-f (WEST)" - }, /obj/machinery/door/airlock{ name = "Kitchen"; req_access_txt = "271" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -4350,8 +4023,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -4359,8 +4031,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/burnturf, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "jD" = ( @@ -4419,8 +4091,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; - initialize_directions = 11; - tag = "icon-manifold-r-f (EAST)" + initialize_directions = 11 }, /obj/structure/spider/terrorweb, /turf/simulated/floor/plasteel{ @@ -4434,12 +4105,6 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mother) -"jL" = ( -/obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/window/full/basic, -/turf/simulated/floor/plating, -/area/awaymission/UO71/science) "jM" = ( /obj/structure/grille, /obj/structure/window/full/basic, @@ -4454,6 +4119,7 @@ req_access_txt = "271"; req_one_access_txt = "0" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -4475,17 +4141,16 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark/damageturf, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "jR" = ( /obj/structure/chair{ - tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4 }, @@ -4531,24 +4196,25 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/junction{ icon_state = "pipe-j2"; dir = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 7 + }, /turf/simulated/floor/plasteel{ icon_state = "bar" }, @@ -4558,8 +4224,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/light/small{ dir = 1 @@ -4577,8 +4242,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -4586,6 +4250,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "jY" = ( @@ -4593,8 +4260,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -4606,22 +4272,29 @@ req_access_txt = "0"; req_one_access_txt = "0" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "jZ" = ( /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "ka" = ( @@ -4629,8 +4302,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -4639,14 +4311,16 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "kb" = ( /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -4656,6 +4330,9 @@ dir = 9 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/centralhall) "kc" = ( @@ -4671,8 +4348,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/door/airlock/command{ name = "Gateway"; @@ -4689,36 +4365,22 @@ /area/awaymission/UO71/science) "kf" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (NORTHWEST)"; icon_state = "whitepurple"; dir = 9 }, /area/awaymission/UO71/science) "kg" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (NORTHEAST)"; icon_state = "whitepurple"; dir = 5 }, /area/awaymission/UO71/science) -"kh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/rust, -/area/awaymission/UO71/science) "ki" = ( /obj/structure/dispenser/oxygen, /turf/simulated/floor/plating, /area/awaymission/UO71/gateway) -"kj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; - icon_state = "whitepurplecorner"; - dir = 4; - heat_capacity = 1e+006 - }, -/area/awaymission/UO71/science) "kk" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/plating, @@ -4745,7 +4407,6 @@ /obj/effect/decal/cleanable/dirt, /obj/item/paper/terrorspiders5, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (NORTHWEST)"; icon_state = "whitepurple"; dir = 9 }, @@ -4756,7 +4417,6 @@ pixel_y = 8 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurple (NORTHEAST)"; icon_state = "whitepurple"; dir = 5 }, @@ -4784,10 +4444,13 @@ layer = 5 }, /obj/machinery/light/small{ - tag = "icon-bulb1 (EAST)"; icon_state = "bulb1"; dir = 4 }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + on = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -4795,7 +4458,11 @@ /area/awaymission/UO71/science) "kt" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 7 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -4848,14 +4515,12 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; - initialize_directions = 11; - tag = "icon-manifold-r-f (EAST)" + initialize_directions = 11 }, /obj/machinery/firealarm{ dir = 4; @@ -4880,13 +4545,13 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/damageturf, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "kC" = ( @@ -4911,7 +4576,6 @@ /area/awaymission/UO71/gateway) "kF" = ( /obj/structure/chair{ - tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8 }, @@ -4938,7 +4602,6 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -4949,7 +4612,6 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -4964,7 +4626,6 @@ }, /mob/living/simple_animal/hostile/poison/terror_spider/gray, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -4981,7 +4642,6 @@ req_access = null }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -4995,7 +4655,6 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -5004,11 +4663,9 @@ "kN" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-r-f (NORTH)" + initialize_directions = 14 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -5023,7 +4680,6 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -5035,7 +4691,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -5051,7 +4706,6 @@ req_access_txt = "271" }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -5101,12 +4755,6 @@ icon_state = "white" }, /area/awaymission/UO71/gateway) -"kV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/awaymission/UO71/science) "kW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -5116,7 +4764,6 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -5136,16 +4783,6 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; - icon_state = "whitepurplecorner"; - dir = 4; - heat_capacity = 1e+006 - }, -/area/awaymission/UO71/science) -"kY" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -5160,7 +4797,6 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -5169,7 +4805,6 @@ "la" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -5177,7 +4812,6 @@ /area/awaymission/UO71/science) "lb" = ( /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -5186,8 +4820,7 @@ "lc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-r-f (NORTH)" + initialize_directions = 14 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -5204,9 +4837,7 @@ "le" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -5270,16 +4901,14 @@ "lm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; - initialize_directions = 7; - tag = "icon-manifold-b-f (WEST)" + initialize_directions = 7 }, /obj/structure/sign/science{ pixel_x = -32 }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "purplecorner"; - tag = "icon-purplecorner (WEST)" + icon_state = "purplecorner" }, /area/awaymission/UO71/centralhall) "ln" = ( @@ -5363,8 +4992,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/junction, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5378,8 +5006,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; - initialize_directions = 11; - tag = "icon-manifold-b-f (EAST)" + initialize_directions = 11 }, /turf/simulated/floor/plasteel{ icon_state = "bar" @@ -5401,8 +5028,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "warndark"; - tag = "icon-warndark (EAST)" + icon_state = "warndark" }, /area/awaymission/UO71/gateway) "ly" = ( @@ -5410,8 +5036,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/gateway) @@ -5419,8 +5044,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/gateway) @@ -5435,8 +5059,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -5448,8 +5071,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -5459,8 +5081,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ @@ -5472,14 +5093,12 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/gateway) @@ -5489,8 +5108,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5508,8 +5126,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5523,8 +5140,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5539,8 +5155,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ @@ -5553,8 +5168,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/firealarm{ dir = 1; @@ -5579,8 +5193,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1; @@ -5596,8 +5209,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5619,8 +5231,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5639,11 +5250,12 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /mob/living/simple_animal/hostile/poison/terror_spider/red{ wander = 0 }, @@ -5657,14 +5269,12 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -5672,26 +5282,9 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-b-f (NORTH)" + initialize_directions = 14 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 2; - icon_state = "whitepurplecorner" - }, -/area/awaymission/UO71/science) -"lP" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 2; @@ -5729,13 +5322,11 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/junction{ dir = 8; - icon_state = "pipe-j1"; - tag = "icon-pipe-j1 (EAST)" + icon_state = "pipe-j1" }, /obj/machinery/firealarm{ dir = 1; @@ -5755,8 +5346,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-b-f (NORTH)" + initialize_directions = 14 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -5775,9 +5365,8 @@ }, /area/awaymission/UO71/science) "lU" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -5805,6 +5394,9 @@ dir = 1; network = list("UO71") }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 2; icon_state = "whitepurplecorner" @@ -5847,8 +5439,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "purple"; - tag = "icon-purple (WEST)" + icon_state = "purple" }, /area/awaymission/UO71/centralhall) "mc" = ( @@ -5861,7 +5452,6 @@ /area/awaymission/UO71/centralhall) "md" = ( /obj/structure/chair{ - tag = "icon-chair (EAST)"; icon_state = "chair"; dir = 4 }, @@ -5904,8 +5494,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -5914,20 +5503,6 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) -"mh" = ( -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4; - level = 2 - }, -/turf/simulated/floor/vault, -/area/awaymission/UO71/mother) -"mi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/vault, -/area/awaymission/UO71/mother) "mj" = ( /obj/machinery/suit_storage_unit/standard_unit, /turf/simulated/floor/plating, @@ -5940,8 +5515,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "warndark"; - tag = "icon-warndark (EAST)" + icon_state = "warndark" }, /area/awaymission/UO71/gateway) "ml" = ( @@ -5953,8 +5527,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -5974,12 +5547,12 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/burnturf, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "mo" = ( @@ -6009,15 +5582,14 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/awaymission/UO71/science) "ms" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/awaymission/UO71/science) @@ -6030,8 +5602,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "mu" = ( @@ -6061,20 +5632,8 @@ pixel_y = 0; req_access = null }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/vault, /area/awaymission/UO71/mother) -"my" = ( -/obj/machinery/light/small, -/obj/machinery/atmospherics/unary/vent_pump{ - icon_state = "weld"; - on = 1; - welded = 1 - }, -/turf/simulated/floor/vault, -/area/awaymission/UO71/prince) "mz" = ( /obj/machinery/light/small{ dir = 1 @@ -6102,8 +5661,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/loot) "mC" = ( @@ -6129,10 +5687,13 @@ pixel_x = -30; pixel_y = 0 }, -/obj/item/reagent_containers/food/pill/haloperidol, -/obj/item/reagent_containers/food/pill/haloperidol, -/obj/item/reagent_containers/food/pill/haloperidol, -/obj/item/reagent_containers/food/pill/haloperidol, +/obj/item/paper/terrorspiders4, +/obj/item/reagent_containers/food/pill/charcoal{ + pixel_x = 3 + }, +/obj/item/reagent_containers/food/pill/charcoal{ + pixel_x = -3 + }, /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) "mF" = ( @@ -6164,7 +5725,6 @@ /obj/structure/chair/wood{ dir = 8 }, -/obj/item/paper/terrorspiders4, /turf/simulated/floor/carpet, /area/awaymission/UO71/centralhall) "mH" = ( @@ -6172,8 +5732,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6223,8 +5782,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -6328,8 +5886,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6337,6 +5894,7 @@ name = "Research Maintenance"; req_access_txt = "271" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "mX" = ( @@ -6357,8 +5915,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "mY" = ( @@ -6369,8 +5926,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "mZ" = ( @@ -6380,23 +5936,20 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "na" = ( /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "nb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "nc" = ( @@ -6406,20 +5959,11 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "nd" = ( /obj/structure/table, -/obj/machinery/door_control{ - desc = "A remote control-switch whichs locks the research division down in the event of a biohazard leak or contamination."; - id = "UO71_biohazard"; - name = "Biohazard Door Control"; - pixel_x = 0; - pixel_y = -6; - req_access_txt = "271" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -6431,6 +5975,12 @@ pixel_x = -30 }, /obj/item/book/manual/security_space_law, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 1; + external_pressure_bound = 101.325; + on = 1; + pressure_checks = 1 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" @@ -6480,7 +6030,6 @@ specialfunctions = 4 }, /obj/structure/chair/wood{ - tag = "icon-wooden_chair (NORTH)"; icon_state = "wooden_chair"; dir = 1 }, @@ -6562,7 +6111,6 @@ /area/awaymission/UO71/eng) "ns" = ( /obj/structure/chair/comfy/black{ - tag = "icon-comfychair (EAST)"; icon_state = "comfychair"; dir = 4 }, @@ -6573,7 +6121,6 @@ /area/awaymission/UO71/centralhall) "nt" = ( /obj/structure/chair/comfy/black{ - tag = "icon-comfychair (WEST)"; icon_state = "comfychair"; dir = 8 }, @@ -6612,12 +6159,12 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "nz" = ( @@ -6630,8 +6177,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "nA" = ( @@ -6643,8 +6189,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "nB" = ( @@ -6668,7 +6213,6 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; dir = 4; heat_capacity = 1e+006 @@ -6679,8 +6223,7 @@ /obj/structure/chair, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "nE" = ( @@ -6716,8 +6259,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -6726,6 +6268,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "nI" = ( @@ -6733,8 +6278,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -6742,6 +6286,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "nJ" = ( @@ -6749,12 +6296,12 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark/burnturf, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "nK" = ( @@ -6762,8 +6309,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -6775,21 +6321,26 @@ req_access_txt = "0"; req_one_access_txt = "0" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "nL" = ( /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" @@ -6800,16 +6351,17 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; - initialize_directions = 11; - tag = "icon-manifold-b-f (EAST)" + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -6886,14 +6438,12 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; - initialize_directions = 11; - tag = "icon-manifold-r-f (EAST)" + initialize_directions = 11 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) @@ -6930,8 +6480,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plating, /area/awaymission/UO71/eng) @@ -6939,21 +6488,18 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /turf/simulated/floor/plating, /area/awaymission/UO71/eng) @@ -6961,8 +6507,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plating, /area/awaymission/UO71/eng) @@ -6999,11 +6544,11 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "oh" = ( @@ -7023,8 +6568,7 @@ /obj/item/laser_pointer, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "oi" = ( @@ -7042,16 +6586,14 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "oj" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "ok" = ( @@ -7059,8 +6601,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/light/small{ dir = 4 @@ -7071,16 +6612,41 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) "ol" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/wall, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, /area/awaymission/UO71/science) "om" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/wall/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, /area/awaymission/UO71/science) "on" = ( /obj/structure/table/reinforced, @@ -7095,8 +6661,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "oo" = ( @@ -7109,8 +6674,7 @@ /obj/item/pen, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "op" = ( @@ -7129,14 +6693,10 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "oq" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/science) "or" = ( @@ -7168,14 +6728,16 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5; + level = 1 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -7186,9 +6748,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/alarm/monitor{ dir = 4; frequency = 1439; @@ -7207,8 +6766,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -7226,8 +6784,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -7246,8 +6803,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -7269,8 +6825,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -7291,8 +6846,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/light/small{ dir = 1 @@ -7302,8 +6856,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-r-f (NORTH)" + initialize_directions = 14 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -7316,8 +6869,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -7333,8 +6885,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -7350,8 +6901,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/alarm/monitor{ frequency = 1439; @@ -7364,8 +6914,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-r-f (NORTH)" + initialize_directions = 14 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -7378,8 +6927,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -7398,8 +6946,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -7417,8 +6964,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -7439,8 +6985,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -7467,8 +7012,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -7486,8 +7030,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/junction{ dir = 2; @@ -7519,18 +7062,15 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-y (WEST)"; icon_state = "pipe-y"; dir = 8 }, @@ -7543,16 +7083,14 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; - initialize_directions = 11; - tag = "icon-manifold-b-f (EAST)" + initialize_directions = 11 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) @@ -7561,8 +7099,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /turf/simulated/floor/plating, /area/awaymission/UO71/eng) @@ -7620,8 +7157,7 @@ /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "oW" = ( @@ -7629,26 +7165,16 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/door_control{ - desc = "A remote control-switch whichs locks the research division down in the event of a biohazard leak or contamination."; - id = "UO71_biohazard"; - name = "Biohazard Door Control"; - pixel_x = 0; - pixel_y = 8; - req_access_txt = "271" - }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "oX" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "oY" = ( @@ -7659,28 +7185,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "oZ" = ( /obj/machinery/computer/aifixer, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "pa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door_control{ - desc = "A remote control-switch whichs locks the research division down in the event of a biohazard leak or contamination."; - id = "UO71_biohazard"; - name = "Biohazard Door Control"; - pixel_x = 0; - pixel_y = -24; - req_access_txt = "271" - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -7716,12 +7231,6 @@ }, /area/awaymission/UO71/science) "pd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 2; - on = 1; - scrub_N2O = 0; - scrub_Toxins = 0 - }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "red" @@ -7732,12 +7241,12 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/damageturf, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "pf" = ( @@ -7757,8 +7266,7 @@ "ph" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-b-f (NORTH)" + initialize_directions = 14 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) @@ -7871,8 +7379,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/alarm/monitor{ dir = 8; @@ -7896,8 +7403,7 @@ "pt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; - initialize_directions = 7; - tag = "icon-manifold-b-f (WEST)" + initialize_directions = 7 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -7919,8 +7425,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/light/small{ dir = 8 @@ -7968,8 +7473,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/light/small{ dir = 4 @@ -7992,42 +7496,28 @@ /turf/simulated/floor/plating, /area/awaymission/UO71/eng) "pB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/wall, /area/awaymission/UO71/science) -"pC" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/landmark/burnturf, -/turf/simulated/floor/plating, -/area/awaymission/UO71/science) "pD" = ( /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "pE" = ( @@ -8043,8 +7533,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "pF" = ( @@ -8055,8 +7544,7 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "pG" = ( @@ -8068,25 +7556,11 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/science) "pH" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/landmark/damageturf, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "pI" = ( @@ -8183,8 +7657,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -8199,14 +7672,12 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plating, /area/awaymission/UO71/eng) @@ -8214,10 +7685,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/wall, /area/awaymission/UO71/medical) -"pW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/rust, -/area/awaymission/UO71/medical) "pX" = ( /turf/simulated/wall/rust, /area/awaymission/UO71/medical) @@ -8226,8 +7693,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /turf/simulated/floor/plating, /area/awaymission/UO71/eng) @@ -8235,8 +7701,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /turf/simulated/floor/plating, /area/awaymission/UO71/eng) @@ -8248,12 +7713,12 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "qc" = ( @@ -8290,8 +7755,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -8301,6 +7765,9 @@ dir = 4 }, /obj/effect/landmark/damageturf, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "qh" = ( @@ -8312,8 +7779,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -8326,6 +7792,9 @@ req_access_txt = "271" }, /obj/effect/landmark/damageturf, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/medical) "qj" = ( @@ -8490,8 +7959,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -8501,6 +7969,9 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/burnturf, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "qy" = ( @@ -8513,8 +7984,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/door/airlock/engineering/glass{ name = "SMES Room"; @@ -8561,8 +8031,7 @@ "qF" = ( /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/loot) "qG" = ( @@ -8582,7 +8051,6 @@ pixel_y = 23; req_access = null }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/hand_labeler, /obj/item/clothing/accessory/stethoscope, /turf/simulated/floor/plasteel{ @@ -8606,13 +8074,11 @@ "qK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; - initialize_directions = 11; - tag = "icon-manifold-b-f (EAST)" + initialize_directions = 11 }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "purplecorner"; - tag = "icon-purplecorner (NORTH)" + icon_state = "purplecorner" }, /area/awaymission/UO71/centralhall) "qL" = ( @@ -8716,8 +8182,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) @@ -8726,14 +8191,12 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/suit_storage_unit/engine, @@ -8748,7 +8211,7 @@ layer = 2.9 }, /obj/structure/closet/secure_closet/engineering_personal{ - req_access = list(201) + req_access = list(271) }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -8792,8 +8255,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel{ dir = 9; - icon_state = "arrival"; - tag = "icon-arrival (NORTHWEST)" + icon_state = "arrival" }, /area/awaymission/UO71/eng) "ra" = ( @@ -8895,21 +8357,13 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/awaymission/UO71/science) -"rh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 7; - tag = "icon-manifold-b-f (WEST)" - }, -/turf/simulated/wall, -/area/awaymission/UO71/medical) "ri" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -8943,41 +8397,14 @@ icon_state = "dark" }, /area/awaymission/UO71/science) -"rl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11; - level = 1 - }, -/turf/simulated/wall/rust, -/area/awaymission/UO71/science) -"rm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/awaymission/UO71/bridge) "rn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4; - level = 1 - }, /turf/simulated/shuttle/wall{ dir = 4; icon_state = "wall3" }, /area/awaymission/UO71/bridge) "ro" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; @@ -8996,7 +8423,6 @@ /area/awaymission/UO71/medical) "rq" = ( /obj/structure/chair{ - tag = "icon-chair (WEST)"; icon_state = "chair"; dir = 8 }, @@ -9006,14 +8432,6 @@ "rr" = ( /turf/simulated/floor/plasteel, /area/awaymission/UO71/bridge) -"rs" = ( -/obj/machinery/atmospherics/unary/vent_scrubber{ - dir = 8; - on = 1; - scrub_Toxins = 1 - }, -/turf/simulated/floor/plasteel, -/area/awaymission/UO71/bridge) "rt" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ @@ -9204,7 +8622,7 @@ name = "UO71 Engineering APC"; pixel_x = -25; pixel_y = 0; - req_access = list(201); + req_access = null; start_charge = 100 }, /obj/machinery/atmospherics/unary/vent_pump{ @@ -9226,14 +8644,12 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 6; @@ -9321,8 +8737,7 @@ /obj/mecha/medical/odysseus, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/loot) "rX" = ( @@ -9334,8 +8749,7 @@ }, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/loot) "rY" = ( @@ -9347,10 +8761,8 @@ }, /area/awaymission/UO71/medical) "rZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 7; - tag = "icon-manifold-r-f (WEST)" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -9457,14 +8869,12 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/disposalpipe/segment{ dir = 1; @@ -9479,8 +8889,7 @@ "sm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; - initialize_directions = 7; - tag = "icon-manifold-b-f (WEST)" + initialize_directions = 7 }, /obj/machinery/camera{ c_tag = "Engineering Hallway"; @@ -9494,8 +8903,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -9519,8 +8927,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -9533,8 +8940,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -9553,16 +8959,14 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-b-f (NORTH)" + initialize_directions = 14 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -9574,8 +8978,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/alarm/monitor{ frequency = 1439; @@ -9599,8 +9002,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -9618,8 +9020,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -9644,8 +9045,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -9665,8 +9065,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -9684,8 +9083,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -9698,8 +9096,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -9723,8 +9120,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/structure/disposalpipe/segment{ dir = 2; @@ -9738,8 +9134,7 @@ "sA" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-b-f (NORTH)" + initialize_directions = 14 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -9778,8 +9173,7 @@ "sD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-b-f (NORTH)" + initialize_directions = 14 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) @@ -9815,8 +9209,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/meter{ frequency = 1443; @@ -9915,12 +9308,14 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/awaymission/UO71/medical) "sS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/power/apc/noalarm{ cell_type = 15000; dir = 8; @@ -9928,13 +9323,17 @@ name = "UO71 Medical APC"; pixel_x = -25; pixel_y = 0; - req_access = list(201); + req_access = null; start_charge = 100 }, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitehall" @@ -9975,6 +9374,10 @@ pixel_x = 0; pixel_y = -24 }, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 8; + on = 1 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitehall" @@ -10019,13 +9422,11 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; - initialize_directions = 7; - tag = "icon-manifold-r-f (WEST)" + initialize_directions = 7 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) @@ -10113,8 +9514,7 @@ "tj" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-r-f (NORTH)" + initialize_directions = 14 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -10126,14 +9526,12 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-r-f (NORTH)" + initialize_directions = 14 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) @@ -10172,8 +9570,7 @@ "tn" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-r-f (NORTH)" + initialize_directions = 14 }, /obj/structure/table, /turf/simulated/floor/plasteel{ @@ -10207,8 +9604,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 1 @@ -10308,77 +9704,12 @@ icon_state = "green" }, /area/awaymission/UO71/eng) -"tC" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/wall, -/area/awaymission/UO71/science) "tD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/wall, /area/awaymission/UO71/science) -"tE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/wall, -/area/awaymission/UO71/medical) -"tF" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 7; - tag = "icon-manifold-b-f (WEST)" - }, -/turf/simulated/floor/plating, -/area/awaymission/UO71/science) -"tG" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/awaymission/UO71/science) -"tH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall, -/area/awaymission/UO71/medical) -"tI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall/rust, -/area/awaymission/UO71/medical) "tJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -10395,9 +9726,6 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) "tK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -10410,29 +9738,13 @@ }, /area/awaymission/UO71/medical) "tL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitehall" }, /area/awaymission/UO71/medical) -"tM" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0; - tag = "" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/awaymission/UO71/science) "tN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/poddoor{ @@ -10465,16 +9777,14 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/light/small{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; - initialize_directions = 11; - tag = "icon-manifold-r-f (EAST)" + initialize_directions = 11 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/centralhall) @@ -10499,8 +9809,7 @@ /obj/machinery/portable_atmospherics/scrubber, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "escape"; - tag = "icon-escape (NORTH)" + icon_state = "escape" }, /area/awaymission/UO71/eng) "tT" = ( @@ -10530,8 +9839,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -10559,8 +9867,7 @@ "tX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; - initialize_directions = 7; - tag = "icon-manifold-r-f (WEST)" + initialize_directions = 7 }, /obj/item/radio/off, /obj/item/screwdriver, @@ -10602,8 +9909,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/atmospherics/pipe/manifold/visible/purple{ dir = 4; @@ -10638,11 +9944,23 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) "uf" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5; level = 1 }, -/turf/simulated/wall/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plating, /area/awaymission/UO71/science) "ug" = ( /obj/machinery/atmospherics/binary/pump{ @@ -10666,48 +9984,18 @@ /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) "ui" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Maintenance"; - req_access_txt = "271" - }, -/obj/machinery/atmospherics/pipe/simple/visible/universal, -/turf/simulated/floor/plating, -/area/awaymission/UO71/science) -"uj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/awaymission/UO71/science) -"uk" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/awaymission/UO71/science) -"ul" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1; - icon_state = "pipe-c" + level = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -10720,8 +10008,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/door/poddoor/preopen{ id_tag = "UO71_Engineering"; @@ -10738,8 +10025,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -10747,7 +10033,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1; + level = 1 + }, /turf/simulated/floor/plating, /area/awaymission/UO71/science) "uo" = ( @@ -10755,8 +10044,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -10768,6 +10056,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -10777,22 +10068,22 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/disposalpipe/junction{ - tag = "icon-pipe-j1 (EAST)"; icon_state = "pipe-j1"; dir = 4 }, /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -10804,14 +10095,14 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitehall" @@ -10825,12 +10116,6 @@ }, /turf/simulated/wall/rust, /area/awaymission/UO71/mining) -"us" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/wall, -/area/awaymission/UO71/science) "ut" = ( /turf/simulated/wall, /area/awaymission/UO71/outside) @@ -10853,16 +10138,18 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, /obj/item/stack/rods, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 9 }, /turf/simulated/floor/plating, /area/awaymission/UO71/science) @@ -10924,8 +10211,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -10947,8 +10233,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -11025,8 +10310,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/atmospherics/binary/pump{ dir = 1; @@ -11112,8 +10396,7 @@ /turf/simulated/floor/plasteel{ burnt = 1; dir = 8; - icon_state = "floorscorched2"; - tag = "icon-floorscorched2 (WEST)" + icon_state = "floorscorched2" }, /area/awaymission/UO71/eng) "uU" = ( @@ -11121,8 +10404,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11142,8 +10424,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -11232,14 +10513,12 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; - initialize_directions = 7; - tag = "icon-manifold-r-f (WEST)" + initialize_directions = 7 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) @@ -11256,8 +10535,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/door/airlock/engineering{ name = "Engineering"; @@ -11408,8 +10686,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11516,16 +10793,14 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -11536,8 +10811,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -11556,7 +10830,7 @@ pixel_y = -24 }, /obj/structure/closet/secure_closet/miner{ - req_access = list(201) + req_access = list(271) }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -11680,8 +10954,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -11709,8 +10982,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -11725,8 +10997,7 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/disposalpipe/segment{ dir = 1; @@ -11750,14 +11021,12 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/structure/disposalpipe/segment{ dir = 2; @@ -11765,8 +11034,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1; - initialize_directions = 14; - tag = "icon-manifold-b-f (NORTH)" + initialize_directions = 14 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) @@ -11775,8 +11043,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -11821,8 +11088,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/eng) @@ -11831,8 +11097,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/door/airlock/engineering{ name = "Engineering"; @@ -11854,8 +11119,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -11920,8 +11184,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/mining/glass{ @@ -11957,8 +11220,7 @@ /obj/machinery/computer/station_alert, /turf/simulated/floor/plasteel{ dir = 10; - icon_state = "caution"; - tag = "icon-caution (SOUTHWEST)" + icon_state = "caution" }, /area/awaymission/UO71/eng) "wF" = ( @@ -11985,8 +11247,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -12020,8 +11281,7 @@ /turf/simulated/floor/plasteel{ burnt = 1; dir = 8; - icon_state = "floorscorched2"; - tag = "icon-floorscorched2 (WEST)" + icon_state = "floorscorched2" }, /area/awaymission/UO71/eng) "wL" = ( @@ -12168,8 +11428,7 @@ "xc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; - initialize_directions = 11; - tag = "icon-manifold-r-f (EAST)" + initialize_directions = 11 }, /obj/structure/closet/crate, /obj/item/stack/sheet/metal{ @@ -12184,8 +11443,7 @@ "xd" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; - initialize_directions = 11; - tag = "icon-manifold-r-f (EAST)" + initialize_directions = 11 }, /obj/structure/cable, /turf/simulated/floor/plasteel, @@ -12227,15 +11485,13 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/machinery/door/airlock/command/glass{ name = "Chief Engineer"; @@ -12318,8 +11574,7 @@ "xp" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; - initialize_directions = 11; - tag = "icon-manifold-b-f (EAST)" + initialize_directions = 11 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) @@ -12369,8 +11624,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -12395,8 +11649,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -12420,8 +11673,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, @@ -12460,8 +11712,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -12518,8 +11769,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -12580,8 +11830,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /obj/machinery/light/small{ dir = 4 @@ -12652,7 +11901,7 @@ icon_state = "miningsec"; locked = 0; name = "miner's equipment"; - req_access = list(201) + req_access = list(271) }, /obj/item/storage/backpack/satchel_eng, /obj/item/clothing/gloves/fingerless, @@ -12674,16 +11923,14 @@ "xS" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; - initialize_directions = 11; - tag = "icon-manifold-r-f (EAST)" + initialize_directions = 11 }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /turf/simulated/floor/plasteel{ dir = 2; @@ -12717,8 +11964,7 @@ /obj/structure/cable{ d1 = 2; d2 = 4; - icon_state = "2-4"; - tag = "" + icon_state = "2-4" }, /turf/simulated/floor/plasteel{ dir = 2; @@ -12755,8 +12001,7 @@ /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -12776,8 +12021,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) @@ -12904,8 +12148,7 @@ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) @@ -12959,15 +12202,13 @@ "yt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; - initialize_directions = 7; - tag = "icon-manifold-r-f (WEST)" + initialize_directions = 7 }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; - pixel_y = 0; - tag = "" + pixel_y = 0 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) @@ -12997,8 +12238,7 @@ /turf/simulated/floor/plasteel{ burnt = 1; dir = 8; - icon_state = "floorscorched2"; - tag = "icon-floorscorched2 (WEST)" + icon_state = "floorscorched2" }, /area/awaymission/UO71/mining) "yx" = ( @@ -13021,16 +12261,14 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) "yB" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; - initialize_directions = 7; - tag = "icon-manifold-b-f (WEST)" + initialize_directions = 7 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) @@ -13049,8 +12287,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) @@ -13066,8 +12303,7 @@ d1 = 4; d2 = 8; icon_state = "4-8"; - pixel_x = 0; - tag = "" + pixel_x = 0 }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) @@ -13087,8 +12323,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/mining) @@ -13096,20 +12331,17 @@ /obj/structure/cable{ d1 = 1; d2 = 4; - icon_state = "1-4"; - tag = "" + icon_state = "1-4" }, /obj/structure/cable{ d1 = 1; d2 = 8; - icon_state = "1-8"; - tag = "" + icon_state = "1-8" }, /turf/simulated/floor/mech_bay_recharge_floor, /area/awaymission/UO71/mining) "yI" = ( /obj/machinery/mech_bay_recharge_port{ - tag = "icon-recharge_port (WEST)"; icon_state = "recharge_port"; dir = 8 }, @@ -13219,13 +12451,6 @@ }, /turf/simulated/floor/plasteel, /area/awaymission/UO71/queen) -"yX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" - }, -/area/awaymission/UO71/outside) "yY" = ( /obj/structure/sign/biohazard, /turf/simulated/shuttle/wall{ @@ -13253,16 +12478,16 @@ }, /area/awaymission/UO71/outside) "zd" = ( -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" +/turf/unsimulated/wall{ + icon_state = "rock"; + name = "rock" }, /area/awaymission/UO71/queen) "ze" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/shuttle/wall{ - dir = 4; - icon_state = "wall3" +/turf/unsimulated/wall{ + icon_state = "rock"; + name = "rock" }, /area/awaymission/UO71/queen) "zf" = ( @@ -13281,8 +12506,7 @@ "zj" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; - initialize_directions = 7; - tag = "icon-manifold-b-f (WEST)" + initialize_directions = 7 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, @@ -13385,14 +12609,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/wall, /area/awaymission/UO71/queen) -"zH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 7; - tag = "icon-manifold-r-f (WEST)" - }, -/turf/simulated/wall, -/area/awaymission/UO71/science) "zM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/mineral/random/labormineral, @@ -13408,8 +12624,7 @@ /obj/item/paper/researchnotes, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "cafeteria"; - tag = "icon-cafeteria (NORTHEAST)" + icon_state = "cafeteria" }, /area/awaymission/UO71/loot) "zP" = ( @@ -13457,7 +12672,6 @@ "zX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/chair/wood{ - tag = "icon-wooden_chair (EAST)"; icon_state = "wooden_chair"; dir = 4 }, @@ -13469,7 +12683,6 @@ /area/awaymission/UO71/queen) "zZ" = ( /obj/structure/chair/wood{ - tag = "icon-wooden_chair (EAST)"; icon_state = "wooden_chair"; dir = 4 }, @@ -13490,7 +12703,6 @@ /area/awaymission/UO71/queen) "Ac" = ( /obj/structure/chair/wood{ - tag = "icon-wooden_chair (NORTH)"; icon_state = "wooden_chair"; dir = 1 }, @@ -13523,12 +12735,270 @@ /obj/machinery/light, /turf/simulated/floor/wood, /area/awaymission/UO71/queen) -"Ai" = ( +"AW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "green" + }, +/area/awaymission/UO71/plaza) +"BE" = ( +/obj/machinery/door/poddoor{ + id_tag = "UO71_Containment"; + name = "Containment 1" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/awaymission/UO71/mother) +"CA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/awaymission/UO71/plaza) +"CE" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/awaymission/UO71/science) +"CI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, +/turf/simulated/floor/plasteel, +/area/awaymission/UO71/plaza) +"CP" = ( +/obj/structure/grille, +/obj/structure/window/full/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/awaymission/UO71/plaza) +"Eb" = ( +/obj/machinery/atmospherics/unary/vent_pump{ + icon_state = "weld"; + on = 1; + welded = 1 + }, +/turf/simulated/floor/vault, +/area/awaymission/UO71/prince) +"Fu" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/awaymission/UO71/mother) +"Gl" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/awaymission/UO71/plaza) +"GY" = ( +/obj/machinery/door/airlock/engineering{ + name = "Engineering Maintenance"; + req_access_txt = "271" + }, +/obj/machinery/atmospherics/pipe/simple/visible/universal, +/turf/simulated/floor/plating, +/area/awaymission/UO71/science) +"HH" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/awaymission/UO71/science) +"Io" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/awaymission/UO71/plaza) +"Iq" = ( +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "0"; + req_one_access_txt = "0" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/awaymission/UO71/plaza) +"IL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/wall/rust, +/area/awaymission/UO71/science) +"IU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5; + level = 2 + }, +/turf/simulated/floor/plating, +/area/awaymission/UO71/plaza) +"Jo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/wall/r_wall, +/area/awaymission/UO71/prince) +"KE" = ( +/obj/structure/spider/cocoon{ + icon_state = "cocoon_large1" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/vault, +/area/awaymission/UO71/prince) +"Lf" = ( +/turf/unsimulated/wall{ + icon_state = "rock"; + name = "rock" + }, +/area/awaymission/UO71/loot) +"Lw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plasteel, +/area/awaymission/UO71/plaza) +"LR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/awaymission/UO71/centralhall) +"Mh" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/public/glass{ + name = "Central Access" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/awaymission/UO71/plaza) +"NA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/vault, +/area/awaymission/UO71/prince) +"Of" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/awaymission/UO71/plaza) +"Pk" = ( +/turf/simulated/floor/plating, +/area/awaymission/UO71/science) +"Pv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1; - level = 1 + initialize_directions = 14 + }, +/turf/simulated/floor/plasteel, +/area/awaymission/UO71/plaza) +"PS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/awaymission/UO71/mother) +"Rk" = ( +/obj/structure/bed, +/obj/item/bedsheet, +/obj/machinery/atmospherics/unary/vent_pump{ + dir = 1; + external_pressure_bound = 101.325; + on = 1; + pressure_checks = 1 + }, +/turf/simulated/floor/carpet, +/area/awaymission/UO71/plaza) +"Sz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "red" + }, +/area/awaymission/UO71/plaza) +"Ug" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/awaymission/UO71/plaza) +"UF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/shuttle/wall{ + dir = 4; + icon_state = "wall3" + }, +/area/awaymission/UO71/outside) +"Vz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/wall, +/area/awaymission/UO71/centralhall) +"VA" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/awaymission/UO71/plaza) +"We" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + dir = 2; + icon_state = "whitepurplecorner" + }, +/area/awaymission/UO71/science) +"Xq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/mineral/random/labormineral, +/area/awaymission/UO71/outside) +"ZV" = ( +/obj/structure/grille, +/obj/structure/window/full/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, /area/awaymission/UO71/science) (1,1,1) = {" @@ -13633,7 +13103,7 @@ aa aa aa aa -zc +aa aa aa aa @@ -13783,7 +13253,7 @@ aa aa aa aa -zc +aa aa aa aa @@ -13933,7 +13403,7 @@ aa aa aa aa -zc +aa aa aa aa @@ -14083,7 +13553,7 @@ aa aa aa aa -zc +aa aa aa aa @@ -14233,7 +13703,7 @@ aa aa aa aa -zc +aa aa aa aa @@ -14383,7 +13853,7 @@ aa aa aa aa -zc +aa aa aa aa @@ -14533,7 +14003,7 @@ aa aa aa aa -zc +aa aa aa aa @@ -14683,7 +14153,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -14833,7 +14303,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -14983,7 +14453,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -15133,7 +14603,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -15283,7 +14753,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -15433,7 +14903,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -15583,7 +15053,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -15733,7 +15203,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -15883,7 +15353,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -16033,7 +15503,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -16183,7 +15653,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -16333,7 +15803,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -16483,7 +15953,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -16633,7 +16103,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -16783,7 +16253,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -16933,7 +16403,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -17083,7 +16553,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -17233,7 +16703,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -17383,7 +16853,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -17533,7 +17003,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -17683,7 +17153,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -17833,7 +17303,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -17934,8 +17404,8 @@ ab ab ab ga -gp -gp +gq +gU gp hV ga @@ -17983,7 +17453,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -18084,16 +17554,16 @@ ab ab ab ga -gq -gU -gp -gp -iO -jn -jK +hG +hW +hW +hW +Fu +PS +BE kf -kJ -lH +kP +lI fO fO fO @@ -18133,7 +17603,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -18234,10 +17704,10 @@ ab ab ab ga -hG -hW -hW -mi +gp +gp +gp +gp iO jn jK @@ -18283,7 +17753,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -18387,7 +17857,7 @@ ga gp gp gp -mh +hV ga jg jG @@ -18433,7 +17903,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -18538,11 +18008,11 @@ gp gp gp mx -iF -ji -ji -kh -kP +ga +fO +fO +fN +kJ lN fO mT @@ -18583,7 +18053,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -18706,6 +18176,7 @@ fO fN fN fN +fN fO fN fO @@ -18732,8 +18203,7 @@ ab ab ab ab -ab -zc +aa ab ab ab @@ -18842,21 +18312,22 @@ fN fO fO kr -lc -lP +ld +lH ms -mR -mR -km -km +fN +fN +fO +fO pD qb mn rg pe rg -tG +rg uf +fN rP sE uv @@ -18882,8 +18353,7 @@ ab ab ab ab -ab -zc +aa ab ab ab @@ -18990,9 +18460,9 @@ hC cO iP jo -jL -kj -kV +jM +lb +lc lO mr mW @@ -19000,13 +18470,14 @@ ny og jQ jZ -ji -kh -ji -kh -kh -tF +fO +fO +fO +fO +fO +fO ui +GY rR vm uK @@ -19032,8 +18503,7 @@ ab ab ab ab -ab -zc +aa ab ab ab @@ -19138,7 +18608,7 @@ gy ah ig cV -iQ +jp jp jN kt @@ -19155,8 +18625,9 @@ qu ra qu fO -pC +fO ol +fO rS tp uO @@ -19182,8 +18653,7 @@ ab ab ab ab -ab -zc +aa ab ab ab @@ -19307,6 +18777,7 @@ rQ fO pH om +fN fO fO fN @@ -19332,8 +18803,7 @@ ab ab ab ab -ab -zc +aa ab ab ab @@ -19436,7 +18906,7 @@ fN gj gA ap -ap +HH gZ fO fO @@ -19455,9 +18925,9 @@ mu rj mu fO -nI -om -fO +CE +ol +fN ab ab ab @@ -19483,7 +18953,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -19605,8 +19075,8 @@ qB ri rU fN -nI -uj +Pk +ol fO ab ab @@ -19633,7 +19103,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -19744,7 +19214,7 @@ ab fO kN lV -fO +km nb nD oo @@ -19755,8 +19225,8 @@ qC rk rV fN -tC -ul +fO +ol fO ab ab @@ -19783,7 +19253,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -19886,7 +19356,7 @@ ab fO fN fN -fN +IL fN fO ab @@ -19905,8 +19375,8 @@ pT pT pT pT -tD -uk +fO +ol qa qa qa @@ -19933,7 +19403,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -20036,14 +19506,14 @@ ab ab ab ab -ab +Xq ab ab ab ab fO kJ -lX +lU fO nc na @@ -20055,7 +19525,7 @@ qF qF rX pT -Ai +fO un pV vq @@ -20083,7 +19553,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -20186,7 +19656,7 @@ zc zc zc zc -zc +UF zc zc zc @@ -20205,7 +19675,7 @@ zO qF rW sN -tD +fO qg pX vp @@ -20233,7 +19703,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -20336,15 +19806,15 @@ fP fP fP fP +Jo fP -id -iI -yX -jl -km -kY -lX -mu +fP +zc +ab +fO +kJ +We +ZV ne nF or @@ -20355,8 +19825,8 @@ pT pT pT pT -tD -uk +fO +ol pX vs qJ @@ -20383,7 +19853,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -20487,7 +19957,7 @@ gd gd gd hD -ie +gd fP zc ab @@ -20500,12 +19970,12 @@ nE oq pa pB -pV -pV -rh -pV -pV -tE +qa +qa +qa +qa +qa +qa uo qa vr @@ -20533,7 +20003,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -20636,7 +20106,7 @@ fP gd gd gd -ge +KE gd fP zc @@ -20649,8 +20119,8 @@ nf nG os pd -km -pW +fO +pX qH ro rZ @@ -20683,7 +20153,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -20786,7 +20256,7 @@ fP ge ge gd -gd +NA if fP yY @@ -20833,7 +20303,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -20919,10 +20389,10 @@ ac ce cn cG -cD -cb -cb -dM +bK +bI +bI +aY ac ab ab @@ -20936,7 +20406,7 @@ fP gf gx gd -ge +KE gd iR jq @@ -20955,7 +20425,7 @@ qJ qJ sc sU -tH +qa qi pX pX @@ -20983,7 +20453,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -21069,7 +20539,7 @@ ac bF bI cF -ca +bI ac ac dL @@ -21086,7 +20556,7 @@ fP gd gd gd -gd +NA gd iR jq @@ -21105,7 +20575,7 @@ qI rp sb sT -tI +qa qx fN ab @@ -21133,7 +20603,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -21219,14 +20689,14 @@ ac cf cp cG -bN +bF ac dw -dO +ec dZ ej ev -cU +ac eV fm ad @@ -21236,9 +20706,9 @@ fP gd gd ge -gd -my -iK +NA +if +fP yY jG ke @@ -21255,8 +20725,8 @@ qa qa qa qa -tI -uk +qa +ol fN ab ab @@ -21283,7 +20753,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -21363,20 +20833,20 @@ aQ aZ bi br -bx -bJ -bW -bW +ac +aY +ac +ac cm -cH -bQ -bW +cG +aY +ac dv -dN +ar dY -bv +al eu -bV +ad eU fl ac @@ -21385,10 +20855,10 @@ zc fP gd gd -gd +Eb hE ge -iL +fP zc ab fO @@ -21405,7 +20875,7 @@ og nJ kB og -tM +og uw fN ab @@ -21433,7 +20903,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -21513,13 +20983,13 @@ aR bc ac ad -by +ac bM cb cc cd cb -cT +IU ad dy dP @@ -21528,7 +20998,7 @@ el ew ad eX -bC +Rk ac ab zc @@ -21536,9 +21006,9 @@ fP fP fP fP +Jo fP fP -iL zc ab fO @@ -21547,16 +21017,16 @@ gA kR mR jC -zH -mR -mR -km -mR -rl -mR -mR -km -us +fO +fN +fN +fO +fN +fN +fN +fN +fO +fO fN ab ab @@ -21583,7 +21053,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -21663,19 +21133,19 @@ aQ bb bj bs -bz +ad bL ad ad ac ad -ba +Iq ad dx at ea ek -at +CP ac eW ac @@ -21686,9 +21156,9 @@ zc zc zc zc +UF zc zc -jm zc ab fN @@ -21697,12 +21167,12 @@ gA lh fO nI -ol fO fO fO fO -rm +fO +sa sa sa sa @@ -21733,7 +21203,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -21813,21 +21283,21 @@ ad bd ac ad -bz +ad bO -bY +ad ch cs ac -ar +Of af al dQ -ec +Sz ec ex aw -eY +Ug fn ad ab @@ -21836,9 +21306,9 @@ ab ab ab ab +Xq ab ab -iM ab ab fO @@ -21847,12 +21317,12 @@ gA li fO nI -om +fN fO fO fO fO -rm +sa sg rr sa @@ -21883,7 +21353,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -21963,7 +21433,7 @@ aS aw al ar -by +ac bN ac cg @@ -21971,14 +21441,14 @@ cr cI ae dd -al -al -al -al -al -al -eY -al +CA +CA +CI +CA +Gl +CA +bG +Lw ac fb fb @@ -21986,9 +21456,9 @@ fb fb fe fb +Vz fb -fb -iN +fe fe fb fO @@ -21997,12 +21467,12 @@ lZ tD fN nK -om +fN fb fb fb fb -rm +sa sf rr sa @@ -22033,7 +21503,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -22113,14 +21583,14 @@ aU be bl bt -bA +ac bQ bW ci ct ac ar -df +Pv dA ay ed @@ -22128,17 +21598,17 @@ em ey eK bH -al -cJ -fF -fR -fF -fR -gD -hf +df +Mh +LR hJ +LR +hJ +gD hJ iS +hJ +hJ js jP ku @@ -22183,7 +21653,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -22263,14 +21733,14 @@ aT ac bk al -bz +ad bP ad ac ac ad al -al +bS dz dR dR @@ -22302,7 +21772,7 @@ ll pI jf zP -rm +sa se sa sa @@ -22333,7 +21803,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -22413,14 +21883,14 @@ aW ac bn bv -bH -bS +bv +Io aw ar ar cJ al -al +bS dz dR ef @@ -22452,7 +21922,7 @@ ll fR qk zQ -rs +rr si rr tO @@ -22483,7 +21953,7 @@ ab ab ab ab -zc +aa ab ab uW @@ -22563,14 +22033,14 @@ aV ac bm bu -bG -bR +bu +VA al al al cJ al -al +bS dz dR ee @@ -22633,7 +22103,7 @@ ab ab ab ab -zc +aa ab ab uW @@ -22713,14 +22183,14 @@ aT ac bp ar -by +ac bP ac ad ac ac cW -al +bS dC dR dR @@ -22783,7 +22253,7 @@ ab ab ab ab -zc +aa ab ab uW @@ -22863,14 +22333,14 @@ aX aX bo bw -by -bT -bY -cj +ac +bL +ad +aF cu ac al -dg +Pv dB dS eg @@ -22933,7 +22403,7 @@ ab ab ab ab -zc +aa ab ab uW @@ -23013,14 +22483,14 @@ al bf al al -bz +ad bU ac cl cr cM bu -di +bR dE dT dT @@ -23083,7 +22553,7 @@ ab ab ab ab -zc +aa ab ab uW @@ -23163,14 +22633,14 @@ ac ac ad bB -bD +ad bX bV ck cv ac cX -dh +AW dD dh dh @@ -23233,7 +22703,7 @@ ab ab ab ab -zc +aa ab ab uW @@ -23313,14 +22783,14 @@ ac bh bq bq -by +ac ca ad ac ad ad ac -at +CP dG dU at @@ -23383,7 +22853,7 @@ ab ab ab ab -zc +aa ab ab uW @@ -23463,14 +22933,14 @@ ac bg aH bC -by +ac bZ cc cd -cc +IU cN ac -at +CP dF al at @@ -23533,7 +23003,7 @@ ab ab ab ab -zc +aa ab ab uW @@ -23613,12 +23083,12 @@ ac ac ac ac -bE -bV -bW -bW -cx -ca +ac +ad +ac +ac +bL +bI ad dk dH @@ -23683,7 +23153,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -23768,8 +23238,8 @@ ab ab ac cw -cy -cU +bK +ac dj bu dV @@ -23833,7 +23303,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -23918,7 +23388,7 @@ ab ab ad cw -cK +ac ac dm dI @@ -23983,7 +23453,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -24068,7 +23538,7 @@ ab ab ac cw -cK +ac cY dl ar @@ -24133,7 +23603,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -24218,7 +23688,7 @@ ab ab ad cw -cK +ac da do dI @@ -24283,7 +23753,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -24368,7 +23838,7 @@ ab ab ac cw -cL +ad cZ dn al @@ -24518,7 +23988,7 @@ ab ab ad cw -cK +ac dc do dI @@ -24668,7 +24138,7 @@ ab ab ad co -cL +ad db dp al @@ -24818,7 +24288,7 @@ ab ab ac cA -cL +ad ad dr dI @@ -24967,12 +24437,12 @@ ab ab ab ac -cz -cP -bV +bL +cF +ad dq dJ -dW +dT eh dT eG @@ -25118,7 +24588,7 @@ ab ab ad cq -bL +aY ac dt dh @@ -25139,7 +24609,7 @@ hq hQ gk gk -jw +fb jY fb fb @@ -25268,7 +24738,7 @@ ab ab ad cC -bN +bF ad ds dK @@ -25289,7 +24759,7 @@ hp gk gk fU -jw +fb jX it fb @@ -25418,7 +24888,7 @@ ab ab ad cC -bL +aY ac ac ac @@ -25439,7 +24909,7 @@ hs hR ir iX -jx +fe ka kD fe @@ -25568,7 +25038,7 @@ ab ab ac cE -cQ +cc cb cR cd @@ -25589,7 +25059,7 @@ hr fb fe fb -jx +fe is kC fe @@ -25717,18 +25187,18 @@ ab ab ab ac -cB -bW -bV -bV -bW -bV -bV -bW -bV -bV -fh -fu +ad +ac +ad +ad +ac +ad +ad +ac +ad +ad +fe +fb fD fK fx @@ -25739,7 +25209,7 @@ ht gb fy iY -gm +de kb fe fe @@ -25878,18 +25348,18 @@ ab ab ab ab -fv -fh -fh -fh -fX -fX -fh -fh -fh -fh -fh -jz +fb +fe +fe +fe +fb +fb +fe +fe +fe +fe +fe +fb fe fb ab @@ -26383,7 +25853,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -26533,7 +26003,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -26683,7 +26153,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -26833,7 +26303,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -26983,7 +26453,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -27133,7 +26603,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -27283,7 +26753,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -27433,7 +26903,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -27583,7 +27053,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -27733,7 +27203,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -27883,7 +27353,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -28033,7 +27503,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -28183,7 +27653,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -28333,7 +27803,7 @@ ab ab ab ab -pT +Lf pT pT pT @@ -28483,7 +27953,7 @@ ab ab ab ab -pT +Lf zo zt zv @@ -28633,7 +28103,7 @@ ab ab ab ab -pT +Lf zn zs zs @@ -28783,7 +28253,7 @@ ab ab ab ab -pT +Lf zp zu zs @@ -28933,7 +28403,7 @@ ab ab ab ab -pT +Lf pT pT pT @@ -29083,7 +28553,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -29233,7 +28703,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -29383,7 +28853,7 @@ ab ab ab ab -zc +aa ab ab zr @@ -29533,7 +29003,7 @@ ab ab ab ab -zc +aa ab ab uW @@ -29683,7 +29153,7 @@ ab ab ab ab -zc +aa ab ab uW @@ -29833,7 +29303,7 @@ ab ab ab ab -zc +aa ab ab uW @@ -29983,7 +29453,7 @@ ab ab ab ab -zc +aa ab zr uW @@ -30133,7 +29603,7 @@ ab ab ab ab -zc +aa ab uW zr @@ -30283,7 +29753,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -30433,7 +29903,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -30583,7 +30053,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -30733,7 +30203,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -30883,7 +30353,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -31033,7 +30503,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -31183,7 +30653,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -31333,7 +30803,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -31483,7 +30953,7 @@ ab ab ab ab -zc +aa ab ab ab @@ -31632,8 +31102,8 @@ aa aa aa aa -ab -zc +aa +aa aa aa aa @@ -31782,8 +31252,8 @@ aa aa aa aa -ab -zc +aa +aa aa aa aa @@ -31932,8 +31402,8 @@ aa aa aa aa -ab -zc +aa +aa aa aa aa @@ -32082,8 +31552,8 @@ aa aa aa aa -ab -zc +aa +aa aa aa aa @@ -32232,8 +31702,8 @@ aa aa aa aa -ab -zc +aa +aa aa aa aa @@ -32382,8 +31852,8 @@ aa aa aa aa -ab -zc +aa +aa aa aa aa @@ -32532,8 +32002,8 @@ aa aa aa aa -ab -zc +aa +aa aa aa aa diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index de20ccd1a4c..0c7e32a0a76 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -3,6 +3,7 @@ #define GAS_PL (1 << 2) #define GAS_CO2 (1 << 3) #define GAS_N2O (1 << 4) +#define GAS_A_B (1 << 5) //ATMOS //stuff you should probably leave well alone! diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 2f98b6ee7b5..b7e89e678ed 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -36,6 +36,7 @@ #define PASSEMOTES 16 //Mob has a cortical borer or holders inside of it that need to see emotes. #define GOTTAGOFAST 32 #define IGNORESLOWDOWN 128 +#define IGNORE_SPEED_CHANGES 256 #define GODMODE 4096 #define FAKEDEATH 8192 //Replaces stuff like changeling.changeling_fakedeath #define XENO_HOST 16384 //Tracks whether we're gonna be a baby alien's mummy. diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index 26b1d2d44aa..4b10bee2a2b 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -198,6 +198,8 @@ // /area signals +///from base of area/proc/power_change(): () +#define COMSIG_AREA_POWER_CHANGE "area_power_change" ///from base of area/Entered(): (atom/movable/M) #define COMSIG_AREA_ENTERED "area_entered" ///from base of area/Exited(): (atom/movable/M) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 0a36db1b185..e04a95bcae2 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -363,7 +363,7 @@ #define INVESTIGATE_BOMB "bombs" // The SQL version required by this version of the code -#define SQL_VERSION 12 +#define SQL_VERSION 13 // Vending machine stuff #define CAT_NORMAL 1 @@ -429,6 +429,10 @@ // Filters #define FILTER_AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-2, size=4, color="#04080FAA") +#define FILTER_EYE_BLUR filter(type="blur", size=0) + +#define AMBIENT_OCCLUSION_FILTER_KEY "ambient occlusion" +#define EYE_BLUR_FILTER_KEY "eye blur" //Fullscreen overlay resolution in tiles. #define FULLSCREEN_OVERLAY_RESOLUTION_X 15 diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index eb5fad0ff27..7d8528d2da3 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -12,34 +12,57 @@ #define SOUND_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|SOUND_HEARTBEAT|SOUND_BUZZ|SOUND_INSTRUMENTS|SOUND_MENTORHELP|SOUND_DISCO|SOUND_AI_VOICE) -#define CHAT_OOC 1 -#define CHAT_DEAD 2 -#define CHAT_GHOSTEARS 4 -#define CHAT_GHOSTSIGHT 8 -#define CHAT_PRAYER 16 -#define CHAT_RADIO 32 -#define AZERTY 64 -#define CHAT_DEBUGLOGS 128 -#define CHAT_LOOC 256 -#define CHAT_GHOSTRADIO 512 -#define SHOW_TYPING 1024 -#define DISABLE_SCOREBOARD 2048 -#define DISABLE_KARMA_REMINDER 4096 -#define MEMBER_PUBLIC 8192 -#define CHAT_NO_ADMINLOGS 16384 -#define DONATOR_PUBLIC 32768 -#define CHAT_NO_TICKETLOGS 65536 -#define UI_DARKMODE 131072 -#define DISABLE_KARMA 262144 -#define CHAT_NO_MENTORTICKETLOGS 524288 -#define TYPING_ONCE 1048576 -#define AMBIENT_OCCLUSION 2097152 -#define CHAT_GHOSTPDA 4194304 -#define NUMPAD_TARGET 8388608 -#define TOGGLES_TOTAL 16777215 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. +#define PREFTOGGLE_CHAT_OOC 1 +#define PREFTOGGLE_CHAT_DEAD 2 +#define PREFTOGGLE_CHAT_GHOSTEARS 4 +#define PREFTOGGLE_CHAT_GHOSTSIGHT 8 +#define PREFTOGGLE_CHAT_PRAYER 16 +#define PREFTOGGLE_CHAT_RADIO 32 +#define PREFTOGGLE_AZERTY 64 +#define PREFTOGGLE_CHAT_DEBUGLOGS 128 +#define PREFTOGGLE_CHAT_LOOC 256 +#define PREFTOGGLE_CHAT_GHOSTRADIO 512 +#define PREFTOGGLE_SHOW_TYPING 1024 +#define PREFTOGGLE_DISABLE_SCOREBOARD 2048 +#define PREFTOGGLE_DISABLE_KARMA_REMINDER 4096 +#define PREFTOGGLE_MEMBER_PUBLIC 8192 +#define PREFTOGGLE_CHAT_NO_ADMINLOGS 16384 +#define PREFTOGGLE_DONATOR_PUBLIC 32768 +#define PREFTOGGLE_CHAT_NO_TICKETLOGS 65536 +#define PREFTOGGLE_UI_DARKMODE 131072 +#define PREFTOGGLE_DISABLE_KARMA 262144 +#define PREFTOGGLE_CHAT_NO_MENTORTICKETLOGS 524288 +#define PREFTOGGLE_TYPING_ONCE 1048576 +#define PREFTOGGLE_AMBIENT_OCCLUSION 2097152 +#define PREFTOGGLE_CHAT_GHOSTPDA 4194304 +#define PREFTOGGLE_NUMPAD_TARGET 8388608 + +#define TOGGLES_TOTAL 16777215 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. + +#define TOGGLES_DEFAULT (PREFTOGGLE_CHAT_OOC|PREFTOGGLE_CHAT_DEAD|PREFTOGGLE_CHAT_GHOSTEARS|PREFTOGGLE_CHAT_GHOSTSIGHT|PREFTOGGLE_CHAT_PRAYER|PREFTOGGLE_CHAT_RADIO|PREFTOGGLE_CHAT_LOOC|PREFTOGGLE_MEMBER_PUBLIC|PREFTOGGLE_DONATOR_PUBLIC|PREFTOGGLE_AMBIENT_OCCLUSION|PREFTOGGLE_CHAT_GHOSTPDA|PREFTOGGLE_NUMPAD_TARGET) + +// toggles_2 variables. These MUST be prefixed with PREFTOGGLE_2 +#define PREFTOGGLE_2_RANDOMSLOT 1 +#define PREFTOGGLE_2_FANCYUI 2 +#define PREFTOGGLE_2_ITEMATTACK 4 +#define PREFTOGGLE_2_WINDOWFLASHING 8 +#define PREFTOGGLE_2_ANONDCHAT 16 +#define PREFTOGGLE_2_AFKWATCH 32 + +#define TOGGLES_2_TOTAL 63 // If you add or remove a preference toggle above, make sure you update this define with the total value of the toggles combined. + +#define TOGGLES_2_DEFAULT (PREFTOGGLE_2_FANCYUI|PREFTOGGLE_2_ITEMATTACK|PREFTOGGLE_2_WINDOWFLASHING) + +// Sanity checks +#if TOGGLES_TOTAL > 16777215 +#error toggles bitflag over 16777215. Please use toggles_2. +#endif + +#if TOGGLES_2_TOTAL > 16777215 +#error toggles_2 bitflag over 16777215. Please make an issue report and postpone the feature you are working on. +#endif -#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_LOOC|MEMBER_PUBLIC|DONATOR_PUBLIC|AMBIENT_OCCLUSION|CHAT_GHOSTPDA|NUMPAD_TARGET) // Admin attack logs filter system, see /proc/add_attack_logs and /proc/msg_admin_attack #define ATKLOG_ALL 0 diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index a3154834fe4..32fe8b70b2d 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -39,7 +39,7 @@ GLOBAL_VAR_INIT(log_end, (world.system_type == UNIX ? ascii2text(13) : "")) WRITE_LOG(GLOB.world_game_log, "DEBUG: [text][GLOB.log_end]") for(var/client/C in GLOB.admins) - if(check_rights(R_DEBUG, 0, C.mob) && (C.prefs.toggles & CHAT_DEBUGLOGS)) + if(check_rights(R_DEBUG, 0, C.mob) && (C.prefs.toggles & PREFTOGGLE_CHAT_DEBUGLOGS)) to_chat(C, "DEBUG: [text]") /proc/log_game(text) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 62c97f8807c..150de317bb1 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -229,7 +229,7 @@ var/turf/ear = get_turf(M) if(ear) // Ghostship is magic: Ghosts can hear radio chatter from anywhere - if(speaker_coverage[ear] || (istype(M, /mob/dead/observer) && M.get_preference(CHAT_GHOSTRADIO))) + if(speaker_coverage[ear] || (istype(M, /mob/dead/observer) && M.get_preference(PREFTOGGLE_CHAT_GHOSTRADIO))) . |= M // Since we're already looping through mobs, why bother using |= ? This only slows things down. return . @@ -469,10 +469,66 @@ var/mob/M = C if(M.client) C = M.client - if(!C || !C.prefs.windowflashing) + if(!C || !C.prefs.toggles2 & PREFTOGGLE_2_WINDOWFLASHING) return winset(C, "mainwindow", "flash=5") +/** + * Returns a list of vents that can be used as a potential spawn if they meet the criteria set by the arguments + * + * Will not include parent-less vents to the returned list. + * Arguments: + * * unwelded_only - Whether the list should only include vents that are unwelded + * * exclude_mobs_nearby - Whether to exclude vents that are near living mobs regardless of visibility + * * nearby_mobs_range - The range at which to look for living mobs around the vent for the above argument + * * exclude_visible_by_mobs - Whether to exclude vents that are visible to any living mob + * * min_network_size - The minimum length (non-inclusive) of the vent's parent network. A smaller number means vents in small networks (Security, Virology) will appear in the list + * * station_levels_only - Whether to only consider vents that are in a Z-level with a STATION_LEVEL trait + * * z_level - The Z-level number to look for vents in. Defaults to all + */ +/proc/get_valid_vent_spawns(unwelded_only = TRUE, exclude_mobs_nearby = FALSE, nearby_mobs_range = world.view, exclude_visible_by_mobs = FALSE, min_network_size = 50, station_levels_only = TRUE, z_level = 0) + ASSERT(min_network_size >= 0) + ASSERT(z_level >= 0) + + var/num_z_levels = length(GLOB.space_manager.z_list) + var/list/non_station_levels[num_z_levels] // Cache so we don't do is_station_level for every vent! + + . = list() + for(var/object in GLOB.all_vent_pumps) // This only contains vent_pumps so don't bother with type checking + var/obj/machinery/atmospherics/unary/vent_pump/vent = object + var/vent_z = vent.z + if(z_level && vent_z != z_level) + continue + if(station_levels_only && (non_station_levels[vent_z] || !is_station_level(vent_z))) + non_station_levels[vent_z] = TRUE + continue + if(unwelded_only && vent.welded) + continue + if(exclude_mobs_nearby) + var/turf/T = get_turf(vent) + var/mobs_nearby = FALSE + for(var/mob/living/M in orange(nearby_mobs_range, T)) + if(!M.is_dead()) + mobs_nearby = TRUE + break + if(mobs_nearby) + continue + if(exclude_visible_by_mobs) + var/turf/T = get_turf(vent) + var/visible_by_mobs = FALSE + for(var/mob/living/M in viewers(world.view, T)) + if(!M.is_dead()) + visible_by_mobs = TRUE + break + if(visible_by_mobs) + continue + if(!vent.parent) // This seems to have been an issue in the past, so this is here until it's definitely fixed + log_debug("get_valid_vent_spawns(), vent has no parent: [vent], qdeled: [QDELETED(vent)], loc: [vent.loc]") + continue + if(length(vent.parent.other_atmosmch) <= min_network_size) + continue + . += vent + /** * Get a bounding box of a list of atoms. * diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index b70c98908f5..a041454f816 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -46,7 +46,7 @@ desc = "Shift-click any button to reset its position, and Control-click it to lock/unlock its position. Alt-click this button to reset all buttons to their default positions." icon = 'icons/mob/actions/actions.dmi' icon_state = "bg_default" - var/hidden = 0 + var/hidden = FALSE /obj/screen/movable/action_button/hide_toggle/MouseDrop(over_object) if(istype(over_object, /obj/screen/movable/action_button)) @@ -99,14 +99,23 @@ /obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(mob/living/user) if(isalien(user)) + icon = 'icons/mob/actions/actions.dmi' icon_state = "bg_alien" else + icon = initial(icon) icon_state = "bg_default" + if(user.client) // Apply the client's UI style + icon = ui_style2icon(user.client.prefs.UI_style) + icon_state = "template" + if(user.client) + alpha = user.client.prefs.UI_style_alpha + color = user.client.prefs.UI_style_color UpdateIcon() /obj/screen/movable/action_button/hide_toggle/proc/UpdateIcon() - overlays.Cut() - var/image/img = image(icon, src, hidden ? "show" : "hide") + cut_overlays() + var/image/img = image(initial(icon), src, hidden ? "show" : "hide") + img.appearance_flags = RESET_COLOR | RESET_ALPHA overlays += img /obj/screen/movable/action_button/MouseEntered(location, control, params) diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index 9d00f216eac..f6c8880a485 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -99,11 +99,6 @@ /obj/screen/fullscreen/impaired icon_state = "impairedoverlay" -/obj/screen/fullscreen/blurry - icon = 'icons/mob/screen_gen.dmi' - screen_loc = "WEST,SOUTH to EAST,NORTH" - icon_state = "blurry" - /obj/screen/fullscreen/flash icon = 'icons/mob/screen_gen.dmi' screen_loc = "WEST,SOUTH to EAST,NORTH" diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 00b23ff3cdd..c8d8a7d2290 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -7,11 +7,10 @@ /datum/hud var/mob/mymob - var/hud_shown = 1 //Used for the HUD toggle (F12) - var/hud_version = 1 //Current displayed version of the HUD - var/inventory_shown = 1 //the inventory - var/show_intent_icons = 0 - var/hotkey_ui_hidden = 0 //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons) + var/hud_shown = TRUE //Used for the HUD toggle (F12) + var/hud_version = 1 //Current displayed version of the HUD + var/inventory_shown = TRUE //the inventory + var/hotkey_ui_hidden = FALSE //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons) var/obj/screen/lingchemdisplay var/obj/screen/lingstingdisplay @@ -37,7 +36,7 @@ var/list/inv_slots[slots_amt] // /obj/screen/inventory objects, ordered by their slot ID. var/obj/screen/movable/action_button/hide_toggle/hide_actions_toggle - var/action_buttons_hidden = 0 + var/action_buttons_hidden = FALSE var/list/obj/screen/plane_master/plane_masters = list() // see "appearance_flags" in the ref, assoc list of "[plane]" = object @@ -123,7 +122,7 @@ switch(display_hud_version) if(HUD_STYLE_STANDARD) //Default HUD - hud_shown = 1 //Governs behavior of other procs + hud_shown = TRUE //Governs behavior of other procs if(static_inventory.len) mymob.client.screen += static_inventory if(toggleable_inventory.len && inventory_shown) @@ -139,7 +138,7 @@ action_intent.screen_loc = initial(action_intent.screen_loc) //Restore intent selection to the original position if(HUD_STYLE_REDUCED) //Reduced HUD - hud_shown = 0 //Governs behavior of other procs + hud_shown = FALSE //Governs behavior of other procs if(static_inventory.len) mymob.client.screen -= static_inventory if(toggleable_inventory.len) @@ -159,7 +158,7 @@ action_intent.screen_loc = ui_acti_alt //move this to the alternative position, where zone_select usually is. if(HUD_STYLE_NOHUD) //No HUD - hud_shown = 0 //Governs behavior of other procs + hud_shown = FALSE //Governs behavior of other procs if(static_inventory.len) mymob.client.screen -= static_inventory if(toggleable_inventory.len) @@ -205,7 +204,7 @@ //Triggered when F12 is pressed (Unless someone changed something in the DMF) /mob/verb/button_pressed_F12() set name = "F12" - set hidden = 1 + set hidden = TRUE if(hud_used && client) hud_used.show_hud() //Shows the next hud preset diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index e28fdf65f1e..5b4ce4c99e9 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -7,10 +7,10 @@ /obj/screen/human/toggle/Click() if(usr.hud_used.inventory_shown) - usr.hud_used.inventory_shown = 0 + usr.hud_used.inventory_shown = FALSE usr.client.screen -= usr.hud_used.toggleable_inventory else - usr.hud_used.inventory_shown = 1 + usr.hud_used.inventory_shown = TRUE usr.client.screen += usr.hud_used.toggleable_inventory usr.hud_used.hidden_inventory_update() @@ -26,7 +26,7 @@ H.quick_equip() /obj/screen/ling - invisibility = 101 + invisibility = INVISIBILITY_ABSTRACT /obj/screen/ling/sting name = "current sting" @@ -74,6 +74,7 @@ /mob/living/carbon/human/proc/remake_hud() //used for preference changes mid-round; can't change hud icons without remaking the hud. QDEL_NULL(hud_used) create_mob_hud() + update_action_buttons_icon() if(hud_used) hud_used.show_hud(hud_used.hud_version) @@ -81,6 +82,9 @@ if(client && !hud_used) hud_used = new /datum/hud/human(src, ui_style2icon(client.prefs.UI_style), client.prefs.UI_style_color, client.prefs.UI_style_alpha) +/datum/hud/human + var/hud_alpha = 255 + /datum/hud/human/New(mob/living/carbon/human/owner, var/ui_style = 'icons/mob/screen_white.dmi', var/ui_color = "#ffffff", var/ui_alpha = 255) ..() owner.overlay_fullscreen("see_through_darkness", /obj/screen/fullscreen/see_through_darkness) @@ -88,6 +92,8 @@ var/obj/screen/using var/obj/screen/inventory/inv_box + hud_alpha = ui_alpha + using = new /obj/screen/craft using.icon = ui_style using.color = ui_color @@ -102,7 +108,6 @@ using = new /obj/screen/act_intent() using.icon_state = mymob.a_intent - using.color = ui_color using.alpha = ui_alpha static_inventory += using action_intent = using @@ -371,11 +376,13 @@ infodisplay += devilsouldisplay zone_select = new /obj/screen/zone_sel() + zone_select.color = ui_color zone_select.icon = ui_style + zone_select.alpha = ui_alpha zone_select.update_icon(mymob) static_inventory += zone_select - inventory_shown = 0 + inventory_shown = FALSE for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) @@ -395,9 +402,9 @@ for(var/obj/screen/inventory/inv in (static_inventory + toggleable_inventory)) if(inv.slot_id) if(inv.slot_id in S.no_equip) - inv.alpha = 128 + inv.alpha = hud_alpha / 2 else - inv.alpha = initial(inv.alpha) + inv.alpha = hud_alpha for(var/obj/screen/craft/crafting in static_inventory) if(!S.can_craft) crafting.invisibility = INVISIBILITY_ABSTRACT @@ -511,7 +518,7 @@ if(hud_used.hotkey_ui_hidden) client.screen += hud_used.hotkeybuttons - hud_used.hotkey_ui_hidden = 0 + hud_used.hotkey_ui_hidden = FALSE else client.screen -= hud_used.hotkeybuttons - hud_used.hotkey_ui_hidden = 1 + hud_used.hotkey_ui_hidden = TRUE diff --git a/code/_onclick/hud/plane_master.dm b/code/_onclick/hud/plane_master.dm index fc3e926b396..e5cd410a27b 100644 --- a/code/_onclick/hud/plane_master.dm +++ b/code/_onclick/hud/plane_master.dm @@ -5,6 +5,7 @@ blend_mode = BLEND_OVERLAY var/show_alpha = 255 var/hide_alpha = 0 + var/current_filters = list() /obj/screen/plane_master/proc/Show(override) alpha = override || show_alpha @@ -12,14 +13,21 @@ /obj/screen/plane_master/proc/Hide(override) alpha = override || hide_alpha -/obj/screen/plane_master/proc/outline(_size, _color) - filters += filter(type = "outline", size = _size, color = _color) +/obj/screen/plane_master/proc/add_filter(key, filter) + if(current_filters[key]) + filters -= current_filters[key] -/obj/screen/plane_master/proc/shadow(_size, _border, _offset = 0, _x = 0, _y = 0, _color = "#04080FAA") - filters += filter(type = "drop_shadow", x = _x, y = _y, color = _color, size = _size, offset = _offset) + filters += filter + current_filters[key] = filters[filters.len] //assigning `filter` will not allow it to work later while animating removal -/obj/screen/plane_master/proc/clear_filters() - filters = list() +/obj/screen/plane_master/proc/remove_filter(key) + if(current_filters[key]) + animate(current_filters[key], size=0, time=5) //not all filters have a size param, but this is good enough for the general case + addtimer(CALLBACK(src, .proc/remove_callback, key), 5) + +/obj/screen/plane_master/proc/remove_callback(key) + filters -= current_filters[key] + current_filters -= key //Why do plane masters need a backdrop sometimes? Read http://www.byond.com/forum/?post=2141928 //Trust me, you need one. Period. If you don't think you do, you're doing something extremely wrong. @@ -38,9 +46,8 @@ blend_mode = BLEND_OVERLAY /obj/screen/plane_master/game_world/backdrop(mob/mymob) - clear_filters() - if(istype(mymob) && mymob.client && mymob.client.prefs && (mymob.client.prefs.toggles & AMBIENT_OCCLUSION)) - filters += FILTER_AMBIENT_OCCLUSION + if(istype(mymob) && mymob.client && mymob.client.prefs && (mymob.client.prefs.toggles & PREFTOGGLE_AMBIENT_OCCLUSION)) + add_filter(AMBIENT_OCCLUSION_FILTER_KEY, FILTER_AMBIENT_OCCLUSION) /obj/screen/plane_master/lighting name = "lighting plane master" diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 9795975a090..3b7f98a8220 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -293,7 +293,12 @@ /obj/screen/zone_sel/update_icon(mob/user) overlays.Cut() - overlays += image('icons/mob/zone_sel.dmi', "[selecting]") + var/image/human = image('icons/mob/zone_sel.dmi', "human") + human.appearance_flags = RESET_COLOR + overlays += human + var/image/sel = image('icons/mob/zone_sel.dmi', "[selecting]") + sel.appearance_flags = RESET_COLOR + overlays += sel user.zone_selected = selecting /obj/screen/zone_sel/alien diff --git a/code/controllers/subsystem/afk.dm b/code/controllers/subsystem/afk.dm index 25ccda3349c..3d82762cc42 100644 --- a/code/controllers/subsystem/afk.dm +++ b/code/controllers/subsystem/afk.dm @@ -29,7 +29,7 @@ SUBSYSTEM_DEF(afk) var/turf/T // Only players and players with the AFK watch enabled // No dead, unconcious, restrained, people without jobs or people on other Z levels than the station - if(!H.client || !H.client.prefs.afk_watch || !H.mind || \ + if(!H.client || !H.client.prefs.toggles2 & PREFTOGGLE_2_AFKWATCH || !H.mind || \ H.stat || H.restrained() || !H.job || !is_station_level((T = get_turf(H)).z)) // Assign the turf as last. Small optimization if(afk_players[H.ckey]) toRemove += H.ckey diff --git a/code/controllers/subsystem/changelog.dm b/code/controllers/subsystem/changelog.dm index 98188599abd..eef8ee6da62 100644 --- a/code/controllers/subsystem/changelog.dm +++ b/code/controllers/subsystem/changelog.dm @@ -57,7 +57,7 @@ SUBSYSTEM_DEF(changelog) return // Only return here, we dont have to worry about a queue list because this will be called from ShowChangelog() // Technically this is only for the date but we can also do the UI button at the same time var/datum/preferences/P = GLOB.preferences_datums[C.ckey] - if(P.toggles & UI_DARKMODE) + if(P.toggles & PREFTOGGLE_UI_DARKMODE) winset(C, "rpane.changelog", "background-color=#40628a;font-color=#ffffff;font-style=none") else winset(C, "rpane.changelog", "background-color=none;font-style=none") @@ -74,7 +74,7 @@ SUBSYSTEM_DEF(changelog) /datum/controller/subsystem/changelog/proc/UpdatePlayerChangelogButton(client/C) // If SQL aint even enabled, just set the button to default style if(!GLOB.dbcon.IsConnected()) - if(C.prefs.toggles & UI_DARKMODE) + if(C.prefs.toggles & PREFTOGGLE_UI_DARKMODE) winset(C, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF") else winset(C, "rpane.changelog", "background-color=none;text-color=#000000") @@ -83,7 +83,7 @@ SUBSYSTEM_DEF(changelog) // If SQL is enabled but we aint ready, queue them up, and use the default style if(!ss_ready) startup_clients_button |= C - if(C.prefs.toggles & UI_DARKMODE) + if(C.prefs.toggles & PREFTOGGLE_UI_DARKMODE) winset(C, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF") else winset(C, "rpane.changelog", "background-color=none;text-color=#000000") @@ -96,7 +96,7 @@ SUBSYSTEM_DEF(changelog) winset(C, "rpane.changelog", "background-color=#bb7700;text-color=#FFFFFF;font-style=bold") to_chat(C, "Changelog has changed since your last visit.") else - if(C.prefs.toggles & UI_DARKMODE) + if(C.prefs.toggles & PREFTOGGLE_UI_DARKMODE) winset(C, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF") else winset(C, "rpane.changelog", "background-color=none;text-color=#000000") diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 729c4dbe67b..0c223dc16df 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -285,7 +285,7 @@ SUBSYSTEM_DEF(jobs) for(var/mob/new_player/player in GLOB.player_list) if(player.ready && player.has_valid_preferences() && player.mind && !player.mind.assigned_role) unassigned += player - if(player.client.prefs.randomslot) + if(player.client.prefs.toggles2 & PREFTOGGLE_2_RANDOMSLOT) player.client.prefs.load_random_character_slot(player.client) Debug("DO, Len: [unassigned.len]") diff --git a/code/controllers/subsystem/tickets/mentor_tickets.dm b/code/controllers/subsystem/tickets/mentor_tickets.dm index 97f84263a45..706a498aa64 100644 --- a/code/controllers/subsystem/tickets/mentor_tickets.dm +++ b/code/controllers/subsystem/tickets/mentor_tickets.dm @@ -10,6 +10,9 @@ GLOBAL_REAL(SSmentor_tickets, /datum/controller/subsystem/tickets/mentor_tickets ticket_system_name = "Mentor Tickets" ticket_name = "Mentor Ticket" span_class = "mentorhelp" + anchor_link_extra = ";is_mhelp=1" + ticket_help_type = "Mentorhelp" + ticket_help_span = "mentorhelp" other_ticket_name = "Admin" other_ticket_permission = R_ADMIN close_rights = R_MENTOR | R_ADMIN @@ -21,8 +24,11 @@ GLOBAL_REAL(SSmentor_tickets, /datum/controller/subsystem/tickets/mentor_tickets "Your [ticket_name] has now been closed.") return ..() -/datum/controller/subsystem/tickets/mentor_tickets/message_staff(msg) - message_mentorTicket(msg) +/datum/controller/subsystem/tickets/mentor_tickets/message_staff(msg, prefix_type = NONE, important = FALSE) + message_mentorTicket(msg, important) /datum/controller/subsystem/tickets/mentor_tickets/create_other_system_ticket(datum/ticket/T) - SStickets.newTicket(get_client_by_ckey(T.client_ckey), T.content, T.title) + SStickets.newTicket(get_client_by_ckey(T.client_ckey), T.content, T.raw_title) + +/datum/controller/subsystem/tickets/mentor_tickets/autoRespond(N) + return diff --git a/code/controllers/subsystem/tickets/tickets.dm b/code/controllers/subsystem/tickets/tickets.dm index 60f3a5fa8dd..30c4c13166c 100644 --- a/code/controllers/subsystem/tickets/tickets.dm +++ b/code/controllers/subsystem/tickets/tickets.dm @@ -10,6 +10,9 @@ #define TICKET_RESOLVED 3 #define TICKET_STALE 4 +#define TICKET_STAFF_MESSAGE_ADMIN_CHANNEL 1 +#define TICKET_STAFF_MESSAGE_PREFIX 2 + SUBSYSTEM_DEF(tickets) name = "Admin Tickets" init_order = INIT_ORDER_TICKETS @@ -24,6 +27,11 @@ SUBSYSTEM_DEF(tickets) var/close_rights = R_ADMIN var/rights_needed = R_ADMIN | R_MOD + /// Text that will be added to the anchor link + var/anchor_link_extra = "" + + var/ticket_help_type = "Adminhelp" + var/ticket_help_span = "adminhelp" /// The name of the other ticket type to convert to var/other_ticket_name = "Mentor" /// Which permission to look for when seeing if there is staff available for the other ticket type @@ -34,7 +42,8 @@ SUBSYSTEM_DEF(tickets) var/ticketCounter = 1 /datum/controller/subsystem/tickets/Initialize() - close_messages = list("- [ticket_name] Rejected! -", + if(!close_messages) + close_messages = list("- [ticket_name] Rejected! -", "", "Your [ticket_name] has now been closed.") return ..() @@ -76,22 +85,56 @@ SUBSYSTEM_DEF(tickets) var/datum/ticket/T = i resolveTicket(T.ticketNum) +/** + * Will either make a new ticket using the given text or will add the text to an existing ticket. + * Staff will get a message + * Arguments: + * C - The client who requests help + * text - The text the client send + */ +/datum/controller/subsystem/tickets/proc/newHelpRequest(client/C, text) + var/ticketNum // Holder for the ticket number + var/datum/ticket/T + // Get the open ticket assigned to the client and add a response. If no open tickets then make a new one + if((T = checkForOpenTicket(C))) + ticketNum = T.ticketNum + T.addResponse(C, text) + T.setCooldownPeriod() + to_chat(C.mob, "Your [ticket_name] #[ticketNum] remains open! Visit \"My tickets\" under the Admin Tab to view it.") + var/url_message = makeUrlMessage(C, text, ticketNum) + message_staff(url_message, NONE, TRUE) + else + newTicket(C, text, text) + +/** + * Will add the URLs usable by staff to the message and return it + * Arguments: + * C - The client who send the message + * msg - The raw message + * ticketNum - Which ticket number the ticket has + */ +/datum/controller/subsystem/tickets/proc/makeUrlMessage(client/C, msg, ticketNum) + var/list/L = list() + L += "[ticket_help_type]: [key_name(C, TRUE, ticket_help_type)] " + L += "([ADMIN_QUE(C.mob,"?")]) ([ADMIN_PP(C.mob,"PP")]) ([ADMIN_VV(C.mob,"VV")]) ([ADMIN_TP(C.mob,"TP")]) ([ADMIN_SM(C.mob,"SM")]) " + L += "([admin_jump_link(C.mob)]) (TICKET) " + L += "[isAI(C.mob) ? "(CL)" : ""] (TAKE) " + L += "(RESOLVE) (AUTO) " + L += "(CONVERT) : [msg]" + return L.Join() + //Open a new ticket and populate details then add to the list of open tickets /datum/controller/subsystem/tickets/proc/newTicket(client/C, passedContent, title) if(!C || !passedContent) return - //Check if the user has an open ticket already within the cooldown period, if so we don't create a new one and re-set the cooldown period - var/datum/ticket/existingTicket = checkForOpenTicket(C) - if(existingTicket) - existingTicket.setCooldownPeriod() - to_chat(C.mob, "Your [ticket_name] #[existingTicket.ticketNum] remains open! Visit \"My tickets\" under the Admin Tab to view it.") - return - if(!title) title = passedContent - var/datum/ticket/T = new(title, passedContent, getTicketCounterAndInc()) + var/new_ticket_num = getTicketCounterAndInc() + var/url_title = makeUrlMessage(C, title, new_ticket_num) + + var/datum/ticket/T = new(url_title, title, passedContent, new_ticket_num) allTickets += T T.client_ckey = C.ckey T.locationSent = C.mob.loc.name @@ -102,6 +145,8 @@ SUBSYSTEM_DEF(tickets) var/ticket_open_sound = sound('sound/effects/adminticketopen.ogg') SEND_SOUND(C, ticket_open_sound) + message_staff(url_title, NONE, TRUE) + //Set ticket state with key N to open /datum/controller/subsystem/tickets/proc/openTicket(N) var/datum/ticket/T = allTickets[N] @@ -148,7 +193,7 @@ SUBSYSTEM_DEF(tickets) /datum/controller/subsystem/tickets/proc/create_other_system_ticket(datum/ticket/T) var/client/C = get_client_by_ckey(T.client_ckey) - SSmentor_tickets.newTicket(C, T.content, T.title) + SSmentor_tickets.newTicket(C, T.content, T.raw_title) /datum/controller/subsystem/tickets/proc/autoRespond(N) if(!check_rights(rights_needed)) @@ -250,6 +295,7 @@ SUBSYSTEM_DEF(tickets) var/client_ckey var/timeOpened // Time the ticket was opened var/title //The initial message with links + var/raw_title // The title without URLs added var/list/content // content of the staff help var/lastStaffResponse // Last staff member who responded var/lastResponseTime // When the staff last responded @@ -260,8 +306,9 @@ SUBSYSTEM_DEF(tickets) var/ticketCooldown // Cooldown before allowing the user to open another ticket. var/client/staffAssigned // Staff member who has assigned themselves to this ticket -/datum/ticket/New(tit, cont, num) +/datum/ticket/New(tit, raw_tit, cont, num) title = tit + raw_title = raw_tit content = list() content += cont timeOpened = worldtime2text() @@ -440,9 +487,21 @@ UI STUFF to_chat(target, text) return TRUE -//Sends a message to the designated staff -/datum/controller/subsystem/tickets/proc/message_staff(var/msg, var/alt = FALSE) - message_adminTicket(msg, alt) +/** + * Sends a message to the designated staff + * Arguments: + * msg - The message being send + * alt - If an alternative prefix should be used or not. Defaults to TICKET_STAFF_MESSAGE_PREFIX + * important - If the message is important. If TRUE it will ignore the CHAT_NO_TICKETLOGS preferences, + send a sound and flash the window. Defaults to FALSE + */ +/datum/controller/subsystem/tickets/proc/message_staff(msg, prefix_type = TICKET_STAFF_MESSAGE_PREFIX, important = FALSE) + switch(prefix_type) + if(TICKET_STAFF_MESSAGE_ADMIN_CHANNEL) + msg = "ADMIN TICKET: [msg]" + if(TICKET_STAFF_MESSAGE_PREFIX) + msg = "ADMIN TICKET: [msg]" + message_adminTicket(msg, important) /datum/controller/subsystem/tickets/Topic(href, href_list) @@ -524,7 +583,7 @@ UI STUFF if(span_class == "mentorhelp") message_staff("[usr.client] / ([usr]) has taken [ticket_name] number [index]") else - message_staff("[usr.client] / ([usr]) has taken [ticket_name] number [index]", TRUE) + message_staff("[usr.client] / ([usr]) has taken [ticket_name] number [index]", TICKET_STAFF_MESSAGE_ADMIN_CHANNEL) to_chat_safe(returnClient(index), "Your [ticket_name] is being handled by [usr.client].") /datum/controller/subsystem/tickets/proc/unassignTicket(index) @@ -535,4 +594,7 @@ UI STUFF if(span_class == "mentorhelp") message_staff("[usr.client] / ([usr]) has unassigned [ticket_name] number [index]") else - message_staff("[usr.client] / ([usr]) has unassigned [ticket_name] number [index]", TRUE) + message_staff("[usr.client] / ([usr]) has unassigned [ticket_name] number [index]", TICKET_STAFF_MESSAGE_ADMIN_CHANNEL) + +#undef TICKET_STAFF_MESSAGE_ADMIN_CHANNEL +#undef TICKET_STAFF_MESSAGE_PREFIX diff --git a/code/datums/action.dm b/code/datums/action.dm index 84702757e86..18c5c4f885e 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -9,7 +9,6 @@ var/desc = null var/obj/target = null var/check_flags = 0 - var/processing = 0 var/obj/screen/movable/action_button/button = null var/button_icon = 'icons/mob/actions/actions.dmi' var/background_icon_state = "bg_default" @@ -17,6 +16,8 @@ var/icon_icon = 'icons/mob/actions/actions.dmi' var/button_icon_state = "default" var/mob/owner + /// Whether to darken the button or not if [/datum/action/proc/IsAvailable] return FALSE. + var/darken_when_unavailable = TRUE /datum/action/New(var/Target) target = Target @@ -59,48 +60,61 @@ /datum/action/proc/Trigger() if(!IsAvailable()) - return 0 - return 1 + return FALSE + return TRUE /datum/action/proc/Process() return /datum/action/proc/IsAvailable()// returns 1 if all checks pass if(!owner) - return 0 + return FALSE if(check_flags & AB_CHECK_RESTRAINED) if(owner.restrained()) - return 0 + return FALSE if(check_flags & AB_CHECK_STUNNED) if(owner.stunned || owner.IsWeakened()) - return 0 + return FALSE if(check_flags & AB_CHECK_LYING) if(owner.lying) - return 0 + return FALSE if(check_flags & AB_CHECK_CONSCIOUS) if(owner.stat) - return 0 - return 1 + return FALSE + return TRUE /datum/action/proc/UpdateButtonIcon() if(button) - button.icon = button_icon - button.icon_state = background_icon_state + if(owner && owner.client && background_icon_state == "bg_default") // If it's a default action background, apply the custom HUD style + button.alpha = owner.client.prefs.UI_style_alpha + button.color = owner.client.prefs.UI_style_color + button.icon = ui_style2icon(owner.client.prefs.UI_style) + button.icon_state = "template" + else + button.icon = button_icon + button.icon_state = background_icon_state button.desc = desc ApplyIcon(button) + // If the action isn't available, darken the button if(!IsAvailable()) - button.color = rgb(128,0,0,128) + if(!darken_when_unavailable) + return + var/image/img = image('icons/mob/screen_white.dmi', icon_state = "template") + img.alpha = 200 + img.appearance_flags = RESET_COLOR | RESET_ALPHA + img.color = "#000000" + img.plane = FLOAT_PLANE + 1 + button.overlays += img else - button.color = rgb(255,255,255,255) - return 1 + return TRUE /datum/action/proc/ApplyIcon(obj/screen/movable/action_button/current_button) - current_button.overlays.Cut() + current_button.cut_overlays() if(icon_icon && button_icon_state) - var/image/img - img = image(icon_icon, current_button, button_icon_state) + var/image/img = image(icon_icon, current_button, button_icon_state) + img.appearance_flags = RESET_COLOR | RESET_ALPHA img.pixel_x = 0 img.pixel_y = 0 current_button.overlays += img @@ -126,25 +140,27 @@ /datum/action/item_action/Trigger(attack_self = TRUE) //Maybe we don't want to click the thing itself if(!..()) - return 0 + return FALSE if(target && attack_self) var/obj/item/I = target I.ui_action_click(owner, type) - return 1 + return TRUE /datum/action/item_action/ApplyIcon(obj/screen/movable/action_button/current_button) if(use_itemicon) - current_button.overlays.Cut() if(target) var/obj/item/I = target var/old_layer = I.layer var/old_plane = I.plane + var/old_appearance_flags = I.appearance_flags I.layer = FLOAT_LAYER //AAAH I.plane = FLOAT_PLANE //^ what that guy said + I.appearance_flags |= RESET_COLOR | RESET_ALPHA current_button.cut_overlays() current_button.add_overlay(I) I.layer = old_layer I.plane = old_plane + I.appearance_flags = old_appearance_flags else ..() /datum/action/item_action/toggle_light @@ -193,6 +209,7 @@ if(iscarbon(owner)) var/mob/living/carbon/C = owner if(target == C.internal) + button.icon = 'icons/mob/actions/actions.dmi' button.icon_state = "bg_default_on" /datum/action/item_action/toggle_mister @@ -246,7 +263,7 @@ if(istype(target, /obj/item/hierophant_club)) var/obj/item/hierophant_club/H = target if(H.teleporting) - return 0 + return FALSE return ..() /datum/action/item_action/change_headphones_song @@ -346,7 +363,7 @@ /datum/action/item_action/jetpack_stabilization/IsAvailable() var/obj/item/tank/jetpack/J = target if(!istype(J) || !J.on) - return 0 + return FALSE return ..() /datum/action/item_action/hands_free @@ -363,7 +380,7 @@ if(IsAvailable()) owner.research_scanner = !owner.research_scanner to_chat(owner, "Research analyzer is now [owner.research_scanner ? "active" : "deactivated"].") - return 1 + return TRUE /datum/action/item_action/toggle_research_scanner/Remove(mob/living/L) if(owner) @@ -371,9 +388,10 @@ ..() /datum/action/item_action/toggle_research_scanner/ApplyIcon(obj/screen/movable/action_button/current_button) - current_button.overlays.Cut() + current_button.cut_overlays() if(button_icon && button_icon_state) var/image/img = image(button_icon, current_button, "scan_mode") + img.appearance_flags = RESET_COLOR | RESET_ALPHA current_button.overlays += img /datum/action/item_action/instrument @@ -405,7 +423,7 @@ /datum/action/item_action/organ_action/IsAvailable() var/obj/item/organ/internal/I = target if(!I.owner) - return 0 + return FALSE return ..() /datum/action/item_action/organ_action/toggle @@ -440,12 +458,12 @@ /datum/action/item_action/accessory/IsAvailable() . = ..() if(!.) - return 0 + return FALSE if(target.loc == owner) - return 1 + return TRUE if(istype(target.loc, /obj/item/clothing/under) && target.loc.loc == owner) - return 1 - return 0 + return TRUE + return FALSE /datum/action/item_action/accessory/holster name = "Holster" @@ -458,6 +476,7 @@ /datum/action/spell_action check_flags = 0 background_icon_state = "bg_spell" + darken_when_unavailable = FALSE var/recharge_text_color = "#FFFFFF" /datum/action/spell_action/New(Target) @@ -478,23 +497,23 @@ /datum/action/spell_action/Trigger() if(!..()) - return 0 + return FALSE if(target) var/obj/effect/proc_holder/spell = target spell.Click() - return 1 + return TRUE /datum/action/spell_action/IsAvailable() if(!target) - return 0 + return FALSE var/obj/effect/proc_holder/spell/spell = target if(spell.special_availability_check) - return 1 + return TRUE if(owner) return spell.can_cast(owner) - return 0 + return FALSE /datum/action/spell_action/UpdateButtonIcon() if(button && !(. = ..())) @@ -508,6 +527,14 @@ button.color = rgb(col_val_high, col_val_low, col_val_low, col_val_high) else button.maptext = null + +/datum/action/spell_action/ApplyIcon(obj/screen/movable/action_button/current_button) + current_button.cut_overlays() + if(icon_icon && button_icon_state) + var/image/img = image(icon_icon, current_button, button_icon_state) + img.pixel_x = 0 + img.pixel_y = 0 + current_button.overlays += img /* /datum/action/spell_action/alien @@ -524,16 +551,16 @@ //Preset for general and toggled actions /datum/action/innate check_flags = 0 - var/active = 0 + var/active = FALSE /datum/action/innate/Trigger() if(!..()) - return 0 + return FALSE if(!active) Activate() else Deactivate() - return 1 + return TRUE /datum/action/innate/proc/Activate() return @@ -548,7 +575,7 @@ /datum/action/generic/Trigger() if(!..()) - return 0 + return FALSE if(target && procname) call(target,procname)(usr) - return 1 + return TRUE diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index e4268c16cd5..1042d9a8ddd 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -35,12 +35,18 @@ var/rank = t.fields["rank"] var/real_rank = t.fields["real_rank"] if(OOC) - var/active = 0 - for(var/mob/M in GLOB.player_list) - if(M.real_name == name && M.client && M.client.inactivity <= 10 * 60 * 10) - active = 1 + var/activetext = "Inactive" + for(var/thing in GLOB.human_list) + var/mob/living/carbon/human/H = thing + if(H.real_name != name) + continue + if(H.client && H.client.inactivity <= 6000) + activetext = "Active" break - isactive[name] = active ? "Active" : "Inactive" + if(isLivingSSD(H)) + activetext = "SSD" + break + isactive[name] = activetext else isactive[name] = t.fields["p_stat"] var/department = 0 diff --git a/code/datums/periodic_news.dm b/code/datums/periodic_news.dm index d0d1f01ebf3..2bac74a1fbd 100644 --- a/code/datums/periodic_news.dm +++ b/code/datums/periodic_news.dm @@ -119,27 +119,22 @@ GLOBAL_LIST_EMPTY(announced_news_types) /proc/announce_newscaster_news(datum/news_announcement/news) - var/datum/feed_channel/sendto - for(var/datum/feed_channel/FC in GLOB.news_network.network_channels) - if(FC.channel_name == news.channel_name) - sendto = FC - break - + var/datum/feed_channel/sendto = GLOB.news_network.get_channel_by_name(news.channel_name) if(!sendto) sendto = new /datum/feed_channel sendto.channel_name = news.channel_name sendto.author = news.author - sendto.locked = 1 - sendto.is_admin_channel = 1 - GLOB.news_network.network_channels += sendto + sendto.frozen = TRUE + sendto.admin_locked = TRUE + GLOB.news_network.channels += sendto var/datum/feed_message/newMsg = new /datum/feed_message newMsg.author = news.author ? news.author : sendto.author - newMsg.is_admin_message = !news.can_be_redacted + newMsg.admin_locked = !news.can_be_redacted newMsg.body = news.message - newMsg.message_type = news.message_type - sendto.messages += newMsg + sendto.add_message(newMsg) - for(var/obj/machinery/newscaster/NEWSCASTER in GLOB.allNewscasters) - NEWSCASTER.newsAlert(news.channel_name) + for(var/nc in GLOB.allNewscasters) + var/obj/machinery/newscaster/NC = nc + NC.alert_news(news.channel_name) diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 3541be89983..c11eed424da 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -249,6 +249,15 @@ always_place = TRUE // Its designed to make exploring other space ruins more accessible cost = 0 // Force spawned so shouldnt have a cost +/datum/map_template/ruin/space/golem_destination + id = "golemtarget" + suffix = "golemtarget.dmm" + name = "Golem Shuttle Destination" + description = "Just a handful of rocks floating in space. Guaranteed space destination for the Golem shuttle in case other destinations don't spawn." + allow_duplicates = FALSE + always_place = TRUE + cost = 0 + /datum/map_template/ruin/space/syndiecakesfactory id = "Syndiecakes Factory" suffix = "syndiecakesfactory.dmm" diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 61decede9bc..78b9e1c0413 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -215,7 +215,7 @@ alert_type = /obj/screen/alert/status_effect/regenerative_core /datum/status_effect/regenerative_core/on_apply() - owner.status_flags |= IGNORESLOWDOWN + owner.status_flags |= IGNORE_SPEED_CHANGES owner.adjustBruteLoss(-25) owner.adjustFireLoss(-25) owner.remove_CC() @@ -229,4 +229,4 @@ return TRUE /datum/status_effect/regenerative_core/on_remove() - owner.status_flags &= ~IGNORESLOWDOWN + owner.status_flags &= ~IGNORE_SPEED_CHANGES diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 389b21dd6d1..0e96ba8c346 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -1338,7 +1338,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) Nanotrasen crew who spot these suits are known to panic." reference = "BRHS" item = /obj/item/storage/box/syndie_kit/hardsuit - cost = 8 + cost = 6 excludefrom = list(/datum/game_mode/nuclear) /datum/uplink_item/suits/hardsuit/elite diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 990e2f1694d..aec3ea58f01 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -420,11 +420,15 @@ /area/space/powered(chan) //Nope.avi return 0 -// called when power status changes - +/** + * Called when the area power status changes + * + * Updates the area icon, calls power change on all machines in the area, and sends the `COMSIG_AREA_POWER_CHANGE` signal. + */ /area/proc/power_change() for(var/obj/machinery/M in src) // for each machine in the area M.power_change() // reverify power status (to update icons etc.) + SEND_SIGNAL(src, COMSIG_AREA_POWER_CHANGE) updateicon() /area/proc/usage(var/chan) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index d463c85eaf6..a3b6dff7905 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -561,7 +561,7 @@ // Who can see the attack? var/list/viewing = list() for(var/mob/M in viewers(A)) - if(M.client && M.client.prefs.show_ghostitem_attack) + if(M.client && M.client.prefs.toggles2 & PREFTOGGLE_2_ITEMATTACK) viewing |= M.client flick_overlay(I, viewing, 5) // 5 ticks/half a second diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index 34c717f11a8..57a2917d72c 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -182,6 +182,7 @@ pressure_resistance = 50 see_in_dark = 8 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE + move_resist = MOVE_FORCE_OVERPOWERING /mob/living/simple_animal/hostile/blob/blobbernaut/Life(seconds, times_fired) if(stat != DEAD && (getBruteLoss() || getFireLoss())) // Heal on blob structures diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm index 97192c86a0f..e392974648c 100644 --- a/code/game/gamemodes/changeling/powers/swap_form.dm +++ b/code/game/gamemodes/changeling/powers/swap_form.dm @@ -38,7 +38,7 @@ target.do_jitter_animation(500) user.do_jitter_animation(500) - if(!do_mob(user,target,20)) + if(!do_mob(user, target, 10 SECONDS)) to_chat(user, "The body swap has been interrupted!") return diff --git a/code/game/gamemodes/miniantags/borer/borer_event.dm b/code/game/gamemodes/miniantags/borer/borer_event.dm index f5a3b7aa4af..d5bd7d65776 100644 --- a/code/game/gamemodes/miniantags/borer/borer_event.dm +++ b/code/game/gamemodes/miniantags/borer/borer_event.dm @@ -13,16 +13,12 @@ /datum/event/borer_infestation/announce() if(successSpawn) GLOB.command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg') + else + log_and_message_admins("Warning: Could not spawn any mobs for event Borer Infestation") /datum/event/borer_infestation/start() - var/list/vents = list() - for(var/obj/machinery/atmospherics/unary/vent_pump/temp_vent in SSair.atmos_machinery) - if(is_station_level(temp_vent.loc.z) && !temp_vent.welded) - //Stops cortical borers getting stuck in small networks. See: Security, Virology - if(temp_vent.parent.other_atmosmch.len > 50) - vents += temp_vent - - while(spawncount >= 1 && vents.len) + var/list/vents = get_valid_vent_spawns(exclude_mobs_nearby = TRUE, exclude_visible_by_mobs = TRUE) + while(spawncount && length(vents)) var/obj/vent = pick_n_take(vents) new /mob/living/simple_animal/borer(vent.loc) successSpawn = TRUE diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm index 2e370db5f7a..fb10923e657 100644 --- a/code/game/gamemodes/scoreboard.dm +++ b/code/game/gamemodes/scoreboard.dm @@ -157,7 +157,7 @@ to_chat(world, "The crew's final score is:") to_chat(world, "[GLOB.score_crewscore]") for(var/mob/E in GLOB.player_list) - if(E.client && !E.get_preference(DISABLE_SCOREBOARD)) + if(E.client && !E.get_preference(PREFTOGGLE_DISABLE_SCOREBOARD)) E.scorestats() // A recursive function to properly determine the wealthiest escapee diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 4be50a6cd59..883b37f9d83 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -235,6 +235,9 @@ if(!(ling.mind in SSticker.mode.shadows)) return var/mob/living/carbon/human/target = targets[1] + if(ismindshielded(target)) + to_chat(user, "This target has a mindshield, blocking your powers! You cannot thrall it!") + return enthralling = TRUE to_chat(user, "This target is valid. You begin the enthralling.") to_chat(target, "[user] stares at you. You feel your head begin to pulse.") @@ -249,23 +252,11 @@ user.visible_message("[user]'s palms flare a bright red against [target]'s temples!") to_chat(target, "A terrible red light floods your mind. You collapse as conscious thought is wiped away.") target.Weaken(12) - sleep(20) - if(ismindshielded(target)) - to_chat(user, "They have a mindshield implant. You begin to deactivate it - this will take some time.") - user.visible_message("[user] pauses, then dips [user.p_their()] head in concentration!") - to_chat(target, "Your mindshield implant becomes hot as it comes under attack!") - sleep(100) //10 seconds - not spawn() so the enthralling takes longer - to_chat(user, "The nanobots composing the mindshield implant have been rendered inert. Now to continue.") - user.visible_message("[user] relaxes again.") - for(var/obj/item/implant/mindshield/L in target) - if(L && L.implanted) - qdel(L) - to_chat(target, "Your mental protection implant unexpectedly falters, dims, dies.") if(3) to_chat(user, "You begin planting the tumor that will control the new thrall...") user.visible_message("A strange energy passes from [user]'s hands into [target]'s head!") to_chat(target, "You feel your memories twisting, morphing. A sense of horror dominates your mind.") - if(!do_mob(user, target, 70)) //around 21 seconds total for enthralling, 31 for someone with a mindshield implant + if(!do_mob(user, target, 7.7 SECONDS)) //around 23 seconds total for enthralling to_chat(user, "The enthralling has been interrupted - your target's mind returns to its previous state.") to_chat(target, "You wrest yourself away from [user]'s hands and compose yourself") enthralling = FALSE diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index a20b0e1654b..c7ce0261bd0 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -43,7 +43,7 @@ protected_jobs = list("Captain") /datum/theft_objective/hoslaser - name = "the head of security's recreated antique laser gun" + name = "the head of security's X-01 multiphase energy gun" typepath = /obj/item/gun/energy/gun/hos protected_jobs = list("Head Of Security") diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index d7b21983792..344bca5167a 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -9,6 +9,12 @@ mouse_drag_pointer = MOUSE_ACTIVE_POINTER var/obj/item/reagent_containers/iv_bag/bag = null +/obj/machinery/iv_drip/process() + if(istype(bag) && bag.injection_target) + update_icon() + return + return PROCESS_KILL + /obj/machinery/iv_drip/update_icon() cut_overlays() @@ -28,6 +34,7 @@ if(Adjacent(target) && usr.Adjacent(target)) bag.afterattack(target, usr, TRUE) + START_PROCESSING(SSmachines, src) /obj/machinery/iv_drip/attack_hand(mob/user) if(bag) @@ -48,6 +55,7 @@ bag = I to_chat(user, "You attach [I] to [src].") update_icon() + START_PROCESSING(SSmachines, src) else if (bag && istype(I, /obj/item/reagent_containers)) bag.attackby(I) I.afterattack(bag, usr, TRUE) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm deleted file mode 100644 index c2396ab1d9f..00000000000 --- a/code/game/machinery/newscaster.dm +++ /dev/null @@ -1,855 +0,0 @@ -//############################################## -//################### NEWSCASTERS BE HERE! #### -//###-Agouri################################### - -/datum/feed_message - var/author = "" - var/title = "" - var/body = "" - var/message_type = "Story" - var/backup_body = "" - var/backup_author = "" - var/is_admin_message = 0 - var/icon/img = null - var/icon/backup_img - var/view_count = 0 - -/datum/feed_channel - var/channel_name = "" - var/list/datum/feed_message/messages = list() - var/locked = 0 - var/author = "" - var/backup_author = "" - var/censored = 0 - var/is_admin_channel = 0 - var/total_view_count = 0 - -/datum/feed_message/proc/clear() - author = "" - body = "" - backup_body = "" - backup_author = "" - img = null - backup_img = null - view_count = 0 - -/datum/feed_channel/proc/clear() - channel_name = "" - messages = list() - locked = 0 - author = "" - backup_author = "" - censored = 0 - is_admin_channel = 0 - total_view_count = 0 - -/datum/feed_channel/proc/announce_news(title="") - if(title) - return "Breaking news from [channel_name]: [title]" - return "Breaking news from [channel_name]" - -/datum/feed_channel/station/announce_news() - return "New Station Announcement Available" - -/datum/feed_network - var/list/datum/feed_channel/network_channels = list() - var/datum/feed_message/wanted_issue - -GLOBAL_DATUM_INIT(news_network, /datum/feed_network, new()) //The global news-network, which is coincidentally a global list. - -GLOBAL_LIST_EMPTY(allNewscasters) //Global list that will contain reference to all newscasters in existence. - -#define NEWSCASTER_MAIN 0 // Main menu -#define NEWSCASTER_FC_LIST 1 // Feed channel list -#define NEWSCASTER_CREATE_FC 2 // Create feed channel -#define NEWSCASTER_CREATE_FM 3 // Create feed message -#define NEWSCASTER_PRINT 4 // Print newspaper -#define NEWSCASTER_VIEW_FC 5 // Read feed channel -#define NEWSCASTER_NT_CENSOR 6 // Nanotrasen Feed Censorship Tool -#define NEWSCASTER_D_NOTICE 7 // Nanotrasen D-Notice Handler -#define NEWSCASTER_CENSOR_FC 8 // Censor feed channel -#define NEWSCASTER_D_NOTICE_FC 9 // D-Notice feed channel -#define NEWSCASTER_W_ISSUE_H 10 // Wanted Issue handler -#define NEWSCASTER_W_ISSUE 11 // STATIONWIDE WANTED ISSUE -#define NEWSCASTER_JOBS 12 // Available jobs - -/obj/machinery/newscaster - name = "newscaster" - desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. All the news you absolutely have no use for, in one place!" - icon = 'icons/obj/terminals.dmi' - icon_state = "newscaster_normal" - armor = list(melee = 50, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) - max_integrity = 200 - integrity_failure = 50 - var/screen = NEWSCASTER_MAIN - var/paper_remaining = 15 - var/securityCaster = 0 - // 0 = Caster cannot be used to issue wanted posters - // 1 = the opposite - var/unit_no = 0 //Each newscaster has a unit number - var/alert_delay = 500 - var/alert = 0 - // 0 = there hasn't been a news/wanted update in the last alert_delay - // 1 = there has - var/scanned_user = "Unknown" //Will contain the name of the person who currently uses the newscaster - var/msg = "" //Feed message - var/msg_title = "" // Feed message title - var/obj/item/photo/photo = null - var/channel_name = "" //the feed channel which will be receiving the feed, or being created - var/c_locked = 0 //Will our new channel be locked to public submissions? - var/datum/feed_channel/viewing_channel = null - var/silence = 0 - var/temp = null - var/temp_back_screen = NEWSCASTER_MAIN - var/list/jobblacklist = list( - /datum/job/ai, - /datum/job/cyborg, - /datum/job/captain, - /datum/job/judge, - /datum/job/blueshield, - /datum/job/nanotrasenrep, - /datum/job/pilot, - /datum/job/brigdoc, - /datum/job/mechanic, - /datum/job/barber, - /datum/job/chaplain, - /datum/job/ntnavyofficer, - /datum/job/ntspecops, - /datum/job/civilian, - /datum/job/syndicateofficer) - - var/static/REDACTED = "\[REDACTED\]" - light_range = 0 - anchored = 1 - - -/obj/machinery/newscaster/security_unit - name = "Security Newscaster" - securityCaster = 1 - -/obj/machinery/newscaster/New() - GLOB.allNewscasters += src - unit_no = GLOB.allNewscasters.len - update_icon() //for any custom ones on the map... - ..() - -/obj/machinery/newscaster/Destroy() - GLOB.allNewscasters -= src - viewing_channel = null - QDEL_NULL(photo) - return ..() - -/obj/machinery/newscaster/update_icon() - cut_overlays() - if(inoperable()) - icon_state = "newscaster_off" - else - if(!GLOB.news_network.wanted_issue) //wanted icon state, there can be no overlays on it as it's a priority message - icon_state = "newscaster_normal" - if(alert) //new message alert overlay - add_overlay("newscaster_alert") - var/hp_percent = obj_integrity * 100 /max_integrity - switch(hp_percent) - if(75 to 100) - return - if(50 to 75) - add_overlay("crack1") - if(25 to 50) - add_overlay("crack2") - else - add_overlay("crack3") - -/obj/machinery/newscaster/power_change() - ..() - update_icon() - -/obj/machinery/newscaster/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) - . = ..() - update_icon() - -/obj/machinery/newscaster/attack_ghost(mob/user) - ui_interact(user) - -/obj/machinery/newscaster/attack_hand(mob/user) - if(..()) - return - ui_interact(user) - -/obj/machinery/newscaster/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - user.set_machine(src) - if(can_scan(user)) - scan_user(user) - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - ui = new(user, src, ui_key, "newscaster.tmpl", name, 400, 600) - ui.open() - -/obj/machinery/newscaster/ui_data(user) - var/list/data = list() - - data["unit_no"] = unit_no - data["temp"] = temp - data["temp_back_screen"] = temp_back_screen - data["screen"] = screen - - switch(screen) - if(0) - data["wanted_issue"] = GLOB.news_network.wanted_issue ? 1 : 0 - data["silence"] = silence - data["securityCaster"] = securityCaster - if(securityCaster) - data["scanned_user"] = scanned_user - if(1, 6, 7) - var/list/channels = list() - data["channels"] = channels - for(var/datum/feed_channel/C in GLOB.news_network.network_channels) - channels[++channels.len] = list("name" = C.channel_name, "ref" = "\ref[C]", "censored" = C.censored, "admin" = C.is_admin_channel) - if(2) - data["scanned_user"] = scanned_user - data["channel_name"] = channel_name - data["c_locked"] = c_locked - if(3) - data["scanned_user"] = scanned_user - data["channel_name"] = channel_name - data["title"] = msg_title - data["msg"] = msg - data["photo"] = photo ? 1 : 0 - if(4) - var/total_num = length(GLOB.news_network.network_channels) - var/active_num = total_num - var/message_num=0 - for(var/datum/feed_channel/FC in GLOB.news_network.network_channels) - if(!FC.censored) - message_num += length(FC.messages) - else - active_num-- - data["total_num"] = total_num - data["active_num"] = active_num - data["message_num"] = message_num - data["paper_remaining"] = paper_remaining * 100 - if(5) - data["channel_name"] = viewing_channel.channel_name - data["author"] = viewing_channel.author - data["total_view_count"] = viewing_channel.total_view_count - data["censored"] = viewing_channel.censored - var/list/messages = list() - data["messages"] = messages - var/message_number = 0 - for(var/datum/feed_message/M in viewing_channel.messages) - if(M.img) - user << browse_rsc(M.img, "tmp_photo[message_number].png") - messages[++messages.len] = list("title" = M.title, "body" = M.body, "img" = M.img ? M.img : null, "message_type" = M.message_type, "author" = M.author, "view_count" = M.view_count, "message_number" = message_number) - message_number += 1 - if(8, 9) - data["channel_name"] = viewing_channel.channel_name - data["ref"] = "\ref[viewing_channel]" - data["author"] = viewing_channel.author - data["author_redacted"] = viewing_channel.author == REDACTED ? 1 : 0 - data["total_view_count"] = viewing_channel.total_view_count - data["censored"] = viewing_channel.censored - var/list/messages = list() - data["messages"] = messages - for(var/datum/feed_message/M in viewing_channel.messages) - messages[++messages.len] = list("title" = M.title, "body" = M.body, "body_redacted" = (M.body == REDACTED ? 1 : 0) , "message_type" = M.message_type, "author" = M.author, "author_redacted" = (M.author == REDACTED ? 1 : 0), "ref" = "\ref[M]", "view_count" = M.view_count) - if(10) - var/wanted_already = 0 - var/end_param = 1 - if(GLOB.news_network.wanted_issue) - wanted_already = 1 - end_param = 2 - data["wanted_already"] = wanted_already - data["end_param"] = end_param - data["channel_name"] = channel_name - data["msg"] = msg - data["photo"] = photo ? 1 : 0 - if(wanted_already) - data["author"] = GLOB.news_network.wanted_issue.backup_author - else - data["scanned_user"] = scanned_user - if(11) - data["author"] = GLOB.news_network.wanted_issue.backup_author - data["criminal"] = GLOB.news_network.wanted_issue.author - data["description"] = GLOB.news_network.wanted_issue.body - if(GLOB.news_network.wanted_issue.img) - user << browse_rsc(GLOB.news_network.wanted_issue.img, "tmp_photow.png") - data["photo"] = GLOB.news_network.wanted_issue.img ? GLOB.news_network.wanted_issue.img : 0 - if(12) - var/list/jobs = list() - data["jobs"] = jobs - for(var/datum/job/job in SSjobs.occupations) - if(job_blacklisted(job)) - continue - if(job.is_position_available()) - jobs[++jobs.len] = list("title" = job.title) - return data - -/obj/machinery/newscaster/Topic(href, href_list) - if(..()) - return 1 - - if(href_list["set_channel_name"]) - channel_name = trim(sanitize(strip_html_simple(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", "")))) - - else if(href_list["set_channel_lock"]) - c_locked = !c_locked - - else if(href_list["submit_new_channel"]) - var/list/existing_authors = list() - for(var/datum/feed_channel/FC in GLOB.news_network.network_channels) - if(FC.author == REDACTED) - existing_authors += FC.backup_author - else - existing_authors += FC.author - var/check = 0 - for(var/datum/feed_channel/FC in GLOB.news_network.network_channels) - if(FC.channel_name == channel_name) - check = 1 - break - var/choice = alert("Please confirm feed channel creation", "Network Channel Handler", "Confirm", "Cancel") - if(choice == "Confirm") - if(channel_name == "" || channel_name == REDACTED || scanned_user == "Unknown" || check || (scanned_user in existing_authors)) - temp = "ERROR: Could not submit feed channel to Network.

"
- else
- dat+="None"
- else
- dat+="Apart from some uninteresting Classified ads, there's nothing on this page..."
- if(scribble_page==curr_page)
- dat+="
"
- else
- dat+="None"
- dat+="Green
Will lay eggs on dead bodies, breeding more spiders.
Black
Even a single bite is enough to kill a humanoid, given time.
White
Injects a parasitic agent. Deemed to pose too great an infection risk to study.
Purple
Only seen guarding the nest of the Queen to the south. Appear to be territorial, and very dangerous.
Purple
Seen guarding key areas and important spiders. Appear to be territorial, and very dangerous.
Prince
Held in containment 2. Appears to be a sort of super-warrior. Fast, strong, and thickly armored.
Mother
Carries hordes of spiderlings on its back. Held in containment 1.
Queen
Unable to contain. Present south of Cargo before contact was lost. Presumed ruler of the local hive.
Setup Character
[real_name]

"
+ else
+ dat += "None"
+ else
+ dat += "Apart from some uninteresting Classified ads, there's nothing on this page..."
+ if(scribble_page==curr_page)
+ dat += "
- {{:value.title}}
-

- {{:value.body}}
-
