diff --git a/SQL/database_changelog.txt b/SQL/database_changelog.txt index 0c36eb059f8..5617a4af275 100644 --- a/SQL/database_changelog.txt +++ b/SQL/database_changelog.txt @@ -23,11 +23,13 @@ Once created this table is populated with rows from the `feedback` table. START TRANSACTION; CREATE TABLE `feedback`.`round` (`id` INT(11) NOT NULL AUTO_INCREMENT, `start_datetime` DATETIME NOT NULL, `end_datetime` DATETIME NULL, `server_ip` INT(10) UNSIGNED NOT NULL, `server_port` SMALLINT(5) UNSIGNED NOT NULL, `commit_hash` CHAR(40) NULL, `game_mode` VARCHAR(32) NULL, `game_mode_result` VARCHAR(64) NULL, `end_state` VARCHAR(64) NULL, `shuttle_name` VARCHAR(64) NULL, `map_name` VARCHAR(32) NULL, `station_name` VARCHAR(80) NULL, PRIMARY KEY (`id`)); +ALTER TABLE `feedback`.`feedback` ADD INDEX `tmp` (`round_id` ASC, `var_name` ASC); INSERT INTO `feedback`.`round` (`id`, `start_datetime`, `end_datetime`, `server_ip`, `server_port`, `commit_hash`, `game_mode`, `game_mode_result`, `end_state`, `shuttle_name`, `map_name`, `station_name`) SELECT DISTINCT ri.round_id, IFNULL(STR_TO_DATE(st.details,'%a %b %e %H:%i:%s %Y'), TIMESTAMP(0)), STR_TO_DATE(et.details,'%a %b %e %H:%i:%s %Y'), IFNULL(INET_ATON(SUBSTRING_INDEX(IF(si.details = '', '0', IF(SUBSTRING_INDEX(si.details, ':', 1) LIKE '%_._%', si.details, '0')), ':', 1)), INET_ATON(0)), IFNULL(IF(si.details LIKE '%:_%', CAST(SUBSTRING_INDEX(si.details, ':', -1) AS UNSIGNED), '0'), '0'), ch.details, gm.details, mr.details, IFNULL(es.details, ep.details), ss.details, mn.details, sn.details FROM `feedback`.`feedback`AS ri LEFT JOIN `feedback`.`feedback` AS st ON ri.round_id = st.round_id AND st.var_name = "round_start" LEFT JOIN `feedback`.`feedback` AS et ON ri.round_id = et.round_id AND et.var_name = "round_end" LEFT JOIN `feedback`.`feedback` AS si ON ri.round_id = si.round_id AND si.var_name = "server_ip" LEFT JOIN `feedback`.`feedback` AS ch ON ri.round_id = ch.round_id AND ch.var_name = "revision" LEFT JOIN `feedback`.`feedback` AS gm ON ri.round_id = gm.round_id AND gm.var_name = "game_mode" LEFT JOIN `feedback`.`feedback` AS mr ON ri.round_id = mr.round_id AND mr.var_name = "round_end_result" LEFT JOIN `feedback`.`feedback` AS es ON ri.round_id = es.round_id AND es.var_name = "end_state" LEFT JOIN `feedback`.`feedback` AS ep ON ri.round_id = ep.round_id AND ep.var_name = "end_proper" LEFT JOIN `feedback`.`feedback` AS ss ON ri.round_id = ss.round_id AND ss.var_name = "emergency_shuttle" LEFT JOIN `feedback`.`feedback` AS mn ON ri.round_id = mn.round_id AND mn.var_name = "map_name" LEFT JOIN `feedback`.`feedback` AS sn ON ri.round_id = sn.round_id AND sn.var_name = "station_renames"; +ALTER TABLE `feedback`.`feedback` DROP INDEX `tmp`; COMMIT; It's not necessary to delete the rows from the `feedback` table but henceforth these datapoints will be in the `round` table. diff --git a/_maps/RandomZLevels/centcomAway.dmm b/_maps/RandomZLevels/centcomAway.dmm index 8fab986fdb0..97b8381ff29 100644 --- a/_maps/RandomZLevels/centcomAway.dmm +++ b/_maps/RandomZLevels/centcomAway.dmm @@ -3502,7 +3502,7 @@ /area/awaymission/centcomAway/general) "kN" = ( /obj/structure/table/wood, -/obj/item/clothing/tie/medal, +/obj/item/clothing/accessory/medal, /turf/open/floor/carpet, /area/awaymission/centcomAway/general) "kO" = ( @@ -3516,7 +3516,7 @@ /area/awaymission/centcomAway/general) "kQ" = ( /obj/structure/table/wood, -/obj/item/clothing/tie/medal/gold, +/obj/item/clothing/accessory/medal/gold, /turf/open/floor/carpet, /area/awaymission/centcomAway/general) "kR" = ( diff --git a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm index 7618b86f338..7e99d45be78 100644 --- a/_maps/map_files/Cerestation/cerestation.dmm +++ b/_maps/map_files/Cerestation/cerestation.dmm @@ -213,8 +213,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/circuit{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -224,12 +223,10 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/circuit{ @@ -318,8 +315,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/firedoor, /turf/open/floor/plating{ @@ -477,8 +473,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/circuit{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -785,8 +780,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/circuit{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -878,8 +872,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/porta_turret/ai{ dir = 4 @@ -959,8 +952,7 @@ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; - name = "EXTERNAL AIRLOCK"; - pixel_x = 0 + name = "EXTERNAL AIRLOCK" }, /turf/closed/wall/mineral/plastitanium, /area/shuttle/syndicate) @@ -1012,8 +1004,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -1102,8 +1093,7 @@ icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; - pixel_x = 0; - pixel_y = 0 + pixel_x = 0 }, /turf/open/floor/circuit{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -1121,8 +1111,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/ai_slipper{ uses = 10 @@ -1150,8 +1139,7 @@ icon = 'icons/mob/robots.dmi'; icon_state = "robot_old"; name = "Cyborg Statue"; - pixel_x = 0; - pixel_y = 0 + pixel_x = 0 }, /turf/open/floor/circuit{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -1167,8 +1155,7 @@ /area/ai_monitored/turret_protected/ai) "acC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/machinery/ai_slipper{ uses = 10 @@ -1229,8 +1216,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/holopad, /turf/open/floor/circuit{ @@ -1305,8 +1291,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -1426,8 +1411,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -1528,8 +1512,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; @@ -1710,8 +1693,7 @@ /obj/machinery/computer/message_monitor, /obj/machinery/camera{ c_tag = "Telecomms Control Room 2"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -1729,9 +1711,7 @@ "adL" = ( /obj/machinery/camera{ c_tag = "AI Hallway"; - dir = 5; - icon_state = "camera"; - tag = "" + dir = 5 }, /turf/open/floor/circuit{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -1802,9 +1782,7 @@ /obj/structure/rack, /obj/item/weapon/gun/energy/ionrifle, /obj/item/weapon/gun/energy/temperature/security, -/obj/item/clothing/suit/armor/laserproof{ - pixel_x = 0 - }, +/obj/item/clothing/suit/armor/laserproof, /obj/structure/window/reinforced{ dir = 1 }, @@ -1883,8 +1861,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -1910,8 +1887,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/holopad, /turf/open/floor/plasteel/vault{ @@ -2019,7 +1995,6 @@ /obj/machinery/camera{ c_tag = "Brig Cell 5"; dir = 6; - icon_state = "camera"; network = list("SS13","Security","PrisonCell") }, /turf/open/floor/plasteel/floorgrime{ @@ -2049,7 +2024,6 @@ /obj/machinery/camera{ c_tag = "Brig Cell 6"; dir = 6; - icon_state = "camera"; network = list("SS13","Security","PrisonCell") }, /turf/open/floor/plasteel/floorgrime{ @@ -2111,8 +2085,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -2148,8 +2121,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; @@ -2176,9 +2148,7 @@ "aeF" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ pixel_x = 30 @@ -2229,9 +2199,7 @@ pixel_x = -3; pixel_y = 3 }, -/obj/item/clothing/suit/armor/bulletproof{ - pixel_y = 0 - }, +/obj/item/clothing/suit/armor/bulletproof, /obj/item/clothing/suit/armor/bulletproof{ pixel_x = 3; pixel_y = -3 @@ -2296,8 +2264,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/circuit{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -2489,8 +2456,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/circuit{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -2510,8 +2476,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/circuit{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -2526,8 +2491,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -2538,8 +2502,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -2555,8 +2518,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -2727,8 +2689,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 @@ -2755,8 +2716,7 @@ }, /obj/machinery/camera{ c_tag = "Telecomms Control Room"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -2803,8 +2763,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -2885,7 +2844,6 @@ /obj/machinery/camera{ c_tag = "Brig Cell 4"; dir = 4; - icon_state = "camera"; network = list("SS13","Security","PrisonCell") }, /turf/open/floor/plasteel/floorgrime{ @@ -3290,8 +3248,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/holopad, /turf/open/floor/plasteel{ @@ -3302,8 +3259,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -3321,8 +3277,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -3335,8 +3290,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -3353,8 +3307,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -3409,13 +3362,11 @@ /obj/machinery/camera{ c_tag = "AI Asteroid Hallway 4"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /obj/item/device/radio/beacon, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/black{ @@ -3445,7 +3396,6 @@ /area/ai_monitored/turret_protected/aisat/hallway) "agV" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -3453,8 +3403,7 @@ /obj/item/seeds/ambrosia, /obj/machinery/flasher{ id = "PermaCell"; - pixel_x = -24; - pixel_y = 0 + pixel_x = -24 }, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -3517,8 +3466,7 @@ /area/security/prison) "ahb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -3532,9 +3480,7 @@ /obj/machinery/camera{ c_tag = "Brig Perma Cell 2"; dir = 10; - icon_state = "camera"; - network = list("SS13","Security","PrisonCell"); - tag = "icon-camera (SOUTHWEST)" + network = list("SS13","Security","PrisonCell") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -3754,8 +3700,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -3770,8 +3715,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -4012,7 +3956,6 @@ /obj/machinery/light, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel{ @@ -4051,8 +3994,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/sign/map/left/ceres{ pixel_x = -32 @@ -4140,8 +4082,7 @@ /obj/machinery/door_timer{ id = "Cell 4"; name = "Cell 4"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 @@ -4199,8 +4140,7 @@ /obj/machinery/door_timer{ id = "Cell 7"; name = "Cell 7"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/light{ dir = 4 @@ -4259,9 +4199,7 @@ /obj/machinery/camera{ c_tag = "Brig Perma Cell 5"; dir = 10; - icon_state = "camera"; - network = list("SS13","Security","PrisonCell"); - tag = "icon-camera (SOUTHWEST)" + network = list("SS13","Security","PrisonCell") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -4392,13 +4330,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/camera{ c_tag = "AI Asteroid Hallway 3"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -4523,7 +4459,6 @@ /obj/machinery/camera{ c_tag = "Brig Cell 3"; dir = 4; - icon_state = "camera"; network = list("SS13","Security","PrisonCell") }, /turf/open/floor/plasteel/floorgrime{ @@ -4585,8 +4520,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Prison Wing APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable/orange{ d2 = 2; @@ -5165,8 +5099,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance/external{ name = "External Airlock Access"; @@ -5490,8 +5423,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -5515,8 +5447,7 @@ /area/ai_monitored/turret_protected/aisat/hallway) "ala" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -5616,8 +5547,7 @@ /obj/machinery/door_timer{ id = "Cell 3"; name = "Cell 3"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -5737,7 +5667,6 @@ /area/crew_quarters/heads/captain) "alE" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -5809,7 +5738,6 @@ /obj/machinery/camera{ c_tag = "Cargo Disposals"; dir = 1; - icon_state = "camera"; network = list("SS13","QM") }, /turf/open/floor/plasteel{ @@ -5837,7 +5765,6 @@ "alQ" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/table, @@ -6336,8 +6263,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -6352,8 +6278,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ c_tag = "AI Asteroid Hallway 2"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -6574,9 +6499,7 @@ /obj/machinery/camera{ c_tag = "Brig Perma Cell 3"; dir = 10; - icon_state = "camera"; - network = list("SS13","Security","PrisonCell"); - tag = "icon-camera (SOUTHWEST)" + network = list("SS13","Security","PrisonCell") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -6731,8 +6654,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -6902,8 +6824,7 @@ /obj/machinery/door_timer{ id = "Cell 2"; name = "Cell 2"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -6955,8 +6876,7 @@ /obj/machinery/door_timer{ id = "Cell 9"; name = "Cell 9"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -7254,8 +7174,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/fans/tiny, /turf/open/floor/plating{ @@ -7444,8 +7363,7 @@ /obj/machinery/door_timer{ id = "Cell 4"; name = "Cell 4"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/cable/orange{ d1 = 1; @@ -7540,7 +7458,6 @@ /obj/machinery/camera{ c_tag = "Brig Cell 9"; dir = 9; - icon_state = "camera"; network = list("SS13","Security","PrisonCell") }, /turf/open/floor/plasteel/floorgrime{ @@ -7643,8 +7560,7 @@ "apd" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/item/weapon/melee/chainofcommand, /turf/open/floor/wood{ @@ -7697,8 +7613,7 @@ }, /obj/machinery/camera{ c_tag = "Command Escape Pod"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_1) @@ -7710,8 +7625,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -7868,7 +7782,6 @@ /obj/machinery/camera{ c_tag = "Brig Cellblock South"; dir = 6; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel{ @@ -7947,7 +7860,6 @@ /obj/machinery/camera{ c_tag = "Brig Cell 7"; dir = 9; - icon_state = "camera"; network = list("SS13") }, /obj/item/weapon/bedsheet, @@ -8103,8 +8015,7 @@ "apY" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced, /obj/machinery/recharger, @@ -8236,7 +8147,6 @@ /obj/machinery/camera{ c_tag = "Cargo Western Loading Bay 2"; dir = 5; - icon_state = "camera"; network = list("SS13","QM") }, /turf/open/floor/plasteel{ @@ -8422,8 +8332,7 @@ "aqJ" = ( /obj/machinery/camera{ c_tag = "Fore Asteroid Maintenance APCs 2"; - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -8543,8 +8452,7 @@ department = "Cargo Bay"; departmentType = 2; name = "Cargo RC"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -8646,14 +8554,12 @@ department = "Cargo Bay"; departmentType = 2; name = "Cargo RC"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/camera{ c_tag = "Cargo Eastern Loading Bay 1"; dir = 8; - icon_state = "camera"; network = list("SS13","QM") }, /turf/open/floor/plasteel{ @@ -8697,8 +8603,7 @@ /obj/machinery/door_timer{ id = "Cell 1"; name = "Cell 1"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/light{ icon_state = "tube1"; @@ -8783,8 +8688,7 @@ /obj/machinery/door_timer{ id = "Cell 10"; name = "Cell 10"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/light{ dir = 4 @@ -8852,8 +8756,7 @@ }, /obj/machinery/camera{ c_tag = "Dorm Commons North"; - dir = 4; - icon_state = "camera" + dir = 4 }, /obj/item/weapon/twohanded/required/kirbyplants{ icon_state = "plant-22" @@ -8974,7 +8877,6 @@ "arI" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ @@ -9087,8 +8989,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -9242,8 +9143,7 @@ /obj/machinery/door_timer{ id = "Cell 3"; name = "Cell 3"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/structure/cable/orange{ d1 = 1; @@ -9872,7 +9772,6 @@ /obj/machinery/camera{ c_tag = "Brig Cell 6"; dir = 9; - icon_state = "camera"; network = list("SS13") }, /obj/item/weapon/bedsheet, @@ -10278,7 +10177,6 @@ /obj/machinery/camera{ c_tag = "Brig Equipment North"; dir = 6; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel/red/side{ @@ -10393,9 +10291,7 @@ /obj/machinery/camera{ c_tag = "Brig Perma South"; dir = 10; - icon_state = "camera"; - network = list("SS13","Security","PrisonCell"); - tag = "icon-camera (SOUTHWEST)" + network = list("SS13","Security","PrisonCell") }, /turf/open/floor/plating/asteroid, /area/security/prison) @@ -10518,8 +10414,7 @@ department = "Chief Medical Officer's Desk"; departmentType = 5; name = "Chief Medical Officer RC"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -10727,8 +10622,7 @@ department = "Chief Engineer's Desk"; departmentType = 3; name = "Chief Engineer RC"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -10963,7 +10857,6 @@ /obj/item/weapon/storage/box/prisoner, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel{ @@ -10974,8 +10867,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Security Equipment APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable/orange{ d2 = 2; @@ -11324,8 +11216,7 @@ "awl" = ( /obj/structure/table/wood, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/item/weapon/folder, /turf/open/floor/carpet{ @@ -11423,8 +11314,7 @@ "awx" = ( /obj/machinery/computer/shuttle/labor, /obj/structure/reagent_dispensers/peppertank{ - pixel_x = -31; - pixel_y = 0 + pixel_x = -31 }, /turf/open/floor/mineral/plastitanium, /area/shuttle/labor) @@ -11548,9 +11438,7 @@ }, /area/security/warden) "awM" = ( -/obj/structure/closet/secure_closet/warden{ - pixel_x = 0 - }, +/obj/structure/closet/secure_closet/warden, /obj/item/device/radio, /obj/structure/extinguisher_cabinet{ pixel_y = 32 @@ -11707,8 +11595,7 @@ /area/bridge) "axd" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced, /obj/machinery/computer/cargo/request, @@ -11809,8 +11696,7 @@ "axo" = ( /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/brown/corner{ tag = "icon-browncorner (WEST)"; @@ -11824,9 +11710,7 @@ /obj/machinery/camera{ c_tag = "Mining Bay"; dir = 8; - icon_state = "camera"; - network = list("SS13","QM"); - tag = "icon-camera (WEST)" + network = list("SS13","QM") }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -12525,7 +12409,6 @@ /obj/machinery/camera{ c_tag = "Cargo Western Loading Bay 1"; dir = 5; - icon_state = "camera"; network = list("SS13","QM") }, /turf/open/floor/plasteel{ @@ -12880,8 +12763,7 @@ /obj/structure/cable{ d1 = 2; d2 = 8; - icon_state = "2-8"; - tag = "" + icon_state = "2-8" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -13301,7 +13183,6 @@ /obj/machinery/camera{ c_tag = "Cargo Eastern Loading Bay 2"; dir = 8; - icon_state = "camera"; network = list("SS13","QM") }, /turf/open/floor/plasteel/brown/corner{ @@ -13316,8 +13197,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -13350,8 +13230,7 @@ "aAo" = ( /obj/machinery/mineral/labor_claim_console{ machinedir = 1; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/labor) @@ -13637,8 +13516,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -13662,8 +13540,7 @@ }, /obj/machinery/camera{ c_tag = "Dorm SMES"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -13762,7 +13639,6 @@ "aBc" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ @@ -13782,8 +13658,7 @@ department = "Head of Security's Desk"; departmentType = 5; name = "Head of Security RC"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -13839,8 +13714,7 @@ department = "Research Director's Desk"; departmentType = 5; name = "Research Director RC"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -13941,7 +13815,6 @@ /obj/machinery/camera{ c_tag = "Brig Equipment East"; dir = 9; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel/red/side{ @@ -14088,8 +13961,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/rack, /turf/open/floor/plasteel/floorgrime{ @@ -14213,12 +14085,10 @@ /obj/machinery/camera{ c_tag = "Bridge Main 2"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plasteel/darkblue/side{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -14587,7 +14457,6 @@ /obj/machinery/camera{ c_tag = "Brig Main West"; dir = 6; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel/red/side{ @@ -14683,7 +14552,6 @@ /obj/machinery/camera{ c_tag = "Brig Main Middle"; dir = 6; - icon_state = "camera"; network = list("SS13","Security") }, /obj/machinery/computer/security/telescreen{ @@ -14840,8 +14708,7 @@ }, /obj/machinery/camera{ c_tag = "Courtroom North"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -14882,8 +14749,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/table, /obj/machinery/light/small{ @@ -14926,9 +14792,7 @@ }, /obj/machinery/camera{ c_tag = "Dorm Commons South"; - dir = 10; - icon_state = "camera"; - tag = "icon-camera (SOUTHWEST)" + dir = 10 }, /obj/item/device/radio/intercom{ broadcasting = 0; @@ -15210,7 +15074,6 @@ /obj/machinery/camera{ c_tag = "Cargo Hall"; dir = 1; - icon_state = "camera"; network = list("SS13","QM") }, /turf/open/floor/plasteel{ @@ -15237,7 +15100,6 @@ /obj/machinery/camera{ c_tag = "Cargo Hall East"; dir = 8; - icon_state = "camera"; network = list("SS13","QM") }, /turf/open/floor/plasteel{ @@ -15305,8 +15167,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plasteel/showroomfloor{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -15935,9 +15796,7 @@ /area/bridge) "aEN" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ - pixel_x = 0 - }, +/obj/item/weapon/storage/firstaid/regular, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -16968,8 +16827,7 @@ department = "Cargo Bay"; departmentType = 2; name = "Quartermaster RC"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -17075,7 +16933,6 @@ /obj/machinery/camera{ c_tag = "Cargo Desk"; dir = 6; - icon_state = "camera"; network = list("SS13","QM") }, /obj/machinery/status_display{ @@ -17739,7 +17596,6 @@ /obj/machinery/camera{ c_tag = "Brig Lobby West"; dir = 4; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel/red/side{ @@ -17814,7 +17670,6 @@ /obj/machinery/camera{ c_tag = "Brig Lobby Checkpoint"; dir = 9; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel/showroomfloor{ @@ -18110,7 +17965,6 @@ /obj/machinery/camera{ c_tag = "Bridge Midway 2"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/darkblue/side{ @@ -18176,7 +18030,6 @@ "aID" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/red/side{ @@ -18257,7 +18110,6 @@ "aIJ" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel/grimy{ @@ -18471,8 +18323,7 @@ /obj/structure/disposalpipe/segment, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; - pixel_x = -29; - pixel_y = 0 + pixel_x = -29 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -18781,7 +18632,6 @@ /obj/machinery/camera{ c_tag = "Cargo Security Checkpoint"; dir = 8; - icon_state = "camera"; network = list("SS13","QM") }, /turf/open/floor/plasteel/red/side{ @@ -18821,8 +18671,7 @@ }, /obj/machinery/camera{ c_tag = "Detective's Office"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/grimy{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -18861,7 +18710,6 @@ "aJR" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/holopad, @@ -19266,14 +19114,12 @@ /obj/machinery/camera{ c_tag = "Brig Holding Cell"; dir = 4; - icon_state = "camera"; network = list("SS13","Security") }, /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -19342,13 +19188,10 @@ "aKL" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -19441,7 +19284,6 @@ /obj/machinery/camera{ c_tag = "Head of Personnel's Office"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /obj/machinery/recharger, @@ -19474,8 +19316,7 @@ /obj/machinery/button/flasher{ id = "hopflash"; name = "Line Flash"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/button/door{ id = "hopshutter"; @@ -19595,8 +19436,7 @@ "aLi" = ( /obj/machinery/camera{ c_tag = "Command SMES"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -19682,12 +19522,10 @@ /obj/machinery/camera{ c_tag = "Docking Quantum Pad"; dir = 8; - icon_state = "camera"; network = list("SS13","QM") }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -19911,8 +19749,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Lawyer's Office APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable/orange{ d2 = 8; @@ -19996,8 +19833,7 @@ "aLQ" = ( /obj/machinery/camera{ c_tag = "Courtroom Jury East"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -20047,8 +19883,7 @@ /obj/structure/closet/wardrobe/mixed, /obj/machinery/camera{ c_tag = "Dorm Lockers"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -20161,8 +19996,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -20172,8 +20006,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable/orange{ d1 = 1; @@ -20214,8 +20047,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -20227,8 +20059,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -20549,7 +20380,6 @@ /obj/machinery/camera{ c_tag = "Courtroom South"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/vault{ @@ -20613,13 +20443,11 @@ "aMU" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/camera{ c_tag = "Dorm Bathroom"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/freezer{ @@ -20631,7 +20459,6 @@ /obj/machinery/camera{ c_tag = "Dorm Laundry Room"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/barber{ @@ -20658,8 +20485,7 @@ }, /obj/machinery/camera{ c_tag = "Head of Personnel's Queue Line"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/blue/side{ tag = "icon-blue (NORTHWEST)"; @@ -20695,7 +20521,6 @@ /obj/machinery/camera{ c_tag = "Bridge Midway 3"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/darkblue/side{ @@ -20797,8 +20622,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -20814,8 +20638,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -20829,8 +20652,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/fans/tiny, /turf/open/floor/plating{ @@ -20847,8 +20669,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -20955,8 +20776,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/brown/corner{ tag = "icon-browncorner (EAST)"; @@ -21304,8 +21124,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance/external{ name = "External Airlock Access"; @@ -21350,8 +21169,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/grille, /obj/structure/window/reinforced{ @@ -21439,7 +21257,6 @@ /obj/machinery/camera{ c_tag = "Cargo Lobby"; dir = 8; - icon_state = "camera"; network = list("SS13","QM") }, /obj/structure/disposalpipe/segment, @@ -21614,8 +21431,7 @@ }, /obj/machinery/camera{ c_tag = "Command Asteroid Hall 2"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; @@ -21825,8 +21641,7 @@ }, /obj/machinery/camera{ c_tag = "Command Asteroid Hall 4"; - dir = 6; - icon_state = "camera" + dir = 6 }, /obj/machinery/newscaster{ pixel_y = 32 @@ -21918,8 +21733,7 @@ }, /obj/machinery/camera{ c_tag = "Command Asteroid Hall 5"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; @@ -22028,8 +21842,7 @@ }, /obj/machinery/camera{ c_tag = "Command Asteroid Hall 6"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; @@ -22075,8 +21888,7 @@ }, /obj/machinery/camera{ c_tag = "Command Asteroid Hall 7"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/blue/corner{ tag = "icon-bluecorner (EAST)"; @@ -22288,8 +22100,7 @@ }, /obj/machinery/camera{ c_tag = "Command Asteroid Hall 8"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; @@ -22318,8 +22129,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -22405,8 +22215,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; @@ -22452,8 +22261,7 @@ "aPy" = ( /obj/machinery/camera{ c_tag = "Command Asteroid Hall 9"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; @@ -22696,7 +22504,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/brown/corner{ @@ -22779,8 +22586,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -22790,8 +22596,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -22801,8 +22606,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/components/unary/vent_pump{ on = 1 @@ -23050,8 +22854,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -23083,8 +22886,7 @@ /area/hallway/primary/starboard/fore) "aQy" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -23572,8 +23374,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -23586,8 +23387,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -23600,8 +23400,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/airalarm{ dir = 1; @@ -23622,8 +23421,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -23705,7 +23503,6 @@ /obj/machinery/camera{ c_tag = "Cargo Asteroid Hall 1"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/neutral/corner{ @@ -24065,8 +23862,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/door/airlock/maintenance/external{ @@ -24270,8 +24066,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/weapon/screwdriver, @@ -24294,8 +24089,7 @@ "aSz" = ( /obj/structure/noticeboard{ dir = 8; - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/item/weapon/paper{ info = "
Dummies Guide To Quantum Pads


Do you hate the concept of having to use your legs, let alone walk to places? Well, with the Quantum Pad (tm), never again will the fear of cardio keep you from going places!

How to set up your Quantum Pad(tm)


1.Unscrew the Quantum Pad(tm) you wish to link.
2. Use your multi-tool to cache the buffer of the Quantum Pad(tm) you wish to link.
3. Apply the multi-tool to the secondary Quantum Pad(tm) you wish to link to the first Quantum Pad(tm)

If you followed these instructions carefully, your Quantum Pad(tm) should now be properly linked together for near-instant movement across the station! Bear in mind that this is technically a one-way teleport, so you'll need to do the same process with the secondary pad to the first one if you wish to travel between both.
"; @@ -24478,8 +24272,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ c_tag = "Vault Airlock"; - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/machinery/holopad, /turf/open/floor/plasteel/black, @@ -24581,8 +24374,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -24645,8 +24437,7 @@ "aTe" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/space, /area/space) @@ -24776,8 +24567,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ c_tag = "Cargo Asteroid Hall 2"; - dir = 4; - icon_state = "camera" + dir = 4 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral/corner{ @@ -24844,7 +24634,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel/black{ @@ -24910,8 +24699,7 @@ /area/janitor) "aTC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/structure/disposalpipe/segment, /obj/machinery/power/apc{ @@ -24931,8 +24719,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; - pixel_x = -29; - pixel_y = 0 + pixel_x = -29 }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -24976,8 +24763,7 @@ }, /obj/machinery/camera{ c_tag = "Command Atmospherics Checkpoint"; - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -25010,8 +24796,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -25032,13 +24817,11 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/camera{ c_tag = "Cargo Atmospherics Checkpoint"; - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -25291,8 +25074,7 @@ "aUm" = ( /obj/machinery/camera{ c_tag = "Command Asteroid Hallway 1"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -25334,8 +25116,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'KEEP CLEAR OF PAD WHEN IN USE'."; name = "KEEP CLEAR OF PAD WHEN IN USE"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 1; @@ -25370,8 +25151,7 @@ /obj/item/key/janitor, /obj/machinery/camera{ c_tag = "Custodials"; - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/item/key/janitor, /turf/open/floor/plasteel{ @@ -25504,8 +25284,7 @@ "aUH" = ( /obj/machinery/camera{ c_tag = "Command Asteroid Hall 10"; - dir = 8; - icon_state = "camera" + dir = 8 }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -25555,8 +25334,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -25566,8 +25344,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable/orange{ d1 = 1; @@ -25585,8 +25362,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ name = "Cargo SMES Access"; @@ -25615,8 +25391,7 @@ "aUQ" = ( /obj/machinery/camera{ c_tag = "Cargo Bay SMES"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -25637,8 +25412,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -25887,8 +25661,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating{ @@ -26015,8 +25788,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light/small{ @@ -26209,8 +25981,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating{ @@ -26275,8 +26046,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -26345,8 +26115,7 @@ "aWc" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/cable{ d1 = 2; @@ -26367,8 +26136,7 @@ }, /obj/structure/grille, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/space, /area/hallway/secondary/bridges/com_serv) @@ -26398,8 +26166,7 @@ "aWg" = ( /obj/machinery/camera{ c_tag = "Vault"; - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) @@ -26410,8 +26177,7 @@ "aWi" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -26437,8 +26203,7 @@ }, /obj/structure/grille, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/space, /area/hallway/secondary/bridges/com_engi) @@ -26506,8 +26271,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; @@ -26532,8 +26296,7 @@ "aWs" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/cable{ d1 = 1; @@ -26578,8 +26341,7 @@ "aWx" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/grille, @@ -26596,14 +26358,12 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/grille, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/space, /area/hallway/secondary/bridges/com_engi) @@ -26753,8 +26513,7 @@ }, /obj/machinery/camera{ c_tag = "Cargo Asteroid Hall 3"; - dir = 4; - icon_state = "camera" + dir = 4 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral/corner{ @@ -26905,8 +26664,7 @@ "aWX" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/cable{ d1 = 2; @@ -26937,8 +26695,7 @@ "aWZ" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ @@ -27012,8 +26769,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/space, /area/solar/asteroid/fore) @@ -27058,8 +26814,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -27316,8 +27071,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -27404,7 +27158,6 @@ /obj/machinery/hydroponics/soil, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/camera{ @@ -27450,8 +27203,7 @@ "aYk" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/cable{ d1 = 1; @@ -27519,8 +27271,7 @@ "aYr" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -27546,8 +27297,7 @@ }, /obj/structure/grille, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/space, /area/hallway/secondary/bridges/com_engi) @@ -27707,8 +27457,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating{ @@ -27730,8 +27479,7 @@ "aYQ" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -27793,8 +27541,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -27833,8 +27580,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -27850,8 +27596,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -27871,8 +27616,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -27889,8 +27633,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -27995,8 +27738,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/light/small{ dir = 4 @@ -28071,8 +27813,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -28117,8 +27858,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -28138,8 +27878,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -28159,8 +27898,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -28253,8 +27991,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating{ @@ -28344,8 +28081,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -28494,7 +28230,6 @@ /obj/machinery/camera{ c_tag = "Engineering Asteroid Hallway 7"; dir = 4; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/neutral/corner{ @@ -28617,7 +28352,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/floorgrime{ @@ -28628,8 +28362,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ c_tag = "Service Asteroid Hallway 1"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -28752,8 +28485,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -28816,14 +28548,12 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; - pixel_x = 29; - pixel_y = 0 + pixel_x = 29 }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; @@ -28836,8 +28566,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -28953,8 +28682,7 @@ "baZ" = ( /obj/machinery/camera{ c_tag = "Bar Backroom"; - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -29145,8 +28873,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating{ @@ -29173,8 +28900,7 @@ "bbx" = ( /obj/machinery/camera{ c_tag = "EVA Equipment"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -29288,8 +29014,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -29361,8 +29086,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -29372,8 +29096,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance/external{ name = "External Airlock Access"; @@ -29390,8 +29113,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -29401,8 +29123,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -29418,8 +29139,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -29432,8 +29152,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance/external{ @@ -29451,8 +29170,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (NORTH)"; @@ -29533,8 +29251,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -29554,8 +29271,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -29813,8 +29529,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line, @@ -29868,8 +29583,7 @@ "bcN" = ( /obj/machinery/camera{ c_tag = "Medical SMES"; - dir = 6; - icon_state = "camera" + dir = 6 }, /obj/structure/chair/stool, /turf/open/floor/plasteel/floorgrime{ @@ -29924,7 +29638,6 @@ /obj/machinery/camera{ c_tag = "Medbay Asteroid Hallway 6"; dir = 8; - icon_state = "camera"; network = list("SS13","QM") }, /turf/open/floor/plasteel/neutral/corner{ @@ -30242,8 +29955,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ @@ -30267,8 +29979,7 @@ "bdz" = ( /obj/structure/rack, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/item/weapon/tank/jetpack/carbondioxide, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -30423,8 +30134,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance/external{ name = "External Airlock Access"; @@ -30438,8 +30148,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/corner{ @@ -30452,8 +30161,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral{ @@ -30729,8 +30437,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/neutral/corner{ @@ -30835,8 +30542,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable/orange{ d1 = 1; @@ -31076,8 +30782,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -31090,8 +30795,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -31119,8 +30823,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -31133,8 +30836,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -31244,8 +30946,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance/external{ name = "Medbay SMES Access"; @@ -31351,8 +31052,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/plating{ @@ -31503,8 +31203,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/stripes/asteroid/line, @@ -31526,7 +31225,6 @@ /obj/structure/flora/ausbushes/fullgrass, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/grass{ @@ -31634,7 +31332,6 @@ /obj/machinery/camera{ c_tag = "Engineering Asteroid Hallway 3"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/neutral/corner{ @@ -31680,7 +31377,6 @@ /obj/machinery/camera{ c_tag = "Engineering Asteroid Hallway 4"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/neutral/corner{ @@ -31719,8 +31415,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -31898,8 +31593,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -32202,8 +31896,7 @@ "bgN" = ( /obj/machinery/camera{ c_tag = "Bar"; - dir = 5; - icon_state = "camera" + dir = 5 }, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 @@ -32364,8 +32057,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -32413,8 +32105,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -32480,8 +32171,7 @@ "bhk" = ( /obj/machinery/camera{ c_tag = "EVA Storage"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/plasteel/blue/side{ tag = "icon-blue (EAST)"; @@ -32508,8 +32198,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral{ @@ -32530,8 +32219,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -32546,8 +32234,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -32563,8 +32250,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -32578,8 +32264,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -32747,8 +32432,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -32806,8 +32490,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/camera{ c_tag = "Engineering Asteroid Hallway 5"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (NORTH)"; @@ -32820,8 +32503,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -32912,7 +32594,6 @@ /obj/machinery/camera{ c_tag = "Medbay Asteroid Hallway 4"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/neutral/corner{ @@ -32941,7 +32622,6 @@ /obj/machinery/camera{ c_tag = "Medbay Asteroid Hallway 5"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/neutral/corner{ @@ -33020,8 +32700,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ c_tag = "Service Asteroid Hallway 2"; - dir = 4; - icon_state = "camera" + dir = 4 }, /obj/structure/sign/map/left/ceres{ pixel_x = -32 @@ -33187,16 +32866,14 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line{ dir = 8 }, /obj/machinery/camera{ c_tag = "Service Atmospherics Checkpoint"; - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -33427,8 +33104,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -33441,8 +33117,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/light/small{ dir = 1 @@ -33458,8 +33133,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -33475,8 +33149,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/maintenance{ name = "Port Asteroid Maintenance"; @@ -33493,8 +33166,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ @@ -33510,8 +33182,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -33621,8 +33292,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -33720,8 +33390,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -34180,7 +33849,6 @@ /obj/structure/closet/secure_closet/freezer/fridge, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/cafeteria{ @@ -34195,8 +33863,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -34261,8 +33928,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -34276,8 +33942,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/power/emitter{ anchored = 1; @@ -34389,7 +34054,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/black{ @@ -34522,8 +34186,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/structure/sign/securearea{ @@ -34531,8 +34194,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -34567,8 +34229,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -34581,8 +34242,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -34598,8 +34258,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -34617,8 +34276,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -34670,8 +34328,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -34694,8 +34351,7 @@ department = "Chief Engineer's Desk"; departmentType = 3; name = "Chief Engineer RC"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -34724,8 +34380,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -34743,8 +34398,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -34763,8 +34417,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -34785,8 +34438,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -34805,8 +34457,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -34822,8 +34473,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -34840,8 +34490,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -34867,8 +34516,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -34889,8 +34537,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -34900,8 +34547,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -34914,8 +34560,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -34934,8 +34579,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -34958,8 +34602,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment{ @@ -34981,8 +34624,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -35086,8 +34728,7 @@ }, /obj/machinery/camera{ c_tag = "Surgery Observation"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -35259,7 +34900,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/bar{ @@ -35337,8 +34977,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -35351,8 +34990,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -35367,8 +35005,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -35414,8 +35051,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -35428,8 +35064,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/light/small, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -35447,8 +35082,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -35495,8 +35129,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/camera{ c_tag = "Engineering Asteroid Hallway 2"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; @@ -35509,8 +35142,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -35609,8 +35241,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -35626,8 +35257,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/light/small, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -35648,8 +35278,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -35715,8 +35344,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -35732,8 +35360,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -35753,8 +35380,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -35832,7 +35458,6 @@ /obj/machinery/camera{ c_tag = "Chief Medical Officer's Office"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /obj/machinery/button/door{ @@ -35934,9 +35559,7 @@ /obj/machinery/camera{ c_tag = "Surgery"; dir = 10; - icon_state = "camera"; - network = list("SS13","CMO"); - tag = "icon-camera (SOUTHWEST)" + network = list("SS13","CMO") }, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -36035,7 +35658,6 @@ /obj/machinery/camera{ c_tag = "Virology Breakroom"; dir = 5; - icon_state = "camera"; network = list("SS13","CMO") }, /turf/open/floor/plasteel/white{ @@ -36108,8 +35730,7 @@ /obj/structure/table, /obj/machinery/camera{ c_tag = "Primary Tool Storage North"; - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -36310,8 +35931,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -36367,8 +35987,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -36432,8 +36051,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -36629,7 +36247,6 @@ /area/medical/surgery) "bon" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -37111,8 +36728,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -37204,8 +36820,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 4; @@ -37332,7 +36947,6 @@ /obj/machinery/camera{ c_tag = "Medbay Asteroid Hallway 3"; dir = 8; - icon_state = "camera"; network = list("SS13","QM") }, /turf/open/floor/plasteel/neutral/corner{ @@ -37399,8 +37013,7 @@ }, /obj/machinery/camera{ c_tag = "Medbay Security Checkpoint"; - dir = 6; - icon_state = "camera" + dir = 6 }, /obj/structure/reagent_dispensers/peppertank{ pixel_y = 32 @@ -37640,7 +37253,6 @@ /obj/machinery/camera{ c_tag = "Virology 2"; dir = 5; - icon_state = "camera"; network = list("SS13","CMO") }, /turf/open/floor/plasteel/white{ @@ -37664,7 +37276,6 @@ /obj/machinery/camera{ c_tag = "Virology"; dir = 5; - icon_state = "camera"; network = list("SS13","CMO") }, /obj/machinery/requests_console{ @@ -37764,8 +37375,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -37898,8 +37508,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; @@ -37913,8 +37522,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; - pixel_x = 29; - pixel_y = 0 + pixel_x = 29 }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; @@ -37938,8 +37546,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -38008,7 +37615,6 @@ /obj/machinery/camera{ c_tag = "SM North"; dir = 1; - icon_state = "camera"; network = list("SS13","CE") }, /turf/open/floor/engine{ @@ -38104,8 +37710,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (NORTH)"; @@ -38345,7 +37950,6 @@ /obj/machinery/camera{ c_tag = "Medbay North"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /obj/effect/landmark/lightsout, @@ -38491,7 +38095,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel/whitegreen/side{ @@ -38862,8 +38465,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -38880,8 +38482,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -38894,8 +38495,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -38910,8 +38510,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -38932,8 +38531,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/firedoor, /turf/open/floor/plasteel/neutral/corner{ @@ -38947,8 +38545,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -38963,8 +38560,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -38974,8 +38570,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -39007,8 +38602,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -39071,8 +38665,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ d1 = 2; @@ -39161,8 +38754,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -39173,8 +38765,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -39189,8 +38780,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -39201,8 +38791,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -39436,7 +39025,6 @@ /obj/machinery/camera{ c_tag = "Virology Airlocks"; dir = 5; - icon_state = "camera"; network = list("SS13","CMO") }, /turf/open/floor/plasteel/whitegreen/side{ @@ -39592,8 +39180,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -39728,8 +39315,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral{ @@ -39765,8 +39351,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -39800,8 +39385,7 @@ /obj/structure/cable/yellow{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/door/poddoor/shutters{ id = "SM1" @@ -39895,8 +39479,7 @@ /obj/structure/cable/yellow{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/door/poddoor/shutters{ id = "SM2" @@ -39952,7 +39535,6 @@ /obj/machinery/camera{ c_tag = "SM East"; dir = 9; - icon_state = "camera"; network = list("SS13","CE") }, /turf/open/floor/plasteel/black{ @@ -39975,8 +39557,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -40090,8 +39671,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -40668,7 +40248,6 @@ "buP" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -40680,8 +40259,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/navbeacon{ @@ -40723,8 +40301,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ on = 1 @@ -40849,8 +40426,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -40866,7 +40442,6 @@ "bvf" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel/yellow/corner{ @@ -40911,8 +40486,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -41445,8 +41019,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -41475,8 +41048,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/poddoor/preopen{ @@ -41513,7 +41085,6 @@ /obj/machinery/camera{ c_tag = "SM West"; dir = 4; - icon_state = "camera"; network = list("SS13","CE") }, /turf/open/floor/plasteel/black{ @@ -41527,8 +41098,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/engine{ @@ -41619,8 +41189,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -41659,8 +41228,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -41677,8 +41245,7 @@ }, /obj/machinery/camera{ c_tag = "Medbay Atmospherics Checkpoint"; - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -41794,13 +41361,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/camera{ c_tag = "Medbay East"; - dir = 9; - icon_state = "camera" + dir = 9 }, /obj/structure/noticeboard{ dir = 8; - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -41845,8 +41410,7 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/camera{ c_tag = "Cyrotubes"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -42048,8 +41612,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ c_tag = "Service Asteroid Hallway 3"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -42208,8 +41771,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -42618,8 +42180,7 @@ /obj/machinery/portable_atmospherics/scrubber, /obj/machinery/camera{ c_tag = "Primary Tool Storage South"; - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -42779,8 +42340,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -43022,8 +42582,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white{ @@ -43037,8 +42596,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -43074,7 +42632,6 @@ /obj/machinery/camera{ c_tag = "Medbay West"; dir = 5; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/white{ @@ -43105,8 +42662,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/sign/nosmoking_2{ pixel_x = 32 @@ -43276,8 +42832,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ tag = "icon-intact (EAST)"; @@ -43309,8 +42864,7 @@ }, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; - pixel_x = 29; - pixel_y = 0 + pixel_x = 29 }, /turf/open/floor/plasteel/yellow/side{ tag = "icon-yellow (EAST)"; @@ -43382,8 +42936,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel/yellow/side{ tag = "icon-yellow (WEST)"; @@ -43396,8 +42949,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel{ @@ -43415,8 +42967,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ d2 = 8; @@ -43783,7 +43334,6 @@ "bAl" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel{ @@ -43989,7 +43539,6 @@ /obj/machinery/camera{ c_tag = "Engineering Lobby West"; dir = 4; - icon_state = "camera"; network = list("SS13","CE") }, /obj/machinery/newscaster{ @@ -44003,8 +43552,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; @@ -44067,8 +43615,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -44085,8 +43632,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -44106,8 +43652,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -44127,8 +43672,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -44143,8 +43687,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/airalarm{ frequency = 1439; @@ -44264,8 +43807,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ dir = 8; @@ -44281,8 +43823,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -44296,8 +43837,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ d2 = 8; @@ -44320,8 +43860,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -44333,8 +43872,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel{ @@ -44355,7 +43893,6 @@ /area/security/checkpoint/engineering) "bBc" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -44412,7 +43949,6 @@ /obj/machinery/camera{ c_tag = "Medbay Lobby"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/white{ @@ -44433,7 +43969,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/white{ @@ -44740,8 +44275,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 2; @@ -44800,8 +44334,7 @@ /obj/structure/cable/yellow{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -44812,8 +44345,7 @@ /obj/structure/cable/yellow{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -44824,14 +44356,12 @@ /obj/structure/cable/yellow{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -44842,8 +44372,7 @@ /obj/structure/cable/yellow{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable/yellow{ d1 = 2; @@ -44860,8 +44389,7 @@ /obj/structure/cable/yellow{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -44911,7 +44439,6 @@ /obj/machinery/camera{ c_tag = "Engineering Lobby East"; dir = 4; - icon_state = "camera"; network = list("SS13","CE") }, /turf/open/floor/plasteel/yellow/side{ @@ -44957,8 +44484,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -44986,14 +44512,12 @@ /obj/machinery/recharger, /obj/machinery/camera{ c_tag = "Engineering Security Checkpoint"; - dir = 9; - icon_state = "camera" + dir = 9 }, /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/machinery/light{ dir = 4 @@ -45157,9 +44681,7 @@ /obj/machinery/camera{ c_tag = "Cloning"; dir = 10; - icon_state = "camera"; - network = list("SS13","CMO"); - tag = "icon-camera (SOUTHWEST)" + network = list("SS13","CMO") }, /obj/structure/cable/orange{ d1 = 1; @@ -45297,8 +44819,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 @@ -45391,13 +44912,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/camera{ c_tag = "SM South"; dir = 1; - icon_state = "camera"; network = list("SS13","CE") }, /turf/open/floor/engine{ @@ -45479,8 +44998,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/door/airlock/glass_security{ name = "Prisoner Processing"; @@ -45544,7 +45062,6 @@ /obj/machinery/camera{ c_tag = "Medbay Asteroid Hallway 2"; dir = 8; - icon_state = "camera"; network = list("SS13","QM") }, /turf/open/floor/plasteel/neutral/corner{ @@ -45685,8 +45202,7 @@ }, /obj/machinery/camera{ c_tag = "Medbay South"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -45884,7 +45400,6 @@ /obj/machinery/camera{ c_tag = "Hydroponics Bee Reserve South"; dir = 5; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/grass{ @@ -45960,8 +45475,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel{ @@ -46044,8 +45558,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/cable{ icon_state = "0-2"; @@ -46133,8 +45646,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ d2 = 8; @@ -46165,7 +45677,6 @@ "bEo" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/filingcabinet, @@ -46605,8 +46116,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -46661,8 +46171,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -46926,8 +46435,7 @@ department = "Chemistry"; departmentType = 2; name = "Chemistry RC"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /mob/living/simple_animal/bot/cleanbot{ name = "Na2CO3" @@ -47189,7 +46697,6 @@ "bGh" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/light{ @@ -47309,9 +46816,7 @@ /area/library) "bGs" = ( /obj/structure/table/wood, -/obj/item/device/taperecorder{ - pixel_y = 0 - }, +/obj/item/device/taperecorder, /obj/item/device/camera, /obj/item/device/radio/intercom{ pixel_y = 25 @@ -47472,7 +46977,6 @@ /obj/machinery/camera{ c_tag = "Atmospherics North-West"; dir = 4; - icon_state = "camera"; network = list("SS13","CE") }, /turf/open/floor/plasteel{ @@ -47500,8 +47004,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; @@ -47567,8 +47070,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ dir = 4; @@ -47583,8 +47085,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -47600,8 +47101,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -47626,8 +47126,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -47649,8 +47148,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/yellow/side{ tag = "icon-yellow (WEST)"; @@ -47670,8 +47168,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 1; @@ -47690,8 +47187,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -47704,8 +47200,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; @@ -47723,8 +47218,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; @@ -47747,8 +47241,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel{ @@ -47766,8 +47259,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable/yellow{ d1 = 1; @@ -47789,8 +47281,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -47807,8 +47298,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel{ @@ -47823,8 +47313,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel{ @@ -47841,8 +47330,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/yellow/side{ tag = "icon-yellow (EAST)"; @@ -47860,8 +47348,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -47880,8 +47367,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -47901,8 +47387,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 @@ -48115,8 +47600,7 @@ dir = 1 }, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -48134,8 +47618,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -48338,8 +47821,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -48584,8 +48066,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -48600,8 +48081,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/holopad, /turf/open/floor/plasteel{ @@ -48773,9 +48253,7 @@ /obj/machinery/camera{ c_tag = "Chemistry"; dir = 10; - icon_state = "camera"; - network = list("SS13","CMO"); - tag = "icon-camera (SOUTHWEST)" + network = list("SS13","CMO") }, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -48890,8 +48368,7 @@ department = "Genetics"; departmentType = 0; name = "Genetics Requests Console"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -49143,7 +48620,6 @@ /obj/machinery/camera{ c_tag = "Atmospherics Storage"; dir = 4; - icon_state = "camera"; network = list("SS13","CE") }, /obj/machinery/portable_atmospherics/scrubber, @@ -49224,7 +48700,6 @@ /obj/machinery/camera{ c_tag = "Engineering West"; dir = 4; - icon_state = "camera"; network = list("SS13","CE") }, /obj/machinery/vending/tool, @@ -49255,8 +48730,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/item/clothing/gloves/color/yellow, /turf/open/floor/plasteel{ @@ -49287,8 +48761,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel{ @@ -49329,7 +48802,6 @@ /obj/machinery/camera{ c_tag = "Engineering East"; dir = 9; - icon_state = "camera"; network = list("SS13","CE") }, /turf/open/floor/plasteel/yellow/side{ @@ -49430,9 +48902,7 @@ "bKe" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/disposalpipe/segment{ dir = 8; @@ -49703,13 +49173,11 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/camera{ c_tag = "Atmospherics North"; dir = 9; - icon_state = "camera"; network = list("SS13","CE") }, /obj/structure/closet/secure_closet/atmospherics, @@ -49772,8 +49240,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/yellow/side{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -50051,9 +49518,7 @@ /obj/machinery/camera{ c_tag = "Genetics"; dir = 10; - icon_state = "camera"; - network = list("SS13","CMO"); - tag = "icon-camera (SOUTHWEST)" + network = list("SS13","CMO") }, /turf/open/floor/plasteel/whitepurple/side{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -50264,8 +49729,7 @@ }, /obj/machinery/camera{ c_tag = "Service Asteroid Hallway 4"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -50273,9 +49737,7 @@ /area/hallway/primary/port) "bLF" = ( /obj/structure/table/wood, -/obj/machinery/computer/libraryconsole/bookmanagement{ - pixel_y = 0 - }, +/obj/machinery/computer/libraryconsole/bookmanagement, /obj/machinery/light_switch{ pixel_y = 28 }, @@ -50369,15 +49831,13 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/requests_console{ department = "Atmospherics"; departmentType = 4; name = "Atmos RC"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/structure/closet/secure_closet/atmospherics, /obj/item/weapon/pickaxe/mini, @@ -50393,7 +49853,6 @@ /obj/machinery/camera{ c_tag = "Atmospherics Airlock"; dir = 5; - icon_state = "camera"; network = list("SS13","CE") }, /turf/open/floor/plasteel{ @@ -50462,8 +49921,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "ceoffice" @@ -50490,8 +49948,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/poddoor/shutters/preopen{ id = "ceoffice" @@ -50539,7 +49996,6 @@ /obj/machinery/camera{ c_tag = "Engineering South"; dir = 1; - icon_state = "camera"; network = list("SS13","CE") }, /obj/item/device/radio/intercom{ @@ -50555,8 +50011,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -50664,7 +50119,6 @@ /obj/machinery/camera{ c_tag = "Gravity Generator Airlock"; dir = 1; - icon_state = "camera"; network = list("SS13","CE") }, /turf/open/floor/plasteel/black{ @@ -50690,8 +50144,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -50704,8 +50157,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/engineering{ cyclelinkeddir = null; @@ -50726,13 +50178,11 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/camera{ c_tag = "Gravity Generator"; dir = 1; - icon_state = "camera"; network = list("SS13","CE") }, /turf/open/floor/plasteel/black{ @@ -50749,8 +50199,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -50768,8 +50217,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -50873,8 +50321,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -51045,7 +50492,6 @@ /obj/machinery/camera{ c_tag = "Medbay Storage"; dir = 10; - icon_state = "camera"; network = list("SS13","CMO") }, /turf/open/floor/plasteel/white{ @@ -51257,8 +50703,7 @@ "bNj" = ( /obj/machinery/camera{ c_tag = "Library East"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -51334,8 +50779,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/light{ dir = 4; @@ -51401,8 +50845,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -51419,8 +50862,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/yellow{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -51719,8 +51161,7 @@ /obj/structure/table/wood, /obj/machinery/camera{ c_tag = "Library West"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -51971,8 +51412,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/firealarm{ pixel_y = 24 @@ -51999,8 +51439,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -52016,8 +51455,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -52034,8 +51472,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/yellow/side{ @@ -52049,8 +51486,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/table, /turf/open/floor/plasteel/yellow/side{ @@ -52069,8 +51505,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/yellow/side{ @@ -52089,8 +51524,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/sign/electricshock{ pixel_y = 32 @@ -52104,8 +51538,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ icon_state = "0-4"; @@ -52120,8 +51553,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ icon_state = "0-4"; @@ -52139,8 +51571,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ icon_state = "0-4"; @@ -52168,8 +51599,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -52193,8 +51623,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -52234,8 +51663,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -52648,7 +52076,6 @@ /obj/machinery/suit_storage_unit/ce, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/neutral{ @@ -52660,8 +52087,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -52701,8 +52127,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -53143,7 +52568,6 @@ /obj/machinery/camera{ c_tag = "Atmospheric Tanks 2"; dir = 5; - icon_state = "camera"; network = list("SS13","CE") }, /turf/open/floor/plasteel/black{ @@ -53274,8 +52698,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -53323,7 +52746,6 @@ "bQK" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/structure/disposalpipe/segment{ @@ -53332,7 +52754,6 @@ /obj/machinery/camera{ c_tag = "Engineering Power Storage"; dir = 1; - icon_state = "camera"; network = list("SS13","CE") }, /turf/open/floor/plasteel{ @@ -53399,8 +52820,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -53795,7 +53215,6 @@ /obj/machinery/camera{ c_tag = "Engineering Power Storage 2"; dir = 1; - icon_state = "camera"; network = list("SS13","CE") }, /obj/structure/cable{ @@ -53906,7 +53325,6 @@ /obj/machinery/camera{ c_tag = "Medbay Asteroid Hallway 1"; dir = 8; - icon_state = "camera"; network = list("SS13","QM") }, /turf/open/floor/plasteel/neutral/corner{ @@ -54033,8 +53451,7 @@ /area/crew_quarters/fitness) "bSb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -54206,8 +53623,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -54332,7 +53748,6 @@ /obj/machinery/camera{ c_tag = "Fitness South"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -54424,8 +53839,7 @@ "bSU" = ( /obj/machinery/camera{ c_tag = "Library Explicits"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/plasteel/grimy{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -54568,8 +53982,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -54820,7 +54233,6 @@ /obj/machinery/camera{ c_tag = "Atmospherics Distro"; dir = 9; - icon_state = "camera"; network = list("SS13","CE") }, /turf/open/floor/plasteel{ @@ -54912,7 +54324,6 @@ "bTT" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel/freezer{ @@ -54940,13 +54351,10 @@ "bTW" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/structure/mirror{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -55074,9 +54482,7 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -55484,8 +54890,7 @@ "bVb" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -55585,7 +54990,6 @@ /obj/machinery/camera{ c_tag = "Fitness Bathrooms"; dir = 4; - icon_state = "camera"; network = list("SS13","CE") }, /obj/machinery/atmospherics/components/unary/vent_pump{ @@ -55632,8 +55036,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -55853,8 +55256,7 @@ "bVD" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, @@ -55947,8 +55349,7 @@ "bVK" = ( /obj/machinery/camera{ c_tag = "Chapel West"; - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/open/floor/plasteel/chapel{ tag = "icon-chapel (NORTH)"; @@ -56076,7 +55477,6 @@ /obj/machinery/camera{ c_tag = "Atmospheric Tanks 1"; dir = 1; - icon_state = "camera"; network = list("SS13","CE") }, /obj/machinery/atmospherics/pipe/manifold/cyan/visible, @@ -56175,8 +55575,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ c_tag = "Service Asteroid Hallway 5"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -56417,8 +55816,7 @@ "bWL" = ( /obj/machinery/camera{ c_tag = "Chapel East"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/plasteel/grimy{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -57776,8 +57174,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ c_tag = "Chapel Office"; - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/open/floor/plasteel/grimy{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -57923,8 +57320,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -57937,8 +57333,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance/external{ @@ -58157,8 +57552,7 @@ /obj/structure/closet/coffin, /obj/machinery/camera{ c_tag = "Chapel Coffins"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -58449,7 +57843,6 @@ /obj/machinery/camera{ c_tag = "Holodeck South"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /obj/structure/closet/lasertag/blue, @@ -58549,8 +57942,7 @@ }, /obj/machinery/camera{ c_tag = "Service Asteroid Hallway 6"; - dir = 4; - icon_state = "camera" + dir = 4 }, /obj/structure/extinguisher_cabinet{ pixel_x = -24 @@ -58569,8 +57961,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -58763,8 +58154,7 @@ "cbA" = ( /obj/machinery/camera{ c_tag = "Crematorium"; - dir = 9; - icon_state = "camera" + dir = 9 }, /obj/item/device/radio/intercom{ broadcasting = 0; @@ -58995,8 +58385,7 @@ }) "cbZ" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 @@ -59020,8 +58409,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -59077,8 +58465,7 @@ "ccf" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -59159,8 +58546,7 @@ }) "ccl" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/grille, @@ -59362,8 +58748,7 @@ }, /obj/machinery/camera{ c_tag = "Docking Atmospherics Checkpoint"; - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -59371,8 +58756,7 @@ /area/hallway/primary/starboard/aft) "ccI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -59463,8 +58847,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /obj/structure/cable{ icon_state = "1-2" @@ -59528,8 +58911,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Service-Research Bridge"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -59695,8 +59077,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 16"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -59708,8 +59089,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -59719,8 +59099,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 @@ -59738,8 +59117,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -59839,8 +59217,7 @@ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -59929,8 +59306,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ cyclelinkeddir = 4; @@ -59946,8 +59322,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -59957,8 +59332,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/external{ cyclelinkeddir = 8; @@ -59974,8 +59348,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; @@ -60143,8 +59516,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel, /area/storage/tech) @@ -60283,8 +59655,7 @@ /obj/structure/chair, /obj/machinery/camera{ c_tag = "Docking Security Holding Area"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -60342,8 +59713,7 @@ }) "cew" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -60461,8 +59831,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel, /area/storage/tech) @@ -60663,8 +60032,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -60847,8 +60215,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -61132,9 +60499,7 @@ height = 9; width = 9 }, -/obj/machinery/computer/auxillary_base{ - pixel_y = 0 - }, +/obj/machinery/computer/auxillary_base, /obj/docking_port/stationary/public_mining_dock, /turf/closed/wall{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -61250,8 +60615,7 @@ "cgr" = ( /obj/machinery/camera{ c_tag = "Arrivals SMES"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -61392,8 +60756,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -61646,8 +61009,7 @@ "chf" = ( /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/escape{ tag = "icon-escape (NORTHWEST)"; @@ -61768,8 +61130,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/camera{ c_tag = "Research Asteroid Hallway 1"; - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (NORTH)"; @@ -61830,8 +61191,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/effect/landmark/blobstart, /turf/open/floor/plating{ @@ -61920,8 +61280,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -62119,8 +61478,7 @@ }, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/circuit{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -62240,8 +61598,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -62324,8 +61681,7 @@ /area/hallway/primary/aft) "civ" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; @@ -62348,8 +61704,7 @@ }, /obj/machinery/camera{ c_tag = "Research Atmospherics Checkpoint"; - dir = 5; - icon_state = "camera" + dir = 5 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -62428,7 +61783,6 @@ /obj/item/clothing/glasses/meson, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plating{ @@ -62525,8 +61879,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 15"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -62614,8 +61967,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Departures APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable/orange{ d2 = 8; @@ -62774,9 +62126,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/cloning{ - pixel_x = 0 - }, +/obj/item/weapon/circuitboard/computer/cloning, /obj/item/weapon/circuitboard/computer/med_data{ pixel_x = 3; pixel_y = -3 @@ -62989,8 +62339,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -63079,14 +62428,12 @@ }, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 6"; - dir = 4; - icon_state = "camera" + dir = 4 }, /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel/escape{ tag = "icon-escape (WEST)"; @@ -63158,8 +62505,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/door/airlock/atmos{ name = "Research Atmospherics Checkpoint"; @@ -63257,15 +62603,13 @@ }, /obj/machinery/camera{ c_tag = "Aux Base Construction"; - dir = 6; - icon_state = "camera" + dir = 6 }, /obj/machinery/computer/camera_advanced/base_construction, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -63278,8 +62622,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -63384,8 +62727,7 @@ /obj/machinery/power/apc{ dir = 4; name = "AI Upload APC"; - pixel_x = 26; - pixel_y = 0 + pixel_x = 26 }, /obj/structure/cable{ d2 = 8; @@ -63464,12 +62806,10 @@ /obj/machinery/camera{ c_tag = "Docking Quantum Pad"; dir = 8; - icon_state = "camera"; network = list("SS13","QM") }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -63538,8 +62878,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -63553,8 +62892,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -63819,8 +63157,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -63832,8 +63169,7 @@ icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -64114,8 +63450,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/structure/table, /obj/item/device/multitool, @@ -64281,8 +63616,7 @@ }, /obj/machinery/camera{ c_tag = "Teleporter"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -64412,8 +63746,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -64584,8 +63917,7 @@ /obj/machinery/computer/card, /obj/machinery/camera{ c_tag = "Docking Security Checkpoint"; - dir = 6; - icon_state = "camera" + dir = 6 }, /obj/item/device/radio/intercom{ broadcasting = 0; @@ -64812,8 +64144,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (NORTH)"; @@ -64829,8 +64160,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/sign/map/left/ceres{ pixel_y = 32 @@ -64849,8 +64179,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/camera{ c_tag = "Research Asteroid Hallway 2" @@ -64869,8 +64198,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -64893,8 +64221,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/item/device/radio/intercom{ broadcasting = 0; @@ -64915,8 +64242,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (NORTH)"; @@ -64932,8 +64258,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/light{ dir = 1 @@ -64952,8 +64277,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ @@ -64972,8 +64296,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/neutral/corner{ @@ -64990,8 +64313,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/camera{ c_tag = "Research Asteroid Hallway 3" @@ -65007,8 +64329,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -65476,8 +64797,7 @@ }, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 1"; - dir = 6; - icon_state = "camera" + dir = 6 }, /obj/structure/extinguisher_cabinet{ pixel_y = 32 @@ -65564,8 +64884,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -65802,8 +65121,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -65936,7 +65254,6 @@ "cos" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel{ @@ -66223,8 +65540,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -66241,8 +65557,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -66258,8 +65573,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -66274,14 +65588,12 @@ /obj/machinery/camera{ c_tag = "Research-Docking Bridge 1"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/engine, /area/hallway/secondary/bridges/sci_dock) @@ -66493,8 +65805,7 @@ /obj/structure/disposalpipe/trunk, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 5"; - dir = 6; - icon_state = "camera" + dir = 6 }, /obj/structure/sign/map/left/ceres{ pixel_y = 32 @@ -66757,8 +66068,7 @@ }, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 2"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/arrival/corner{ tag = "icon-arrivalcorner (NORTH)"; @@ -66828,8 +66138,7 @@ }, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 3"; - dir = 6; - icon_state = "camera" + dir = 6 }, /obj/item/device/radio/intercom{ broadcasting = 0; @@ -67012,8 +66321,7 @@ }, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 4"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/red/corner{ tag = "icon-redcorner (EAST)"; @@ -67454,7 +66762,6 @@ /obj/machinery/camera{ c_tag = "Science SMES"; dir = 8; - icon_state = "camera"; network = list("SS13","QM") }, /obj/effect/turf_decal/stripes/line{ @@ -67747,8 +67054,7 @@ /area/science/mixing) "crn" = ( /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /obj/machinery/light{ dir = 4; @@ -67873,12 +67179,10 @@ "crC" = ( /obj/item/weapon/folder/white, /obj/item/weapon/disk/tech_disk{ - pixel_x = 0; - pixel_y = 0 + pixel_x = 0 }, /obj/item/weapon/disk/tech_disk{ - pixel_x = 0; - pixel_y = 0 + pixel_x = 0 }, /obj/item/weapon/disk/design_disk, /obj/item/weapon/disk/design_disk, @@ -68158,7 +67462,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/arrival{ @@ -68440,8 +67743,7 @@ department = "Science"; departmentType = 2; name = "Science Requests Console"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -68612,8 +67914,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/whitepurple/side{ tag = "icon-whitepurple (EAST)"; @@ -68961,7 +68262,6 @@ /obj/machinery/camera{ c_tag = "Toxins Mixing"; dir = 9; - icon_state = "camera"; network = list("SS13","RD") }, /obj/structure/closet/bombcloset, @@ -69292,7 +68592,6 @@ /obj/machinery/portable_atmospherics/canister, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel/whitepurple/side{ @@ -69671,8 +68970,7 @@ dir = 10 }, /obj/structure/extinguisher_cabinet{ - pixel_x = 27; - pixel_y = 0 + pixel_x = 27 }, /turf/open/floor/plasteel/whitepurple/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -70643,8 +69941,7 @@ }, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 13"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -70663,8 +69960,7 @@ }, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 11"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -70712,8 +70008,7 @@ }, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 9"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -70727,8 +70022,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 7"; - dir = 4; - icon_state = "camera" + dir = 4 }, /obj/structure/cable/orange{ d1 = 1; @@ -70811,12 +70105,8 @@ /obj/item/device/transfer_valve{ pixel_x = -5 }, -/obj/item/device/transfer_valve{ - pixel_x = 0 - }, -/obj/item/device/transfer_valve{ - pixel_x = 0 - }, +/obj/item/device/transfer_valve, +/obj/item/device/transfer_valve, /obj/item/device/transfer_valve{ pixel_x = 5 }, @@ -70842,8 +70132,7 @@ pixel_y = -4 }, /obj/item/device/assembly/timer{ - pixel_x = 0; - pixel_y = 0 + pixel_x = 0 }, /obj/structure/table/reinforced, /turf/open/floor/plasteel/whitepurple/side{ @@ -70923,7 +70212,6 @@ /obj/machinery/camera{ c_tag = "Research Western Wing"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/white{ @@ -70979,7 +70267,6 @@ /obj/machinery/camera{ c_tag = "Research Eastern Wing"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/white{ @@ -71037,7 +70324,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel/white{ @@ -71100,7 +70386,6 @@ /obj/machinery/camera{ c_tag = "Xenobiology 1"; dir = 6; - icon_state = "camera"; network = list("SS13","RD") }, /turf/open/floor/plasteel/white{ @@ -71402,7 +70687,6 @@ /obj/machinery/camera{ c_tag = "Research Xenobiology-Testing Airlock"; dir = 9; - icon_state = "camera"; network = list("SS13","RD") }, /turf/open/floor/plasteel/white{ @@ -71933,8 +71217,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -71992,7 +71275,6 @@ /obj/machinery/camera{ c_tag = "Xenobiology 2"; dir = 1; - icon_state = "camera"; network = list("SS13","RD") }, /turf/open/floor/plasteel/white{ @@ -72007,8 +71289,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -72026,7 +71307,6 @@ }, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel{ @@ -72078,7 +71358,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel{ @@ -72094,8 +71373,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /obj/structure/cable/orange{ d1 = 1; @@ -72197,7 +71475,6 @@ /obj/machinery/camera{ c_tag = "Research Treatment Center"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /obj/item/clothing/neck/stethoscope, @@ -72268,7 +71545,6 @@ "cyT" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/cable/orange{ @@ -72564,7 +71840,6 @@ /obj/machinery/camera{ c_tag = "Research Server Room"; dir = 1; - icon_state = "camera"; network = list("SS13","RD") }, /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ @@ -72627,7 +71902,6 @@ /obj/machinery/camera{ c_tag = "Research Security Checkpoint"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/red/side{ @@ -73203,7 +72477,6 @@ /obj/machinery/camera{ c_tag = "Research Director's Office"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/cafeteria{ @@ -73254,7 +72527,6 @@ "cAx" = ( /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /obj/structure/table, @@ -73276,7 +72548,6 @@ /obj/machinery/camera{ c_tag = "Xenobiology Killroom"; dir = 1; - icon_state = "camera"; network = list("SS13","RD") }, /turf/open/floor/circuit{ @@ -73569,8 +72840,7 @@ /obj/structure/closet/emcloset, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 14"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -73607,8 +72877,7 @@ }, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 12"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -73618,8 +72887,7 @@ /obj/structure/closet/emcloset, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 10"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -73649,8 +72917,7 @@ }, /obj/machinery/camera{ c_tag = "Docking Asteroid Hall 8"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -73728,7 +72995,6 @@ /obj/machinery/camera{ c_tag = "Testing Lab"; dir = 9; - icon_state = "camera"; network = list("SS13","RD") }, /turf/open/floor/plasteel{ @@ -73989,7 +73255,6 @@ /obj/machinery/camera{ c_tag = "Research Testing Containment"; dir = 9; - icon_state = "camera"; network = list("SS13","RD") }, /turf/open/floor/plating{ @@ -75602,8 +74867,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=Medbay2"; @@ -75694,8 +74958,7 @@ /area/engine/engineering) "cFx" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/closet/secure_closet/medical3, /turf/open/floor/plasteel/white{ @@ -75839,8 +75102,7 @@ /obj/structure/sign/securearea{ desc = "A warning sign which reads 'WARNING: FUN-SIZED JUSTICE'."; name = "WARNING: FUN-SIZED JUSTICE"; - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -76240,8 +75502,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /obj/effect/landmark/start/station_engineer, /turf/open/floor/plasteel{ @@ -76386,8 +75647,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -76780,7 +76040,6 @@ /obj/machinery/camera{ c_tag = "Brig Lobby East"; dir = 9; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel/red/side{ @@ -76802,7 +76061,6 @@ /obj/machinery/camera{ c_tag = "Brig Holding Cell"; dir = 9; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plasteel/floorgrime{ @@ -77042,8 +76300,7 @@ }, /obj/machinery/camera{ c_tag = "Command Asteroid Hall 3"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/red/corner{ icon_state = "redcorner"; @@ -77300,8 +76557,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; @@ -77806,8 +77062,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -77828,8 +77083,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -77977,8 +77231,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral/corner{ @@ -78001,8 +77254,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/engine, /area/hallway/secondary/bridges/sci_dock) @@ -78262,8 +77514,7 @@ /obj/structure/flora/tree/palm, /obj/machinery/camera{ c_tag = "Genetics Monkey Dome"; - dir = 9; - icon_state = "camera" + dir = 9 }, /turf/open/floor/grass{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -78542,7 +77793,6 @@ "cKR" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel{ @@ -78646,7 +77896,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel{ @@ -78802,13 +78051,11 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /obj/machinery/camera{ c_tag = "Cargo Hall West"; dir = 1; - icon_state = "camera"; network = list("SS13","QM") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -79045,8 +78292,7 @@ department = "Cargo Bay"; departmentType = 2; name = "Quartermaster RC"; - pixel_x = 30; - pixel_y = 0 + pixel_x = 30 }, /obj/structure/filingcabinet/chestdrawer, /turf/open/floor/plasteel/brown{ @@ -79107,7 +78353,6 @@ /obj/machinery/camera{ c_tag = "Quartermaster's Office"; dir = 1; - icon_state = "camera"; network = list("SS13","QM") }, /turf/open/floor/plasteel/brown{ @@ -79143,7 +78388,6 @@ }, /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel{ @@ -79341,7 +78585,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/structure/cable{ @@ -79410,7 +78653,6 @@ /obj/machinery/camera{ c_tag = "Service SMES"; dir = 6; - icon_state = "camera"; network = list("SS13","QM") }, /obj/structure/table, @@ -79671,8 +78913,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -79734,8 +78975,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/grille, /turf/open/floor/plating{ @@ -79763,8 +79003,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -79778,8 +79017,7 @@ }, /obj/machinery/camera{ c_tag = "Theatre Backstage"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -79807,8 +79045,7 @@ /obj/item/device/instrument/violin, /obj/machinery/camera{ c_tag = "Theatre Stage"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/plasteel/bar{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -80252,7 +79489,6 @@ /obj/machinery/camera{ c_tag = "Theatre"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, @@ -80404,8 +79640,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/junction{ icon_state = "pipe-j2"; @@ -80589,8 +79824,7 @@ department = "Chief Medical Officer's Desk"; departmentType = 5; name = "Chief Medical Officer RC"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/plasteel/barber{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -80808,7 +80042,6 @@ /area/medical/virology) "cPi" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -80898,8 +80131,7 @@ /obj/item/weapon/folder, /obj/machinery/camera{ c_tag = "Morgue North"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -81111,7 +80343,6 @@ /obj/machinery/camera{ c_tag = "Morgue South"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /obj/effect/landmark/revenantspawn, @@ -81123,7 +80354,6 @@ "cPO" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/plasteel/black{ @@ -81177,8 +80407,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -81288,8 +80517,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/disposalpipe/junction{ icon_state = "pipe-j1"; @@ -81349,8 +80577,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/structure/cable{ d1 = 2; @@ -81512,8 +80739,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -81820,7 +81046,6 @@ /obj/machinery/camera{ c_tag = "Aux Base Construction North"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/plating{ @@ -81887,8 +81112,7 @@ "cRB" = ( /obj/machinery/camera{ c_tag = "Aux Base Construction South"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -81967,8 +81191,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -82017,8 +81240,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -82196,7 +81418,6 @@ "cSk" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel{ @@ -82217,7 +81438,6 @@ /obj/machinery/camera{ c_tag = "Toxins Storage"; dir = 9; - icon_state = "camera"; network = list("SS13","RD") }, /obj/machinery/atmospherics/components/unary/vent_scrubber{ @@ -82425,8 +81645,7 @@ department = "Research Director's Desk"; departmentType = 5; name = "Research Director RC"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -82517,7 +81736,6 @@ "cSO" = ( /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /obj/machinery/keycard_auth{ @@ -82737,7 +81955,6 @@ "cTl" = ( /obj/machinery/airalarm{ dir = 1; - icon_state = "alarm0"; pixel_y = -22 }, /turf/open/floor/circuit{ @@ -83234,8 +82451,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -83258,8 +82474,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -83321,8 +82536,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -83358,8 +82572,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -83370,8 +82583,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -83405,8 +82617,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plating{ @@ -83421,8 +82632,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -83435,8 +82645,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -83486,8 +82695,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -83545,8 +82753,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -83559,8 +82766,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -83575,8 +82781,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -83586,7 +82791,6 @@ /obj/machinery/airalarm{ desc = "This particular atmos control unit appears to have no access restrictions."; dir = 8; - icon_state = "alarm0"; locked = 0; name = "all-access air alarm"; pixel_x = 24; @@ -83626,8 +82830,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -83828,8 +83031,7 @@ dir = 8 }, /obj/structure/sign/fire{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) @@ -83847,8 +83049,7 @@ on = 1 }, /obj/structure/sign/fire{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/machinery/doorButtons/access_button{ idSelf = "incinerator_access_control"; @@ -83972,8 +83173,7 @@ /area/maintenance/disposal/incinerator) "cVu" = ( /obj/structure/sign/fire{ - pixel_x = 0; - pixel_y = 0 + pixel_x = 0 }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) @@ -84101,9 +83301,7 @@ /obj/machinery/camera{ c_tag = "Brig Perma Cell 1"; dir = 10; - icon_state = "camera"; - network = list("SS13","Security","PrisonCell"); - tag = "icon-camera (SOUTHWEST)" + network = list("SS13","Security","PrisonCell") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -84295,8 +83493,7 @@ /obj/machinery/door_timer{ id = "Cell 7"; name = "Cell 7"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -84485,8 +83682,7 @@ "cWl" = ( /obj/machinery/camera{ c_tag = "Command-Service Bridge"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/engine, /area/hallway/secondary/bridges/com_serv) @@ -84549,8 +83745,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/engine, /area/hallway/secondary/bridges/com_serv) @@ -84585,8 +83780,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/camera{ c_tag = "Medbay-Cargo Bridge"; - dir = 4; - icon_state = "camera" + dir = 4 }, /obj/structure/cable{ icon_state = "1-2" @@ -84618,8 +83812,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/closed/wall/r_wall, /area/hallway/secondary/bridges/serv_engi) @@ -84692,8 +83885,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/engine, /area/hallway/secondary/bridges/serv_engi) @@ -84705,8 +83897,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/engine, /area/hallway/secondary/bridges/serv_engi) @@ -84714,8 +83905,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -84727,8 +83917,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -84738,8 +83927,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/engine, /area/hallway/secondary/bridges/engi_med) @@ -84751,8 +83939,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/engine, /area/hallway/secondary/bridges/engi_med) @@ -84844,8 +84031,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Docking-Medical Bridge APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable{ icon_state = "0-2"; @@ -84945,8 +84131,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/plasteel/neutral/corner{ icon_state = "neutralcorner"; @@ -84961,14 +84146,12 @@ /obj/machinery/camera{ c_tag = "Research-Docking Bridge 5"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/engine, /area/hallway/secondary/bridges/sci_dock) @@ -84979,14 +84162,12 @@ /obj/machinery/camera{ c_tag = "Research-Docking Bridge 2"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_x = 0 + icon_state = "4-8" }, /turf/open/floor/engine, /area/hallway/secondary/bridges/sci_dock) @@ -85003,7 +84184,6 @@ /obj/machinery/camera{ c_tag = "Research-Docking Bridge 3"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/engine, @@ -85015,7 +84195,6 @@ /obj/machinery/camera{ c_tag = "Research-Docking Bridge 4"; dir = 1; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/engine, @@ -85032,8 +84211,7 @@ "cXu" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/grille, /obj/structure/cable{ @@ -85057,23 +84235,20 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/grille, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/space, /area/hallway/secondary/bridges/cargo_ai) "cXw" = ( /obj/structure/lattice/catwalk, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/grille, /obj/structure/window/reinforced{ @@ -85121,8 +84296,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/closed/wall/r_wall, /area/hallway/secondary/bridges/cargo_ai) @@ -85296,8 +84470,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Command-Engineering Bridge APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable{ icon_state = "0-2"; @@ -85310,8 +84483,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/engine, /area/hallway/secondary/bridges/com_engi) @@ -85324,8 +84496,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; @@ -85338,8 +84509,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /turf/open/floor/plasteel/neutral/corner{ tag = "icon-neutralcorner (EAST)"; @@ -85532,8 +84702,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -85975,8 +85144,7 @@ "cZj" = ( /obj/structure/table, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/floor/plasteel/black, /area/shuttle/escape) @@ -86054,8 +85222,7 @@ "cZu" = ( /obj/machinery/computer/communications, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /turf/open/floor/plasteel/black, /area/shuttle/escape) @@ -86172,8 +85339,7 @@ /area/shuttle/escape) "cZH" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced, /turf/open/floor/plasteel/black, @@ -86927,8 +86093,7 @@ /area/shuttle/escape) "dbz" = ( /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/structure/window/reinforced{ dir = 1; @@ -86975,8 +86140,7 @@ "dbC" = ( /obj/structure/table, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/item/weapon/circular_saw, /obj/item/weapon/scalpel{ @@ -87011,8 +86175,7 @@ "dbG" = ( /obj/structure/table, /obj/structure/window/reinforced{ - dir = 4; - pixel_x = 0 + dir = 4 }, /obj/item/clothing/suit/apron/surgical, /obj/item/clothing/gloves/color/latex, @@ -87130,7 +86293,6 @@ /area/shuttle/escape) "dbU" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -87401,7 +86563,6 @@ /obj/machinery/camera{ c_tag = "Hydroponics Bee Reserve North"; dir = 9; - icon_state = "camera"; network = list("SS13") }, /turf/open/floor/grass{ @@ -87410,7 +86571,6 @@ /area/hydroponics) "dcG" = ( /obj/structure/sink{ - icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2 @@ -87603,9 +86763,7 @@ "dda" = ( /obj/structure/sink{ dir = 4; - icon_state = "sink"; - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 @@ -87837,8 +86995,7 @@ /obj/structure/cable{ d1 = 1; d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + icon_state = "1-2" }, /obj/structure/closet/secure_closet/atmospherics, /obj/item/weapon/pickaxe/mini, @@ -88143,7 +87300,6 @@ /obj/machinery/camera{ c_tag = "Atmospherics Distro"; dir = 9; - icon_state = "camera"; network = list("SS13","CE") }, /turf/open/floor/plasteel/yellow/side{ @@ -88160,7 +87316,6 @@ /obj/machinery/camera{ c_tag = "Atmospherics South"; dir = 4; - icon_state = "camera"; network = list("SS13","CE") }, /obj/machinery/atmospherics/pipe/manifold/general/visible{ @@ -88363,7 +87518,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/airalarm{ dir = 8; - icon_state = "alarm0"; pixel_x = 24 }, /turf/open/floor/plasteel{ @@ -88751,8 +87905,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -90261,8 +89414,7 @@ /obj/structure/cable{ d1 = 4; d2 = 8; - icon_state = "4-8"; - pixel_y = 0 + icon_state = "4-8" }, /turf/open/space, /area/solar/asteroid/aft) @@ -90840,8 +89992,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Prisoner Transfer APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable/orange{ d2 = 8; @@ -91139,7 +90290,6 @@ /obj/machinery/camera{ c_tag = "Brig Labor Shuttle Dock North"; dir = 6; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel{ @@ -91255,8 +90405,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Labor Shuttle Dock APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable/orange{ d2 = 2; @@ -91300,9 +90449,7 @@ /obj/machinery/camera{ c_tag = "Brig Perma Wing 4"; dir = 10; - icon_state = "camera"; - network = list("SS13","Security"); - tag = "icon-camera (SOUTHWEST)" + network = list("SS13","Security") }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -91617,7 +90764,6 @@ /obj/machinery/camera{ c_tag = "Brig Perma North"; dir = 6; - icon_state = "camera"; network = list("SS13","Security","PrisonCell") }, /turf/open/floor/plating/asteroid, @@ -91675,8 +90821,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = 28; - pixel_y = 0 + pixel_x = 28 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -91732,7 +90877,6 @@ /obj/machinery/camera{ c_tag = "Brig Cell 7"; dir = 9; - icon_state = "camera"; network = list("SS13","Security","PrisonCell") }, /turf/open/floor/plasteel/floorgrime{ @@ -91743,7 +90887,6 @@ /obj/machinery/camera{ c_tag = "Brig Perma Wing 3"; dir = 4; - icon_state = "camera"; network = list("SS13","Security") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -92093,7 +91236,6 @@ /obj/machinery/camera{ c_tag = "Brig Labor Shuttle Dock main"; dir = 4; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel{ @@ -92460,7 +91602,6 @@ /obj/machinery/camera{ c_tag = "Brig Cell 8"; dir = 9; - icon_state = "camera"; network = list("SS13","Security","PrisonCell") }, /turf/open/floor/plasteel/floorgrime{ @@ -92534,8 +91675,7 @@ "don" = ( /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel{ @@ -92590,9 +91730,7 @@ /obj/machinery/camera{ c_tag = "Brig Cellblock North"; dir = 10; - icon_state = "camera"; - network = list("SS13","Security"); - tag = "icon-camera (SOUTHWEST)" + network = list("SS13","Security") }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -92625,7 +91763,6 @@ /obj/machinery/camera{ c_tag = "Brig Perma Middle 1"; dir = 4; - icon_state = "camera"; network = list("SS13","Security","PrisonCell") }, /turf/open/floor/plating/astplate{ @@ -92679,7 +91816,6 @@ /obj/machinery/camera{ c_tag = "Brig Labor Shuttle Dock South"; dir = 4; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel{ @@ -92857,8 +91993,7 @@ /obj/machinery/door_timer{ id = "Cell 8"; name = "Cell 8"; - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -92869,8 +92004,7 @@ "doU" = ( /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -92878,7 +92012,6 @@ /obj/machinery/camera{ c_tag = "Brig Perma Wing 2"; dir = 4; - icon_state = "camera"; network = list("SS13","Security") }, /obj/structure/cable/orange{ @@ -93056,8 +92189,7 @@ desc = "Used to watch the various criminals inside their cells."; name = "Cell Monitor"; network = list("PrisonCell"); - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -93452,8 +92584,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9; - pixel_y = 0 + dir = 9 }, /turf/open/floor/plasteel/darkred/side{ icon_state = "darkred"; @@ -93476,7 +92607,6 @@ /obj/machinery/camera{ c_tag = "Brig Cell 2"; dir = 4; - icon_state = "camera"; network = list("SS13","Security","PrisonCell") }, /turf/open/floor/plasteel/floorgrime{ @@ -93569,9 +92699,7 @@ /obj/machinery/camera{ c_tag = "Brig Perma Cell 4"; dir = 10; - icon_state = "camera"; - network = list("SS13","Security","PrisonCell"); - tag = "icon-camera (SOUTHWEST)" + network = list("SS13","Security","PrisonCell") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -93606,7 +92734,6 @@ /obj/machinery/camera{ c_tag = "Brig Perma Middle 2"; dir = 4; - icon_state = "camera"; network = list("SS13","Security","PrisonCell") }, /turf/open/floor/plating{ @@ -93690,9 +92817,7 @@ /obj/structure/rack, /obj/item/weapon/gun/energy/ionrifle, /obj/item/weapon/gun/energy/temperature/security, -/obj/item/clothing/suit/armor/laserproof{ - pixel_x = 0 - }, +/obj/item/clothing/suit/armor/laserproof, /obj/structure/window/reinforced{ dir = 1 }, @@ -93817,8 +92942,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Armory APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -94059,9 +93183,7 @@ pixel_x = -3; pixel_y = 3 }, -/obj/item/clothing/suit/armor/bulletproof{ - pixel_y = 0 - }, +/obj/item/clothing/suit/armor/bulletproof, /obj/item/clothing/suit/armor/bulletproof{ pixel_x = 3; pixel_y = -3 @@ -94267,7 +93389,6 @@ /obj/machinery/camera{ c_tag = "Brig Cell 1"; dir = 4; - icon_state = "camera"; network = list("SS13","Security","PrisonCell") }, /turf/open/floor/plasteel/floorgrime{ @@ -94328,7 +93449,6 @@ /obj/machinery/camera{ c_tag = "Brig Cell 10"; dir = 9; - icon_state = "camera"; network = list("SS13","Security","PrisonCell") }, /turf/open/floor/plasteel/floorgrime{ @@ -94339,7 +93459,6 @@ /obj/machinery/camera{ c_tag = "Brig Perma Wing 1"; dir = 4; - icon_state = "camera"; network = list("SS13","Security") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -94880,9 +93999,7 @@ /obj/machinery/camera{ c_tag = "Brig Perma Cell 6"; dir = 10; - icon_state = "camera"; - network = list("SS13","Security","PrisonCell"); - tag = "icon-camera (SOUTHWEST)" + network = list("SS13","Security","PrisonCell") }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -95185,7 +94302,6 @@ /obj/machinery/camera{ c_tag = "Brig Evidence Room"; dir = 6; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel/red/side{ @@ -95198,8 +94314,7 @@ "dth" = ( /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /turf/open/floor/plasteel/showroomfloor{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -95228,7 +94343,6 @@ /obj/machinery/camera{ c_tag = "Brig Control Room"; dir = 6; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel/showroomfloor{ @@ -95275,7 +94389,6 @@ /obj/machinery/camera{ c_tag = "Brig Medbay"; dir = 6; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel/whiteblue/side{ @@ -95305,7 +94418,6 @@ /obj/machinery/camera{ c_tag = "Brig Interrogation"; dir = 6; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel/black{ @@ -95365,7 +94477,6 @@ /obj/machinery/camera{ c_tag = "Brig Interrogation 2"; dir = 6; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel/black{ @@ -95449,9 +94560,7 @@ /area/crew_quarters/heads/hos) "dtF" = ( /obj/structure/table/wood, -/obj/item/device/taperecorder{ - pixel_y = 0 - }, +/obj/item/device/taperecorder, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -95621,8 +94730,7 @@ department = "Head of Security's Desk"; departmentType = 5; name = "Head of Security RC"; - pixel_x = -30; - pixel_y = 0 + pixel_x = -30 }, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -95723,9 +94831,7 @@ /area/security/brig) "duj" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ - pixel_x = 0 - }, +/obj/item/weapon/storage/firstaid/regular, /obj/item/weapon/storage/toolbox/mechanical, /obj/structure/reagent_dispensers/peppertank{ pixel_x = -32 @@ -96076,8 +95182,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Head of Security's Office APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable/orange{ d1 = 1; @@ -96099,7 +95204,6 @@ /obj/machinery/camera{ c_tag = "Head of Security's Office"; dir = 4; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/carpet, @@ -96508,7 +95612,6 @@ /obj/machinery/camera{ c_tag = "Brig Main East"; dir = 6; - icon_state = "camera"; network = list("SS13","Security") }, /turf/open/floor/plasteel/red/side{ @@ -96620,8 +95723,7 @@ broadcasting = 0; dir = 8; listening = 1; - name = "Station Intercom (Court)"; - pixel_x = 0 + name = "Station Intercom (Court)" }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -96702,8 +95804,7 @@ /obj/structure/closet/bombcloset, /obj/machinery/airalarm{ dir = 4; - pixel_x = -23; - pixel_y = 0 + pixel_x = -23 }, /obj/structure/cable/orange{ d1 = 1; @@ -97274,9 +96375,7 @@ /obj/machinery/camera{ c_tag = "Brig Equipment South"; dir = 10; - icon_state = "camera"; - network = list("SS13","Security"); - tag = "icon-camera (SOUTHWEST)" + network = list("SS13","Security") }, /turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -97308,8 +96407,7 @@ /obj/machinery/power/apc{ dir = 4; name = "Detective's Office APC"; - pixel_x = 24; - pixel_y = 0 + pixel_x = 24 }, /obj/structure/cable/orange{ d2 = 8; @@ -97782,7 +96880,6 @@ /obj/item/weapon/storage/briefcase, /obj/machinery/airalarm{ dir = 4; - icon_state = "alarm0"; pixel_x = -22 }, /turf/open/floor/plasteel/grimy{ @@ -97804,8 +96901,7 @@ "dyb" = ( /obj/machinery/camera{ c_tag = "Lawyer's Office"; - dir = 4; - icon_state = "camera" + dir = 4 }, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -98245,8 +97341,7 @@ }, /obj/machinery/camera{ c_tag = "Command Asteroid Hall 10"; - dir = 6; - icon_state = "camera" + dir = 6 }, /turf/open/floor/plasteel/red/corner{ icon_state = "redcorner"; @@ -98329,8 +97424,7 @@ /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -102764,8 +101858,8 @@ acU aei aeE aeS -dnl -dnI +dmS +dno aaa aaa aaa @@ -103021,8 +102115,8 @@ acU aej acU aeT -dnm -dnJ +dmS +dnp aaa aaa cFp @@ -103036,7 +102130,7 @@ cFp aaP drg drH -dsf +drH abV acj cFp @@ -103278,8 +102372,8 @@ acU aek aeF aeU -dnn -dnK +dmS +dnq aaa aaa cFp @@ -103293,7 +102387,7 @@ cFp aaP drh drI -dsg +drI aaP aaP cXs @@ -103548,8 +102642,8 @@ cFp cFp cFp aaP -dri -drJ +drh +drI aaP aaP cXs @@ -104562,7 +103656,7 @@ aan aan aan aeH -dmT +dmS dnp aaa aaa @@ -104819,7 +103913,7 @@ aan aan aaB aeG -dmU +dmS dnq aaa aaa @@ -105848,8 +104942,8 @@ aan aan aan aeX -dnr -dnL +dmS +dno cFp cFp cFp @@ -106105,8 +105199,8 @@ aan aan aan aeY -dns -dnM +dmS +dnp cFp cFp cFp @@ -106117,20 +105211,20 @@ abE deK deI dqB -dqP +dqD drl deI deL -dsE -dsZ -dtB +dro +dsj +dsj dtY -duy +dsj duW -dvw +dsj dvO -dwb -dwq +dsj +dsj dwE deL deI @@ -106362,8 +105456,8 @@ adO adO acG aeZ -dnt -dnN +dmS +dnq cFp cFp cFp @@ -106375,21 +105469,21 @@ deK dqn dqC dqQ -drm +dqS deK deL dsF dta -awz -awz -awz -awz -awz -awz -awz -awz -dwF -dxa +dta +dta +dta +dta +dta +dta +dta +dta +dsF +dvN deI dgh abW @@ -106632,11 +105726,11 @@ dpQ axE dqD dqR -drn +dqT drK dsh dsG -dtb +dta dtC dtZ duz @@ -106644,8 +105738,8 @@ duX dvx dvP dwc -awz -dwG +dta +dsF deL dxw dgh @@ -106892,19 +105986,19 @@ dqS deK deK deL -dsH -dtc +dsF +dta dtD dua -duA +duc duY -dvy -dvQ -dwd -awz -dwH +duY +duY +duY +dta +dsF deL -dxx +dtA deK abW cFp @@ -107149,8 +106243,8 @@ dqT deI drL deL -dsI -dtd +dsF +dta dtE dub duB @@ -107158,9 +106252,9 @@ duZ dvz dvR dwe -awz -dwI -dxb +dta +dsF +dsD deK deK abW @@ -107407,7 +106501,7 @@ deK dgq dsi dsJ -dte +dta axu duc duC @@ -107415,14 +106509,14 @@ dva dvA dvS dwf -awz -dwJ +dta +dsF deL deI dgh abW deK -dyF +drk deK deK deK @@ -107663,18 +106757,18 @@ dgh deK deL deL -dsK -awz +dsF +dta dtF -dud -duD -dvb +duc +duC +duc dvB dvT -dwg -awz +duc +dta dwK -dxc +dwE deL deI dgh @@ -107918,21 +107012,21 @@ dgh dgh dgh deL -drM +dro dsj dsL -awz +dta dtG -due -duE -dvc -dvC -dvU -dwh -awz +duc +duC +duc +dvB +duc +duc +dta dgh dxd -dxy +dwE deL dgh deK @@ -108176,22 +107270,22 @@ deI deL dro drN -dsk +dqV dsM awA awA duf aAp -dvd +duf aCz -dvV +duf awA awA -dwL +dsM dxe dxz -dxT -dyj +dwE +dsD deI aMu aOo @@ -108432,8 +107526,8 @@ deI dqF dqU drp -drO -dsl +dqV +dqX dsN awB axy @@ -108441,13 +107535,13 @@ dug duF dve dvD -dvW +dve dwi dwr -dwM +dsN dxf -dxA -dxU +dxe +dsF deL deI dgJ @@ -108689,7 +107783,7 @@ deL dgk dqV drq -drP +dqX dsm dsO awC @@ -108701,10 +107795,10 @@ dvE aDM dwj dws -dwN +dsO dxg -aBu -dxV +dqW +dsF aJL deI axE @@ -108960,9 +108054,9 @@ aFf avy avy dxh -aBu +dqW dxW -dyk +dvN deI dyG dgR @@ -109198,9 +108292,9 @@ abW abW dpn dpE -dpS -dqq -dqH +dpE +dpE +dpE dqX arn arn @@ -109217,8 +108311,8 @@ aFf avy avy dxi -aBu -dxX +dqW +dsF dgo deK deK @@ -109455,11 +108549,11 @@ cFp abW dpo dpF -cKJ -cKJ -cKJ -cKJ -cKJ +dpF +dpF +dpF +dpF +dpF arn auq dsP @@ -109473,9 +108567,9 @@ azc aFh aDM aHy -dxj -aBu -dxY +dxh +dqW +dsF deL deL deL @@ -109710,13 +108804,13 @@ cFp cFp cFp abW -dpp -dpG +dpo +dpF +dpT dpT -dqr dqI -dqY -drs +dpT +dpT arn dso avy @@ -109730,8 +108824,8 @@ azd aFf avy avy -aIF -aBu +dxh +dqW dgt dgp dgp @@ -109961,18 +109055,18 @@ dmb awG cFp awG -dnP +dmb awG cFp cFp abW abW -dpq -dpH +dpo +dpF dpU dqs -dqJ -dqZ +dqs +dqs drt drR aur @@ -109990,9 +109084,9 @@ dft aIG dxB ajc -dyl -aMw -aMw +dsj +dsj +dsj dyP aPS dhh @@ -110223,22 +109317,22 @@ awG atk akG doL -doZ +doL akI -dpI +dpF dfb dqt -dfi -dfi +dqt +dqt dfp arn arn arn awI dtI -azf +dtI aAt -aBu +dqW aCE aDO aFk @@ -110481,8 +109575,8 @@ dol doA doM dpa -dpr -cKJ +doM +dpF dfc cEv cEy @@ -110490,11 +109584,11 @@ cEy cEy cEy dsp -cKJ +dpF awJ dtJ -dui -duI +dtJ +dtJ dvh dvG aDP @@ -110728,18 +109822,18 @@ atk dlg dlt dlH -dmc -dmz +dlH +dlH dmW -dnv -dnQ +dlH +dlH aja atk -akH -doN +doA +doM dpb -dps -cKJ +doM +dpF dpV cEw cEz @@ -110747,7 +109841,7 @@ dra ash atm dsq -cKJ +dpF awK axF axF @@ -110994,9 +110088,9 @@ dob dom akI doO -dpc -dpt -cKJ +dmb +doM +dpF dpW cEx cEA @@ -111004,7 +110098,7 @@ cEB cEx cEx aut -cKJ +dpF cGj aGP aGP @@ -111253,7 +110347,7 @@ atk atk dpd atk -cKJ +dpF dpX dqu dqK @@ -111261,7 +110355,7 @@ drb asj atn dsr -cKJ +dpF dtg dtK azi @@ -111501,9 +110595,9 @@ dlu awF dmf dmB -dmX -dnw -dnR +dmB +dmB +dmf dod don doB @@ -111518,11 +110612,11 @@ cEx cEx cEx dss -cKJ -anF +dpF +dsR awL -anF -anF +dsR +dsR dvi aCI aGP @@ -111533,7 +110627,7 @@ dxm dxG dya aME -dyw +dxC dyI aOv aPW @@ -111759,12 +110853,12 @@ dlI dmg dmC dmY -dnx +dmY dnS akL doo -doC -doQ +doo +doo dpf dpv dpJ @@ -111780,18 +110874,18 @@ dth aoP duj duK -dvj +dvi aCG aGP aFq dwv -aGG -aGG -aGG -aGG -aGG -aGG -aGG +dwv +dwv +dwv +dwv +dwv +dwv +dwv dyR aPX aQP @@ -112041,7 +111135,7 @@ dvk aCK aGP aFq -aGG +dwv dwT dxn aJR @@ -112273,28 +111367,28 @@ abW alm aga agW -dny +dli alm aje dop -akN +dli alm alS dpw alm dqa apy -akN +dli alm drv atq -akN +dli dsR dtj axI aoP asn -dvl +dvi aCL aJX aFs @@ -112305,9 +111399,9 @@ aHC aHC dym aIQ -dyK +dyJ aOv -aPZ +aPW aQR aKp aSt @@ -112546,7 +111640,7 @@ aeK anE amS alT -dsS +dsR dtk aoP aoP @@ -112555,16 +111649,16 @@ dvm aCG aGP aFq -aGG +dwv aIQ aIM aIM aKB aLH aIQ -aGG +dwv aOv -aPZ +aPW aQS aKp aKp @@ -112794,7 +111888,7 @@ amS ahJ alm alU -amT +dpw alm dqb amS @@ -112803,7 +111897,7 @@ alm drw amS ahJ -anF +dsR dtl aoP aoP @@ -112821,7 +111915,7 @@ aLI aIQ aNE aOv -aPZ +aPW aQT aRz aSu @@ -113048,19 +112142,19 @@ dnz alm agc cEr -ajZ +dnz alm alU -amT +dpw alm agc apz -ajZ +dnz alm agc drT -ajZ -anF +dnz +dsR awM ats aoP @@ -113076,7 +112170,7 @@ dxH aKD aLJ dyx -aGG +dwv aOv cEU aQU @@ -113322,20 +112416,20 @@ awN axK aoP aAy -anF +dsR aCG aGP aFw -aGG -aGG -aGG -aGG -aGG -aGG -aGG -aGG +dwv +dwv +dwv +dwv +dwv +dwv +dwv +dwv dyS -aPZ +aPW aQV aRt aSw @@ -113559,27 +112653,27 @@ dmi cTV dmZ dnA -cVB +dml amd -doq -ahN +dlP +dnA anI alX amd anI amd anI -ahN +dnA anI amd drU aoM -anF -anF +dsR +dsR axL dul -anF -anF +dsR +dsR aCM aGP aFx @@ -113592,7 +112686,7 @@ dyn cHm avI aOw -aPZ +aPW aQR aRR aRR @@ -113823,7 +112917,7 @@ ajj doR alY amW -dpK +doR amW dqw cTX @@ -113836,7 +112930,7 @@ awP dtL dum awP -aAD +dsU dvI aJX dwk @@ -113849,7 +112943,7 @@ dyo aJU aNG aOw -aPZ +aPW aQW aRS aSx @@ -114081,11 +113175,11 @@ aeK dph dpy aeK -dqc +dmo apA cTY azk -drx +doe atr dsw cEt @@ -114094,16 +113188,16 @@ aFB cLf cHc cEt -dvJ +dvH cHc aFy aGL aHM aIR dxJ -aKF -aKF -aKF +dxJ +dxJ +dxJ aNH aOw aQa @@ -114324,7 +113418,7 @@ agm adS alm aes -dly +dlw dlL dmj agf @@ -114337,10 +113431,10 @@ doE doS alZ dpz -anK -aoN +doS +dpz dqx -aso +dnB azl ajk azl @@ -114349,8 +113443,8 @@ dsV dtm dtM dun -aAA -dvp +dtm +dsV dvK aEb aFz @@ -114586,18 +113680,18 @@ amS afz cTV aha -ahN +dnA anI amd anI -ahN +dnA anI ama amd anI amd amh -ahN +dnA anI amd att @@ -114832,13 +113926,13 @@ abW abW agl agk -dkN -dkU +dkM +dkM acN acN alm -dlk -aeM +dli +dlx afg afA agh @@ -114852,12 +113946,12 @@ doT amb amX anM -dqd -apC +dof +dos ahO aru -dry -apC +dof +dos dsx avI awR @@ -114869,15 +113963,15 @@ aCG aGP dwl awJ -dwU -dxp +dtJ +dtJ dxK -dyd -dyp +dtJ +dtJ dyy avI aOA -aPZ +aPW aQR aKp aMk @@ -115089,7 +114183,7 @@ dkF abW abW agk -dkO +dkM dkV ahP agl @@ -115104,18 +114198,18 @@ dnC alm agi akf -doF +dnC alm alU -amT +dpw alm agi apD -cGe +dnC alm agi drV -cGe +dnC avI awS axO @@ -115134,7 +114228,7 @@ aGP cEP cER cES -aPZ +aPW dyU dyV aMk @@ -115364,7 +114458,7 @@ amS ahJ alm alU -amT +dpw alm dqe amS @@ -115378,7 +114472,7 @@ dtn axO duo axO -dvr +dvq aCG aGP dwm @@ -115391,7 +114485,7 @@ aGP cHD cER cES -aPZ +aPW aQR aKp aKp @@ -115620,8 +114714,8 @@ anR amS ami alm -ame -dpA +dpg +dpx alm anR amS @@ -115634,21 +114728,21 @@ avI dto dtN dup -duN +dup dvs aCG aGP -cHa +dwm cHb aHN -dxq +dtK dxM cHs aGP cHD cER cES -aPZ +aPW aQR aKp abW @@ -115871,22 +114965,22 @@ afh alm dmG dnd -dnD +dli alm dog dot -akN +dli alm alS -amT +dpw alm aoR dqy -akN +dli alm drz drW -akN +dli avI avI avI @@ -115902,8 +114996,8 @@ dxr awJ dyf dyq -aMK -cHJ +dyq +dtJ aOC cHT aRf @@ -116147,7 +115241,7 @@ alm avI awT dtO -duq +dtO aAE avI aCG @@ -116162,7 +115256,7 @@ aEb aEb aEb cHO -aPZ +aPW aQR cHY dhs @@ -116417,7 +115511,7 @@ aJW aHP dyr dyz -aNJ +dyz aOD aQd aQZ @@ -116641,22 +115735,22 @@ dlB dlP dml anI -cVB +dml anI anI -cVB +dml anI amh -cVB +dml anQ anI anI -cVB +dml anI anI -cVB +dml anI -drX +dlP awO avI dtp @@ -116664,7 +115758,7 @@ dtP azo duO dvt -dvM +dvK aEb aFF dwz @@ -116676,7 +115770,7 @@ dys aGP avI aOE -aPZ +aPW aQR cHY dhs @@ -116892,7 +115986,7 @@ abW abW abW alm -dle +dlc dlq dlC dlQ @@ -116900,17 +115994,17 @@ dmm dmI cVC cVH -cVL +dmI cVM ake -cVL +dmI doV dpi cVH -cVL +dmI dqf ake -cVL +dmI cVX drB drY @@ -116918,7 +116012,7 @@ dsz avI dtq dtQ -axR +dtQ duP avI aCI @@ -116929,11 +116023,11 @@ dwW cHk avI dyg -dyt +dys cHD cER cES -aQe +aPX aRa cHY dhs @@ -117155,23 +116249,23 @@ dlD dlR dmn dmJ -cVD -cVI +dmn +dlR dnU -cVD -cVI +dmn +dlR amj -cVD +dmn dpj alm apG -dqg +dmo alm dqM -drd -drC +dmo +doD atv -dsA +dmo avI dtr axQ @@ -117190,7 +116284,7 @@ dyu cHD cER cES -aPZ +aPW aQR cHZ dhs @@ -117414,25 +116508,25 @@ dmo dmK cVE alm -dnV +dmK ahc alm -amk +dmK anb anS alm -amk +dmK dqh alm -amk +dmK aiy -drD -amk +doD +dmK dsB avI dts -axR -axR +dtQ +dtQ aAG dvu aCS @@ -117447,7 +116541,7 @@ cHz cHG cER cES -aPZ +aPW aRb cHY dhr @@ -117667,7 +116761,7 @@ abW abW afd dlT -dmp +dmo dmL dne alm @@ -117683,13 +116777,13 @@ dqi alm dqN cVY -drE +doD drZ dsC avI dtt dtR -dus +dtR aAF azp azp @@ -117704,7 +116798,7 @@ azp azp azp cHQ -aPZ +aPW aQR cHY dhr @@ -117924,7 +117018,7 @@ abW abW afd dlU -dmq +dmo dmM alm alm @@ -117940,13 +117034,13 @@ alm alm dqO alm -drF +doD dsa alm avI dtu -dtS -dut +dtR +dtR aAF azp aCU @@ -117961,7 +117055,7 @@ aIX aIY azp aOF -aPZ +aPW aQR cHY dhr @@ -118218,7 +117312,7 @@ aIX aMM aNK aOB -aPZ +aPW aQR cHY dhs @@ -118438,13 +117532,13 @@ abW abW afd dlV -dms +dmr ahH agX agX agX -doi -dov +dmN +dmN agX agX agX @@ -118454,7 +117548,7 @@ ahH ahH agX agX -alr +dmN dsc agX avI @@ -118471,7 +117565,7 @@ aGU aIW dxN dyh -aLM +dyh aMN dyM dyT @@ -118697,24 +117791,24 @@ afd alm dmt agX -dnf -dnE +dmN +dmN agX -doj -dow -doI -alr -alr +dmN +dmN +dmN +dmN +dmN anc cVR aml agX -alr -alr -alr +dmN +dmN +dmN dsd agX -aTz +dlX afd adP adP @@ -118732,7 +117826,7 @@ aDc aMO azp aOH -aPZ +aPW aRd cHY dhs @@ -118960,16 +118054,16 @@ agX agX agX agX -alr +dmN als dpC dpN -alr -alr -alr +dmN +dmN +dmN dre agX -atx +dre auz alm afd @@ -118989,7 +118083,7 @@ aDc aDc aNL aOB -aPZ +aPW aQS cHY dhs @@ -119218,17 +118312,17 @@ agX agX agX afD -alr -alr +dmN +dmN als -alr -alr -alr +dmN +dmN +dmN agX agX agX -alr -aTz +dmN +dlX afd afH cEG @@ -119467,25 +118561,25 @@ abW afd dlX alm -dmP +dmN agX agX agX agX agX agX -alr -alr -alr -alr +dmN +dmN +dmN +dmN dqk dqz -aTz +dlX drf agX -dse -cKZ -aTz +drf +dlW +dlX afd afE dfd @@ -119498,8 +118592,8 @@ dwC aHW aIZ dxQ -dyi -aLP +dxQ +dxQ aMP aNM aOJ @@ -119723,25 +118817,25 @@ cFp abW afd afd -dmw -dmQ -dng -dnF -dnZ +dlX +dlW +dlX +dmN +dlW alm dox -doJ -alr +dmN +dmN dpm dpD dpO -dql -dqA -aTz -aTz +dlW +dlW +dlX +dlX alm -aTz -aTz +dlX +dlX afd afd afH @@ -119760,7 +118854,7 @@ aIX aDc aNK aOK -aPZ +aPW cMh cHY dht @@ -119981,12 +119075,12 @@ adm abW afd afd -dmR -dnh -dnG -aTz -aTz -doy +dlX +dlX +dlX +dlX +dlX +dlW doK alt afd @@ -120017,7 +119111,7 @@ aIX dyB azp aOL -aPZ +aPW cMh cHY aSC @@ -120228,12 +119322,12 @@ abX ack abX dkG -dkJ -dkR -dkY -dkZ -dla -dlf +dkG +dkG +dkG +dkG +dkG +dkG dlr abW abW @@ -120274,7 +119368,7 @@ azp azp azp aOM -aPZ +aPW cMh cIc aRW @@ -120653,7 +119747,7 @@ ccW ccW ceW clY -cna +cmJ cfv coy cJC @@ -120910,7 +120004,7 @@ ccW cda ceW clZ -cna +cmJ cfv coy cJS @@ -121167,7 +120261,7 @@ cda cda ceW cma -cna +cmJ cnR coL cJC @@ -121522,7 +120616,7 @@ abC cCF dlE dlY -dmx +dlE aBI dni afE @@ -121681,7 +120775,7 @@ cfA cfA cfA cmb -cna +cmJ cfv coy cJC @@ -121938,7 +121032,7 @@ cfA cfA cfA cfA -cna +cmJ cfv coN cJC @@ -122709,7 +121803,7 @@ cke ckM clp ckM -cnd +cmR cfv coP cJC @@ -123480,7 +122574,7 @@ cfA ccW ccW ceW -cna +cmJ cfv coP cJC @@ -128741,7 +127835,7 @@ aBi awe awe azK -duS +dsX aBV aDs aEE @@ -128997,7 +128091,7 @@ auP dsW dtx dtW -duw +dtX duT aBW aDs @@ -130038,7 +129132,7 @@ dxR aLc aMa aJq -dyN +dxR aPe aQj aQR @@ -130552,7 +129646,7 @@ dxS aLe aMc aJs -dyO +dxS aPg aQj aQR @@ -131360,7 +130454,7 @@ aYJ baj baN baN -bbT +baQ baN cIz bej @@ -131565,10 +130659,10 @@ asN arP auZ dsX -dty +dtx dtX -dux -duU +dtX +duT aCe aDs aEP @@ -131825,12 +130919,12 @@ dsY dtz ayx azQ -duV +dsW dvv aDs aEQ dwo -dwD +dvv arP arP abW @@ -133385,9 +132479,9 @@ aQt aRm aSf aSY -aTK -aTK -aTK +aTu +aTu +aTu aVg aKp aKp @@ -137753,7 +136847,7 @@ aqV aqV aqV aSh -aTe +aql aaa aaa aaa diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 5764c1db7b8..88116a4801c 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -394,6 +394,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) "aaV" = ( @@ -404,6 +407,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aaW" = ( @@ -414,6 +420,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aaX" = ( @@ -446,6 +455,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "abb" = ( @@ -486,6 +498,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) "abf" = ( @@ -616,6 +631,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/solars/starboard/fore) "abv" = ( @@ -675,6 +693,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/solars/starboard/fore) "abz" = ( @@ -1108,6 +1129,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/shuttle/arrival) "acm" = ( @@ -1137,6 +1161,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) "acq" = ( @@ -1324,6 +1351,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) "acM" = ( @@ -1450,6 +1480,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) "add" = ( @@ -1622,6 +1655,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plating, /area/construction/mining/aux_base) "adx" = ( @@ -1900,6 +1936,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) "aee" = ( @@ -1982,6 +2021,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) "aep" = ( @@ -2055,6 +2097,9 @@ name = "Arrival Shuttle Airlock"; req_access_txt = "0" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/shuttle/arrival) "aez" = ( @@ -2287,6 +2332,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/construction/mining/aux_base) "aeT" = ( @@ -2419,6 +2467,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "afn" = ( @@ -2448,6 +2499,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "afs" = ( @@ -2552,6 +2606,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "afG" = ( @@ -2648,6 +2705,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "afP" = ( @@ -2656,6 +2716,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "afQ" = ( @@ -2665,6 +2728,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "afR" = ( @@ -2678,6 +2744,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "afT" = ( @@ -3319,6 +3388,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "ahu" = ( @@ -3341,6 +3413,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/vacantoffice) "ahy" = ( @@ -3360,6 +3435,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/port/fore) "ahA" = ( @@ -3479,6 +3557,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "ahR" = ( @@ -3534,6 +3615,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "ahX" = ( @@ -4130,6 +4214,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/checkpoint/customs) "ajq" = ( @@ -4189,6 +4276,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/checkpoint/checkpoint2) "ajy" = ( @@ -4856,6 +4946,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/vacantoffice) "all" = ( @@ -5459,12 +5552,11 @@ id = "garbage"; verted = -1 }, -/obj/effect/turf_decal/stripes/end{ - dir = 8 - }, -/turf/open/floor/plating{ - icon_state = "plating_warn_end" +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/plating, /area/maintenance/disposal) "amJ" = ( /obj/machinery/conveyor{ @@ -5481,9 +5573,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - icon_state = "plating_warn_side" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/turf/open/floor/plating, /area/maintenance/disposal) "amK" = ( /obj/machinery/conveyor{ @@ -5497,9 +5590,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - icon_state = "plating_warn_side" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/turf/open/floor/plating, /area/maintenance/disposal) "amL" = ( /obj/machinery/mass_driver{ @@ -5512,9 +5606,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - icon_state = "plating_warn_side" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/turf/open/floor/plating, /area/maintenance/disposal) "amM" = ( /obj/machinery/door/poddoor{ @@ -6051,6 +6146,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/disposal) "anS" = ( @@ -6270,6 +6368,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/checkpoint/customs) "aoo" = ( @@ -6285,6 +6386,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/checkpoint/checkpoint2) "aop" = ( @@ -6466,6 +6570,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) "aoK" = ( @@ -6484,6 +6591,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) "aoN" = ( @@ -6499,6 +6609,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/electronic_marketing_den) "aoO" = ( @@ -6512,6 +6625,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/electronic_marketing_den) "aoP" = ( @@ -6776,6 +6892,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/disposal) "apw" = ( @@ -7294,6 +7413,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port/fore) "aqw" = ( @@ -7394,6 +7516,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "aqF" = ( @@ -7459,6 +7584,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "aqL" = ( @@ -7800,6 +7928,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/port/fore) "arr" = ( @@ -7811,6 +7942,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/port/fore) "ars" = ( @@ -8100,6 +8234,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/disposal) "arT" = ( @@ -8607,6 +8744,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "asR" = ( @@ -8632,6 +8772,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "asT" = ( @@ -8642,6 +8785,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "asU" = ( @@ -8653,6 +8799,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "asV" = ( @@ -8684,6 +8833,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "asY" = ( @@ -8729,6 +8881,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/quartermaster/storage) "ate" = ( @@ -8934,6 +9089,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port/fore) "atF" = ( @@ -9699,6 +9857,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "avr" = ( @@ -9787,6 +9948,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "avz" = ( @@ -10122,6 +10286,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "awl" = ( @@ -10244,6 +10411,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "awz" = ( @@ -10505,6 +10675,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/janitor) "axe" = ( @@ -10515,6 +10688,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/janitor) "axf" = ( @@ -10532,6 +10708,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/janitor) "axg" = ( @@ -11631,6 +11810,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port/fore) "azA" = ( @@ -11701,6 +11883,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "azF" = ( @@ -11876,6 +12061,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/storage) "azV" = ( @@ -11897,6 +12085,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/storage) "azX" = ( @@ -12096,6 +12287,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/service) "aAx" = ( @@ -12817,6 +13011,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/quartermaster/sorting) "aBP" = ( @@ -12841,6 +13038,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/storage) "aBT" = ( @@ -13976,6 +14176,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hydroponics/garden/abandoned) "aDS" = ( @@ -13991,6 +14194,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hydroponics/garden/abandoned) "aDT" = ( @@ -14053,6 +14259,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/bar) "aDX" = ( @@ -14222,6 +14431,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "aEu" = ( @@ -14407,6 +14619,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/solars/port/fore) "aEO" = ( @@ -14487,6 +14702,9 @@ icon_state = "intact"; dir = 10 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/solars/port/fore) "aET" = ( @@ -14628,6 +14846,9 @@ req_access_txt = "0"; req_one_access_txt = "24;10" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) "aFd" = ( @@ -14653,6 +14874,9 @@ req_access_txt = "0"; req_one_access_txt = "24;10" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) "aFg" = ( @@ -14694,6 +14918,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) "aFj" = ( @@ -15232,6 +15459,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "aGu" = ( @@ -15750,9 +15980,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plasteel/black{ - icon_state = "black_warn_side" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/turf/open/floor/plasteel/black, /area/prison/execution_room) "aHA" = ( /obj/structure/lattice/catwalk, @@ -16505,6 +16736,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmos) "aIX" = ( @@ -16531,6 +16765,9 @@ req_access_txt = "0"; req_one_access_txt = "24;10" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmos) "aJb" = ( @@ -16551,6 +16788,9 @@ req_access_txt = "0"; req_one_access_txt = "24;10" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmos) "aJd" = ( @@ -18227,6 +18467,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/bar/atrium) "aMO" = ( @@ -18883,6 +19126,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/theatre) "aOe" = ( @@ -18978,6 +19224,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/theatre) "aOk" = ( @@ -19020,6 +19269,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/bar/atrium) "aOn" = ( @@ -19076,6 +19328,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/bar/atrium) "aOt" = ( @@ -19099,6 +19354,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/quartermaster/sorting) "aOv" = ( @@ -19153,6 +19411,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "aOA" = ( @@ -19369,6 +19630,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/prison) "aOW" = ( @@ -19389,6 +19653,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/prison) "aOX" = ( @@ -19407,6 +19674,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/prison) "aOY" = ( @@ -19775,6 +20045,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/abandoned_gambling_den) "aPD" = ( @@ -19832,6 +20105,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/abandoned_gambling_den) "aPJ" = ( @@ -20005,6 +20281,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/bar/atrium) "aQc" = ( @@ -20576,9 +20855,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - icon_state = "plating_warn_side" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/turf/open/floor/plating, /area/security/prison) "aQZ" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, @@ -21008,6 +21288,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/storage) "aRV" = ( @@ -21148,6 +21431,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/qm) "aSf" = ( @@ -21226,6 +21512,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/qm) "aSn" = ( @@ -21585,6 +21874,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmos) "aSX" = ( @@ -21871,6 +22163,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/storage) "aTE" = ( @@ -22137,9 +22432,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - icon_state = "plating_warn_side" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/turf/open/floor/plating, /area/security/prison) "aUg" = ( /turf/closed/wall/mineral/plastitanium, @@ -22474,6 +22770,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/service) "aUN" = ( @@ -23115,6 +23414,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison) "aVS" = ( @@ -23425,6 +23727,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hydroponics) "aWE" = ( @@ -23652,6 +23957,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "aXf" = ( @@ -23682,6 +23990,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "aXi" = ( @@ -23938,6 +24249,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison) "aXG" = ( @@ -24351,6 +24665,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "aYz" = ( @@ -24362,6 +24679,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "aYA" = ( @@ -24370,6 +24690,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "aYB" = ( @@ -24390,6 +24713,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/quartermaster/office) "aYD" = ( @@ -24561,6 +24887,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/prison) "aYX" = ( @@ -24579,6 +24908,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/prison) "aYZ" = ( @@ -24952,6 +25284,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/service) "aZL" = ( @@ -24994,6 +25329,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "aZO" = ( @@ -25810,6 +26148,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "bbI" = ( @@ -25985,6 +26326,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/prison) "bcb" = ( @@ -26083,6 +26427,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmos) "bck" = ( @@ -26186,6 +26533,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hydroponics) "bcw" = ( @@ -26201,6 +26551,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/service) "bcx" = ( @@ -26221,6 +26574,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "bcA" = ( @@ -26288,6 +26644,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "bcH" = ( @@ -26434,6 +26793,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "bda" = ( @@ -26461,6 +26823,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "bdd" = ( @@ -26471,6 +26836,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/shuttle/mining) "bde" = ( @@ -26514,6 +26882,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/shuttle/mining) "bdi" = ( @@ -26532,6 +26903,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/brig) "bdk" = ( @@ -26557,6 +26931,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/brig) "bdm" = ( @@ -26953,6 +27330,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "bee" = ( @@ -27018,6 +27398,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "bem" = ( @@ -27077,6 +27460,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "bes" = ( @@ -27176,6 +27562,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/shuttle/mining) "beE" = ( @@ -27745,6 +28134,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hydroponics) "bfH" = ( @@ -27793,6 +28185,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "bfL" = ( @@ -29623,6 +30018,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/service) "bjz" = ( @@ -29663,6 +30061,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "bjD" = ( @@ -29677,6 +30078,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "bjE" = ( @@ -29700,6 +30104,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "bjG" = ( @@ -29708,6 +30115,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "bjH" = ( @@ -29720,6 +30130,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/fore) "bjJ" = ( @@ -29750,6 +30163,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "bjM" = ( @@ -30123,6 +30539,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmos) "bky" = ( @@ -30313,6 +30732,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bkT" = ( @@ -30461,6 +30883,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) "blg" = ( @@ -30601,11 +31026,11 @@ "blx" = ( /obj/structure/table/reinforced, /obj/item/weapon/clipboard, -/obj/item/clothing/tie/armband/deputy, -/obj/item/clothing/tie/armband/deputy, -/obj/item/clothing/tie/armband/deputy, -/obj/item/clothing/tie/armband/deputy, -/obj/item/clothing/tie/armband/deputy, +/obj/item/clothing/accessory/armband/deputy, +/obj/item/clothing/accessory/armband/deputy, +/obj/item/clothing/accessory/armband/deputy, +/obj/item/clothing/accessory/armband/deputy, +/obj/item/clothing/accessory/armband/deputy, /obj/item/weapon/reagent_containers/food/snacks/donut/jelly/cherryjelly, /turf/open/floor/plasteel/red/side{ dir = 8 @@ -31110,6 +31535,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port/fore) "bmw" = ( @@ -31309,6 +31737,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bmO" = ( @@ -31442,6 +31873,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bna" = ( @@ -32295,6 +32729,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "boK" = ( @@ -33077,6 +33514,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/atmos) "bqe" = ( @@ -33193,6 +33633,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bqr" = ( @@ -33204,6 +33647,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bqs" = ( @@ -33213,6 +33659,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bqt" = ( @@ -33232,6 +33681,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bqw" = ( @@ -33275,6 +33727,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/shuttle/labor) "bqC" = ( @@ -33286,6 +33741,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/transfer) "bqD" = ( @@ -33302,6 +33760,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/transfer) "bqF" = ( @@ -34261,6 +34722,9 @@ req_access_txt = "0"; req_one_access_txt = "24;10" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/atmos) "bsC" = ( @@ -34865,6 +35329,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/gravity_generator) "btF" = ( @@ -35725,6 +36192,9 @@ req_access_txt = "0"; req_one_access_txt = "24;10" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bvs" = ( @@ -35855,6 +36325,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/storage/tech) "bvD" = ( @@ -35932,6 +36405,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port/fore) "bvJ" = ( @@ -36211,6 +36687,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/shuttle/labor) "bwd" = ( @@ -36222,6 +36701,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/transfer) "bwe" = ( @@ -36239,6 +36721,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/transfer) "bwg" = ( @@ -36636,6 +37121,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/gravity_generator) "bwQ" = ( @@ -36688,6 +37176,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bwY" = ( @@ -36701,6 +37192,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bwZ" = ( @@ -36718,6 +37212,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bxa" = ( @@ -36905,6 +37402,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/storage/primary) "bxt" = ( @@ -37572,6 +38072,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "byK" = ( @@ -37613,6 +38116,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "byM" = ( @@ -37633,6 +38139,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/break_room) "byO" = ( @@ -38662,6 +39171,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/gravity_generator) "bAn" = ( @@ -38699,6 +39211,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/gravity_generator) "bAr" = ( @@ -38750,6 +39265,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bAv" = ( @@ -38780,6 +39298,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bAx" = ( @@ -38793,6 +39314,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bAy" = ( @@ -38809,6 +39333,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bAz" = ( @@ -38841,6 +39368,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bAB" = ( @@ -38851,6 +39381,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bAC" = ( @@ -39703,6 +40236,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bCg" = ( @@ -40403,6 +40939,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/warden) "bDA" = ( @@ -40535,6 +41074,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/gravity_generator) "bDL" = ( @@ -40547,6 +41089,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/gravity_generator) "bDM" = ( @@ -40650,6 +41195,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bDZ" = ( @@ -40694,6 +41242,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bEd" = ( @@ -40885,6 +41436,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/storage/primary) "bEv" = ( @@ -41092,6 +41646,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard) "bER" = ( @@ -41139,7 +41696,7 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/item/clothing/head/det_hat{ +/obj/item/clothing/head/fedora/det_hat{ icon_state = "curator" }, /obj/item/clothing/suit/det_suit{ @@ -41598,6 +42155,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bFO" = ( @@ -41820,6 +42380,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/storage/primary) "bGn" = ( @@ -42017,6 +42580,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/starboard) "bGN" = ( @@ -42037,6 +42603,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/detectives_office) "bGP" = ( @@ -42503,6 +43072,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "bHH" = ( @@ -42520,6 +43092,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bHI" = ( @@ -43617,6 +44192,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bJL" = ( @@ -44566,6 +45144,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/break_room) "bLN" = ( @@ -45655,6 +46236,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/storage/tech) "bOg" = ( @@ -45667,6 +46251,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/storage/primary) "bOh" = ( @@ -45678,6 +46265,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/storage/primary) "bOi" = ( @@ -45703,6 +46293,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bOk" = ( @@ -46585,6 +47178,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "bPI" = ( @@ -46802,6 +47398,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bPZ" = ( @@ -46949,6 +47548,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bQl" = ( @@ -47111,6 +47713,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bQF" = ( @@ -47171,6 +47776,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bQK" = ( @@ -47281,6 +47889,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bQT" = ( @@ -48084,6 +48695,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bSs" = ( @@ -48375,6 +48989,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bSU" = ( @@ -48408,6 +49025,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bSY" = ( @@ -48470,6 +49090,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bTf" = ( @@ -48521,6 +49144,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/brig) "bTi" = ( @@ -48669,6 +49295,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "bTs" = ( @@ -49219,6 +49848,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bUr" = ( @@ -49292,6 +49924,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bUy" = ( @@ -49498,6 +50133,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bUW" = ( @@ -49549,6 +50187,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bVb" = ( @@ -49655,6 +50296,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "bVl" = ( @@ -49806,6 +50450,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "bVy" = ( @@ -50058,6 +50705,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/engineering) "bWa" = ( @@ -50078,6 +50728,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/checkpoint/engineering) "bWc" = ( @@ -50124,6 +50777,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/port) "bWi" = ( @@ -50483,6 +51139,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/brig) "bWZ" = ( @@ -50923,6 +51582,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/port) "bXL" = ( @@ -51464,6 +52126,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "bYU" = ( @@ -51596,6 +52261,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/engineering) "bZl" = ( @@ -51721,6 +52389,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/engineering) "bZx" = ( @@ -53995,6 +54666,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/captain/private) "cdJ" = ( @@ -54930,6 +55604,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/brig) "cfK" = ( @@ -55313,9 +55990,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - icon_state = "plating_warn_side" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/turf/open/floor/plating, /area/teleporter) "cgB" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -55465,9 +56143,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, -/turf/open/floor/plating{ - icon_state = "plating_warn_side" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, +/turf/open/floor/plating, /area/lawoffice) "cgR" = ( /obj/effect/decal/cleanable/cobweb, @@ -55814,6 +56493,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port) "chG" = ( @@ -55894,6 +56576,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/library) "chN" = ( @@ -56113,6 +56798,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/teleporter) "cim" = ( @@ -56611,6 +57299,9 @@ dir = 2 }, /obj/structure/barricade/wooden, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/engineering) "cjc" = ( @@ -57733,6 +58424,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/locker) "clx" = ( @@ -57756,6 +58450,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/starboard) "clA" = ( @@ -57782,6 +58479,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/range) "clC" = ( @@ -57887,6 +58587,9 @@ dir = 8 }, /obj/structure/barricade/wooden, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/engineering) "clT" = ( @@ -57961,6 +58664,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/engineering) "clZ" = ( @@ -58141,6 +58847,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/command) "cmx" = ( @@ -58153,6 +58862,9 @@ dir = 2 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/teleporter) "cmy" = ( @@ -58169,6 +58881,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/teleporter) "cmz" = ( @@ -58180,6 +58895,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/teleporter) "cmA" = ( @@ -58528,6 +59246,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/engineering) "cnt" = ( @@ -58619,6 +59340,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port) "cnC" = ( @@ -58714,6 +59438,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/command) "cnM" = ( @@ -59150,6 +59877,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plating, /area/maintenance/starboard) "coD" = ( @@ -59157,6 +59887,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plating, /area/maintenance/starboard) "coE" = ( @@ -59299,6 +60032,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/engineering) "coW" = ( @@ -59463,6 +60199,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/command) "cpp" = ( @@ -59853,6 +60592,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/locker) "cpW" = ( @@ -60203,6 +60945,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "cqJ" = ( @@ -60216,6 +60961,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "cqK" = ( @@ -60312,6 +61060,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/gateway) "cqV" = ( @@ -60372,6 +61123,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "crc" = ( @@ -60456,6 +61210,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "crj" = ( @@ -60487,6 +61244,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/locker) "crl" = ( @@ -60736,12 +61496,7 @@ /turf/open/floor/plasteel/black, /area/library) "crP" = ( -/obj/structure/closet/crate, -/obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/under/rank/curator/treasure_hunter, -/obj/item/clothing/suit/curator, -/obj/item/clothing/head/curator, -/obj/item/weapon/storage/backpack/satchel/explorer, +/obj/structure/closet/wardrobe/curator, /turf/open/floor/plasteel/black, /area/library) "crQ" = ( @@ -61033,6 +61788,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "csu" = ( @@ -61058,6 +61816,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "csz" = ( @@ -61201,6 +61962,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "csO" = ( @@ -61818,6 +62582,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "cue" = ( @@ -61846,6 +62613,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "cuh" = ( @@ -61903,6 +62673,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/locker) "cul" = ( @@ -62606,6 +63379,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/restrooms) "cvH" = ( @@ -63715,6 +64491,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/storage) "cxP" = ( @@ -64228,6 +65007,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/restrooms) "cyJ" = ( @@ -64593,6 +65375,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port) "czC" = ( @@ -64705,6 +65490,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/library) "czM" = ( @@ -64966,6 +65754,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/gateway) "cAn" = ( @@ -65155,6 +65946,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/restrooms) "cAD" = ( @@ -65351,6 +66145,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/engine/engineering) "cBa" = ( @@ -66237,6 +67034,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "cCU" = ( @@ -66247,6 +67047,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "cCV" = ( @@ -66264,6 +67067,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "cCW" = ( @@ -66303,6 +67109,9 @@ dir = 2 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/gateway) "cDa" = ( @@ -66320,6 +67129,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/gateway) "cDb" = ( @@ -66331,6 +67143,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/gateway) "cDc" = ( @@ -66341,6 +67156,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/gateway) "cDd" = ( @@ -66436,6 +67254,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/locker) "cDo" = ( @@ -66448,6 +67269,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/locker) "cDp" = ( @@ -66559,6 +67383,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engine/engineering) "cDB" = ( @@ -66845,6 +67672,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/restrooms) "cEh" = ( @@ -66938,6 +67768,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "cEq" = ( @@ -67030,6 +67863,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "cEx" = ( @@ -67126,6 +67962,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "cEH" = ( @@ -67139,6 +67978,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "cEI" = ( @@ -67187,6 +68029,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port) "cEN" = ( @@ -67644,6 +68489,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port) "cFw" = ( @@ -67825,6 +68673,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/aft) "cFK" = ( @@ -67947,6 +68798,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/aft) "cFT" = ( @@ -68622,6 +69476,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "cHs" = ( @@ -68729,6 +69586,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "cHA" = ( @@ -68854,6 +69714,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/department/electrical) "cHP" = ( @@ -69030,6 +69893,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "cIl" = ( @@ -69041,6 +69907,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "cIn" = ( @@ -69066,6 +69935,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "cIp" = ( @@ -69076,6 +69948,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "cIq" = ( @@ -69088,6 +69963,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "cIr" = ( @@ -69113,6 +69991,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "cIu" = ( @@ -69125,6 +70006,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "cIw" = ( @@ -69312,6 +70196,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "cIX" = ( @@ -69325,6 +70212,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "cIY" = ( @@ -69585,6 +70475,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "cJD" = ( @@ -69682,6 +70575,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "cJO" = ( @@ -69996,6 +70892,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/storage) "cKC" = ( @@ -70083,6 +70982,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/aft) "cKI" = ( @@ -70386,6 +71288,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "cLn" = ( @@ -71176,6 +72081,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "cNa" = ( @@ -71310,6 +72218,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/research) "cNr" = ( @@ -71341,6 +72252,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "cNv" = ( @@ -71402,6 +72316,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "cNC" = ( @@ -71601,6 +72518,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "cNR" = ( @@ -71778,6 +72698,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/department/electrical) "cOq" = ( @@ -72050,6 +72973,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/checkpoint/science/research) "cOS" = ( @@ -72175,6 +73101,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/research) "cPg" = ( @@ -72215,6 +73144,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "cPk" = ( @@ -72315,6 +73247,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "cPu" = ( @@ -72484,6 +73419,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "cPI" = ( @@ -73202,6 +74140,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/checkpoint/medical) "cRi" = ( @@ -73274,6 +74215,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "cRp" = ( @@ -73548,6 +74492,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "cRS" = ( @@ -73564,6 +74511,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/science/xenobiology) "cRT" = ( @@ -73968,6 +74918,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/storage) "cSM" = ( @@ -74486,6 +75439,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "cTS" = ( @@ -74503,6 +75459,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "cTU" = ( @@ -74959,6 +75918,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "cUM" = ( @@ -75074,6 +76036,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/department/electrical) "cUZ" = ( @@ -75089,6 +76054,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/department/electrical) "cVb" = ( @@ -75602,6 +76570,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "cWe" = ( @@ -76207,6 +77178,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/checkpoint/science/research) "cXm" = ( @@ -76434,6 +77408,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "cXM" = ( @@ -77241,6 +78218,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port) "cZJ" = ( @@ -77254,6 +78234,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port) "cZK" = ( @@ -77367,6 +78350,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/xenobiology) "cZU" = ( @@ -77387,6 +78373,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "cZW" = ( @@ -77402,6 +78391,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "cZY" = ( @@ -77619,6 +78611,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/checkpoint/medical) "dat" = ( @@ -77627,6 +78622,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "dau" = ( @@ -77642,6 +78640,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "daw" = ( @@ -77656,6 +78657,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "day" = ( @@ -77674,6 +78678,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "daA" = ( @@ -77720,6 +78727,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/abandoned) "daE" = ( @@ -77773,6 +78783,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/abandoned) "daK" = ( @@ -78076,6 +79089,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/research) "dbt" = ( @@ -78373,6 +79389,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "dbY" = ( @@ -78708,6 +79727,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/research) "dcQ" = ( @@ -78755,6 +79777,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/lab) "dcV" = ( @@ -78928,6 +79953,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "ddq" = ( @@ -79017,6 +80045,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "ddA" = ( @@ -79446,6 +80477,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/research) "deC" = ( @@ -79683,6 +80717,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/chemistry) "deW" = ( @@ -79757,6 +80794,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "dfe" = ( @@ -79947,6 +80987,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/starboard/aft) "dfB" = ( @@ -80225,6 +81268,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "dgh" = ( @@ -80255,6 +81301,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/misc_lab/range) "dgk" = ( @@ -80369,6 +81418,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "dgy" = ( @@ -80378,6 +81430,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "dgz" = ( @@ -80385,6 +81440,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "dgA" = ( @@ -80398,6 +81456,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "dgB" = ( @@ -80413,6 +81474,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "dgD" = ( @@ -80436,6 +81500,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "dgH" = ( @@ -80446,6 +81513,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "dgI" = ( @@ -80465,6 +81535,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/surgery) "dgL" = ( @@ -80481,6 +81554,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/surgery) "dgN" = ( @@ -80992,7 +82068,6 @@ }, /area/hallway/primary/aft) "dhQ" = ( -/turf/open/floor/plating, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/table, @@ -81254,6 +82329,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/construction) "diw" = ( @@ -81261,6 +82339,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/construction) "dix" = ( @@ -81268,6 +82349,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/construction) "diy" = ( @@ -81446,6 +82530,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port) "diW" = ( @@ -81486,6 +82573,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/explab) "diZ" = ( @@ -81623,6 +82713,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/explab) "djj" = ( @@ -81685,6 +82778,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/research) "djo" = ( @@ -81949,6 +83045,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "djN" = ( @@ -82051,6 +83150,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/genetics/cloning) "djZ" = ( @@ -82129,6 +83231,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/surgery) "dki" = ( @@ -82361,6 +83466,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/research/abandoned) "dkK" = ( @@ -82381,6 +83489,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port) "dkL" = ( @@ -82616,6 +83727,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hor) "dlh" = ( @@ -82707,6 +83821,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hor) "dln" = ( @@ -82796,6 +83913,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "dlx" = ( @@ -82911,6 +84031,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/genetics/cloning) "dlM" = ( @@ -83090,6 +84213,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port) "dmk" = ( @@ -83175,6 +84301,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/mixing) "dmw" = ( @@ -83293,6 +84422,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "dmJ" = ( @@ -83329,6 +84461,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/robotics/mechbay) "dmP" = ( @@ -83669,6 +84804,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research/abandoned) "dnD" = ( @@ -83875,6 +85013,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/genetics) "doc" = ( @@ -83908,6 +85049,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/genetics) "dog" = ( @@ -84087,6 +85231,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/construction) "doz" = ( @@ -84132,6 +85279,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/construction) "doF" = ( @@ -84811,6 +85961,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/surgery) "dqa" = ( @@ -84861,6 +86014,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/surgery) "dqe" = ( @@ -84933,6 +86089,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/surgery) "dqk" = ( @@ -85379,6 +86538,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/genetics) "drf" = ( @@ -85599,6 +86761,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/cmo) "drx" = ( @@ -85673,6 +86838,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/cmo) "drD" = ( @@ -86041,6 +87209,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/crew_quarters/heads/hor) "dsx" = ( @@ -86061,6 +87232,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "dsz" = ( @@ -86074,6 +87248,9 @@ dir = 8; pixel_x = 24 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "dsA" = ( @@ -86104,6 +87281,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/robotics/lab) "dsE" = ( @@ -86116,6 +87296,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "dsG" = ( @@ -86201,6 +87384,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/genetics) "dsL" = ( @@ -86636,6 +87822,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/research/abandoned) "dtG" = ( @@ -87118,6 +88307,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/construction) "duB" = ( @@ -87914,6 +89106,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/solars/starboard/aft) "dwb" = ( @@ -88207,6 +89402,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/morgue) "dwM" = ( @@ -88233,6 +89431,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/morgue) "dwQ" = ( @@ -88306,6 +89507,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "dwX" = ( @@ -88634,6 +89838,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/misc_lab/range) "dxE" = ( @@ -88695,6 +89902,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/robotics/lab) "dxJ" = ( @@ -88850,7 +90060,6 @@ /turf/open/floor/plating, /area/medical/morgue) "dxZ" = ( -/turf/open/floor/plating, /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -89027,6 +90236,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/detectives_office/private_investigators_office) "dyu" = ( @@ -89613,6 +90825,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/mixing) "dzM" = ( @@ -89907,6 +91122,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/morgue) "dAm" = ( @@ -90030,6 +91248,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/morgue) "dAw" = ( @@ -90929,6 +92150,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/mixing) "dCs" = ( @@ -90985,6 +92209,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/mixing) "dCw" = ( @@ -91067,6 +92294,9 @@ icon_state = "intact"; dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/mixing) "dCC" = ( @@ -91460,6 +92690,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/crew_quarters/theatre/abandoned) "dDs" = ( @@ -91860,6 +93093,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/robotics/lab) "dEk" = ( @@ -91899,6 +93135,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/morgue) "dEn" = ( @@ -91917,6 +93156,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "dEp" = ( @@ -92048,6 +93290,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/mixing) "dEE" = ( @@ -92064,6 +93309,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/mixing) "dEF" = ( @@ -92095,6 +93343,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "dEJ" = ( @@ -92224,6 +93475,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "dEW" = ( @@ -92620,6 +93874,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/mixing) "dFN" = ( @@ -92866,6 +94123,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "dGp" = ( @@ -93097,6 +94357,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "dGO" = ( @@ -93166,6 +94429,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "dGS" = ( @@ -93468,6 +94734,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/research) "dHD" = ( @@ -93552,6 +94821,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/checkpoint/customs) "dHL" = ( @@ -93568,6 +94840,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "dHN" = ( @@ -93578,6 +94853,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "dHO" = ( @@ -93590,6 +94868,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/aft) "dHP" = ( @@ -93659,6 +94940,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port/aft) "dHY" = ( @@ -93675,6 +94959,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/port/aft) "dIa" = ( @@ -94037,6 +95324,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/library/abandoned) "dIN" = ( @@ -94053,6 +95343,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/library/abandoned) "dIO" = ( @@ -94077,6 +95370,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "dIS" = ( @@ -94255,6 +95551,9 @@ pixel_y = -2; req_access_txt = "39" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/medbay/central) "dJo" = ( @@ -94857,6 +96156,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "dKJ" = ( @@ -95004,6 +96306,9 @@ pixel_y = 22; req_access_txt = "39" }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/virology) "dKZ" = ( @@ -95019,6 +96324,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/virology) "dLa" = ( @@ -95037,6 +96345,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/virology) "dLb" = ( @@ -95051,6 +96362,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/virology) "dLc" = ( @@ -95674,6 +96988,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/virology) "dMm" = ( @@ -95727,6 +97044,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/virology) "dMr" = ( @@ -95859,6 +97179,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/chapel/office) "dMG" = ( @@ -95944,6 +97267,9 @@ icon_state = "manifold"; dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "dMQ" = ( @@ -95992,6 +97318,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "dMW" = ( @@ -96002,6 +97331,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "dMX" = ( @@ -96321,6 +97653,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/chapel/main) "dNK" = ( @@ -96766,6 +98101,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/shuttle/escape) "dOU" = ( @@ -96984,6 +98322,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/chapel/main) "dPt" = ( @@ -97344,6 +98685,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/chapel/main) "dQi" = ( @@ -97712,6 +99056,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "dRf" = ( @@ -97727,6 +99074,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/shuttle/escape) "dRh" = ( @@ -97869,6 +99219,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/virology) "dRt" = ( @@ -97937,6 +99290,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/virology) "dRz" = ( @@ -98185,6 +99541,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/shuttle/escape) "dSc" = ( @@ -98531,7 +99890,13 @@ turf_type = /turf/open/space; width = 30 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel/white, /area/shuttle/escape) "dSS" = ( /obj/structure/flora/ausbushes/grassybush, @@ -98699,6 +100064,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/medical/virology) "dTg" = ( @@ -99260,6 +100628,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/virology) "dUl" = ( @@ -99465,6 +100836,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/shuttle/escape) "dUK" = ( @@ -99596,6 +100970,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/port/aft) "dUZ" = ( @@ -99613,6 +100990,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/port/aft) "dVa" = ( @@ -99630,6 +101010,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/port/aft) "dVb" = ( @@ -99643,6 +101026,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/maintenance/port/aft) "dVc" = ( @@ -99838,6 +101224,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/solars/port/aft) "dVy" = ( @@ -99911,6 +101300,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/solars/port/aft) "dVD" = ( @@ -100561,6 +101953,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "dXa" = ( @@ -100576,6 +101971,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/checkpoint/checkpoint2) "dXb" = ( @@ -100597,6 +101995,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/checkpoint/checkpoint2) "dXd" = ( @@ -100639,6 +102040,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/checkpoint/checkpoint2) "dXh" = ( @@ -100693,6 +102097,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/shuttle/escape) "dXn" = ( @@ -100991,6 +102398,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/chapel/office) "dXF" = ( @@ -101099,6 +102509,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/checkpoint/checkpoint2) "dXS" = ( @@ -101114,6 +102527,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/shuttle/escape) "dXU" = ( @@ -101309,6 +102725,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "dYs" = ( @@ -101399,6 +102818,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/security/checkpoint/checkpoint2) "dYz" = ( @@ -101505,6 +102927,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/shuttle/escape) "dYN" = ( @@ -101867,6 +103292,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/shuttle/escape) "dZz" = ( @@ -102023,6 +103451,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 2 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "dZR" = ( @@ -102089,6 +103520,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/shuttle/escape) "eaa" = ( @@ -103015,6 +104449,9 @@ dir = 2 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/surgery) "ecX" = ( @@ -103086,6 +104523,10 @@ /obj/structure/cable/white{ icon_state = "4-8" }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/medical/virology) "edh" = ( @@ -103261,7 +104702,7 @@ /obj/item/weapon/wirerod, /obj/item/weapon/wrench, /obj/item/clothing/under/waiter, -/obj/item/clothing/tie/waistcoat, +/obj/item/clothing/accessory/waistcoat, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, @@ -104034,6 +105475,9 @@ /obj/structure/sign/poster/official/cleanliness{ pixel_x = -32 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/medical/storage) "egb" = ( @@ -104492,6 +105936,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "egU" = ( @@ -104502,6 +105949,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "egV" = ( @@ -104513,6 +105963,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "egW" = ( @@ -104524,6 +105977,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "egX" = ( @@ -105014,6 +106470,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/maintenance/solars/starboard/aft) "eit" = ( @@ -105501,7 +106960,7 @@ dir = 8; icon_state = "diagonalWall3" }, -/area/space) +/area/shuttle/syndicate) "ejD" = ( /turf/closed/wall/mineral/plastitanium, /area/space) @@ -107174,6 +108633,176 @@ icon_state = "diagonalWall3" }, /area/space) +"epb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"epc" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"epd" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"epe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"epf" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"epg" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"eph" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/obj/structure/cable/white{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/maintenance/port/fore) +"epi" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"epj" = ( +/obj/machinery/door/airlock/glass{ + name = "Holodeck Access" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"epk" = ( +/obj/machinery/door/airlock/glass{ + name = "Holodeck Access" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/fitness/recreation) +"epl" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"epm" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable/white{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"epn" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) (1,1,1) = {" aaa @@ -109788,16 +111417,16 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -110039,22 +111668,22 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -110296,22 +111925,22 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -110553,22 +112182,22 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -110803,29 +112432,29 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111060,26 +112689,26 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111317,28 +112946,28 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111574,28 +113203,28 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -111831,28 +113460,28 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112088,28 +113717,28 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112345,28 +113974,28 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112602,26 +114231,26 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -112859,29 +114488,29 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113125,20 +114754,20 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113382,20 +115011,20 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113642,17 +115271,17 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -113900,16 +115529,16 @@ aaa aaa aaa aaa -adm -adm -adm -adm -adm -adm -adm -adm -adm -adm +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -116224,16 +117853,16 @@ aaa aaa aaa aaa -emc -emt -emK -enb -ens -enH -enY -eon -eoC -eoR +ejC +adn +adn +adn +adn +adn +adn +adn +adn +aes aaa aaa aaa @@ -116475,22 +118104,22 @@ aaa aaa aaa aaa -ekH -ekR -elb -elp -elB -elP -emd -emu -emL -enc -ent -enI -enZ -eoo -eoD -eoS +ejC +adn +adn +adn +adn +adn +adn +aiN +ajI +aiN +alK +amN +anW +aoz +aoC +apA aaa aaa aaa @@ -116732,22 +118361,22 @@ aaa aaa aaa aaa -ekI -ekS -elc -elq -elC -elQ -eme -emv -emM -end -enu -enJ -eoa -eop -eoE -eoT +adn +afv +afK +afK +afK +aho +adn +agG +aeh +aeG +aeG +amO +aeG +aoA +aoC +apB aaa aaa aaa @@ -116989,22 +118618,22 @@ aaa aaa aaa aaa -ekJ -ekT -eld -elr -elD -elR -emf -emw -emN -ene -env -enK -eob -eoq -eoF -eoU +adn +aeG +aeG +aeG +aeG +aeG +aia +ehe +aeh +akK +alL +amP +anX +aoB +aoC +apC aaa aaa aaa @@ -117240,28 +118869,28 @@ aaa aaa aaa ejC -ejL -ejU -ekd -ekm +adn +adn +adn +aes aaa aaa -ekK -ekU -ele -els -elE -elS -emg -emx -emO -enf -enw -enL -eoc -eor -eoG -eoV +adn +aeG +aeG +aeG +aeG +aeG +adn +aiO +aeh +akL +age +amQ +adn +adn +adn +aeI aaa aaa aaa @@ -117496,26 +119125,26 @@ aaa aaa aaa aaa -ejD -ejM -ejV -eke -ekn -ekv +adn +adA +adT +aeh +adn +aeE aaa -ekL -ekV -elf -elt -elF -elT -emh -emy -emP -eng -enx -enM -eod +adn +afw +afL +ehd +agG +ahp +adn +aiP +aeh +akL +age +amR +adn aaa aaa aaa @@ -117753,28 +119382,28 @@ aaa aaa aaa aaa -ejE -ejN -ejW -ekf -eko -ekw -ekC -ekM -ekW -elg -elu -elG -brL -emi -emz -emQ -enh -brL -enN -eoe -eos -eoH +ado +adB +adU +aeh +adn +adn +adn +adn +adn +adn +adn +agH +agb +adn +adn +adn +akM +agb +adn +adn +adn +aes aaa aaa aaa @@ -118010,28 +119639,28 @@ aaa aaa aaa aaa -ejF -ejO -ejX -ekg -ekp -ekx -ekD -ekN -ekX -elh -brL -elH -elU -emj -emA -emR -eni -eny -enO -brL -eot -eoI +ado +adC +adV +aeh +aet +aeF +aeT +ehb +aeT +aeT +agb +aeG +aeG +aeG +aeG +ehf +akL +age +aeh +agb +aoC +apA aaa aaa aaa @@ -118267,28 +119896,28 @@ aaa aaa aaa aaa -ejG -ejP -ejY -ekh -ekq -eky -ekE -ekO -ekY -eli -elv -elI -elV -emk -emB -emS -enj -enz -enP -eof -eou -eoJ +ado +adD +adW +aeh +aeu +aeG +adV +adV +adV +aeG +agc +aeG +adV +adV +adV +adV +akL +age +aeh +anY +aoC +apB aaa aaa aaa @@ -118524,28 +120153,28 @@ aaa aaa aaa aaa -ejH -ejQ -ejZ -eki -ekr -ekz -ekF -ekP -ekZ -elj -brL -elJ -elW -eml -emC -emT -enk -enA -enQ -brL -eov -eoK +ado +adE +adV +aeh +adn +aeH +aeU +ehc +aeU +aeU +agb +aeG +aeG +aeG +aeG +ehg +akL +age +aeh +agb +aoC +apC aaa aaa aaa @@ -118781,28 +120410,28 @@ aaa aaa aaa aaa -ejI -ejR -eka -ekj -eks -ekA -ekG -ekQ -ela -elk -elw -elK -brL -emm -emD -emU -enl -brL -enR -eog -eow -eoL +ado +adF +adX +aeh +adn +adn +adn +afk +adn +adn +adn +agI +agb +adn +adn +adn +akM +agb +adn +adn +adn +aev aaa aaa aaa @@ -119038,26 +120667,26 @@ aaa aaa aaa aaa -ejJ -ejS -ekb -ekk -ekt -ekB +adn +adG +adY +aeh +adn +aeI aaa aaa aaa -ell -elx -elL -elX -emn -emE -emV -enm -enB -enS -eoh +adn +agd +aeG +ahq +adn +aiQ +aeh +akL +age +amS +adn aaa aaa aaa @@ -119295,29 +120924,29 @@ aaa aaa aaa aaa -ejK -ejT -ekc -ekl -eku +adp +adn +adn +adn +aev aaa aaa aaa aaa -elm -ely -elM -elY -emo -emF -emW -enn -enC -enT -eoi -eox -eoM -eoW +afM +age +aeG +ahq +adn +aiR +aeh +akL +age +amT +adn +adn +adn +aeE aaa aaa aaa @@ -119561,20 +121190,20 @@ aaa aaa aaa aaa -eln -elz -elN -elZ -emp -emG -emX -eno -enD -enU -eoj -eoy -eoN -eoX +afN +agf +aeG +ahr +aet +aiS +aeh +akN +alM +amP +aeG +aoE +aoC +apA aaa aaa aaa @@ -119818,20 +121447,20 @@ aaa aaa aaa aaa -elo -elA -elO -ema -emq -emH -emY -enp -enE -enV -eok -eoz -eoO -eoY +adp +adn +adn +adn +adn +aiT +aeh +aeG +aeG +amU +aeG +aoF +aoC +apB aaa aaa aaa @@ -120078,17 +121707,17 @@ aaa aaa aaa aaa -emb -emr -emI -emZ -enq -enF -enW -eol -eoA -eoP -eoZ +ahs +adn +aiU +aeh +akO +alN +amV +ehg +aoE +aoC +apC aaa aaa aaa @@ -120336,16 +121965,16 @@ aaa aaa aaa aaa -ems -emJ -ena -enr -enG -enX -eom -eoB -eoQ -epa +adp +adn +adn +adn +adn +adn +adn +adn +adn +aev aaa aaa aaa @@ -136085,7 +137714,7 @@ bou bou bOd bPY -bSm +epi bUq bWg bWg @@ -138173,9 +139802,9 @@ cHW cHW cHW cOH -cQx -cRP -cTA +epl +epm +epn cOH cHW cHW @@ -138396,7 +140025,7 @@ akm ajl bKc aip -aol +eph bQf bSn bUr @@ -138834,14 +140463,14 @@ aaf aaf aaf aax -ach +epb aax aaf aaa aaa aaf aax -ach +epb aax aaf aaf @@ -139348,14 +140977,14 @@ aax aaD abT aax -acj +epc aax acC acT ack adq aax -ach +epb aax abR aaD @@ -139886,7 +141515,7 @@ akc alc amd anm -aol +eph aip aqf aib @@ -141673,9 +143302,9 @@ edp edp edp een -acj +epc aci -acj +epc agl agN ahu @@ -142689,14 +144318,14 @@ aaf aaf aaf aax -ach +epb aax aaf aaf aaf aaf aax -acj +epc aax aaf aaf @@ -143203,14 +144832,14 @@ aax aaD abR aax -acj +epc aax acE acV adg adr aax -ach +epb aax abT aaD @@ -162837,10 +164466,10 @@ cqf cqf cqf cqf -cEE +epj cqf cqf -cIU +epk cqf cqf cqf @@ -165407,10 +167036,10 @@ cqf cqf cqf cqf -cEE +epj cqf cqf -cIU +epk cqf cqf cqf diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 77d983a2293..dbb0d800bdb 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -14011,7 +14011,7 @@ name = "Station Intercom (General)"; pixel_y = 28 }, -/obj/item/clothing/tie/waistcoat, +/obj/item/clothing/accessory/waistcoat, /obj/item/clothing/suit/toggle/lawyer/black, /obj/item/clothing/under/suit_jacket/red, /obj/item/clothing/neck/tie/black, @@ -15128,7 +15128,7 @@ contents = newlist(/obj/item/clothing/suit/armor/vest,/obj/item/weapon/gun/ballistic/automatic/pistol,/obj/item/weapon/suppressor,/obj/item/weapon/melee/classic_baton/telescopic,/obj/item/clothing/mask/balaclava,/obj/item/bodybag,/obj/item/weapon/soap/nanotrasen) }, /obj/item/weapon/storage/backpack/dufflebag{ - contents = newlist(/obj/item/clothing/under/lawyer/blacksuit,/obj/item/clothing/tie/waistcoat,/obj/item/clothing/suit/toggle/lawyer/black,/obj/item/clothing/shoes/laceup,/obj/item/clothing/gloves/color/black,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/head/fedora); + contents = newlist(/obj/item/clothing/under/lawyer/blacksuit,/obj/item/clothing/accessory/waistcoat,/obj/item/clothing/suit/toggle/lawyer/black,/obj/item/clothing/shoes/laceup,/obj/item/clothing/gloves/color/black,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/head/fedora); desc = "A large dufflebag for holding extra things. There is a NanoTrasen logo on the back."; icon_state = "duffle-syndieammo"; item_state = "duffle-syndieammo" @@ -50365,12 +50365,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = 30 }, -/obj/structure/closet/crate, -/obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/under/rank/curator/treasure_hunter, -/obj/item/clothing/suit/curator, -/obj/item/clothing/head/curator, -/obj/item/weapon/storage/backpack/satchel/explorer, +/obj/structure/closet/wardrobe/curator, /turf/open/floor/engine/cult, /area/library) "bPY" = ( @@ -57181,7 +57176,7 @@ "ccz" = ( /obj/item/weapon/wrench, /obj/item/clothing/suit/apron, -/obj/item/clothing/tie/armband/hydro, +/obj/item/clothing/accessory/armband/hydro, /obj/structure/table/glass, /obj/effect/turf_decal/stripes/line{ dir = 9 diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 95b54cab7f6..f9643c4d42b 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -19077,12 +19077,7 @@ /turf/open/floor/wood, /area/library) "aQr" = ( -/obj/structure/closet/crate, -/obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/under/rank/curator/treasure_hunter, -/obj/item/clothing/suit/curator, -/obj/item/clothing/head/curator, -/obj/item/weapon/storage/backpack/satchel/explorer, +/obj/structure/closet/wardrobe/curator, /obj/machinery/light/small, /turf/open/floor/engine/cult, /area/library) diff --git a/_maps/map_files/generic/Centcomm.dmm b/_maps/map_files/generic/Centcomm.dmm index d315b451496..8b9c67e043c 100644 --- a/_maps/map_files/generic/Centcomm.dmm +++ b/_maps/map_files/generic/Centcomm.dmm @@ -5590,8 +5590,8 @@ /obj/item/clothing/under/skirt/black, /obj/item/clothing/under/shorts/black, /obj/item/clothing/under/pants/track, -/obj/item/clothing/tie/armband/deputy, -/obj/item/clothing/tie/waistcoat, +/obj/item/clothing/accessory/armband/deputy, +/obj/item/clothing/accessory/waistcoat, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/shoes/laceup, /obj/item/clothing/neck/stripedredscarf, @@ -11175,7 +11175,7 @@ /obj/structure/rack, /obj/item/clothing/head/that, /obj/item/clothing/under/suit_jacket, -/obj/item/clothing/tie/waistcoat, +/obj/item/clothing/accessory/waistcoat, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) "BI" = ( @@ -11379,7 +11379,7 @@ /obj/structure/sign/goldenplaque{ pixel_y = 32 }, -/obj/item/clothing/tie/lawyers_badge{ +/obj/item/clothing/accessory/lawyers_badge{ desc = "A badge of upmost glory."; name = "thunderdome badge" }, @@ -11400,7 +11400,7 @@ /obj/structure/sign/goldenplaque{ pixel_y = 32 }, -/obj/item/clothing/tie/medal/silver{ +/obj/item/clothing/accessory/medal/silver{ pixel_y = 5 }, /turf/open/floor/plasteel/grimy, @@ -11605,11 +11605,11 @@ name = "Thunderdome Plaque"; pixel_y = -32 }, -/obj/item/clothing/tie/medal/gold{ +/obj/item/clothing/accessory/medal/gold{ pixel_x = 3; pixel_y = 5 }, -/obj/item/clothing/tie/medal/gold, +/obj/item/clothing/accessory/medal/gold, /turf/open/floor/plasteel/grimy, /area/tdome/tdomeobserve) "CF" = ( @@ -11625,7 +11625,7 @@ name = "Thunderdome Plaque"; pixel_y = -32 }, -/obj/item/clothing/tie/medal{ +/obj/item/clothing/accessory/medal{ pixel_y = 5 }, /turf/open/floor/plasteel/grimy, diff --git a/code/__DEFINES/clockcult.dm b/code/__DEFINES/clockcult.dm index 5ea3bc7a70f..c74bf9c61e9 100644 --- a/code/__DEFINES/clockcult.dm +++ b/code/__DEFINES/clockcult.dm @@ -7,7 +7,7 @@ GLOBAL_VAR_INIT(clockwork_construction_value, 0) //The total value of all structures built by the clockwork cult GLOBAL_VAR_INIT(clockwork_caches, 0) //How many clockwork caches exist in the world (not each individual) -GLOBAL_VAR_INIT(clockwork_daemons, 0) //How many daemons exist in the world +GLOBAL_LIST_EMPTY(active_daemons) //A list of all active tinkerer's daemons GLOBAL_LIST_EMPTY(all_clockwork_objects) //All clockwork items, structures, and effects in existence GLOBAL_LIST_EMPTY(all_clockwork_mobs) //All clockwork SERVANTS (not creatures) in existence GLOBAL_LIST_INIT(clockwork_component_cache, list(BELLIGERENT_EYE = 0, VANGUARD_COGWHEEL = 0, GEIS_CAPACITOR = 0, REPLICANT_ALLOY = 0, HIEROPHANT_ANSIBLE = 0)) //The pool of components that caches draw from @@ -19,10 +19,10 @@ GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not us #define SCRIPTURE_PERIPHERAL "Peripheral" #define SCRIPTURE_DRIVER "Driver" #define SCRIPTURE_SCRIPT "Script" -#define SCRIPT_SERVANT_REQ 5 +#define SCRIPT_SERVANT_REQ 6 #define SCRIPT_CACHE_REQ 1 #define SCRIPTURE_APPLICATION "Application" -#define APPLICATION_SERVANT_REQ 8 +#define APPLICATION_SERVANT_REQ 9 #define APPLICATION_CACHE_REQ 3 #define APPLICATION_CV_REQ 100 #define SCRIPTURE_JUDGEMENT "Judgement" @@ -94,3 +94,5 @@ GLOBAL_LIST_EMPTY(all_scripture) //a list containing scripture instances; not us #define OCULAR_WARDEN_EXCLUSION_RANGE 3 //the range at which ocular wardens cannot be placed near other ocular wardens #define RATVARIAN_SPEAR_DURATION 1800 //how long ratvarian spears last; defaults to 3 minutes + +#define PRISM_DELAY_DURATION 1200 //how long prolonging prisms delay the shuttle for; defaults to 2 minutes diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm index c787f4415aa..5001a3541ed 100644 --- a/code/__HELPERS/files.dm +++ b/code/__HELPERS/files.dm @@ -26,7 +26,7 @@ for(var/i in valid_extensions) if(extensions) extensions += "|" - extensions += valid_extensions[i] + extensions += "[i]" var/regex/valid_ext = new("\\.([extensions])$", "i") if( !fexists(path) || !(valid_ext.Find(path)) ) to_chat(src, "Error: browse_files(): File not found/Invalid file([path]).") diff --git a/code/_globalvars/game_modes.dm b/code/_globalvars/game_modes.dm index 38a415585fc..9c3af923f18 100644 --- a/code/_globalvars/game_modes.dm +++ b/code/_globalvars/game_modes.dm @@ -14,4 +14,5 @@ GLOBAL_VAR_INIT(cult_vote_called, FALSE) GLOBAL_VAR_INIT(cult_mastered, FALSE) GLOBAL_VAR_INIT(reckoning_complete, FALSE) GLOBAL_VAR_INIT(sac_complete, FALSE) -GLOBAL_DATUM(cult_narsie, /obj/singularity/narsie/large/cult) \ No newline at end of file +GLOBAL_DATUM(cult_narsie, /obj/singularity/narsie/large/cult) +GLOBAL_LIST_EMPTY(summon_spots) \ No newline at end of file diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index b2cc7b5c9c9..f257af11dec 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -306,7 +306,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." angle = 0 cut_overlays() icon_state = "runed_sense1" - desc = "The sacrifice is complete, bring the wrath of Nar-Sie upon the crew!" + desc = "The sacrifice is complete, summon Nar-Sie! The summoning can only take place in [english_list(GLOB.summon_spots)]!" add_overlay(narnar) return var/turf/P = get_turf(blood_target) @@ -468,10 +468,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." textlist = list("[servants] Servant, who [validservants ? "counts":"does not count"] towards scripture.
") textlist += "[GLOB.clockwork_caches ? "[GLOB.clockwork_caches] Tinkerer's Caches.":"No Tinkerer's Caches, construct one!"]
\ [GLOB.clockwork_construction_value] Construction Value.
" - if(GLOB.clockwork_daemons) - textlist += "[GLOB.clockwork_daemons] Tinkerer's Daemons: [servants * 0.2 < GLOB.clockwork_daemons ? "DISABLED":"ACTIVE"]
" - else - textlist += "No Tinkerer's Daemons.
" + textlist += "[Floor(servants * 0.2)] Tinkerer's Daemons can be active at once. [LAZYLEN(GLOB.active_daemons)] are active.
" for(var/obj/structure/destructible/clockwork/massive/celestial_gateway/G in GLOB.all_clockwork_objects) var/area/gate_area = get_area(G) textlist += "Ark Location: [uppertext(gate_area.map_name)]
" diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm old mode 100644 new mode 100755 index 4bf86f414bc..74f87618635 --- a/code/_onclick/hud/parallax.dm +++ b/code/_onclick/hud/parallax.dm @@ -21,6 +21,7 @@ C.parallax_layers_cached = list() C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_1(null, C.view) C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_2(null, C.view) + C.parallax_layers_cached += new /obj/screen/parallax_layer/layer_3(null, C.view) C.parallax_layers = C.parallax_layers_cached.Copy() @@ -278,6 +279,11 @@ speed = 1 layer = 2 +/obj/screen/parallax_layer/layer_3 + icon_state = "layer3" + speed = 1.4 + layer = 3 + #undef LOOP_NONE #undef LOOP_NORMAL #undef LOOP_REVERSE diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index 9a4f3bdb6fd..e819060afbc 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -98,7 +98,7 @@ SUBSYSTEM_DEF(atoms) else if(!A.initialized) BadInitializeCalls[the_type] |= BAD_INIT_DIDNT_INIT - return qdeleted || QDELETED(A) + return qdeleted || QDELING(A) /datum/controller/subsystem/atoms/proc/map_loader_begin() old_initialized = initialized diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index ff9dfca7394..9ffe3087378 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -27,7 +27,7 @@ SUBSYSTEM_DEF(blackbox) if(M.client) playercount += 1 var/admincount = GLOB.admins.len - var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', COALESCE(INET_ATON('[world.internet_address]'), 0), '[world.port]')") + var/datum/DBQuery/query_record_playercount = SSdbcore.NewQuery("INSERT INTO [format_table_name("legacy_population")] (playercount, admincount, time, server_ip, server_port) VALUES ([playercount], [admincount], '[SQLtime()]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]')") query_record_playercount.Execute() /datum/controller/subsystem/blackbox/Recover() @@ -178,7 +178,7 @@ SUBSYSTEM_DEF(blackbox) var/sqlstamina = sanitizeSQL(L.getStaminaLoss()) var/coord = sanitizeSQL("[L.x], [L.y], [L.z]") var/map = sanitizeSQL(SSmapping.config.map_name) - var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', COALESCE(INET_ATON('[world.internet_address]'), 0), '[world.port]')") + var/datum/DBQuery/query_report_death = SSdbcore.NewQuery("INSERT INTO [format_table_name("death")] (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss, toxloss, cloneloss, staminaloss, coord, mapname, server_ip, server_port) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[SQLtime()]', '[laname]', '[lakey]', '[sqlgender]', [sqlbrute], [sqlfire], [sqlbrain], [sqloxy], [sqltox], [sqlclone], [sqlstamina], '[coord]', '[map]', INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]')") query_report_death.Execute() diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm index 602455621bd..67ee5113cb2 100644 --- a/code/controllers/subsystem/processing/processing.dm +++ b/code/controllers/subsystem/processing/processing.dm @@ -22,9 +22,7 @@ SUBSYSTEM_DEF(processing) while(current_run.len) var/datum/thing = current_run[current_run.len] current_run.len-- - if(thing) - thing.process(wait) - else + if(QDELETED(thing) || thing.process(wait) == PROCESS_KILL) processing -= thing if (MC_TICK_CHECK) return @@ -33,4 +31,4 @@ SUBSYSTEM_DEF(processing) /datum/proc/process() set waitfor = 0 STOP_PROCESSING(SSobj, src) - return 0 \ No newline at end of file + return 0 diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 22b35da4987..55f3fc26afa 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -233,6 +233,8 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/PostSetup() set waitfor = 0 mode.post_setup() + GLOB.start_state = new /datum/station_state() + GLOB.start_state.count(1) //Cleanup some stuff for(var/obj/effect/landmark/start/S in GLOB.landmarks_list) //Deleting Startpoints but we need the ai point to AI-ize people later @@ -432,7 +434,7 @@ SUBSYSTEM_DEF(ticker) /datum/controller/subsystem/ticker/proc/transfer_characters() var/list/livings = list() - for(var/mob/dead/new_player/player in GLOB.player_list) + for(var/mob/dead/new_player/player in GLOB.mob_list) var/mob/living = player.transfer_character() if(living) qdel(player) diff --git a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm index 813fc343ee0..7f1c3c5817c 100644 --- a/code/datums/antagonists/datum_cult.dm +++ b/code/datums/antagonists/datum_cult.dm @@ -1,3 +1,5 @@ +#define SUMMON_POSSIBILITIES 3 + /datum/antagonist/cult var/datum/action/innate/cult/comm/communion = new var/datum/action/innate/cult/mastervote/vote = new @@ -35,7 +37,14 @@ message_admins("Cult Sacrifice: Could not find unconvertable or convertable target. WELP!") GLOB.sac_complete = TRUE SSticker.mode.cult_objectives += "sacrifice" - SSticker.mode.cult_objectives += "eldergod" + if(GLOB.summon_spots.len) + SSticker.mode.cult_objectives += "eldergod" + else + while(GLOB.summon_spots.len < SUMMON_POSSIBILITIES) + var/area/summon = pick(GLOB.sortedAreas) + if(summon && (summon.z == ZLEVEL_STATION) && summon.valid_territory) + GLOB.summon_spots |= summon + SSticker.mode.cult_objectives += "eldergod" /datum/antagonist/cult/proc/cult_memorization(datum/mind/cult_mind) var/mob/living/current = cult_mind.current @@ -48,7 +57,7 @@ else explanation = "The veil has already been weakened here, proceed to the final objective." if("eldergod") - explanation = "Summon Nar-Sie by invoking the rune 'Summon Nar-Sie' with nine acolytes on it. You must do this after sacrificing your target." + explanation = "Summon Nar-Sie by invoking the rune 'Summon Nar-Sie'. The summoning can only be accomplished in [english_list(GLOB.summon_spots)] - where the veil is weak enough for the ritual to begin." if(!silent) to_chat(current, "Objective #[obj_count]: [explanation]") cult_mind.memory += "Objective #[obj_count]: [explanation]
" diff --git a/code/datums/antagonists/datum_traitor.dm b/code/datums/antagonists/datum_traitor.dm index a57c2087e30..514d2619ead 100644 --- a/code/datums/antagonists/datum_traitor.dm +++ b/code/datums/antagonists/datum_traitor.dm @@ -243,11 +243,15 @@ /datum/antagonist/traitor/proc/finalize_traitor() SSticker.mode.update_traitor_icons_added(owner) return + /datum/antagonist/traitor/AI/finalize_traitor() + ..() add_law_zero() owner.current.playsound_local('sound/ambience/antag/Malf.ogg',100,0) owner.current.grant_language(/datum/language/codespeak) + /datum/antagonist/traitor/human/finalize_traitor() + ..() if(should_equip) equip(silent) owner.current.playsound_local('sound/ambience/antag/TatorAlert.ogg',100,0) diff --git a/code/datums/verbs.dm b/code/datums/verbs.dm new file mode 100644 index 00000000000..48f990d2acb --- /dev/null +++ b/code/datums/verbs.dm @@ -0,0 +1,102 @@ +/datum/verbs + var/name + var/list/children + var/datum/verbs/parent + var/list/verblist + var/abstract = FALSE + +//returns the master list for verbs of a type +/datum/verbs/proc/GetList() + CRASH("Abstract verblist for [type]") + +//do things for each entry in Generate_list +//return value sets Generate_list[verbpath] +/datum/verbs/proc/HandleVerb(list/entry, atom/verb/verbpath, ...) + return entry + +/datum/verbs/New() + var/mainlist = GetList() + var/ourentry = mainlist[type] + children = list() + verblist = list() + if (ourentry) + if (!islist(ourentry)) //some of our childern already loaded + qdel(src) + CRASH("Verb double load: [type]") + Add_children(ourentry) + + mainlist[type] = src + + Load_verbs(type, typesof("[type]/verb")) + + var/datum/verbs/parent = mainlist[parent_type] + if (!parent) + mainlist[parent_type] = list(src) + else if (islist(parent)) + parent += src + else + parent.Add_children(list(src)) + +/datum/verbs/proc/Set_parent(datum/verbs/_parent) + parent = _parent + if (abstract) + parent.Add_children(children) + var/list/verblistoftypes = list() + for(var/thing in verblist) + LAZYADD(verblistoftypes[verblist[thing]], thing) + + for(var/verbparenttype in verblistoftypes) + parent.Load_verbs(verbparenttype, verblistoftypes[verbparenttype]) + +/datum/verbs/proc/Add_children(list/kids) + if (abstract && parent) + parent.Add_children(kids) + return + + for(var/thing in kids) + var/datum/verbs/item = thing + item.Set_parent(src) + if (!item.abstract) + children += item + +/datum/verbs/proc/Load_verbs(verb_parent_type, list/verbs) + if (abstract && parent) + parent.Load_verbs(verb_parent_type, verbs) + return + + for (var/verbpath in verbs) + verblist[verbpath] = verb_parent_type + +/datum/verbs/proc/Generate_list(...) + . = list() + if (length(children)) + for (var/thing in children) + var/datum/verbs/child = thing + var/list/childlist = child.Generate_list(arglist(args)) + if (childlist) + var/childname = "[child]" + if (childname == "[child.type]") + var/list/tree = splittext(childname, "/") + childname = tree[tree.len] + .[child.type] = "parent=[url_encode(type)];name=[url_encode(childname)]" + . += childlist + + for (var/thing in verblist) + var/atom/verb/verbpath = thing + if (!verbpath) + stack_trace("Bad VERB in [type] verblist: [english_list(verblist)]") + var/list/entry = list() + entry["parent"] = "[type]" + entry["name"] = verbpath.desc + if (copytext(verbpath.name,1,2) == "@") + entry["command"] = copytext(verbpath.name,2) + else + entry["command"] = replacetext(verbpath.name, " ", "-") + + .[verbpath] = HandleVerb(arglist(list(entry, verbpath) + args)) + +/world/proc/LoadVerbs(verb_type) + if(!ispath(verb_type, /datum/verbs) || verb_type == /datum/verbs) + CRASH("Invalid verb_type: [verb_type]") + for (var/typepath in subtypesof(verb_type)) + new typepath() diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 959f85febfa..8028e416e00 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -79,13 +79,8 @@ return INITIALIZE_HINT_NORMAL //called if Initialize returns INITIALIZE_HINT_LATELOAD -//This version shouldn't be called /atom/proc/LateInitialize() - var/static/list/warned_types = list() - if(!warned_types[type]) - WARNING("Old style LateInitialize behaviour detected in [type]!") - warned_types[type] = TRUE - Initialize(FALSE) + return /atom/Destroy() if(alternate_appearances) diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index eb1e8baba71..8f8e422ea53 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -57,9 +57,9 @@ /obj/effect/proc_holder/changeling/sting/transformation name = "Transformation Sting" desc = "We silently sting a human, injecting a retrovirus that forces them to transform." - helptext = "The victim will transform much like a changeling would. The effects will be obvious to the victim, and the process will damage our genomes." + helptext = "The victim will transform much like a changeling would. Does not provide a warning to others. Mutations will not be transferred, and monkeys will become human." sting_icon = "sting_transform" - chemical_cost = 40 + chemical_cost = 50 dna_cost = 3 var/datum/changelingprofile/selected_dna = null @@ -86,26 +86,19 @@ return 1 /obj/effect/proc_holder/changeling/sting/transformation/sting_action(mob/user, mob/target) - set waitfor = FALSE add_logs(user, target, "stung", "transformation sting", " new identity is [selected_dna.dna.real_name]") var/datum/dna/NewDNA = selected_dna.dna if(ismonkey(target)) to_chat(user, "Our genes cry out as we sting [target.name]!") var/mob/living/carbon/C = target - if(istype(C)) - if(C.status_flags & CANWEAKEN) - C.do_jitter_animation(500) - C.take_bodypart_damage(20, 0) //The process is extremely painful - - target.visible_message("[target] begins to violenty convulse!","You feel a tiny prick and a begin to uncontrollably convulse!") . = TRUE - sleep(10) if(istype(C)) C.real_name = NewDNA.real_name - NewDNA.transfer_identity(C, transfer_SE=1) + NewDNA.transfer_identity(C) + if(ismonkey(C)) + C.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_DEFAULTMSG) C.updateappearance(mutcolor_update=1) - C.domutcheck() /obj/effect/proc_holder/changeling/sting/false_armblade diff --git a/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm b/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm index ccf7aead44a..00fb4e6e481 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/slab_abilities.dm @@ -159,22 +159,9 @@ successful = TRUE ranged_ability_user.visible_message("[ranged_ability_user] fires a ray of energy at [target]!", "You fire a volt ray at [target].") playsound(ranged_ability_user, 'sound/effects/light_flicker.ogg', 50, 1) - var/turf/targetturf = get_turf(target) - var/obj/structure/destructible/clockwork/powered/volt_checker/VC = new/obj/structure/destructible/clockwork/powered/volt_checker(get_turf(ranged_ability_user)) - var/multiplier = 1 - var/usable_power = min(Floor(VC.total_accessable_power() * 0.2, MIN_CLOCKCULT_POWER), 1000) - if(VC.try_use_power(usable_power)) - multiplier += (usable_power * 0.001) //should be a multiplier of 2 at maximum power usage - if(iscyborg(ranged_ability_user)) - var/mob/living/silicon/robot/C = ranged_ability_user - if(C.cell) - var/prev_power = usable_power //we don't want to increase the multiplier past 2 - usable_power = min(Floor(C.cell.charge * 0.2, MIN_CLOCKCULT_POWER), 1000) - prev_power - if(usable_power > 0 && C.cell.use(usable_power)) - multiplier += (usable_power * 0.001) - qdel(VC) - new/obj/effect/temp_visual/ratvar/volt_hit/true(targetturf, ranged_ability_user, multiplier) - add_logs(ranged_ability_user, targetturf, "fired a volt ray") + T = get_turf(target) + new/obj/effect/temp_visual/ratvar/volt_hit(T, ranged_ability_user) + add_logs(ranged_ability_user, T, "fired a volt ray") remove_ranged_ability() return TRUE diff --git a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm index 199e0ba9519..6dec7258f64 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm @@ -69,7 +69,7 @@ /obj/item/clockwork/component/vanguard_cogwheel/onyx_prism name = "onyx prism" desc = "An onyx prism with a small aperture. It's very heavy." - clockwork_desc = "A broken prism from a mending motor. Serviceable as a substitute for a vanguard cogwheel." + clockwork_desc = "A broken prism from a prolonging prism. Serviceable as a substitute for a vanguard cogwheel." icon_state = "onyx_prism" cultist_message = "The prism grows painfully hot in your hands." servant_of_ratvar_messages = list("The prism isn't getting any lighter." = FALSE, "\"So... you haven't failed yet. Have hope, child.\"" = TRUE, \ diff --git a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm index bf2bf8ef9cf..746e72f62f9 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm @@ -59,11 +59,11 @@ /obj/item/clockwork/slab/cyborg/security //four scriptures, plus a spear quickbound = list(/datum/clockwork_scripture/channeled/belligerent, /datum/clockwork_scripture/ranged_ability/judicial_marker, /datum/clockwork_scripture/channeled/taunting_tirade, \ - /datum/clockwork_scripture/channeled/volt_void/cyborg) + /datum/clockwork_scripture/channeled/volt_blaster) /obj/item/clockwork/slab/cyborg/peacekeeper //four scriptures, plus a spear quickbound = list(/datum/clockwork_scripture/channeled/belligerent, /datum/clockwork_scripture/ranged_ability/judicial_marker, /datum/clockwork_scripture/channeled/taunting_tirade, \ - /datum/clockwork_scripture/channeled/volt_void/cyborg) + /datum/clockwork_scripture/channeled/volt_blaster) /obj/item/clockwork/slab/cyborg/janitor //five scriptures, plus a fabricator quickbound = list(/datum/clockwork_scripture/create_object/replicant, /datum/clockwork_scripture/create_object/sigil_of_transgression, \ @@ -74,7 +74,7 @@ /datum/clockwork_scripture/spatial_gateway, /datum/clockwork_scripture/fellowship_armory, /datum/clockwork_scripture/create_object/clockwork_obelisk) /obj/item/clockwork/slab/cyborg/miner //three scriptures, plus a spear and xray vision - quickbound = list(/datum/clockwork_scripture/ranged_ability/linked_vanguard, /datum/clockwork_scripture/spatial_gateway, /datum/clockwork_scripture/channeled/volt_void/cyborg) + quickbound = list(/datum/clockwork_scripture/ranged_ability/linked_vanguard, /datum/clockwork_scripture/spatial_gateway, /datum/clockwork_scripture/channeled/volt_blaster) /obj/item/clockwork/slab/cyborg/access_display(mob/living/user) if(!GLOB.ratvar_awakens) diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm index c3e40692c20..f8bc5e4ce02 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm @@ -214,6 +214,38 @@ quickbind_desc = "Creates an Interdiction Lens, which drains power into nearby Sigils of Transmission." +//Prolonging Prism: Creates a prism that will delay the shuttle at a power cost +/datum/clockwork_scripture/create_object/prolonging_prism + descname = "Powered Structure, Delay Emergency Shuttles" + name = "Prolonging Prism" + desc = "Creates a mechanized prism which will delay the arrival of an emergency shuttle by 2 minutes at a massive power cost." + invocations = list("May this prism...", "...grant us time to enact his will!") + channel_time = 80 + consumed_components = list(VANGUARD_COGWHEEL = 5, GEIS_CAPACITOR = 2, REPLICANT_ALLOY = 2) + object_path = /obj/structure/destructible/clockwork/powered/prolonging_prism + creator_message = "You form a prolonging prism, which will delay the arrival of an emergency shuttle at a massive power cost." + observer_message = "An onyx prism forms in midair and sprouts tendrils to support itself!" + invokers_required = 2 + multiple_invokers_used = TRUE + usage_tip = "The power cost to delay a shuttle increases based on CV and the number of times activated." + tier = SCRIPTURE_APPLICATION + one_per_tile = TRUE + primary_component = VANGUARD_COGWHEEL + sort_priority = 7 + quickbind = TRUE + quickbind_desc = "Creates a Prolonging Prism, which will delay the arrival of an emergency shuttle by 2 minutes at a massive power cost." + +/datum/clockwork_scripture/create_object/prolonging_prism/check_special_requirements() + if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE) + to_chat(invoker, "\"It is too late to construct one of these, champion.\"") + return FALSE + var/turf/T = get_turf(invoker) + if(!T || T.z != ZLEVEL_STATION) + to_chat(invoker, "\"You must be on the station to construct one of these, champion.\"") + return FALSE + return ..() + + //Mania Motor: Creates a malevolent transmitter that will broadcast the whispers of Sevtug into the minds of nearby nonservants, causing a variety of mental effects at a power cost. /datum/clockwork_scripture/create_object/mania_motor descname = "Powered Structure, Area Denial" @@ -240,7 +272,7 @@ /datum/clockwork_scripture/create_object/tinkerers_daemon descname = "Powered Structure, Component Generator" name = "Tinkerer's Daemon" - desc = "Creates a tinkerer's daemon which can rapidly collect components. It will only function if it has sufficient power, is outnumbered by Servants by a ratio of 5:1, \ + desc = "Creates a tinkerer's daemon which can rapidly collect components. It will only function if it has sufficient power, active daemons are outnumbered by Servants by a ratio of 5:1, \ and there is at least one existing cache." invocations = list("May this generator...", "...collect Engine parts that yet hold greatness!") channel_time = 80 @@ -257,19 +289,6 @@ quickbind = TRUE quickbind_desc = "Creates a Tinkerer's Daemon, which can rapidly collect components for power." -/datum/clockwork_scripture/create_object/tinkerers_daemon/check_special_requirements() - var/servants = 0 - for(var/mob/living/L in GLOB.living_mob_list) - if(is_servant_of_ratvar(L)) - servants++ - if(servants * 0.2 < GLOB.clockwork_daemons) - to_chat(invoker, "\"Daemons are already disabled, making more of them would be a waste.\"") - return FALSE - if(servants * 0.2 < GLOB.clockwork_daemons+1) - to_chat(invoker, "\"This daemon would be useless, friend.\"") - return FALSE - return ..() - //Clockwork Obelisk: Creates a powerful obelisk that can be used to broadcast messages or open a gateway to any servant or clockwork obelisk at a power cost. /datum/clockwork_scripture/create_object/clockwork_obelisk diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_cyborg.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_cyborg.dm index db5260a8a0d..2989857f0d8 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_cyborg.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_cyborg.dm @@ -44,9 +44,3 @@ Left-click a target to place a Judicial Marker!\n\ Click your slab to cancel." timeout_time = 50 - -//Volt Void, but with a different quickbind desc -/datum/clockwork_scripture/channeled/volt_void/cyborg - quickbind_desc = "Allows you to fire energy rays at target locations using your own power. Failing to fire causes backlash.
Maximum 4 chants." - tier = SCRIPTURE_PERIPHERAL - quickbind = FALSE diff --git a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm index c6eba3e3c92..2c6da828ea2 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_scripts.dm @@ -347,27 +347,27 @@ return slab.procure_gateway(invoker, duration, portal_uses) -//Volt Void: Channeled for up to five times over ten seconds to fire up to five rays of energy at target locations. -/datum/clockwork_scripture/channeled/volt_void +//Volt Blaster: Channeled for up to five times over ten seconds to fire up to five rays of energy at target locations. +/datum/clockwork_scripture/channeled/volt_blaster descname = "Channeled, Targeted Energy Blasts" - name = "Volt Void" //Alternative name: "On all levels but physical, I am a power sink" - desc = "Allows you to fire energy rays at target locations; more power consumed causes more damage. Channeled every fifth of a second for a maximum of ten seconds." + name = "Volt Blaster" + desc = "Allows you to fire five energy rays at target locations. Channeled every fourth of a second for a maximum of ten seconds." channel_time = 30 invocations = list("Amperage...", "...grant me your power!") chant_invocations = list("Use charge to kill!", "Slay with power!", "Hunt with energy!") - chant_amount = 4 - chant_interval = 5 + chant_amount = 5 + chant_interval = 4 consumed_components = list(GEIS_CAPACITOR = 1, HIEROPHANT_ANSIBLE = 2) usage_tip = "Though it requires you to stand still, this scripture can do massive damage." tier = SCRIPTURE_SCRIPT primary_component = HIEROPHANT_ANSIBLE sort_priority = 10 quickbind = TRUE - quickbind_desc = "Allows you to fire energy rays at target locations. Failing to fire causes backlash.
Maximum 4 chants." + quickbind_desc = "Allows you to fire energy rays at target locations.
Maximum 5 chants." var/static/list/nzcrentr_insults = list("You're not very good at aiming.", "You hunt badly.", "What a waste of energy.", "Almost funny to watch.", "Boss says \"Click something, you idiot!\".", "Stop wasting components if you can't aim.") -/datum/clockwork_scripture/channeled/volt_void/chant_effects(chant_number) +/datum/clockwork_scripture/channeled/volt_blaster/chant_effects(chant_number) slab.busy = null var/datum/clockwork_scripture/ranged_ability/volt_ray/ray = new ray.slab = slab @@ -375,24 +375,6 @@ var/turf/T = get_turf(invoker) if(!ray.run_scripture() && slab && invoker) if(can_recite() && T == get_turf(invoker)) - if(!GLOB.ratvar_awakens) - var/obj/structure/destructible/clockwork/powered/volt_checker/VC = new/obj/structure/destructible/clockwork/powered/volt_checker(get_turf(invoker)) - var/multiplier = 0.5 - var/usable_power = min(Floor(VC.total_accessable_power() * 0.2, MIN_CLOCKCULT_POWER), 1000) - if(VC.try_use_power(usable_power)) - multiplier += (usable_power * 0.0005) //at maximum power, should be 1 multiplier - qdel(VC) - if(iscyborg(invoker)) - var/mob/living/silicon/robot/C = invoker - if(C.cell) - var/prev_power = usable_power //we don't want to increase the multiplier past 1 - usable_power = min(Floor(C.cell.charge * 0.2, MIN_CLOCKCULT_POWER), 1000) - prev_power - if(usable_power > 0 && C.cell.use(usable_power)) - multiplier += (usable_power * 0.0005) - var/obj/effect/temp_visual/ratvar/volt_hit/VH = new /obj/effect/temp_visual/ratvar/volt_hit(get_turf(invoker), null, multiplier) - invoker.visible_message("[invoker] is struck by [invoker.p_their()] own [VH.name]!", "You're struck by your own [VH.name]!") - invoker.adjustFireLoss(VH.damage) //you have to fail all five blasts to die to this - playsound(invoker, 'sound/machines/defib_zap.ogg', VH.damage, 1, -1) to_chat(invoker, "\"[text2ratvar(pick(nzcrentr_insults))]\"") else return FALSE @@ -410,6 +392,3 @@ ranged_message = "You charge the clockwork slab with shocking might.\n\ Left-click a target to fire, quickly!" timeout_time = 20 - -/obj/structure/destructible/clockwork/powered/volt_checker - invisibility = INVISIBILITY_ABSTRACT diff --git a/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm b/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm new file mode 100644 index 00000000000..28cc82ff2ee --- /dev/null +++ b/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm @@ -0,0 +1,140 @@ +//Prolonging Prism: A prism that consumes power to delay the shuttle +/obj/structure/destructible/clockwork/powered/prolonging_prism + name = "prolonging prism" + desc = "A dark onyx prism, held in midair by spiraling tendrils of stone." + clockwork_desc = "A powerful prism that will delay the arrival of an emergency shuttle." + icon_state = "prolonging_prism_inactive" + active_icon = "prolonging_prism" + inactive_icon = "prolonging_prism_inactive" + unanchored_icon = "prolonging_prism_unwrenched" + construction_value = 20 + max_integrity = 125 + obj_integrity = 125 + break_message = "The prism falls to the ground with a heavy thud!" + debris = list(/obj/item/clockwork/alloy_shards/small = 3, \ + /obj/item/clockwork/alloy_shards/medium = 1, \ + /obj/item/clockwork/alloy_shards/large = 1, \ + /obj/item/clockwork/component/vanguard_cogwheel/onyx_prism = 1) + var/static/list/component_refund = list(VANGUARD_COGWHEEL = 2, GEIS_CAPACITOR = 1, REPLICANT_ALLOY = 1) + var/static/delay_cost = 2500 + var/static/delay_cost_increase = 750 + var/static/delay_remaining = 0 + +/obj/structure/destructible/clockwork/powered/prolonging_prism/examine(mob/user) + ..() + if(is_servant_of_ratvar(user) || isobserver(user)) + if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE) + to_chat(user, "An emergency shuttle has arrived and this prism is no longer useful; attempt to activate it to gain a partial refund of components used.") + else + var/efficiency = get_efficiency_mod() + var/efficiency_time = get_efficiency_mod(TRUE) + to_chat(user, "It requires at least [get_delay_cost() * efficiency]W of power to attempt to delay the arrival of an emergency shuttle by \ + [2 * efficiency_time] minutes.") + to_chat(user, "This cost increases by [delay_cost_increase * 0.1]W for every 10 CV and [delay_cost_increase]W for every previous \ + activation.") + +/obj/structure/destructible/clockwork/powered/prolonging_prism/forced_disable(bad_effects) + if(active) + if(bad_effects) + try_use_power(MIN_CLOCKCULT_POWER*4) + visible_message("[src] emits an airy chuckling sound and falls dark!") + toggle() + return TRUE + +/obj/structure/destructible/clockwork/powered/prolonging_prism/attack_hand(mob/living/user) + if(user.canUseTopic(src, !issilicon(user), NO_DEXTERY) && is_servant_of_ratvar(user)) + if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE) + to_chat(user, "You break [src] apart, refunding some of the components used.") + for(var/i in component_refund) + generate_cache_component(i, src) + take_damage(max_integrity) + return 0 + if(active) + return 0 + var/turf/T = get_turf(src) + if(!T || T.z != ZLEVEL_STATION) + to_chat(user, "[src] must be on the station to function!") + return 0 + if(SSshuttle.emergency.mode != SHUTTLE_CALL) + to_chat(user, "No emergency shuttles are attempting to arrive at the station!") + return 0 + var/efficiency = get_efficiency_mod() + if(!try_use_power(get_delay_cost() * efficiency)) + to_chat(user, "[src] needs more power to function!") + return 0 + delay_cost += delay_cost_increase + delay_remaining += PRISM_DELAY_DURATION + toggle(0, user) + +/obj/structure/destructible/clockwork/powered/prolonging_prism/process() + var/turf/own_turf = get_turf(src) + if(SSshuttle.emergency.mode != SHUTTLE_CALL || delay_remaining <= 0 || !own_turf || own_turf.z != ZLEVEL_STATION) + forced_disable(FALSE) + return + . = ..() + var/delay_amount = 40 + delay_remaining -= delay_amount + var/efficiency = get_efficiency_mod() + SSshuttle.emergency.setTimer(SSshuttle.emergency.timeLeft(1) + (delay_amount * efficiency)) + var/highest_y + var/highest_x + var/lowest_y + var/lowest_x + var/list/prism_turfs = list() + for(var/t in SSshuttle.emergency.ripple_area(SSshuttle.getDock("emergency_home"))) + prism_turfs[t] = TRUE + var/turf/T = t + if(!highest_y || T.y > highest_y) + highest_y = T.y + if(!highest_x || T.x > highest_x) + highest_x = T.x + if(!lowest_y || T.y < lowest_y) + lowest_y = T.y + if(!lowest_x || T.x < lowest_x) + lowest_x = T.x + var/mean_y = Lerp(lowest_y, highest_y) + var/mean_x = Lerp(lowest_x, highest_x) + if(prob(50)) + mean_y = Ceiling(mean_y) + else + mean_y = Floor(mean_y) + if(prob(50)) + mean_x = Ceiling(mean_x) + else + mean_x = Floor(mean_x) + var/turf/semi_random_center_turf = locate(mean_x, mean_y, ZLEVEL_STATION) + for(var/t in getline(src, semi_random_center_turf)) + prism_turfs[t] = TRUE + var/placement_style = prob(50) + for(var/t in prism_turfs) + var/turf/T = t + if(placement_style) + if(IsOdd(T.x + T.y)) + seven_random_hexes(T, efficiency) + else if(prob(50 * efficiency)) + new /obj/effect/temp_visual/ratvar/prolonging_prism(T) + else + if(IsEven(T.x + T.y)) + seven_random_hexes(T, efficiency) + else if(prob(50 * efficiency)) + new /obj/effect/temp_visual/ratvar/prolonging_prism(T) + CHECK_TICK //we may be going over a hell of a lot of turfs + +/obj/structure/destructible/clockwork/powered/prolonging_prism/proc/get_delay_cost() + return Floor((GLOB.clockwork_construction_value * delay_cost_increase * 0.01) + delay_cost, MIN_CLOCKCULT_POWER) + +/obj/structure/destructible/clockwork/powered/prolonging_prism/proc/seven_random_hexes(turf/T, efficiency) + var/static/list/hex_states = list("prismhex1", "prismhex2", "prismhex3", "prismhex4", "prismhex5", "prismhex6", "prismhex7") + var/mutable_appearance/hex_combo + for(var/n in hex_states) //BUILD ME A HEXAGON + if(prob(50 * efficiency)) + if(!hex_combo) + hex_combo = mutable_appearance('icons/effects/64x64.dmi', n, RIPPLE_LAYER) + else + hex_combo.overlays += mutable_appearance('icons/effects/64x64.dmi', n, RIPPLE_LAYER) + if(hex_combo) //YOU BUILT A HEXAGON + hex_combo.pixel_x = -16 + hex_combo.pixel_y = -16 + hex_combo.mouse_opacity = 0 + hex_combo.plane = GAME_PLANE + new /obj/effect/temp_visual/ratvar/prolonging_prism(T, hex_combo) diff --git a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm index 40d6bb02cea..b8f8b75199b 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/tinkerers_daemon.dm @@ -2,7 +2,7 @@ /obj/structure/destructible/clockwork/powered/tinkerers_daemon name = "tinkerer's daemon" desc = "A strange machine with three small brass obelisks attached to it." - clockwork_desc = "An efficient machine that can rapidly produce components at a small power cost. It will only function if outnumbered by servants at a rate to 5:1." + clockwork_desc = "An efficient machine that can rapidly produce components at a small power cost. It will only function if active daemons are outnumbered by servants at a rate to 5:1." icon_state = "tinkerers_daemon" active_icon = "tinkerers_daemon" inactive_icon = "tinkerers_daemon" @@ -18,14 +18,10 @@ var/static/mutable_appearance/component_glow = mutable_appearance('icons/obj/clockwork_objects.dmi', "t_random_component") var/component_id_to_produce var/production_time = 0 //last time we produced a component - var/production_cooldown = 60 - -/obj/structure/destructible/clockwork/powered/tinkerers_daemon/Initialize() - . = ..() - GLOB.clockwork_daemons++ + var/production_cooldown = 70 /obj/structure/destructible/clockwork/powered/tinkerers_daemon/Destroy() - GLOB.clockwork_daemons-- + GLOB.active_daemons -= src return ..() /obj/structure/destructible/clockwork/powered/tinkerers_daemon/examine(mob/user) @@ -61,13 +57,6 @@ if(!anchored) to_chat(user, "[src] needs to be secured to the floor before it can be activated!") return FALSE - var/servants = 0 - for(var/mob/living/L in GLOB.living_mob_list) - if(is_servant_of_ratvar(L)) - servants++ - if(servants * 0.2 < GLOB.clockwork_daemons) - to_chat(user, "\"There are too few servants for this daemon to work.\"") - return if(!GLOB.clockwork_caches) to_chat(user, "\"You require a cache for this daemon to operate. Get to it.\"") return @@ -80,6 +69,13 @@ if(total_accessable_power() < min_power_usable) to_chat(user, "\"You need more power to activate this daemon, friend.\"") return + var/servants = 0 + for(var/mob/living/L in GLOB.living_mob_list) + if(is_servant_of_ratvar(L)) + servants++ + if(servants * 0.2 < 1) + to_chat(user, "\"There are too few servants for daemons to work.\"") + return var/choice = alert(user,"Activate Daemon...",,"Specific Component","Random Component","Cancel") switch(choice) if("Specific Component") @@ -92,7 +88,7 @@ for(var/mob/living/L in GLOB.living_mob_list) if(is_servant_of_ratvar(L)) servants++ - if(!is_servant_of_ratvar(user) || !user.canUseTopic(src, !issilicon(user), NO_DEXTERY) || active || !GLOB.clockwork_caches || servants * 0.2 < GLOB.clockwork_daemons) + if(!is_servant_of_ratvar(user) || !user.canUseTopic(src, !issilicon(user), NO_DEXTERY) || active || !GLOB.clockwork_caches || servants * 0.2 < 1) return if(!component_id_to_produce) to_chat(user, "You decide not to select a component and activate the daemon.") @@ -103,11 +99,18 @@ toggle(0, user) if("Random Component") component_id_to_produce = null + servants = 0 + for(var/mob/living/L in GLOB.living_mob_list) + if(is_servant_of_ratvar(L)) + servants++ + if(!is_servant_of_ratvar(user) || !user.canUseTopic(src, !issilicon(user), NO_DEXTERY) || active || !GLOB.clockwork_caches || servants * 0.2 < 1) + return toggle(0, user) /obj/structure/destructible/clockwork/powered/tinkerers_daemon/toggle(fast_process, mob/living/user) . = ..() if(active) + GLOB.active_daemons += src var/component_color = get_component_color(component_id_to_produce) daemon_glow.color = component_color add_overlay(daemon_glow) @@ -117,6 +120,7 @@ production_time = world.time + production_cooldown //don't immediately produce when turned on after being off set_light(2, 0.9, get_component_color_bright(component_id_to_produce)) else + GLOB.active_daemons -= src cut_overlays() set_light(0) @@ -128,6 +132,14 @@ for(var/mob/living/L in GLOB.living_mob_list) if(is_servant_of_ratvar(L)) servants++ + while(servants * 0.2 < LAZYLEN(GLOB.active_daemons)) + var/obj/structure/destructible/clockwork/powered/tinkerers_daemon/D = GLOB.active_daemons[1] + if(!istype(D)) + break + if(D.active) + D.forced_disable(FALSE) + if(D == src) + return . = ..() var/min_power_usable = 0 if(!component_id_to_produce) @@ -138,7 +150,7 @@ min_power_usable = min(min_power_usable, get_component_cost(i)) else min_power_usable = get_component_cost(component_id_to_produce) - if(!GLOB.clockwork_caches || servants * 0.2 < GLOB.clockwork_daemons || . < min_power_usable) //if we don't have enough to produce the lowest or what we chose to produce, cancel out + if(!GLOB.clockwork_caches || . < min_power_usable) //if we don't have enough to produce the lowest or what we chose to produce, cancel out forced_disable(FALSE) return if(production_time <= world.time) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index e292cf5ab3b..bf6989e906f 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -206,8 +206,8 @@ This file contains the arcane tome files. if(!SSticker.mode.eldergod) to_chat(user, "\"I am already here. There is no need to try to summon me now.\"") return - if((loc.z && loc.z != ZLEVEL_STATION) || !A.blob_allowed) - to_chat(user, "The Geometer is not interested in lesser locations; the station is the prize!") + if(!(A in GLOB.summon_spots)) + to_chat(user, "The Geometer can only be summoned where the veil is weak - in [english_list(GLOB.summon_spots)]!") return var/confirm_final = alert(user, "This is the FINAL step to summon Nar-Sie; it is a long, painful ritual and the crew will be alerted to your presence", "Are you prepared for the final battle?", "My life for Nar-Sie!", "No") if(confirm_final == "No") @@ -215,7 +215,8 @@ This file contains the arcane tome files. return Turf = get_turf(user) A = get_area(src) - if(!check_rune_turf(Turf, user) || (loc.z && loc.z != ZLEVEL_STATION)|| !A.blob_allowed) + if(!(A in GLOB.summon_spots)) // Check again to make sure they didn't move + to_chat(user, "The Geometer can only be summoned where the veil is weak - in [english_list(GLOB.summon_spots)]!") return priority_announce("Figments from an eldritch god are being summoned by [user] into [A.map_name] from an unknown dimension. Disrupt the ritual at all costs!","Central Command Higher Dimensional Affairs", 'sound/AI/spanomalies.ogg') for(var/B in spiral_range_turfs(1, user, 1)) @@ -248,8 +249,6 @@ This file contains the arcane tome files. SSblackbox.add_details("cult_runes_scribed", R.cultist_name) /obj/item/weapon/tome/proc/check_rune_turf(turf/T, mob/user) - var/area/A = get_area(T) - if(isspaceturf(T)) to_chat(user, "You cannot scribe runes in space!") return FALSE @@ -262,8 +261,4 @@ This file contains the arcane tome files. to_chat(user, "The veil is not weak enough here.") return FALSE - if(istype(A, /area/shuttle)) - to_chat(user, "Interference from hyperspace engines disrupts the Geometer's power on shuttles.") - return FALSE - return TRUE diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 0f7bb791f27..1fe8fcac652 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -94,8 +94,6 @@ if(report) addtimer(CALLBACK(src, .proc/send_intercept, 0), rand(waittime_l, waittime_h)) generate_station_goals() - GLOB.start_state = new /datum/station_state() - GLOB.start_state.count(1) return 1 diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index 87ae5497041..72baa586c74 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -43,7 +43,7 @@ /datum/objective_item/steal/capmedal name = "the medal of captaincy" - targetitem = /obj/item/clothing/tie/medal/gold/captain + targetitem = /obj/item/clothing/accessory/medal/gold/captain difficulty = 5 excludefromjob = list("Captain") diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 5bf819a1558..d5ad78fc1fe 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -159,9 +159,10 @@ else if(istype(W, /obj/item/stack/sheet/mineral/plasma)) if(!isEmpProof()) + var/obj/item/stack/sheet/mineral/plasma/P = W upgradeEmpProof() to_chat(user, "[msg]") - qdel(W) + P.use(1) else to_chat(user, "[msg2]") return diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 787ccaaffe2..0059f9bb5d3 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -995,7 +995,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/clothing/head/helmet/gladiator = 1,/obj/item/clothing/under/gimmick/rank/captain/suit = 1,/obj/item/clothing/head/flatcap = 1, /obj/item/clothing/suit/toggle/labcoat/mad = 1,/obj/item/clothing/shoes/jackboots = 1, /obj/item/clothing/under/schoolgirl = 1,/obj/item/clothing/under/schoolgirl/red = 1,/obj/item/clothing/under/schoolgirl/green = 1,/obj/item/clothing/under/schoolgirl/orange = 1,/obj/item/clothing/head/kitty = 1,/obj/item/clothing/under/skirt/black = 1,/obj/item/clothing/head/beret = 1, - /obj/item/clothing/tie/waistcoat = 1,/obj/item/clothing/under/suit_jacket = 1,/obj/item/clothing/head/that =1,/obj/item/clothing/under/kilt = 1,/obj/item/clothing/head/beret = 1,/obj/item/clothing/tie/waistcoat = 1, + /obj/item/clothing/accessory/waistcoat = 1,/obj/item/clothing/under/suit_jacket = 1,/obj/item/clothing/head/that =1,/obj/item/clothing/under/kilt = 1,/obj/item/clothing/head/beret = 1,/obj/item/clothing/accessory/waistcoat = 1, /obj/item/clothing/glasses/monocle =1,/obj/item/clothing/head/bowler = 1,/obj/item/weapon/cane = 1,/obj/item/clothing/under/sl_suit = 1, /obj/item/clothing/mask/fakemoustache = 1,/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,/obj/item/clothing/head/plaguedoctorhat = 1,/obj/item/clothing/mask/gas/plaguedoctor = 1, /obj/item/clothing/suit/toggle/owlwings = 1, /obj/item/clothing/under/owl = 1,/obj/item/clothing/mask/gas/owl_mask = 1, @@ -1136,7 +1136,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/clothing/neck/scarf/purple=1,/obj/item/clothing/neck/scarf/yellow=1,/obj/item/clothing/neck/scarf/orange=1, /obj/item/clothing/neck/scarf/cyan=1,/obj/item/clothing/neck/scarf=1,/obj/item/clothing/neck/scarf/black=1, /obj/item/clothing/neck/scarf/zebra=1,/obj/item/clothing/neck/scarf/christmas=1,/obj/item/clothing/neck/stripedredscarf=1, - /obj/item/clothing/neck/stripedbluescarf=1,/obj/item/clothing/neck/stripedgreenscarf=1,/obj/item/clothing/tie/waistcoat=1, + /obj/item/clothing/neck/stripedbluescarf=1,/obj/item/clothing/neck/stripedgreenscarf=1,/obj/item/clothing/accessory/waistcoat=1, /obj/item/clothing/under/skirt/black=1,/obj/item/clothing/under/skirt/blue=1,/obj/item/clothing/under/skirt/red=1,/obj/item/clothing/under/skirt/purple=1, /obj/item/clothing/under/sundress=2,/obj/item/clothing/under/stripeddress=1, /obj/item/clothing/under/sailordress=1, /obj/item/clothing/under/redeveninggown=1, /obj/item/clothing/under/blacktango=1, /obj/item/clothing/under/plaid_skirt=1,/obj/item/clothing/under/plaid_skirt/blue=1,/obj/item/clothing/under/plaid_skirt/purple=1,/obj/item/clothing/under/plaid_skirt/green=1, diff --git a/code/game/objects/effects/spawners/bundle.dm b/code/game/objects/effects/spawners/bundle.dm index c272c383e98..c316b7e2099 100644 --- a/code/game/objects/effects/spawners/bundle.dm +++ b/code/game/objects/effects/spawners/bundle.dm @@ -60,7 +60,7 @@ /obj/effect/spawner/bundle/costume/butler name = "butler costume spawner" items = list( - /obj/item/clothing/tie/waistcoat, + /obj/item/clothing/accessory/waistcoat, /obj/item/clothing/under/suit_jacket, /obj/item/clothing/head/that) @@ -73,7 +73,7 @@ /obj/effect/spawner/bundle/costume/prig name = "prig costume spawner" items = list( - /obj/item/clothing/tie/waistcoat, + /obj/item/clothing/accessory/waistcoat, /obj/item/clothing/glasses/monocle, /obj/effect/spawner/lootdrop/minor/bowler_or_that, /obj/item/clothing/shoes/sneakers/black, diff --git a/code/game/objects/effects/temporary_visuals/clockcult.dm b/code/game/objects/effects/temporary_visuals/clockcult.dm index 1eae2a3c643..ff788ef580e 100644 --- a/code/game/objects/effects/temporary_visuals/clockcult.dm +++ b/code/game/objects/effects/temporary_visuals/clockcult.dm @@ -81,21 +81,15 @@ /obj/effect/temp_visual/ratvar/volt_hit name = "volt blast" layer = ABOVE_MOB_LAYER - duration = 5 + duration = 8 icon_state = "volt_hit" light_range = 1.5 light_power = 2 light_color = LIGHT_COLOR_ORANGE var/mob/user - var/damage = 20 + var/damage = 25 -/obj/effect/temp_visual/ratvar/volt_hit/Initialize(mapload, caster, multiplier) - if(multiplier) - damage *= multiplier - duration = max(round(damage * 0.2), 1) - . = ..() - -/obj/effect/temp_visual/ratvar/volt_hit/true/Initialize(mapload, caster, multiplier) +/obj/effect/temp_visual/ratvar/volt_hit/Initialize(mapload, caster) . = ..() user = caster if(user) @@ -146,6 +140,20 @@ pixel_y = rand(-10, 10) animate(src, alpha = 0, time = 3, easing = EASE_OUT) +/obj/effect/temp_visual/ratvar/prolonging_prism + icon = 'icons/effects/64x64.dmi' + icon_state = "prismhex1" + layer = RIPPLE_LAYER + pixel_y = -16 + pixel_x = -16 + duration = 30 + +/obj/effect/temp_visual/ratvar/prolonging_prism/Initialize(mapload, set_appearance) + . = ..() + if(set_appearance) + appearance = set_appearance + animate(src, alpha = 0, time = duration, easing = BOUNCE_EASING) + /obj/effect/temp_visual/ratvar/spearbreak icon = 'icons/effects/64x64.dmi' icon_state = "ratvarspearbreak" diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 64af889af60..381b69b44f7 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -269,13 +269,15 @@ return if(!in_range(src, user)) return + if(is_cyborg) + return else if(zero_amount()) return //get amount from user var/min = 0 var/max = src.get_amount() - var/stackmaterial = round(input(user,"How many sheets do you wish to take out of this stack? (Maximum [max]") as num) + var/stackmaterial = round(input(user,"How many sheets do you wish to take out of this stack? (Maximum [max])") as num) if(stackmaterial == null || stackmaterial <= min || stackmaterial >= src.get_amount()) return else diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/weapons/charter.dm similarity index 89% rename from code/game/objects/items/charter.dm rename to code/game/objects/items/weapons/charter.dm index 36efee00922..42cb30d1510 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/weapons/charter.dm @@ -1,6 +1,6 @@ #define STATION_RENAME_TIME_LIMIT 3000 -/obj/item/station_charter +/obj/item/weapon/station_charter name = "station charter" icon = 'icons/obj/wizard.dmi' icon_state = "scroll2" @@ -16,7 +16,7 @@ var/static/regex/standard_station_regex -/obj/item/station_charter/New() +/obj/item/weapon/station_charter/New() . = ..() if(!standard_station_regex) var/prefixes = jointext(GLOB.station_prefixes, "|") @@ -26,13 +26,13 @@ var/regexstr = "(([prefixes]) )?(([names]) ?)([suffixes]) ([numerals])" standard_station_regex = new(regexstr) -/obj/item/station_charter/Destroy() +/obj/item/weapon/station_charter/Destroy() if(response_timer_id) deltimer(response_timer_id) response_timer_id = null . = ..() -/obj/item/station_charter/attack_self(mob/living/user) +/obj/item/weapon/station_charter/attack_self(mob/living/user) if(used) to_chat(user, "The [name_type] has already been named.") return @@ -63,7 +63,7 @@ response_timer_id = addtimer(CALLBACK(src, .proc/rename_station, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE) to_chat(GLOB.admins, "CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [new_name] (will autoapprove in [approval_time / 10] seconds). [ADMIN_SMITE(user)] (REJECT) [ADMIN_CENTCOM_REPLY(user)]") -/obj/item/station_charter/proc/reject_proposed(user) +/obj/item/weapon/station_charter/proc/reject_proposed(user) if(!user) return if(!response_timer_id) @@ -79,7 +79,7 @@ deltimer(response_timer_id) response_timer_id = null -/obj/item/station_charter/proc/rename_station(designation, uname, ureal_name, ukey) +/obj/item/weapon/station_charter/proc/rename_station(designation, uname, ureal_name, ukey) set_station_name(designation) minor_announce("[ureal_name] has designated your station as [station_name()]", "Captain's Charter", 0) log_game("[ukey] has renamed the station as [station_name()].") @@ -91,7 +91,7 @@ if(!unlimited_uses) used = TRUE -/obj/item/station_charter/admin +/obj/item/weapon/station_charter/admin unlimited_uses = TRUE ignores_timeout = TRUE @@ -99,14 +99,14 @@ /obj/item/weapon/station_charter/flag name = "nanotrasen banner" icon = 'icons/obj/items.dmi' - var/name_type = "planet" + name_type = "planet" icon_state = "banner" item_state = "banner" desc = "A cunning device used to claim ownership of planets." w_class = 5 force = 15 -/obj/item/station_charter/flag/rename_station(designation, uname, ureal_name, ukey) +/obj/item/weapon/station_charter/flag/rename_station(designation, uname, ureal_name, ukey) set_station_name(designation) minor_announce("[ureal_name] has designated the planet as [station_name()]", "Captain's Banner", 0) log_game("[ukey] has renamed the planet as [station_name()].") @@ -116,6 +116,4 @@ if(!unlimited_uses) used = TRUE - - #undef STATION_RENAME_TIME_LIMIT diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index df23172b4fd..2821269da35 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -276,7 +276,6 @@ force = 0 throwforce = 6 w_class = WEIGHT_CLASS_BULKY - flags = NODROP var/revivecost = 1000 var/cooldown = 0 diff --git a/code/game/objects/items/weapons/implants/implant_track.dm b/code/game/objects/items/weapons/implants/implant_track.dm index ea631e360d0..bcd36c7e409 100644 --- a/code/game/objects/items/weapons/implants/implant_track.dm +++ b/code/game/objects/items/weapons/implants/implant_track.dm @@ -33,3 +33,9 @@ Integrity: Gradient creates slight risk of being overcharged and frying the circuitry. As a result neurotoxins can cause massive damage."} return dat + + +/obj/item/weapon/implantcase/track + name = "implant case - 'Tracking'" + desc = "A glass case containing a tracking implant." + imp_type = /obj/item/weapon/implant/tracking \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 5c53db06cf2..c730dcce8a3 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -568,7 +568,7 @@ /obj/item/weapon/storage/box/deputy/PopulateContents() for(var/i in 1 to 7) - new /obj/item/clothing/tie/armband/deputy(src) + new /obj/item/clothing/accessory/armband/deputy(src) /obj/item/weapon/storage/box/metalfoam name = "box of metal foam grenades" diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index 2345f679cd9..3a5e0ee1ef6 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -100,17 +100,20 @@ w_class = WEIGHT_CLASS_NORMAL max_w_class = WEIGHT_CLASS_SMALL storage_slots = 10 + max_combined_w_class = 20 req_access = list(GLOB.access_captain) icon_locked = "medalbox+l" icon_closed = "medalbox" icon_broken = "medalbox+b" + can_hold = list(/obj/item/clothing/accessory/medal) /obj/item/weapon/storage/lockbox/medal/PopulateContents() - new /obj/item/clothing/tie/medal/silver/valor(src) - new /obj/item/clothing/tie/medal/bronze_heart(src) + new /obj/item/clothing/accessory/medal/silver/valor(src) + new /obj/item/clothing/accessory/medal/bronze_heart(src) for(var/i in 1 to 3) - new /obj/item/clothing/tie/medal/conduct(src) - new /obj/item/clothing/tie/medal/gold/captain(src) - new /obj/item/clothing/tie/medal/silver/security(src) - new /obj/item/clothing/tie/medal/nobel_science(src) - new /obj/item/clothing/tie/medal/gold/heroism(src) + new /obj/item/clothing/accessory/medal/conduct(src) + new /obj/item/clothing/accessory/medal/gold/captain(src) + new /obj/item/clothing/accessory/medal/silver/security(src) + new /obj/item/clothing/accessory/medal/plasma(src) + new /obj/item/clothing/accessory/medal/plasma/nobel_science(src) + new /obj/item/clothing/accessory/medal/gold/heroism(src) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index dacd06ee826..84aa45e289f 100755 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -66,6 +66,7 @@ materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get force = 8 //might or might not be too high, subject to change + w_class = WEIGHT_CLASS_SMALL throwforce = 8 attack_verb = list("drilled", "screwed", "jabbed") toolspeed = 0.25 @@ -188,6 +189,7 @@ materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get force = 8 //might or might not be too high, subject to change + w_class = WEIGHT_CLASS_SMALL throwforce = 8 throw_speed = 2 throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 3bf99fb4256..5c1b27b5b4b 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -15,8 +15,8 @@ new /obj/item/clothing/under/sl_suit(src) new /obj/item/clothing/under/rank/bartender(src) new /obj/item/clothing/under/rank/bartender(src) - new /obj/item/clothing/tie/waistcoat(src) - new /obj/item/clothing/tie/waistcoat(src) + new /obj/item/clothing/accessory/waistcoat(src) + new /obj/item/clothing/accessory/waistcoat(src) new /obj/item/clothing/head/soft/black(src) new /obj/item/clothing/head/soft/black(src) new /obj/item/clothing/shoes/sneakers/black(src) @@ -39,8 +39,8 @@ new /obj/item/clothing/under/waiter(src) new /obj/item/device/radio/headset/headset_srv(src) new /obj/item/device/radio/headset/headset_srv(src) - new /obj/item/clothing/tie/waistcoat(src) - new /obj/item/clothing/tie/waistcoat(src) + new /obj/item/clothing/accessory/waistcoat(src) + new /obj/item/clothing/accessory/waistcoat(src) for(var/i in 1 to 3) new /obj/item/clothing/suit/apron/chef(src) new /obj/item/clothing/head/soft/mime(src) @@ -95,8 +95,8 @@ new /obj/item/clothing/suit/toggle/lawyer/black(src) new /obj/item/clothing/shoes/laceup(src) new /obj/item/clothing/shoes/laceup(src) - new /obj/item/clothing/tie/lawyers_badge(src) - new /obj/item/clothing/tie/lawyers_badge(src) + new /obj/item/clothing/accessory/lawyers_badge(src) + new /obj/item/clothing/accessory/lawyers_badge(src) /obj/structure/closet/wardrobe/chaplain_black name = "chapel wardrobe" @@ -353,3 +353,16 @@ new /obj/item/clothing/under/rank/hydroponics(src) for(var/i in 1 to 3) new /obj/item/clothing/mask/bandana(src) + + +/obj/structure/closet/wardrobe/curator + name = "treasure hunting wardrobe" + icon_door = "black" + +/obj/structure/closet/wardrobe/curator/PopulateContents() + new /obj/item/clothing/head/fedora/curator(src) + new /obj/item/clothing/suit/curator(src) + new /obj/item/clothing/under/rank/curator/treasure_hunter(src) + new /obj/item/clothing/shoes/workboots/mining(src) + new /obj/item/weapon/storage/backpack/satchel/explorer(src) + diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 58fcaedf377..c045b763f1a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -132,28 +132,28 @@ /obj/structure/closet/secure_closet/security/cargo/PopulateContents() ..() - new /obj/item/clothing/tie/armband/cargo(src) + new /obj/item/clothing/accessory/armband/cargo(src) new /obj/item/device/encryptionkey/headset_cargo(src) /obj/structure/closet/secure_closet/security/engine /obj/structure/closet/secure_closet/security/engine/PopulateContents() ..() - new /obj/item/clothing/tie/armband/engine(src) + new /obj/item/clothing/accessory/armband/engine(src) new /obj/item/device/encryptionkey/headset_eng(src) /obj/structure/closet/secure_closet/security/science /obj/structure/closet/secure_closet/security/science/PopulateContents() ..() - new /obj/item/clothing/tie/armband/science(src) + new /obj/item/clothing/accessory/armband/science(src) new /obj/item/device/encryptionkey/headset_sci(src) /obj/structure/closet/secure_closet/security/med /obj/structure/closet/secure_closet/security/med/PopulateContents() ..() - new /obj/item/clothing/tie/armband/medblue(src) + new /obj/item/clothing/accessory/armband/medblue(src) new /obj/item/device/encryptionkey/headset_med(src) /obj/structure/closet/secure_closet/detective @@ -168,10 +168,10 @@ ..() new /obj/item/clothing/under/rank/det(src) new /obj/item/clothing/suit/det_suit(src) - new /obj/item/clothing/head/det_hat(src) + new /obj/item/clothing/head/fedora/det_hat(src) new /obj/item/clothing/gloves/color/black(src) new /obj/item/clothing/under/rank/det/grey(src) - new /obj/item/clothing/tie/waistcoat(src) + new /obj/item/clothing/accessory/waistcoat(src) new /obj/item/clothing/suit/det_suit/grey(src) new /obj/item/clothing/head/fedora(src) new /obj/item/clothing/shoes/laceup(src) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 3edb53a1ff4..e431d74d04c 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -3,6 +3,7 @@ * Morgue * Morgue tray * Crematorium + * Creamatorium * Crematorium tray * Crematorium button */ @@ -189,7 +190,7 @@ GLOBAL_LIST_EMPTY(crematoriums) // Make sure we don't delete the actual morgue and its tray var/list/conts = GetAllContents() - src - connected - if(conts.len <= 1) + if(!conts.len) audible_message("You hear a hollow crackle.") return @@ -223,6 +224,20 @@ GLOBAL_LIST_EMPTY(crematoriums) update_icon() playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) //you horrible people +/obj/structure/bodycontainer/crematorium/creamatorium + name = "creamatorium" + desc = "A human incinerator. Works well during ice cream socials." + +/obj/structure/bodycontainer/crematorium/creamatorium/cremate(mob/user) + var/list/icecreams = new() + for(var/mob/living/i_scream in GetAllContents()) + var/obj/item/weapon/reagent_containers/food/snacks/icecream/IC = new() + IC.set_cone_type("waffle") + IC.add_mob_flavor(i_scream) + icecreams += IC + . = ..() + for(var/obj/IC in icecreams) + IC.forceMove(src) /* * Generic Tray diff --git a/code/modules/admin/DB_ban/functions.dm b/code/modules/admin/DB_ban/functions.dm index 1061a58fd58..23bf656b8cb 100644 --- a/code/modules/admin/DB_ban/functions.dm +++ b/code/modules/admin/DB_ban/functions.dm @@ -122,7 +122,7 @@ computerid = "0" if(!ip) ip = "0.0.0.0" - var/sql = "INSERT INTO [format_table_name("ban")] (`bantime`,`server_ip`,`server_port`,`round_id`,`bantype`,`reason`,`job`,`duration`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`) VALUES (Now(), COALESCE(INET_ATON('[world.internet_address]'), 0), '[world.port]', '[GLOB.round_id]', '[bantype_str]', '[reason]', '[job]', [(duration)?"[duration]":"0"], Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[ckey]', '[computerid]', INET_ATON('[ip]'), '[a_ckey]', '[a_computerid]', INET_ATON('[a_ip]'), '[who]', '[adminwho]')" + var/sql = "INSERT INTO [format_table_name("ban")] (`bantime`,`server_ip`,`server_port`,`round_id`,`bantype`,`reason`,`job`,`duration`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`) VALUES (Now(), INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]', '[GLOB.round_id]', '[bantype_str]', '[reason]', '[job]', [(duration)?"[duration]":"0"], Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[ckey]', '[computerid]', INET_ATON('[ip]'), '[a_ckey]', '[a_computerid]', INET_ATON('[a_ip]'), '[who]', '[adminwho]')" var/datum/DBQuery/query_add_ban = SSdbcore.NewQuery(sql) if(!query_add_ban.warn_execute()) return diff --git a/code/modules/admin/adminmenu.dm b/code/modules/admin/adminmenu.dm index fc7a57e212b..5a75accde45 100644 --- a/code/modules/admin/adminmenu.dm +++ b/code/modules/admin/adminmenu.dm @@ -1,8 +1,8 @@ -/datum/menu/Admin/Generate_list(client/C) +/datum/verbs/menu/Admin/Generate_list(client/C) if (C.holder) . = ..() -/datum/menu/Admin/verb/playerpanel() +/datum/verbs/menu/Admin/verb/playerpanel() set name = "Player Panel" set desc = "Player Panel" set category = "Admin" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 1c0dfa027a8..4a9c8368961 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1739,7 +1739,7 @@ else if(href_list["reject_custom_name"]) if(!check_rights(R_ADMIN)) return - var/obj/item/station_charter/charter = locate(href_list["reject_custom_name"]) + var/obj/item/weapon/station_charter/charter = locate(href_list["reject_custom_name"]) if(istype(charter)) charter.reject_proposed(usr) else if(href_list["jumpto"]) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index a6cac2d8a3c..d16fed30d75 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -183,7 +183,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) to_chat(C, "PM to-Admins: [name]") //send it to irc if nobody is on and tell us how many were on - var/admin_number_present = send2irc_adminless_only("#[id] [initiator_ckey]", name) + var/admin_number_present = send2irc_adminless_only(initiator_ckey, "Ticket #[id]: [name]") log_admin_private("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.") if(admin_number_present <= 0) to_chat(C, "No active admins are online, your adminhelp was sent to the admin irc.") diff --git a/code/modules/admin/whitelist.dm b/code/modules/admin/whitelist.dm index 095e3dceac0..082936e0e85 100644 --- a/code/modules/admin/whitelist.dm +++ b/code/modules/admin/whitelist.dm @@ -10,7 +10,7 @@ GLOBAL_PROTECT(whitelist) continue if(findtextEx(line,"#",1,2)) continue - GLOB.whitelist += line + GLOB.whitelist += ckey(line) if(!GLOB.whitelist.len) GLOB.whitelist = null diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm index d12204d8ad3..20439e5c2b7 100644 --- a/code/modules/atmospherics/machinery/other/miner.dm +++ b/code/modules/atmospherics/machinery/other/miner.dm @@ -29,6 +29,10 @@ idle_power_usage = 150 active_power_usage = 2000 +/obj/machinery/atmospherics/miner/Initialize() + . = ..() + set_active(active) //Force overlay update. + /obj/machinery/atmospherics/miner/examine(mob/user) ..() if(broken) @@ -40,31 +44,41 @@ var/turf/T = get_turf(src) if(!isopenturf(T)) broken_message = "VENT BLOCKED" - broken = TRUE + set_broken(TRUE) return FALSE var/turf/open/OT = T if(OT.planetary_atmos) broken_message = "DEVICE NOT ENCLOSED IN A PRESSURIZED ENVIRONMENT" - broken = TRUE + set_broken(TRUE) return FALSE if(isspaceturf(T)) broken_message = "AIR VENTING TO SPACE" - broken = TRUE + set_broken(TRUE) return FALSE var/datum/gas_mixture/G = OT.return_air() if(G.return_pressure() > (max_ext_kpa - ((spawn_mol*spawn_temp*R_IDEAL_GAS_EQUATION)/(CELL_VOLUME)))) broken_message = "EXTERNAL PRESSURE OVER THRESHOLD" - broken = TRUE + set_broken(TRUE) return FALSE if(G.total_moles() > max_ext_mol) broken_message = "EXTERNAL AIR CONCENTRATION OVER THRESHOLD" - broken = TRUE + set_broken(TRUE) return FALSE if(broken) - broken = FALSE + set_broken(FALSE) broken_message = "" return TRUE +/obj/machinery/atmospherics/miner/proc/set_active(setting) + if(active != setting) + active = setting + update_icon() + +/obj/machinery/atmospherics/miner/proc/set_broken(setting) + if(broken != setting) + broken = setting + update_icon() + /obj/machinery/atmospherics/miner/proc/update_power() if(!active) active_power_usage = idle_power_usage @@ -96,7 +110,7 @@ return FALSE /obj/machinery/atmospherics/miner/update_icon() - overlays.Cut() + cut_overlays() if(broken) add_overlay("broken") else if(active) @@ -106,7 +120,6 @@ /obj/machinery/atmospherics/miner/process() update_power() - update_icon() check_operation() if(active && !broken) if(isnull(spawn_id)) diff --git a/code/modules/cargo/exports/sheets.dm b/code/modules/cargo/exports/sheets.dm index 666d0f24fa3..fcd279f87e0 100644 --- a/code/modules/cargo/exports/sheets.dm +++ b/code/modules/cargo/exports/sheets.dm @@ -69,7 +69,7 @@ // Plasteel. Lightweight, strong and contains some plasma too. /datum/export/stack/plasteel - cost = 85 + cost = 305 // 2000u of plasma + 2000u of metal. message = "of plasteel" export_types = list(/obj/item/stack/sheet/plasteel) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index fbce7a705dd..38bd719891f 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -286,7 +286,7 @@ /obj/item/device/camera, /obj/item/device/taperecorder, /obj/item/toy/crayon/white, - /obj/item/clothing/head/det_hat) + /obj/item/clothing/head/fedora/det_hat) crate_name = "forensics crate" /datum/supply_pack/security/armory @@ -1249,13 +1249,13 @@ /datum/supply_pack/materials/plasteel20 name = "20 Plasteel Sheets" - cost = 3000 + cost = 7500 contains = list(/obj/item/stack/sheet/plasteel/twenty) crate_name = "plasteel sheets crate" /datum/supply_pack/materials/plasteel50 name = "50 Plasteel Sheets" - cost = 5000 + cost = 16500 contains = list(/obj/item/stack/sheet/plasteel/fifty) crate_name = "plasteel sheets crate" @@ -1637,7 +1637,7 @@ /obj/item/clothing/suit/toggle/lawyer/purple, /obj/item/clothing/under/lawyer/blacksuit, /obj/item/clothing/suit/toggle/lawyer/black, - /obj/item/clothing/tie/waistcoat, + /obj/item/clothing/accessory/waistcoat, /obj/item/clothing/neck/tie/blue, /obj/item/clothing/neck/tie/red, /obj/item/clothing/neck/tie/black, diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index faf2d0ad6dc..9e78479bff1 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -327,9 +327,9 @@ GLOBAL_LIST(external_rsc_urls) if(!tooltips) tooltips = new /datum/tooltip(src) - var/list/topmenus = GLOB.menulist[/datum/menu] + var/list/topmenus = GLOB.menulist[/datum/verbs/menu] for (var/thing in topmenus) - var/datum/menu/topmenu = thing + var/datum/verbs/menu/topmenu = thing var/topmenuname = "[topmenu]" if (topmenuname == "[topmenu.type]") var/list/tree = splittext(topmenuname, "/") @@ -338,13 +338,13 @@ GLOBAL_LIST(external_rsc_urls) var/list/entries = topmenu.Generate_list(src) for (var/child in entries) winset(src, "[url_encode(child)]", "[entries[child]]") - if (!ispath(child, /datum/menu)) + if (!ispath(child, /datum/verbs/menu)) var/atom/verb/verbpath = child if (copytext(verbpath.name,1,2) != "@") new child(src) for (var/thing in prefs.menuoptions) - var/datum/menu/menuitem = GLOB.menulist[thing] + var/datum/verbs/menu/menuitem = GLOB.menulist[thing] if (menuitem) menuitem.Load_checked(src) @@ -452,7 +452,7 @@ GLOBAL_LIST(external_rsc_urls) return if(!account_join_date) account_join_date = "Error" - var/datum/DBQuery/query_log_connection = SSdbcore.NewQuery("INSERT INTO `[format_table_name("connection_log")]` (`id`,`datetime`,`server_ip`,`server_port`,`ckey`,`ip`,`computerid`) VALUES(null,Now(),COALESCE(INET_ATON('[world.internet_address]'), 0),'[world.port]','[sql_ckey]',INET_ATON('[sql_ip]'),'[sql_computerid]')") + var/datum/DBQuery/query_log_connection = SSdbcore.NewQuery("INSERT INTO `[format_table_name("connection_log")]` (`id`,`datetime`,`server_ip`,`server_port`,`ckey`,`ip`,`computerid`) VALUES(null,Now(),INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')),'[world.port]','[sql_ckey]',INET_ATON('[sql_ip]'),'[sql_computerid]')") query_log_connection.Execute() /client/proc/findJoinDate() diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 5ed5980883f..943999aecc9 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -1,10 +1,10 @@ //this works as is to create a single checked item, but has no back end code for toggleing the check yet #define TOGGLE_CHECKBOX(PARENT, CHILD) PARENT/CHILD/abstract = TRUE;PARENT/CHILD/checkbox = CHECKBOX_TOGGLE;PARENT/CHILD/verb/CHILD -//Example usage TOGGLE_CHECKBOX(datum/menu/Settings/Ghost/chatterbox, toggle_ghost_ears)() +//Example usage TOGGLE_CHECKBOX(datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_ears)() //override because we don't want to save preferences twice. -/datum/menu/Settings/Set_checked(client/C, verbpath) +/datum/verbs/menu/Settings/Set_checked(client/C, verbpath) if (checkbox == CHECKBOX_GROUP) C.prefs.menuoptions[type] = verbpath else if (checkbox == CHECKBOX_TOGGLE) @@ -12,7 +12,7 @@ C.prefs.menuoptions[type] = !checked winset(C, "[verbpath]", "is-checked = [!checked]") -/datum/menu/Settings/verb/setup_character() +/datum/verbs/menu/Settings/verb/setup_character() set name = "Game Preferences" set category = "Preferences" set desc = "Open Game Preferences Window" @@ -20,10 +20,10 @@ usr.client.prefs.ShowChoices(usr) //toggles -/datum/menu/Settings/Ghost/chatterbox +/datum/verbs/menu/Settings/Ghost/chatterbox name = "Chat Box Spam" -TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost/chatterbox, toggle_ghost_ears)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_ears)() set name = "Show/Hide GhostEars" set category = "Preferences" set desc = "See All Speech" @@ -31,10 +31,10 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost/chatterbox, toggle_ghost_ears)() to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].") usr.client.prefs.save_preferences() SSblackbox.add_details("preferences_verb","Toggle Ghost Ears|[usr.client.prefs.chat_toggles & CHAT_GHOSTEARS]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/menu/Settings/Ghost/chatterbox/toggle_ghost_ears/Get_checked(client/C) +/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_ears/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_GHOSTEARS -TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost/chatterbox, toggle_ghost_sight)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_sight)() set name = "Show/Hide GhostSight" set category = "Preferences" set desc = "See All Emotes" @@ -42,10 +42,10 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost/chatterbox, toggle_ghost_sight)() to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].") usr.client.prefs.save_preferences() SSblackbox.add_details("preferences_verb","Toggle Ghost Sight|[usr.client.prefs.chat_toggles & CHAT_GHOSTSIGHT]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/menu/Settings/Ghost/chatterbox/toggle_ghost_sight/Get_checked(client/C) +/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_sight/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_GHOSTSIGHT -TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost/chatterbox, toggle_ghost_whispers)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_whispers)() set name = "Show/Hide GhostWhispers" set category = "Preferences" set desc = "See All Whispers" @@ -53,10 +53,10 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost/chatterbox, toggle_ghost_whispers)() to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTWHISPER) ? "see all whispers in the world" : "only see whispers from nearby mobs"].") usr.client.prefs.save_preferences() SSblackbox.add_details("preferences_verb","Toggle Ghost Whispers|[usr.client.prefs.chat_toggles & CHAT_GHOSTWHISPER]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/menu/Settings/Ghost/chatterbox/toggle_ghost_whispers/Get_checked(client/C) +/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_whispers/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_GHOSTWHISPER -TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost/chatterbox, toggle_ghost_radio)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_radio)() set name = "Show/Hide GhostRadio" set category = "Preferences" set desc = "See All Radio Chatter" @@ -64,10 +64,10 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost/chatterbox, toggle_ghost_radio)() to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTRADIO) ? "see radio chatter" : "not see radio chatter"].") usr.client.prefs.save_preferences() SSblackbox.add_details("preferences_verb","Toggle Ghost Radio|[usr.client.prefs.chat_toggles & CHAT_GHOSTRADIO]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //social experiment, increase the generation whenever you copypaste this shamelessly GENERATION 1 -/datum/menu/Settings/Ghost/chatterbox/toggle_ghost_radio/Get_checked(client/C) +/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_radio/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_GHOSTRADIO -TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost/chatterbox, toggle_ghost_pda)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox, toggle_ghost_pda)() set name = "Show/Hide GhostPDA" set category = "Preferences" set desc = "See All PDA Messages" @@ -75,14 +75,14 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost/chatterbox, toggle_ghost_pda)() to_chat(usr, "As a ghost, you will now [(usr.client.prefs.chat_toggles & CHAT_GHOSTPDA) ? "see all pda messages in the world" : "only see pda messages from nearby mobs"].") usr.client.prefs.save_preferences() SSblackbox.add_details("preferences_verb","Toggle Ghost PDA|[usr.client.prefs.chat_toggles & CHAT_GHOSTPDA]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/menu/Settings/Ghost/chatterbox/toggle_ghost_pda/Get_checked(client/C) +/datum/verbs/menu/Settings/Ghost/chatterbox/toggle_ghost_pda/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_GHOSTPDA -/datum/menu/Settings/Ghost/chatterbox/Events +/datum/verbs/menu/Settings/Ghost/chatterbox/Events name = "Events" //please be aware that the following two verbs have inverted stat output, so that "Toggle Deathrattle|1" still means you activated it -TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost/chatterbox/Events, toggle_deathrattle)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox/Events, toggle_deathrattle)() set name = "Toggle Deathrattle" set category = "Preferences" set desc = "Death" @@ -90,10 +90,10 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost/chatterbox/Events, toggle_deathrattle usr.client.prefs.save_preferences() to_chat(usr, "You will [(usr.client.prefs.toggles & DISABLE_DEATHRATTLE) ? "no longer" : "now"] get messages when a sentient mob dies.") SSblackbox.add_details("preferences_verb", "Toggle Deathrattle|[!(usr.client.prefs.toggles & DISABLE_DEATHRATTLE)]") //If you are copy-pasting this, maybe you should spend some time reading the comments. -/datum/menu/Settings/Ghost/chatterbox/Events/toggle_deathrattle/Get_checked(client/C) +/datum/verbs/menu/Settings/Ghost/chatterbox/Events/toggle_deathrattle/Get_checked(client/C) return !(C.prefs.toggles & DISABLE_DEATHRATTLE) -TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost/chatterbox/Events, toggle_arrivalrattle)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost/chatterbox/Events, toggle_arrivalrattle)() set name = "Toggle Arrivalrattle" set category = "Preferences" set desc = "New Player Arrival" @@ -101,10 +101,10 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost/chatterbox/Events, toggle_arrivalratt to_chat(usr, "You will [(usr.client.prefs.toggles & DISABLE_ARRIVALRATTLE) ? "no longer" : "now"] get messages when someone joins the station.") usr.client.prefs.save_preferences() SSblackbox.add_details("preferences_verb", "Toggle Arrivalrattle|[!(usr.client.prefs.toggles & DISABLE_ARRIVALRATTLE)]") //If you are copy-pasting this, maybe you should rethink where your life went so wrong. -/datum/menu/Settings/Ghost/chatterbox/Events/toggle_arrivalrattle/Get_checked(client/C) +/datum/verbs/menu/Settings/Ghost/chatterbox/Events/toggle_arrivalrattle/Get_checked(client/C) return !(C.prefs.toggles & DISABLE_ARRIVALRATTLE) -TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost, togglemidroundantag)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Ghost, togglemidroundantag)() set name = "Toggle Midround Antagonist" set category = "Preferences" set desc = "Midround Antagonist" @@ -112,10 +112,10 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Ghost, togglemidroundantag)() usr.client.prefs.save_preferences() to_chat(usr, "You will [(usr.client.prefs.toggles & MIDROUND_ANTAG) ? "now" : "no longer"] be considered for midround antagonist positions.") SSblackbox.add_details("preferences_verb","Toggle Midround Antag|[usr.client.prefs.toggles & MIDROUND_ANTAG]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/menu/Settings/Ghost/togglemidroundantag/Get_checked(client/C) +/datum/verbs/menu/Settings/Ghost/togglemidroundantag/Get_checked(client/C) return C.prefs.toggles & MIDROUND_ANTAG -TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, toggletitlemusic)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggletitlemusic)() set name = "Hear/Silence LobbyMusic" set category = "Preferences" set desc = "Hear Music In Lobby" @@ -129,11 +129,11 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, toggletitlemusic)() to_chat(usr, "You will no longer hear music in the game lobby.") usr.stop_sound_channel(CHANNEL_LOBBYMUSIC) SSblackbox.add_details("preferences_verb","Toggle Lobby Music|[usr.client.prefs.toggles & SOUND_LOBBY]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/menu/Settings/Sound/toggletitlemusic/Get_checked(client/C) +/datum/verbs/menu/Settings/Sound/toggletitlemusic/Get_checked(client/C) return C.prefs.toggles & SOUND_LOBBY -TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, togglemidis)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, togglemidis)() set name = "Hear/Silence Midis" set category = "Preferences" set desc = "Hear Admin Triggered Sounds (Midis)" @@ -145,11 +145,11 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, togglemidis)() to_chat(usr, "You will no longer hear sounds uploaded by admins") usr.stop_sound_channel(CHANNEL_ADMIN) SSblackbox.add_details("preferences_verb","Toggle Hearing Midis|[usr.client.prefs.toggles & SOUND_MIDI]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/menu/Settings/Sound/togglemidis/Get_checked(client/C) +/datum/verbs/menu/Settings/Sound/togglemidis/Get_checked(client/C) return C.prefs.toggles & SOUND_MIDI -TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, toggle_instruments)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_instruments)() set name = "Hear/Silence Instruments" set category = "Preferences" set desc = "Hear In-game Instruments" @@ -160,11 +160,11 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, toggle_instruments)() else to_chat(usr, "You will no longer hear musical instruments.") SSblackbox.add_details("preferences_verb","Toggle Instruments|[usr.client.prefs.toggles & SOUND_INSTRUMENTS]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/menu/Settings/Sound/toggle_instruments/Get_checked(client/C) +/datum/verbs/menu/Settings/Sound/toggle_instruments/Get_checked(client/C) return C.prefs.toggles & SOUND_INSTRUMENTS -TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, Toggle_Soundscape)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, Toggle_Soundscape)() set name = "Hear/Silence Ambience" set category = "Preferences" set desc = "Hear Ambient Sound Effects" @@ -177,11 +177,11 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, Toggle_Soundscape)() usr << sound(null, repeat = 0, wait = 0, volume = 0, channel = 1) usr << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2) SSblackbox.add_details("preferences_verb","Toggle Ambience|[usr.client.prefs.toggles & SOUND_AMBIENCE]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/menu/Settings/Sound/Toggle_Soundscape/Get_checked(client/C) +/datum/verbs/menu/Settings/Sound/Toggle_Soundscape/Get_checked(client/C) return C.prefs.toggles & SOUND_AMBIENCE -TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, toggle_ship_ambience)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_ship_ambience)() set name = "Hear/Silence Ship Ambience" set category = "Preferences" set desc = "Hear Ship Ambience Roar" @@ -194,11 +194,11 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, toggle_ship_ambience)() usr << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2) usr.client.ambience_playing = 0 SSblackbox.add_details("preferences_verb", "Toggle Ship Ambience|[usr.client.prefs.toggles & SOUND_SHIP_AMBIENCE]") //If you are copy-pasting this, I bet you read this comment expecting to see the same thing :^) -/datum/menu/Settings/Sound/toggle_ship_ambience/Get_checked(client/C) +/datum/verbs/menu/Settings/Sound/toggle_ship_ambience/Get_checked(client/C) return C.prefs.toggles & SOUND_SHIP_AMBIENCE -TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, toggle_announcement_sound)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggle_announcement_sound)() set name = "Hear/Silence Announcements" set category = "Preferences" set desc = "Hear Announcement Sound" @@ -206,11 +206,11 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, toggle_announcement_sound)() to_chat(usr, "You will now [(usr.client.prefs.toggles & SOUND_ANNOUNCEMENTS) ? "hear announcement sounds" : "no longer hear announcements"].") usr.client.prefs.save_preferences() SSblackbox.add_details("preferences_verb","Toggle Announcement Sound|[usr.client.prefs.toggles & SOUND_ANNOUNCEMENTS]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/menu/Settings/Sound/toggle_announcement_sound/Get_checked(client/C) +/datum/verbs/menu/Settings/Sound/toggle_announcement_sound/Get_checked(client/C) return C.prefs.toggles & SOUND_ANNOUNCEMENTS -TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, toggleprayersounds)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggleprayersounds)() set name = "Hear/Silence Prayer Sounds" set category = "Preferences" set desc = "Hear Prayer Sounds" @@ -221,11 +221,11 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, toggleprayersounds)() else to_chat(usr, "You will no longer prayer sounds.") SSblackbox.add_details("admin_toggle", "Toggle Prayer Sounds|[usr.client.prefs.toggles & SOUND_PRAYERS]") -/datum/menu/Settings/Sound/toggleprayersounds/Get_checked(client/C) +/datum/verbs/menu/Settings/Sound/toggleprayersounds/Get_checked(client/C) return C.prefs.toggles & SOUND_PRAYERS -/datum/menu/Settings/Sound/verb/stop_client_sounds() +/datum/verbs/menu/Settings/Sound/verb/stop_client_sounds() set name = "Stop Sounds" set category = "Preferences" set desc = "Stop Current Sounds" @@ -233,7 +233,7 @@ TOGGLE_CHECKBOX(/datum/menu/Settings/Sound, toggleprayersounds)() SSblackbox.add_details("preferences_verb","Stop Self Sounds") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -TOGGLE_CHECKBOX(/datum/menu/Settings, listen_ooc)() +TOGGLE_CHECKBOX(/datum/verbs/menu/Settings, listen_ooc)() set name = "Show/Hide OOC" set category = "Preferences" set desc = "Show OOC Chat" @@ -241,7 +241,7 @@ TOGGLE_CHECKBOX(/datum/menu/Settings, listen_ooc)() usr.client.prefs.save_preferences() to_chat(usr, "You will [(usr.client.prefs.chat_toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.") SSblackbox.add_details("preferences_verb","Toggle Seeing OOC|[usr.client.prefs.chat_toggles & CHAT_OOC]") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/datum/menu/Settings/listen_ooc/Get_checked(client/C) +/datum/verbs/menu/Settings/listen_ooc/Get_checked(client/C) return C.prefs.chat_toggles & CHAT_OOC diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 8a943b4c268..a5b4b0ca313 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -278,6 +278,11 @@ BLIND // can't see anything var/blockTracking = 0 //For AI tracking var/can_toggle = null +/obj/item/clothing/head/Initialize() + . = ..() + if(istype(loc, /mob/living/carbon/human) && dynamic_hair_suffix) + var/mob/living/carbon/human/H = loc + H.update_hair() /obj/item/clothing/head/worn_overlays(isinhands = FALSE) . = list() @@ -293,6 +298,16 @@ BLIND // can't see anything var/mob/M = loc M.update_inv_head() +/obj/item/clothing/head/equipped(mob/user, slot) + ..() + if(dynamic_hair_suffix) + user.update_hair() + +/obj/item/clothing/head/dropped(mob/user) + ..() + if(dynamic_hair_suffix) + user.update_hair() + //Neck /obj/item/clothing/neck @@ -529,7 +544,7 @@ BLIND // can't see anything var/can_adjust = 1 var/adjusted = NORMAL_STYLE var/alt_covers_chest = 0 // for adjusted/rolled-down jumpsuits, 0 = exposes chest and arms, 1 = exposes arms only - var/obj/item/clothing/tie/hastie = null + var/obj/item/clothing/accessory/attached_accessory var/mutantrace_variation = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to. /obj/item/clothing/under/worn_overlays(isinhands = FALSE) @@ -541,14 +556,14 @@ BLIND // can't see anything . += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform") if(blood_DNA) . += mutable_appearance('icons/effects/blood.dmi', "uniformblood") - if(hastie) - var/tie_color = hastie.item_color - if(!tie_color) - tie_color = hastie.icon_state - var/mutable_appearance/tie = mutable_appearance('icons/mob/ties.dmi', "[tie_color]") - tie.alpha = hastie.alpha - tie.color = hastie.color - . += tie + if(attached_accessory) + var/accessory_color = attached_accessory.item_color + if(!accessory_color) + accessory_color = attached_accessory.icon_state + var/mutable_appearance/accessory = mutable_appearance('icons/mob/accessories.dmi', "[accessory_color]") + accessory.alpha = attached_accessory.alpha + accessory.color = attached_accessory.color + . += accessory /obj/item/clothing/under/attackby(obj/item/W, mob/user, params) if((has_sensor == BROKEN_SENSORS) && istype(W, /obj/item/stack/cable_coil)) @@ -587,29 +602,30 @@ BLIND // can't see anything adjusted = DIGITIGRADE_STYLE H.update_inv_w_uniform() - if(hastie && slot != slot_hands) - hastie.on_uniform_equip(src, user) + if(attached_accessory && slot != slot_hands) + attached_accessory.on_uniform_equip(src, user) /obj/item/clothing/under/dropped(mob/user) - if(hastie) - hastie.on_uniform_dropped(src, user) + if(attached_accessory) + attached_accessory.on_uniform_dropped(src, user) ..() /obj/item/clothing/under/attackby(obj/item/I, mob/user, params) - if(!attachTie(I, user)) + if(!attach_accessory(I, user)) ..() -/obj/item/clothing/under/proc/attachTie(obj/item/I, mob/user, notifyAttach = 1) - if(istype(I, /obj/item/clothing/tie)) - var/obj/item/clothing/tie/T = I - if(hastie) +/obj/item/clothing/under/proc/attach_accessory(obj/item/I, mob/user, notifyAttach = 1) + . = FALSE + if(istype(I, /obj/item/clothing/accessory)) + var/obj/item/clothing/accessory/A = I + if(attached_accessory) if(user) to_chat(user, "[src] already has an accessory.") - return 0 + return else if(user && !user.drop_item()) return - if(!T.attach(src, user)) + if(!A.attach(src, user)) return if(user && notifyAttach) @@ -619,21 +635,21 @@ BLIND // can't see anything var/mob/living/carbon/human/H = loc H.update_inv_w_uniform() - return 1 + return TRUE -/obj/item/clothing/under/proc/removetie(mob/user) +/obj/item/clothing/under/proc/remove_accessory(mob/user) if(!isliving(user)) return if(!can_use(user)) return - if(hastie) - var/obj/item/clothing/tie/T = hastie - hastie.detach(src, user) - if(user.put_in_hands(T)) - to_chat(user, "You detach [T] from [src].") + if(attached_accessory) + var/obj/item/clothing/accessory/A = attached_accessory + attached_accessory.detach(src, user) + if(user.put_in_hands(A)) + to_chat(user, "You detach [A] from [src].") else - to_chat(user, "You detach [T] from [src] and it falls on the floor.") + to_chat(user, "You detach [A] from [src] and it falls on the floor.") if(ishuman(loc)) var/mob/living/carbon/human/H = loc @@ -659,8 +675,8 @@ BLIND // can't see anything to_chat(user, "Its vital tracker appears to be enabled.") if(SENSOR_COORDS) to_chat(user, "Its vital tracker and tracking beacon appear to be enabled.") - if(hastie) - to_chat(user, "\A [hastie] is attached to it.") + if(attached_accessory) + to_chat(user, "\A [attached_accessory] is attached to it.") /proc/generate_female_clothing(index,t_color,icon,type) var/icon/female_clothing_icon = icon("icon"=icon, "icon_state"=t_color) @@ -721,8 +737,8 @@ BLIND // can't see anything to_chat(user, "You can't do that right now!") return else - if(hastie) - removetie(user) + if(attached_accessory) + remove_accessory(user) else rolldown() diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 8402bdfdac3..6fc3a36ad6c 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -72,16 +72,15 @@ flags_cover = HEADCOVERSEYES //Detective -/obj/item/clothing/head/det_hat +/obj/item/clothing/head/fedora/det_hat name = "detective's fedora" desc = "There's only one man who can sniff out the dirty stench of crime, and he's likely wearing this hat." icon_state = "detective" - armor = list(melee = 25, bullet = 5, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0, fire = 30, acid = 50) var/candy_cooldown = 0 pockets = /obj/item/weapon/storage/internal/pocket/small/detective dog_fashion = /datum/dog_fashion/head/detective -/obj/item/clothing/head/det_hat/AltClick() +/obj/item/clothing/head/fedora/det_hat/AltClick() ..() if(ismob(loc)) var/mob/M = loc @@ -166,9 +165,7 @@ icon_state = "officerberet" //Curator -/obj/item/clothing/head/curator +/obj/item/clothing/head/fedora/curator name = "treasure hunter's fedora" desc = "You got red text today kid, but it doesn't mean you have to like it." - icon_state = "curator" - armor = list(melee = 25, bullet = 5, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0, fire = 30, acid = 50) - pockets = /obj/item/weapon/storage/internal/pocket/small \ No newline at end of file + icon_state = "curator" \ No newline at end of file diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index f7e913df678..7428936eaa4 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -181,7 +181,9 @@ name = "fedora" icon_state = "fedora" item_state = "fedora" + armor = list(melee = 25, bullet = 5, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0, fire = 30, acid = 50) desc = "A really cool hat if you're a mobster. A really lame hat if you're not." + dynamic_hair_suffix = "+detective" pockets = /obj/item/weapon/storage/internal/pocket/small /obj/item/clothing/head/fedora/suicide_act(mob/user) diff --git a/code/modules/clothing/neck/ties.dm b/code/modules/clothing/neck/neck.dm similarity index 98% rename from code/modules/clothing/neck/ties.dm rename to code/modules/clothing/neck/neck.dm index 3affebc270e..45bbe23e36b 100644 --- a/code/modules/clothing/neck/ties.dm +++ b/code/modules/clothing/neck/neck.dm @@ -160,7 +160,7 @@ /obj/item/clothing/neck/necklace/dope name = "gold necklace" desc = "Damn, it feels good to be a gangster." - icon = 'icons/obj/clothing/ties.dmi' + icon = 'icons/obj/clothing/neck.dmi' icon_state = "bling" item_color = "bling" @@ -176,4 +176,4 @@ desc = "A hunter's talisman, some say the old gods smile on those who wear it." icon_state = "talisman" item_color = "talisman" - armor = list(melee = 5, bullet = 5, laser = 5, energy = 5, bomb = 20, bio = 20, rad = 5, fire = 0, acid = 25) \ No newline at end of file + armor = list(melee = 5, bullet = 5, laser = 5, energy = 5, bomb = 20, bio = 20, rad = 5, fire = 0, acid = 25) diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 6344ef22d73..b405c16a7bc 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -30,7 +30,7 @@ uniform = /obj/item/clothing/under/rank/det suit = /obj/item/clothing/suit/det_suit glasses = /obj/item/clothing/glasses/thermal/monocle - head = /obj/item/clothing/head/det_hat + head = /obj/item/clothing/head/fedora/det_hat r_hand = /obj/item/weapon/gun/ballistic l_hand = null r_pocket = /obj/item/ammo_box/c10mm @@ -154,7 +154,7 @@ /datum/outfit/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) var/obj/item/clothing/under/U = H.w_uniform - U.attachTie(new /obj/item/clothing/tie/waistcoat(H)) + U.attach_accessory(new /obj/item/clothing/accessory/waistcoat(H)) if(visualsOnly) return diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/accessories.dm similarity index 63% rename from code/modules/clothing/under/ties.dm rename to code/modules/clothing/under/accessories.dm index 5ee12b0bbff..3653d7a395e 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/accessories.dm @@ -1,230 +1,256 @@ -/obj/item/clothing/tie //Ties moved to neck slot items, but as there are still things like medals and armbands, this accessory system is being kept as-is - name = "tie" - desc = "A neosilk clip-on tie." - icon = 'icons/obj/clothing/ties.dmi' - icon_state = "bluetie" - item_state = "" //no inhands - item_color = "bluetie" - slot_flags = 0 - w_class = WEIGHT_CLASS_SMALL - var/minimize_when_attached = TRUE // TRUE if shown as a small icon in corner, FALSE if overlayed - -/obj/item/clothing/tie/proc/attach(obj/item/clothing/under/U, user) - if(pockets) // Attach storage to jumpsuit - if(U.pockets) // storage items conflict - return 0 - - pockets.loc = U - U.pockets = pockets - - U.hastie = src - loc = U - layer = FLOAT_LAYER - plane = FLOAT_PLANE - if(minimize_when_attached) - transform *= 0.5 //halve the size so it doesn't overpower the under - pixel_x += 8 - pixel_y -= 8 - U.add_overlay(src) - - for(var/armor_type in armor) - U.armor[armor_type] += armor[armor_type] - - return 1 - - -/obj/item/clothing/tie/proc/detach(obj/item/clothing/under/U, user) - if(pockets && pockets == U.pockets) - pockets.loc = src - U.pockets = null - - for(var/armor_type in armor) - U.armor[armor_type] -= armor[armor_type] - - if(minimize_when_attached) - transform *= 2 - pixel_x -= 8 - pixel_y += 8 - layer = initial(layer) - plane = initial(plane) - U.cut_overlays() - U.hastie = null - -/obj/item/clothing/tie/proc/on_uniform_equip(obj/item/clothing/under/U, user) - return - -/obj/item/clothing/tie/proc/on_uniform_dropped(obj/item/clothing/under/U, user) - return - -/obj/item/clothing/tie/waistcoat - name = "waistcoat" - desc = "For some classy, murderous fun." - icon_state = "waistcoat" - item_state = "waistcoat" - item_color = "waistcoat" - minimize_when_attached = FALSE - -////////// -//Medals// -////////// - -/obj/item/clothing/tie/medal - name = "bronze medal" - desc = "A bronze medal." - icon_state = "bronze" - item_color = "bronze" - materials = list(MAT_METAL=1000) - resistance_flags = FIRE_PROOF - -//Pinning medals on people -/obj/item/clothing/tie/medal/attack(mob/living/carbon/human/M, mob/living/user) - if(ishuman(M) && (user.a_intent == INTENT_HELP)) - - if(M.wear_suit) - if((M.wear_suit.flags_inv & HIDEJUMPSUIT)) //Check if the jumpsuit is covered - to_chat(user, "Medals can only be pinned on jumpsuits.") - return - - if(M.w_uniform) - var/obj/item/clothing/under/U = M.w_uniform - var/delay = 20 - if(user == M) - delay = 0 - else - user.visible_message("[user] is trying to pin [src] on [M]'s chest.", \ - "You try to pin [src] on [M]'s chest.") - if(do_after(user, delay, target = M)) - if(U.attachTie(src, user, 0)) //Attach it, do not notify the user of the attachment - if(user == M) - to_chat(user, "You attach [src] to [U].") - else - user.visible_message("[user] pins \the [src] on [M]'s chest.", \ - "You pin \the [src] on [M]'s chest.") - - else to_chat(user, "Medals can only be pinned on jumpsuits!") - else ..() - -/obj/item/clothing/tie/medal/conduct - name = "distinguished conduct medal" - desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by Nanotrasen. It is often awarded by a captain to a member of his crew." - -/obj/item/clothing/tie/medal/bronze_heart - name = "bronze heart medal" - desc = "A bronze heart-shaped medal awarded for sacrifice. It is often awarded posthumously or for severe injury in the line of duty." - icon_state = "bronze_heart" - -/obj/item/clothing/tie/medal/nobel_science - name = "nobel sciences award" - desc = "A bronze medal which represents significant contributions to the field of science or engineering." - -/obj/item/clothing/tie/medal/silver - name = "silver medal" - desc = "A silver medal." - icon_state = "silver" - item_color = "silver" - materials = list(MAT_SILVER=1000) - -/obj/item/clothing/tie/medal/silver/valor - name = "medal of valor" - desc = "A silver medal awarded for acts of exceptional valor." - -/obj/item/clothing/tie/medal/silver/security - name = "robust security award" - desc = "An award for distinguished combat and sacrifice in defence of Nanotrasen's commercial interests. Often awarded to security staff." - -/obj/item/clothing/tie/medal/gold - name = "gold medal" - desc = "A prestigious golden medal." - icon_state = "gold" - item_color = "gold" - materials = list(MAT_GOLD=1000) - -/obj/item/clothing/tie/medal/gold/captain - name = "medal of captaincy" - desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain to Nanotrasen, and their undisputable authority over their crew." - resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF - -/obj/item/clothing/tie/medal/gold/heroism - name = "medal of exceptional heroism" - desc = "An extremely rare golden medal awarded only by Centcom. To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders." - -//////////// -//Armbands// -//////////// - -/obj/item/clothing/tie/armband - name = "red armband" - desc = "An fancy red armband!" - icon_state = "redband" - item_color = "redband" - -/obj/item/clothing/tie/armband/deputy - name = "security deputy armband" - desc = "An armband, worn by personnel authorized to act as a deputy of station security." - -/obj/item/clothing/tie/armband/cargo - name = "cargo bay guard armband" - desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is brown." - icon_state = "cargoband" - item_color = "cargoband" - -/obj/item/clothing/tie/armband/engine - name = "engineering guard armband" - desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is orange with a reflective strip!" - icon_state = "engieband" - item_color = "engieband" - -/obj/item/clothing/tie/armband/science - name = "science guard armband" - desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is purple." - icon_state = "rndband" - item_color = "rndband" - -/obj/item/clothing/tie/armband/hydro - name = "hydroponics guard armband" - desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is green and blue." - icon_state = "hydroband" - item_color = "hydroband" - -/obj/item/clothing/tie/armband/med - name = "medical guard armband" - desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is white." - icon_state = "medband" - item_color = "medband" - -/obj/item/clothing/tie/armband/medblue - name = "medical guard armband" - desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is white and blue." - icon_state = "medblueband" - item_color = "medblueband" - -////////////// -//OBJECTION!// -////////////// - -/obj/item/clothing/tie/lawyers_badge - name = "attorney's badge" - desc = "Fills you with the conviction of JUSTICE. Lawyers tend to want to show it to everyone they meet." - icon_state = "lawyerbadge" - item_color = "lawyerbadge" - -/obj/item/clothing/tie/lawyers_badge/attach(obj/item/clothing/under/U, user) - if(!..()) - return 0 - if(isliving(U.loc)) - on_uniform_equip(U, user) - -/obj/item/clothing/tie/lawyers_badge/detach(obj/item/clothing/under/U, user) - ..() - if(isliving(U.loc)) - on_uniform_dropped(U, user) - -/obj/item/clothing/tie/lawyers_badge/on_uniform_equip(obj/item/clothing/under/U, user) - var/mob/living/L = user - if(L) - L.bubble_icon = "lawyer" - -/obj/item/clothing/tie/lawyers_badge/on_uniform_dropped(obj/item/clothing/under/U, user) - var/mob/living/L = user - if(L) - L.bubble_icon = initial(L.bubble_icon) +/obj/item/clothing/accessory //Ties moved to neck slot items, but as there are still things like medals and armbands, this accessory system is being kept as-is + name = "Accessory" + desc = "Something has gone wrong!" + icon = 'icons/obj/clothing/accessories.dmi' + icon_state = "plasma" + item_state = "" //no inhands + item_color = "plasma" //On accessories, this controls the worn sprite. That's a bit weird. + slot_flags = 0 + w_class = WEIGHT_CLASS_SMALL + var/minimize_when_attached = TRUE // TRUE if shown as a small icon in corner, FALSE if overlayed + +/obj/item/clothing/accessory/proc/attach(obj/item/clothing/under/U, user) + if(pockets) // Attach storage to jumpsuit + if(U.pockets) // storage items conflict + return FALSE + + pockets.loc = U + U.pockets = pockets + + U.attached_accessory = src + loc = U + layer = FLOAT_LAYER + plane = FLOAT_PLANE + if(minimize_when_attached) + transform *= 0.5 //halve the size so it doesn't overpower the under + pixel_x += 8 + pixel_y -= 8 + U.add_overlay(src) + + for(var/armor_type in armor) + U.armor[armor_type] += armor[armor_type] + + if(isliving(user)) + on_uniform_equip(U, user) + + return TRUE + + +/obj/item/clothing/accessory/proc/detach(obj/item/clothing/under/U, user) + if(pockets && pockets == U.pockets) + pockets.loc = src + U.pockets = null + + for(var/armor_type in armor) + U.armor[armor_type] -= armor[armor_type] + + if(isliving(user)) + on_uniform_dropped(U, user) + + if(minimize_when_attached) + transform *= 2 + pixel_x -= 8 + pixel_y += 8 + layer = initial(layer) + plane = initial(plane) + U.cut_overlays() + U.attached_accessory = null + +/obj/item/clothing/accessory/proc/on_uniform_equip(obj/item/clothing/under/U, user) + return + +/obj/item/clothing/accessory/proc/on_uniform_dropped(obj/item/clothing/under/U, user) + return + +/obj/item/clothing/accessory/examine(mob/user) + ..() + to_chat(user, "\The [src] can be attached to a uniform. Alt-click to remove it once attached.") + +/obj/item/clothing/accessory/waistcoat + name = "waistcoat" + desc = "For some classy, murderous fun." + icon_state = "waistcoat" + item_state = "waistcoat" + item_color = "waistcoat" + minimize_when_attached = FALSE + +////////// +//Medals// +////////// + +/obj/item/clothing/accessory/medal + name = "bronze medal" + desc = "A bronze medal." + icon_state = "bronze" + item_color = "bronze" + materials = list(MAT_METAL=1000) + resistance_flags = FIRE_PROOF + +//Pinning medals on people +/obj/item/clothing/accessory/medal/attack(mob/living/carbon/human/M, mob/living/user) + if(ishuman(M) && (user.a_intent == INTENT_HELP)) + + if(M.wear_suit) + if((M.wear_suit.flags_inv & HIDEJUMPSUIT)) //Check if the jumpsuit is covered + to_chat(user, "Medals can only be pinned on jumpsuits.") + return + + if(M.w_uniform) + var/obj/item/clothing/under/U = M.w_uniform + var/delay = 20 + if(user == M) + delay = 0 + else + user.visible_message("[user] is trying to pin [src] on [M]'s chest.", \ + "You try to pin [src] on [M]'s chest.") + if(do_after(user, delay, target = M)) + if(U.attach_accessory(src, user, 0)) //Attach it, do not notify the user of the attachment + if(user == M) + to_chat(user, "You attach [src] to [U].") + else + user.visible_message("[user] pins \the [src] on [M]'s chest.", \ + "You pin \the [src] on [M]'s chest.") + + else to_chat(user, "Medals can only be pinned on jumpsuits!") + else ..() + +/obj/item/clothing/accessory/medal/conduct + name = "distinguished conduct medal" + desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by Nanotrasen. It is often awarded by a captain to a member of his crew." + +/obj/item/clothing/accessory/medal/bronze_heart + name = "bronze heart medal" + desc = "A bronze heart-shaped medal awarded for sacrifice. It is often awarded posthumously or for severe injury in the line of duty." + icon_state = "bronze_heart" + +/obj/item/clothing/accessory/medal/silver + name = "silver medal" + desc = "A silver medal." + icon_state = "silver" + item_color = "silver" + materials = list(MAT_SILVER=1000) + +/obj/item/clothing/accessory/medal/silver/valor + name = "medal of valor" + desc = "A silver medal awarded for acts of exceptional valor." + +/obj/item/clothing/accessory/medal/silver/security + name = "robust security award" + desc = "An award for distinguished combat and sacrifice in defence of Nanotrasen's commercial interests. Often awarded to security staff." + +/obj/item/clothing/accessory/medal/gold + name = "gold medal" + desc = "A prestigious golden medal." + icon_state = "gold" + item_color = "gold" + materials = list(MAT_GOLD=1000) + +/obj/item/clothing/accessory/medal/gold/captain + name = "medal of captaincy" + desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain to Nanotrasen, and their undisputable authority over their crew." + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + +/obj/item/clothing/accessory/medal/gold/heroism + name = "medal of exceptional heroism" + desc = "An extremely rare golden medal awarded only by Centcom. To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders." + +/obj/item/clothing/accessory/medal/plasma + name = "plasma medal" + desc = "An eccentric medal made of plasma." + icon_state = "plasma" + item_color = "plasma" + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = -10, acid = 0) //It's made of plasma. Of course it's flammable. + materials = list(MAT_PLASMA=1000) + +/obj/item/clothing/accessory/medal/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) + if(exposed_temperature > 300) + atmos_spawn_air("plasma=20;TEMP=[exposed_temperature]") + visible_message(" \The [src] bursts into flame!","Your [src] bursts into flame!") + qdel(src) + +/obj/item/clothing/accessory/medal/plasma/nobel_science + name = "nobel sciences award" + desc = "A plasma medal which represents significant contributions to the field of science or engineering." + + + +//////////// +//Armbands// +//////////// + +/obj/item/clothing/accessory/armband + name = "red armband" + desc = "An fancy red armband!" + icon_state = "redband" + item_color = "redband" + +/obj/item/clothing/accessory/armband/deputy + name = "security deputy armband" + desc = "An armband, worn by personnel authorized to act as a deputy of station security." + +/obj/item/clothing/accessory/armband/cargo + name = "cargo bay guard armband" + desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is brown." + icon_state = "cargoband" + item_color = "cargoband" + +/obj/item/clothing/accessory/armband/engine + name = "engineering guard armband" + desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is orange with a reflective strip!" + icon_state = "engieband" + item_color = "engieband" + +/obj/item/clothing/accessory/armband/science + name = "science guard armband" + desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is purple." + icon_state = "rndband" + item_color = "rndband" + +/obj/item/clothing/accessory/armband/hydro + name = "hydroponics guard armband" + desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is green and blue." + icon_state = "hydroband" + item_color = "hydroband" + +/obj/item/clothing/accessory/armband/med + name = "medical guard armband" + desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is white." + icon_state = "medband" + item_color = "medband" + +/obj/item/clothing/accessory/armband/medblue + name = "medical guard armband" + desc = "An armband, worn by the station's security forces to display which department they're assigned to. This one is white and blue." + icon_state = "medblueband" + item_color = "medblueband" + +////////////// +//OBJECTION!// +////////////// + +/obj/item/clothing/accessory/lawyers_badge + name = "attorney's badge" + desc = "Fills you with the conviction of JUSTICE. Lawyers tend to want to show it to everyone they meet." + icon_state = "lawyerbadge" + item_color = "lawyerbadge" + +/obj/item/clothing/accessory/lawyers_badge/on_uniform_equip(obj/item/clothing/under/U, user) + var/mob/living/L = user + if(L) + L.bubble_icon = "lawyer" + +/obj/item/clothing/accessory/lawyers_badge/on_uniform_dropped(obj/item/clothing/under/U, user) + var/mob/living/L = user + if(L) + L.bubble_icon = initial(L.bubble_icon) + +//////////////// +//OONGA BOONGA// +//////////////// + +/obj/item/clothing/accessory/talisman + name = "bone talisman" + desc = "A hunter's talisman, some say the old gods smile on those who wear it." + icon_state = "talisman" + item_color = "talisman" + armor = list(melee = 5, bullet = 5, laser = 5, energy = 5, bomb = 20, bio = 20, rad = 5, fire = 0, acid = 25) diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index d84d806a00e..b8fc651a55d 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -427,7 +427,7 @@ /datum/crafting_recipe/bonetalisman name = "Bone Talisman" - result = /obj/item/clothing/neck/talisman + result = /obj/item/clothing/accessory/talisman time = 20 reqs = list(/obj/item/stack/sheet/bone = 2, /obj/item/stack/sheet/sinew = 1) diff --git a/code/modules/events/ghost_role.dm b/code/modules/events/ghost_role.dm index 2468ddb5c6a..f5e9513b2ea 100644 --- a/code/modules/events/ghost_role.dm +++ b/code/modules/events/ghost_role.dm @@ -26,9 +26,7 @@ var/waittime = 300 * (2^retry) message_admins("The event will not spawn a [role_name] until certain \ conditions are met. Waiting [waittime/10]s and then retrying.") - spawn(waittime) - // I hope this doesn't end up running out of stack space - try_spawning(0,++retry) + addtimer(CALLBACK(src, .proc/try_spawning, 0, ++retry), waittime) return if(status == MAP_ERROR) @@ -69,4 +67,4 @@ return candidates -#undef MAX_SPAWN_ATTEMPT \ No newline at end of file +#undef MAX_SPAWN_ATTEMPT diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index fb625e14ea2..08fc5391201 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -287,7 +287,7 @@ name = "detective's flask" desc = "The detective's only true friend." icon_state = "detflask" - list_reagents = list("whiskey" = 30) + list_reagents = list("hearty_punch" = 30) /obj/item/weapon/reagent_containers/food/drinks/britcup name = "cup" diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm index 43be7ad7479..2f810d70d71 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm @@ -147,15 +147,7 @@ if(product_types[dispense_cone] >= 1) product_types[dispense_cone] -= 1 var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = new(src.loc) - I.cone_type = cone_name - I.icon_state = "icecream_cone_[cone_name]" - switch (I.cone_type) - if ("waffle") - I.reagents.add_reagent("nutriment", 1) - if ("chocolate") - I.reagents.add_reagent("cocoa", 1) // chocolate ain't as nutritious kids - - I.desc = "Delicious [cone_name] cone, but no ice cream." + I.set_cone_type(cone_name) src.visible_message("[usr] dispenses a crunchy [cone_name] cone from [src].") else to_chat(usr, "There are no [cone_name] cones left!") @@ -187,10 +179,23 @@ var/cone_type bitesize = 3 -/obj/item/weapon/reagent_containers/food/snacks/icecream/New() +/obj/item/weapon/reagent_containers/food/snacks/icecream/Initialize() + . = ..() create_reagents(20) reagents.add_reagent("nutriment", 4) +/obj/item/weapon/reagent_containers/food/snacks/icecream/proc/set_cone_type(var/cone_name) + cone_type = cone_name + icon_state = "icecream_cone_[cone_name]" + switch (cone_type) + if ("waffle") + reagents.add_reagent("nutriment", 1) + if ("chocolate") + reagents.add_reagent("cocoa", 1) // chocolate ain't as nutritious kids + + desc = "Delicious [cone_name] cone, but no ice cream." + + /obj/item/weapon/reagent_containers/food/snacks/icecream/proc/add_ice_cream(var/flavour_name) name = "[flavour_name] icecream" src.add_overlay("icecream_[flavour_name]") @@ -206,8 +211,15 @@ if ("blue") desc = "A delicious [cone_type] cone filled with blue ice cream. Made with real... blue?" reagents.add_reagent("singulo", 2) + if ("mob") + desc = "A suspicious [cone_type] cone filled with bright red ice cream. That's probably not strawberry..." + reagents.add_reagent("liquidgibs", 2) ice_creamed = 1 +/obj/item/weapon/reagent_containers/food/snacks/icecream/proc/add_mob_flavor(var/mob/M) + add_ice_cream("mob") + name = "[M.name] icecream" + /obj/machinery/icecream_vat/deconstruct(disassembled = TRUE) if(!(flags & NODECONSTRUCT)) new /obj/item/stack/sheet/metal(loc, 4) diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index b75549a5ebe..e34e7763b34 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -39,7 +39,7 @@ Captain suit = /obj/item/clothing/suit/armor/vest/capcarapace shoes = /obj/item/clothing/shoes/sneakers/brown head = /obj/item/clothing/head/caphat - backpack_contents = list(/obj/item/weapon/melee/classic_baton/telescopic=1, /obj/item/station_charter=1) + backpack_contents = list(/obj/item/weapon/melee/classic_baton/telescopic=1, /obj/item/weapon/station_charter=1) backpack = /obj/item/weapon/storage/backpack/captain satchel = /obj/item/weapon/storage/backpack/satchel/cap diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm index fd018464679..704496ad67b 100644 --- a/code/modules/jobs/job_types/civilian.dm +++ b/code/modules/jobs/job_types/civilian.dm @@ -186,7 +186,7 @@ Lawyer shoes = /obj/item/clothing/shoes/laceup l_hand = /obj/item/weapon/storage/briefcase/lawyer l_pocket = /obj/item/device/laser_pointer - r_pocket = /obj/item/clothing/tie/lawyers_badge + r_pocket = /obj/item/clothing/accessory/lawyers_badge /datum/outfit/job/lawyer/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm index c2a1daae6a9..d5fc677208f 100644 --- a/code/modules/jobs/job_types/security.dm +++ b/code/modules/jobs/job_types/security.dm @@ -137,7 +137,7 @@ Detective shoes = /obj/item/clothing/shoes/sneakers/brown suit = /obj/item/clothing/suit/det_suit gloves = /obj/item/clothing/gloves/color/black - head = /obj/item/clothing/head/det_hat + head = /obj/item/clothing/head/fedora/det_hat l_pocket = /obj/item/toy/crayon/white r_pocket = /obj/item/weapon/lighter backpack_contents = list(/obj/item/weapon/storage/box/evidence=1,\ @@ -195,7 +195,7 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S else department = pick_n_take(GLOB.available_depts) var/ears = null - var/tie = null + var/accessory = null var/list/dep_access = null var/destination = null var/spawn_point = null @@ -205,29 +205,29 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S dep_access = list(GLOB.access_mailsorting, GLOB.access_mining, GLOB.access_mining_station) destination = /area/security/checkpoint/supply spawn_point = locate(/obj/effect/landmark/start/depsec/supply) in GLOB.department_security_spawns - tie = /obj/item/clothing/tie/armband/cargo + accessory = /obj/item/clothing/accessory/armband/cargo if(SEC_DEPT_ENGINEERING) ears = /obj/item/device/radio/headset/headset_sec/alt/department/engi dep_access = list(GLOB.access_construction, GLOB.access_engine) destination = /area/security/checkpoint/engineering spawn_point = locate(/obj/effect/landmark/start/depsec/engineering) in GLOB.department_security_spawns - tie = /obj/item/clothing/tie/armband/engine + accessory = /obj/item/clothing/accessory/armband/engine if(SEC_DEPT_MEDICAL) ears = /obj/item/device/radio/headset/headset_sec/alt/department/med dep_access = list(GLOB.access_medical) destination = /area/security/checkpoint/medical spawn_point = locate(/obj/effect/landmark/start/depsec/medical) in GLOB.department_security_spawns - tie = /obj/item/clothing/tie/armband/medblue + accessory = /obj/item/clothing/accessory/armband/medblue if(SEC_DEPT_SCIENCE) ears = /obj/item/device/radio/headset/headset_sec/alt/department/sci dep_access = list(GLOB.access_research) destination = /area/security/checkpoint/science spawn_point = locate(/obj/effect/landmark/start/depsec/science) in GLOB.department_security_spawns - tie = /obj/item/clothing/tie/armband/science + accessory = /obj/item/clothing/accessory/armband/science - if(tie) + if(accessory) var/obj/item/clothing/under/U = H.w_uniform - U.attachTie(new tie) + U.attach_accessory(new accessory) if(ears) if(H.ears) qdel(H.ears) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 595df2a3df9..93686cd7c8b 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -1,3 +1,8 @@ + +#define GIBTONITE_QUALITY_HIGH 3 +#define GIBTONITE_QUALITY_MEDIUM 2 +#define GIBTONITE_QUALITY_LOW 1 + /**********************Mineral ores**************************/ /obj/item/weapon/ore @@ -184,10 +189,11 @@ item_state = "Gibtonite ore" w_class = WEIGHT_CLASS_BULKY throw_range = 0 - var/primed = 0 + var/primed = FALSE var/det_time = 100 - var/quality = 1 //How pure this gibtonite is, determines the explosion produced by it and is derived from the det_time of the rock wall it was taken from, higher value = better + var/quality = GIBTONITE_QUALITY_LOW //How pure this gibtonite is, determines the explosion produced by it and is derived from the det_time of the rock wall it was taken from, higher value = better var/attacher = "UNKNOWN" + var/det_timer /obj/item/weapon/twohanded/required/gibtonite/Destroy() qdel(wires) @@ -213,10 +219,12 @@ return if(primed) if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner) || istype(I, /obj/item/device/multitool)) - primed = 0 + primed = FALSE + if(det_timer) + deltimer(det_timer) user.visible_message("The chain reaction was stopped! ...The ore's quality looks diminished.", "You stopped the chain reaction. ...The ore's quality looks diminished.") icon_state = "Gibtonite ore" - quality = 1 + quality = GIBTONITE_QUALITY_LOW return ..() @@ -237,8 +245,8 @@ /obj/item/weapon/twohanded/required/gibtonite/proc/GibtoniteReaction(mob/user, triggered_by = 0) if(!primed) + primed = TRUE playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,1) - primed = 1 icon_state = "Gibtonite active" var/turf/bombturf = get_turf(src) var/area/A = get_area(bombturf) @@ -260,14 +268,18 @@ else user.visible_message("[user] strikes \the [src], causing a chain reaction!", "You strike \the [src], causing a chain reaction.") log_game("[key_name(user)] has primed a [name] for detonation at [A][COORD(bombturf)]") - if(primed) - if(quality == 3) - explosion(src.loc,2,4,9,adminlog = notify_admins) - if(quality == 2) - explosion(src.loc,1,2,5,adminlog = notify_admins) - if(quality == 1) - explosion(src.loc,-1,1,3,adminlog = notify_admins) - qdel(src) + det_timer = addtimer(CALLBACK(src, .proc/detonate, notify_admins), det_time, TIMER_STOPPABLE) + +/obj/item/weapon/twohanded/required/gibtonite/proc/detonate(notify_admins) + if(primed) + switch(quality) + if(GIBTONITE_QUALITY_HIGH) + explosion(src,2,4,9,adminlog = notify_admins) + if(GIBTONITE_QUALITY_MEDIUM) + explosion(src,1,2,5,adminlog = notify_admins) + if(GIBTONITE_QUALITY_LOW) + explosion(src,0,1,3,adminlog = notify_admins) + qdel(src) /obj/item/weapon/ore/Initialize() ..() diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 2a4cd1ba2ca..c8bc7f4ff5b 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -140,8 +140,7 @@ observer.name = observer.real_name observer.update_icon() observer.stop_sound_channel(CHANNEL_LOBBYMUSIC) - qdel(mind) - + QDEL_NULL(mind) qdel(src) return 1 @@ -352,7 +351,6 @@ if(SHUTTLE_CALL) if(SSshuttle.emergency.timeLeft(1) > initial(SSshuttle.emergencyCallTime)*0.5) SSticker.mode.make_antag_chance(humanc) - qdel(src) /mob/dead/new_player/proc/AddEmploymentContract(mob/living/carbon/human/employee) //TODO: figure out a way to exclude wizards/nukeops/demons from this. @@ -451,6 +449,8 @@ if(.) new_character.key = key //Manually transfer the key to log them in new_character.stop_sound_channel(CHANNEL_LOBBYMUSIC) + new_character = null + qdel(src) /mob/dead/new_player/proc/ViewManifest() var/dat = "" diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 694c9592c4f..6e453f68ef9 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -119,7 +119,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) GLOB.dead_mob_list += src - ..() + . = ..() grant_all_languages() diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm index 90d4ced85fc..71619ff9a41 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm @@ -45,9 +45,6 @@ if(!get_alien_type(/mob/living/carbon/alien/humanoid/royal/queen)) var/mob/living/carbon/alien/humanoid/royal/queen/new_xeno = new (user.loc) user.alien_evolve(new_xeno) - if(new_xeno.client.prefs.unlock_content) - var/datum/action/innate/maid/M = new() - M.Grant(new_xeno) return 1 else to_chat(user, "We already have an alive queen.") diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index dc172b7730d..392e7ec67a9 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -153,36 +153,3 @@ /obj/item/queenpromote/attack_self(mob/user) to_chat(user, "You discard [src].") qdel(src) - -//:^) -/datum/action/innate/maid - name = "Maidify" - button_icon_state = "alien_queen_maidify" - check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_CONSCIOUS|AB_CHECK_LYING - background_icon_state = "bg_alien" - -/datum/action/innate/maid/Activate() - var/mob/living/carbon/alien/humanoid/royal/queen/A = owner - A.maidify() - active = TRUE - -/datum/action/innate/maid/Deactivate() - var/mob/living/carbon/alien/humanoid/royal/queen/A = owner - A.unmaidify() - active = FALSE - - - -/mob/living/carbon/alien/humanoid/royal/queen/proc/maidify() - name = "alien queen maid" - desc = "Lusty, Sexy" - icon_state = "alienqmaid" - caste = "qmaid" - update_icons() - -/mob/living/carbon/alien/humanoid/royal/queen/proc/unmaidify() - name = "alien queen" - desc = "" - icon_state = "alienq" - caste = "q" - update_icons() diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 82e53a73000..a5da6abdb8c 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -232,9 +232,6 @@ if(lying) M.visible_message("[M] shakes [src] trying to get [p_them()] up!", \ "You shake [src] trying to get [p_them()] up!") - else if(check_zone(M.zone_selected) == "head") - M.visible_message("[M] gives [src] a pat on the head to make [p_them()] feel better!", \ - "You give [src] a pat on the head to make [p_them()] feel better!") else M.visible_message("[M] hugs [src] to make [p_them()] feel better!", \ "You hug [src] to make [p_them()] feel better!") @@ -303,8 +300,9 @@ Weaken(stun_pwr*effect_amount) if(istype(ears) && (deafen_pwr || damage_pwr)) - ears.ear_damage += damage_pwr * effect_amount - ears.deaf = max(ears.deaf, deafen_pwr * effect_amount) + var/ear_damage = damage_pwr * effect_amount + var/deaf = max(ears.deaf, deafen_pwr * effect_amount) + adjustEarDamage(ear_damage,deaf) if(ears.ear_damage >= 15) to_chat(src, "Your ears start to ring badly!") diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index e176ee14392..81c1da1fac0 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -14,17 +14,17 @@ //uniform if(w_uniform && !(slot_w_uniform in obscured)) - //Ties - var/tie_msg + //accessory + var/accessory_msg if(istype(w_uniform,/obj/item/clothing/under)) var/obj/item/clothing/under/U = w_uniform - if(U.hastie) - tie_msg += " with \icon[U.hastie] \a [U.hastie]" + if(U.attached_accessory) + accessory_msg += " with \icon[U.attached_accessory] \a [U.attached_accessory]" if(w_uniform.blood_DNA) - msg += "[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] blood-stained [w_uniform.name][tie_msg]!\n" + msg += "[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] blood-stained [w_uniform.name][accessory_msg]!\n" else - msg += "[t_He] [t_is] wearing \icon[w_uniform] \a [w_uniform][tie_msg].\n" + msg += "[t_He] [t_is] wearing \icon[w_uniform] \a [w_uniform][accessory_msg].\n" //head if(head) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 9ca002fe102..214ba337514 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1082,18 +1082,7 @@ /datum/species/proc/disarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) - var/aim_for_mouth = user.zone_selected == "mouth" - var/target_on_help_and_unarmed = target.a_intent == INTENT_HELP && !target.get_active_held_item() - var/target_aiming_for_mouth = target.zone_selected == "mouth" - var/target_restrained = target.restrained() - if(aim_for_mouth && ( target_on_help_and_unarmed || target_restrained || target_aiming_for_mouth)) - playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1) - user.visible_message("[user] slaps [target] in the face!", - "You slap [target] in the face! ",\ - "You hear a slap.") - target.endTailWag() - return FALSE - else if(target.check_block()) + if(target.check_block()) target.visible_message("[target] blocks [user]'s disarm attempt!") return 0 if(attacker_style && attacker_style.disarm_act(user,target)) diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index cd4afa5b627..43516eaec94 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -20,4 +20,12 @@ /datum/species/human/space_move(mob/living/carbon/human/H) var/obj/item/device/flightpack/F = H.get_flightpack() if(istype(F) && (F.flight) && F.allow_thrust(0.01, src)) - return TRUE \ No newline at end of file + return TRUE + +datum/species/human/on_species_gain(mob/living/carbon/human/H, datum/species/old_species) + if(H.dna.features["ears"] == "Cat") + mutantears = /obj/item/organ/ears/cat + if(H.dna.features["tail_human"] == "Cat") + var/tail = /obj/item/organ/tail/cat + mutant_organs += tail + ..() \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 3b1cc00b2d2..fb8af66b822 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -321,7 +321,7 @@ if("Shadow") mob_species = /datum/species/shadow r_pocket = /obj/item/weapon/reagent_containers/pill/shadowtoxin - neck = /obj/item/clothing/tie/medal/nobel_science + neck = /obj/item/clothing/accessory/medal/plasma/nobel_science uniform = /obj/item/clothing/under/color/black shoes = /obj/item/clothing/shoes/sneakers/black suit = /obj/item/clothing/suit/toggle/labcoat diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 6454e17e0a4..8cb4aaabc66 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -1,3 +1,6 @@ + +#define DUALWIELD_PENALTY_EXTRA_MULTIPLIER 1.4 + /obj/item/weapon/gun name = "gun" desc = "It's a gun. It's pretty terrible, though." @@ -229,7 +232,7 @@ break if(chambered && chambered.BB) if(randomspread) - sprd = round((rand() - 0.5) * (randomized_gun_spread + randomized_bonus_spread)) + sprd = round((rand() - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * (randomized_gun_spread + randomized_bonus_spread)) else //Smart spread sprd = round((((rand_spr/burst_size) * i) - (0.5 + (rand_spr * 0.25))) * (randomized_gun_spread + randomized_bonus_spread)) @@ -250,7 +253,7 @@ firing_burst = 0 else if(chambered) - sprd = round((rand() - 0.5) * (randomized_gun_spread + randomized_bonus_spread)) + sprd = round((rand() - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * (randomized_gun_spread + randomized_bonus_spread)) if(!chambered.fire_casing(target, user, params, , suppressed, zone_override, sprd)) shoot_with_empty_chamber(user) return diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 3ba5519a9c0..8cdae1123d8 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -371,7 +371,7 @@ name = "Mix Virus 10" id = "mixvirus10" - required_reagents = list("uraniumvirusfood" = 5) + required_reagents = list("uraniumvirusfood" = 1) level_min = 6 level_max = 7 @@ -379,7 +379,7 @@ name = "Mix Virus 11" id = "mixvirus11" - required_reagents = list("uraniumplasmavirusfood_unstable" = 5) + required_reagents = list("uraniumplasmavirusfood_unstable" = 1) level_min = 7 level_max = 7 @@ -387,7 +387,7 @@ name = "Mix Virus 12" id = "mixvirus12" - required_reagents = list("uraniumplasmavirusfood_stable" = 5) + required_reagents = list("uraniumplasmavirusfood_stable" = 1) level_min = 8 level_max = 8 diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index f72458af4ea..e5b872f5a59 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -357,22 +357,22 @@ build_path = /obj/item/weapon/implantcase/sad_trombone category = list("Medical Designs") -/datum/design/implant_freedom - name = "Freedom Implant Case" +/datum/design/implant_chem + name = "Chemical Implant Case" desc = "A glass case containing an implant." - id = "implant_freedom" - req_tech = list("combat" = 6, "biotech" = 5, "magnets" = 3, "syndicate" = 3) + id = "implant_chem" + req_tech = list("materials" = 3, "biotech" = 5,) build_type = PROTOLATHE - materials = list(MAT_METAL = 800, MAT_GLASS = 500, MAT_GOLD = 500) - build_path = /obj/item/weapon/implantcase/freedom + materials = list(MAT_GLASS = 700) + build_path = /obj/item/weapon/implantcase/chem category = list("Medical Designs") -/datum/design/implant_adrenalin - name = "Adrenalin Implant Case" +/datum/design/implant_tracking + name = "Tracking Implant Case" desc = "A glass case containing an implant." - id = "implant_adrenalin" - req_tech = list("biotech" = 6, "combat" = 6, "syndicate" = 6) + id = "implant_tracking" + req_tech = list("materials" = 2, "biotech" = 3, "magnets" = 3, "programming" = 2) build_type = PROTOLATHE - materials = list(MAT_METAL = 1000, MAT_GLASS = 500, MAT_GOLD = 500, MAT_URANIUM = 600, MAT_DIAMOND = 600) - build_path = /obj/item/weapon/implantcase/adrenaline + materials = list(MAT_METAL = 500, MAT_GLASS = 500) + build_path = /obj/item/weapon/implantcase/track category = list("Medical Designs") diff --git a/code/modules/research/designs/smelting_designs.dm b/code/modules/research/designs/smelting_designs.dm index 9367b38da7a..5c9c0f68313 100644 --- a/code/modules/research/designs/smelting_designs.dm +++ b/code/modules/research/designs/smelting_designs.dm @@ -4,7 +4,7 @@ name = "Plasma + Iron alloy" id = "plasteel" build_type = SMELTER - materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT / 2, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT / 2) + materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/plasteel category = list("initial") @@ -13,7 +13,7 @@ name = "Plasma + Titanium alloy" id = "plastitanium" build_type = SMELTER - materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT / 2, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT / 2) + materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT) build_path = /obj/item/stack/sheet/mineral/plastitanium category = list("initial") diff --git a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm index c59850198e3..0acfcc2a45b 100644 --- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm @@ -12,6 +12,15 @@ loot = list(/obj/effect/gibspawner, /obj/item/device/assembly/signaler/anomaly) del_on_death = 1 var/meat_counter + var/obj/effect/light_emitter/tendril/emitted_light + +/mob/living/simple_animal/hostile/spawner/ash_walker/Initialize() + . = ..() + emitted_light = new(loc) + +/mob/living/simple_animal/hostile/spawner/ash_walker/Destroy() + QDEL_NULL(emitted_light) + . = ..() /mob/living/simple_animal/hostile/spawner/ash_walker/Life() ..() diff --git a/code/modules/server_tools/server_tools.dm b/code/modules/server_tools/server_tools.dm index 106f4c7aa9e..193d3e2b6e7 100644 --- a/code/modules/server_tools/server_tools.dm +++ b/code/modules/server_tools/server_tools.dm @@ -10,18 +10,20 @@ GLOBAL_PROTECT(reboot_mode) /world/proc/IRCBroadcast(msg) ExportService("[SERVICE_REQUEST_IRC_BROADCAST] [msg]") +/world/proc/ServiceEndProcess() + log_world("Sending shutdown request!"); + sleep(1) //flush the buffers + ExportService(SERVICE_REQUEST_KILL_PROCESS) + //called at the exact moment the world is supposed to reboot /world/proc/ServiceReboot() switch(GLOB.reboot_mode) if(REBOOT_MODE_HARD) to_chat(src, "Hard reboot triggered, you will automatically reconnect...") - log_world("Sending shutdown request!"); - sleep(1) //flush the buffers - ExportService(SERVICE_REQUEST_KILL_PROCESS) + ServiceEndProcess() if(REBOOT_MODE_SHUTDOWN) to_chat(src, "The server is shutting down...") - log_world("Deleting world") - qdel(src) + ServiceEndProcess() /world/proc/ServiceCommand(list/params) var/sCK = RunningService() diff --git a/code/modules/spells/spell_types/devil_boons.dm b/code/modules/spells/spell_types/devil_boons.dm index e8fcc730108..75b6597f074 100644 --- a/code/modules/spells/spell_types/devil_boons.dm +++ b/code/modules/spells/spell_types/devil_boons.dm @@ -18,7 +18,7 @@ new /obj/item/weapon/coin/gold(user.loc), new /obj/item/weapon/coin/diamond(user.loc), new /obj/item/weapon/coin/silver(user.loc), - new /obj/item/clothing/tie/medal/gold(user.loc), + new /obj/item/clothing/accessory/medal/gold(user.loc), new /obj/item/stack/sheet/mineral/gold(user.loc), new /obj/item/stack/sheet/mineral/silver(user.loc), new /obj/item/stack/sheet/mineral/diamond(user.loc), diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm index fd6a3466bd9..0a29492c4a7 100644 --- a/code/modules/surgery/organs/ears.dm +++ b/code/modules/surgery/organs/ears.dm @@ -70,3 +70,24 @@ var/obj/item/organ/ears/ears = getorgan(/obj/item/organ/ears) if(ears) ears.minimumDeafTicks(value) + + +/obj/item/organ/ears/cat + name = "cat ears" + icon = 'icons/obj/clothing/hats.dmi' + icon_state = "kitty" + +/obj/item/organ/ears/cat/adjustEarDamage(ddmg, ddeaf) + ..(ddmg*2,ddeaf*2) + +/obj/item/organ/ears/cat/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) + ..() + color = H.hair_color + H.dna.features["ears"] = "Cat" + H.update_body() + +/obj/item/organ/ears/cat/Remove(mob/living/carbon/human/H, special = 0) + ..() + color = H.hair_color + H.dna.features["ears"] = "None" + H.update_body() \ No newline at end of file diff --git a/code/modules/surgery/organs/tails.dm b/code/modules/surgery/organs/tails.dm new file mode 100644 index 00000000000..99d1ed24426 --- /dev/null +++ b/code/modules/surgery/organs/tails.dm @@ -0,0 +1,23 @@ +/obj/item/organ/tail + name = "tail" + desc = "What did you cut this off of?" + zone = "groin" + slot = "tail" + +/obj/item/organ/tail/cat + name = "cat tail" + desc = "Who's wagging now?" + icon_state = "severedtail" + +/obj/item/organ/tail/cat/Insert(mob/living/carbon/human/H, special = 0, drop_if_replaced = TRUE) + ..() + color = H.hair_color + H.dna.features["tail_human"] = "Cat" + H.update_body() + +/obj/item/organ/ears/cat/Remove(mob/living/carbon/human/H, special = 0) + ..() + H.endTailWag() + H.dna.features["tail_human"] = "None" + color = H.hair_color + H.update_body() diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm index 31fe5e3390c..3ff4c902093 100644 --- a/code/modules/uplink/uplink_item.dm +++ b/code/modules/uplink/uplink_item.dm @@ -164,7 +164,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/nukeoffer/sniper name = "Sniper bundle" - desc = "Elegant and refined: Contains a collapsed sniper rifle in an expensive carrying case, a hollowpoint \ + desc = "Elegant and refined: Contains a collapsed sniper rifle in an expensive carrying case, a hollow-point \ haemorrhage magazine, a soporific knockout magazine, a free surplus supressor, and a worn out suit and tie." item = /obj/item/weapon/storage/briefcase/sniperbundle cost = 20 // normally 26 @@ -202,7 +202,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/dangerous/shotgun name = "Bulldog Shotgun" - desc = "A fully-loaded semi-automatic drum-fed shotgun. Compatiable with all 12g rounds. Designed for close \ + desc = "A fully-loaded semi-automatic drum-fed shotgun. Compatible with all 12g rounds. Designed for close \ quarter anti-personnel engagements." item = /obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog cost = 8 @@ -241,7 +241,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/dangerous/sniper name = "Sniper Rifle" - desc = "Ranged fury, Syndicate style. guaranteed to cause shock and awe or your TC back!" + desc = "Ranged fury, Syndicate style. Guaranteed to cause shock and awe or your TC back!" item = /obj/item/weapon/gun/ballistic/automatic/sniper_rifle/syndicate cost = 16 surplus = 25 @@ -260,7 +260,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. fit into a pocket or slip into a bag unnoticed. It will synthesize \ and fire bolts tipped with a paralyzing toxin that will briefly stun \ targets and cause them to slur as if inebriated. It can produce an \ - infinite amount of bolts, but takes time to automatically recharge \ + infinite number of bolts, but takes time to automatically recharge \ after each shot." item = /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow cost = 12 @@ -455,22 +455,22 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. include_modes = list(/datum/game_mode/nuclear) /datum/uplink_item/ammo/shotgun/bag - name = "12g Ammo Duffelbag" - desc = "A duffelbag filled with enough 12g ammo to supply an entire team, at a discounted price." + name = "12g Ammo Dufflebag" + desc = "A dufflebag filled with enough 12g ammo to supply an entire team, at a discounted price." item = /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/shotgun cost = 12 /datum/uplink_item/ammo/smg name = ".45 SMG Magazine" - desc = "An additional 20-round .45 magazine sutable for use with the C-20r submachine gun. \ + desc = "An additional 20-round .45 magazine suitable for use with the C-20r submachine gun. \ These bullets pack a lot of punch that can knock most targets down, but do limited overall damage." item = /obj/item/ammo_box/magazine/smgm45 cost = 3 include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang) /datum/uplink_item/ammo/smg/bag - name = ".45 Ammo Duffelbag" - desc = "A duffelbag filled with enough .45 ammo to supply an entire team, at a discounted price." + name = ".45 Ammo Dufflebag" + desc = "A dufflebag filled with enough .45 ammo to supply an entire team, at a discounted price." item = /obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/smg cost = 20 include_modes = list(/datum/game_mode/nuclear) @@ -591,7 +591,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/support/mauler name = "Mauler Exosuit" - desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targetting, thrust vectoring, \ + desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring, \ and deployable smoke." item = /obj/mecha/combat/marauder/mauler/loaded cost = 140 @@ -856,7 +856,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/suits/hardsuit/elite name = "Elite Syndicate Hardsuit" - desc = "An advanced hardsuit with superior armor and mobility to the standard Syndicate Hardsuit." + desc = "An advanced hardsuit with superior armor and mobility to the standard Syndicate hardsuit." item = /obj/item/clothing/suit/space/hardsuit/syndi/elite cost = 8 include_modes = list(/datum/game_mode/nuclear) @@ -923,7 +923,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/device_tools/thermal name = "Thermal Imaging Glasses" - desc = "These goggles can be turned to resemble common eyewears throughout the station. \ + desc = "These goggles can be turned to resemble common eyewear found throughout the station. \ They allow you to see organisms through walls by capturing the upper portion of the infrared light spectrum, \ emitted as heat and light by objects. Hotter objects, such as warm bodies, cybernetic organisms \ and artificial intelligence cores emit more of this light than cooler objects like walls and airlocks." @@ -1059,7 +1059,7 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. cost = 3 /datum/uplink_item/device_tools/assault_pod - name = "Assault Pod Targetting Device" + name = "Assault Pod Targeting Device" desc = "Use to select the landing zone of your assault pod." item = /obj/item/device/assault_pod cost = 30 @@ -1349,8 +1349,8 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once. /datum/uplink_item/badass/bundle name = "Syndicate Bundle" - desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. \ - These items are collectively worth more than 20 telecrystals, but you do not know which specialisation \ + desc = "Syndicate Bundles are specialized groups of items that arrive in a plain box. \ + These items are collectively worth more than 20 telecrystals, but you do not know which specialization \ you will receive." item = /obj/item/weapon/storage/box/syndicate cost = 20 diff --git a/code/world.dm b/code/world.dm index 7b81dfd7831..21e88f7629a 100644 --- a/code/world.dm +++ b/code/world.dm @@ -29,11 +29,11 @@ SetupLogs() if(!RunningService()) //tgs2 support - GLOB.revdata.DownloadPRDetails() + GLOB.revdata.DownloadPRDetails() load_motd() load_admins() - load_menu() + LoadVerbs(/datum/verbs/menu) if(config.usewhitelist) load_whitelist() LoadBans() @@ -60,7 +60,7 @@ if(config.sql_enabled) if(SSdbcore.Connect()) log_world("Database connection established.") - var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (start_datetime, server_ip, server_port) VALUES (Now(), COALESCE(INET_ATON('[world.internet_address]'), 0), '[world.port]')") + var/datum/DBQuery/query_round_start = SSdbcore.NewQuery("INSERT INTO [format_table_name("round")] (start_datetime, server_ip, server_port) VALUES (Now(), INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]')") query_round_start.Execute() var/datum/DBQuery/query_round_last_id = SSdbcore.NewQuery("SELECT LAST_INSERT_ID()") query_round_last_id.Execute() diff --git a/html/changelog.html b/html/changelog.html index 1ce1f4107f7..451bf7fd683 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,72 @@ -->
+

08 June 2017

+

4dplanner updated:

+
    +
  • traitors show up on antagHUD
    • +
+

Joan updated:

+
    +
  • Tinkerer's Daemons are no longer totally disabled if you drop below the servant requirement.
    • +
  • Instead, Tinkerer's Daemons will disable until the number of active daemons is equal to or less than one-fifth of the living Servants.
    • +
  • Tinkerer's Daemons produce components very slightly slower.
    • +
  • Added Prolonging Prism as an application scripture.
    • +
  • Prolonging Prism will delay the arrival of an emergency shuttle by 2 minutes at the cost of 2500W of power plus 75W for every 10 CV and 750W for every previous activation. In addition to the high cost, it very obviously affects the shuttle dock and leaves an obvious trail to the prism.
    • +
  • Script scripture now requires 6 Servants to unlock, from 5, and Application scripture now requires 9 Servants to unlock, from 8.
    • +
+

NanoTrasen Public Relations Department updated:

+
    +
  • A mining accident has released large amounts of space dust, which is starting to drift near our stations. Don't panic, it's probably safe.
    • +
+

Nanotrasen Plastic Surgery Advert updated:

+
    +
  • Are you a mutant? Were you born hideously deformed? Do you have ears growing out of the top of your head? Or even a tail? Don't worry, with our patented surgical techniques, Nanotrasen's highly trained medical staff can make you normal! Schedule an appointment, and one of our surgeons can see you same day.
    • +
  • Cat ears now give you double the ear damage.
    • +
+

QualityVan updated:

+
    +
  • Cremators now still work when there's only one thing in them
    • +
  • The ORM now uses the intended amount of resources when making alloys
    • +
  • Cyborgs can no longer alt-click their material stacks to split them
    • +
+

Shadowlight213 updated:

+
    +
  • Tracking implants and chem implants have been added to rnd
    • +
  • Adrenaline and freedom implants have been removed from rnd
    • +
+

oranges updated:

+
    +
  • Added stungloves to the brain damage lines
    • +
+ +

07 June 2017

+

Expletive updated:

+
    +
  • New plasma medals have been added to the Captain's medal box. Don't get them too warm.
    • +
  • New sprites for plasma medals.
    • +
  • Icon and worn sprites for all medals and the lawyer's badge have been improved. Worn medals more closely match their icons.
    • +
  • The bone talisman is an accessory again, so it's not useless.
    • +
  • It also has a new worn sprite, based on an arm band.
    • +
  • Ties have been removed from accessories.dmi and vice versa. Same for the explorer's webbing sprites that were in there. ties.dmi is now neck.dmi, and has sprites for scarves, ties, sthetoscopes, etc.
    • +
  • Examining an accessory now tells you how to use it.
    • +
+

Joan updated:

+
    +
  • Renamed Volt Void to Volt Blaster.
    • +
  • Volt Blaster does not consume power when firing and does not cause backlash if you don't fire.
    • +
  • Volt Blaster does 25 damage, from 20-40 depending on power, and has 5 shots, from 4, over its duration.
    • +
+

QualityVan updated:

+
    +
  • Surplus rifles are no longer invisible while unloaded
    • +
+

Shadowlight213 updated:

+
    +
  • The Changeling Transformation Sting is once again stealthy. However, it no longer transfers mutations.
    • +
  • The chemical cost of Transformation Sting has been increased to 50
    • +
+

06 June 2017

Joan updated:

    @@ -62,6 +128,7 @@
  • Renames Clockwork Proselytizers to Replica Fabricators.
  • Replica Fabricators can directly consume floor tiles, rods, metal, and plasteel for power instead of needing to convert to brass first.
  • Cogscarabs can no longer use guns.
    • +
  • KA modkits in necropolis chests are now design discs with designs for those modkits, to force miners to bring back minerals.

PKPenguin321 updated:

    @@ -1475,31 +1542,6 @@
    • Secure lockers will no longer have multiple lines about being broken.
    - -

    05 April 2017

    -

    Cyberboss updated:

    -
      -
    • Cardboard boxes and bodybags can no longer be anchored
      • -
    -

    Penguaro updated:

    -
      -
    • [Box] A fire alarm has been added to the Lawyer's office.
      • -
    • [Box] Adds access for Scientists to Starboard Maintenance Areas outside of Toxins.
      • -
    • [Box] Adjusted Science doors to more logical access codes.
      • -
    -

    QV updated:

    -
      -
    • Fixed taking max suffocation damage whenever oxygen was slightly low
      • -
    -

    RemieRichards updated:

    -
      -
    • Using TK on the supermatter will burn your head off violently, don't do this.
      • -
    • Examining clothing with pockets will now give information about the pockets: number of slots, how it is interacted with (backpack, etc.), if it has quickdraw (Alt-Click) support and whether or not it is silent to interact with.
      • -
    -

    coiax updated:

    -
      -
    • Emergency shuttles will now forget early launch authorizations if they cannot launch due to a hostile environment.
      • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 091a293167e..1dbe6c706ef 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -11698,6 +11698,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - balance: Replica Fabricators can directly consume floor tiles, rods, metal, and plasteel for power instead of needing to convert to brass first. - balance: Cogscarabs can no longer use guns. + - tweak: KA modkits in necropolis chests are now design discs with designs for those + modkits, to force miners to bring back minerals. PKPenguin321: - bugfix: The fake pits that the arcade machines can vend now vend properly, for real this time. @@ -11714,3 +11716,62 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. this prevents the inventory bugs associated with this item. thefastfoodguy: - tweak: you can burn your brains out with a flashlight if you're tired of life +2017-06-07: + Expletive: + - rscadd: New plasma medals have been added to the Captain's medal box. Don't get + them too warm. + - imageadd: New sprites for plasma medals. + - imageadd: Icon and worn sprites for all medals and the lawyer's badge have been + improved. Worn medals more closely match their icons. + - tweak: The bone talisman is an accessory again, so it's not useless. + - imageadd: It also has a new worn sprite, based on an arm band. + - imagedel: Ties have been removed from accessories.dmi and vice versa. Same for + the explorer's webbing sprites that were in there. ties.dmi is now neck.dmi, + and has sprites for scarves, ties, sthetoscopes, etc. + - tweak: Examining an accessory now tells you how to use it. + Joan: + - spellcheck: Renamed Volt Void to Volt Blaster. + - tweak: Volt Blaster does not consume power when firing and does not cause backlash + if you don't fire. + - balance: Volt Blaster does 25 damage, from 20-40 depending on power, and has 5 + shots, from 4, over its duration. + QualityVan: + - bugfix: Surplus rifles are no longer invisible while unloaded + Shadowlight213: + - balance: The Changeling Transformation Sting is once again stealthy. However, + it no longer transfers mutations. + - balance: The chemical cost of Transformation Sting has been increased to 50 +2017-06-08: + 4dplanner: + - bugfix: traitors show up on antagHUD + Joan: + - balance: Tinkerer's Daemons are no longer totally disabled if you drop below the + servant requirement. + - balance: Instead, Tinkerer's Daemons will disable until the number of active daemons + is equal to or less than one-fifth of the living Servants. + - tweak: Tinkerer's Daemons produce components very slightly slower. + - rscadd: Added Prolonging Prism as an application scripture. + - balance: Prolonging Prism will delay the arrival of an emergency shuttle by 2 + minutes at the cost of 2500W of power plus 75W for every 10 CV and 750W for + every previous activation. In addition to the high cost, it very obviously affects + the shuttle dock and leaves an obvious trail to the prism. + - balance: Script scripture now requires 6 Servants to unlock, from 5, and Application + scripture now requires 9 Servants to unlock, from 8. + NanoTrasen Public Relations Department: + - rscadd: A mining accident has released large amounts of space dust, which is starting + to drift near our stations. Don't panic, it's probably safe. + Nanotrasen Plastic Surgery Advert: + - rscadd: Are you a mutant? Were you born hideously deformed? Do you have ears growing + out of the top of your head? Or even a tail? Don't worry, with our patented + surgical techniques, Nanotrasen's highly trained medical staff can make you + normal! Schedule an appointment, and one of our surgeons can see you same day. + - balance: Cat ears now give you double the ear damage. + QualityVan: + - bugfix: Cremators now still work when there's only one thing in them + - bugfix: The ORM now uses the intended amount of resources when making alloys + - rscdel: Cyborgs can no longer alt-click their material stacks to split them + Shadowlight213: + - rscadd: Tracking implants and chem implants have been added to rnd + - rscdel: Adrenaline and freedom implants have been removed from rnd + oranges: + - rscadd: Added stungloves to the brain damage lines diff --git a/html/changelogs/AutoChangeLog-pr-28098.yml b/html/changelogs/AutoChangeLog-pr-28098.yml deleted file mode 100644 index 646ebab943f..00000000000 --- a/html/changelogs/AutoChangeLog-pr-28098.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Joan" -delete-after: True -changes: - - tweak: "KA modkits in necropolis chests are now design discs with designs for those modkits, to force miners to bring back minerals." diff --git a/html/changelogs/AutoChangeLog-pr-28137.yml b/html/changelogs/AutoChangeLog-pr-28137.yml new file mode 100644 index 00000000000..7ac18b1e849 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28137.yml @@ -0,0 +1,4 @@ +author: "Robustin" +delete-after: True +changes: + - balance: "The blood cult can only attempt to summon Nar-Sie in one of three rooms that are randomly selected at round-start." diff --git a/html/changelogs/AutoChangeLog-pr-28171.yml b/html/changelogs/AutoChangeLog-pr-28171.yml new file mode 100644 index 00000000000..f7b64b0f08d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28171.yml @@ -0,0 +1,4 @@ +author: "lzimann" +delete-after: True +changes: + - rscdel: "Xeno queens can no longer be maids" diff --git a/html/changelogs/AutoChangeLog-pr-28178.yml b/html/changelogs/AutoChangeLog-pr-28178.yml new file mode 100644 index 00000000000..ff5abf73f1e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28178.yml @@ -0,0 +1,8 @@ +author: "Expletive" +delete-after: True +changes: + - tweak: "The detective's flask has Hearty Punch instead of whiskey." + - bugfix: "The Detective's fedora no longer clips with hair." + - imageadd: "Adds 91 new sprites to fix clipping issues with the Detective's fedora and hair." + - imageadd: "Change the standard fedora to match the detective and treasure hunter variants." + - tweak: "Detective, Treasure Hunter, and standard fedoras now all benefit from new sprites." diff --git a/html/changelogs/AutoChangeLog-pr-28189.yml b/html/changelogs/AutoChangeLog-pr-28189.yml new file mode 100644 index 00000000000..eeed3b359b0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28189.yml @@ -0,0 +1,4 @@ +author: "Xhuis" +delete-after: True +changes: + - tweak: "Defibrillator paddles will no longer stick to your hands, and will snap back onto the unit if you drop them somehow." diff --git a/icons/effects/64x64.dmi b/icons/effects/64x64.dmi index 361cfff40c0..d80b077988a 100644 Binary files a/icons/effects/64x64.dmi and b/icons/effects/64x64.dmi differ diff --git a/icons/effects/parallax.dmi b/icons/effects/parallax.dmi old mode 100644 new mode 100755 index a770bf8667d..b7a003d1bb0 Binary files a/icons/effects/parallax.dmi and b/icons/effects/parallax.dmi differ diff --git a/icons/mob/accessories.dmi b/icons/mob/accessories.dmi new file mode 100644 index 00000000000..22c42e1eae7 Binary files /dev/null and b/icons/mob/accessories.dmi differ diff --git a/icons/mob/alienqueen.dmi b/icons/mob/alienqueen.dmi index 4b84210c5a7..115bd17cb0b 100644 Binary files a/icons/mob/alienqueen.dmi and b/icons/mob/alienqueen.dmi differ diff --git a/icons/mob/hair_extensions.dmi b/icons/mob/hair_extensions.dmi index cf74d73796c..bd2adda94bd 100644 Binary files a/icons/mob/hair_extensions.dmi and b/icons/mob/hair_extensions.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 26101a5dbc2..a9960f84d82 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi deleted file mode 100644 index 19b36bfc948..00000000000 Binary files a/icons/mob/ties.dmi and /dev/null differ diff --git a/icons/obj/clockwork_objects.dmi b/icons/obj/clockwork_objects.dmi index 02e07435931..dc6f1e61439 100644 Binary files a/icons/obj/clockwork_objects.dmi and b/icons/obj/clockwork_objects.dmi differ diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi new file mode 100644 index 00000000000..99c203cc167 Binary files /dev/null and b/icons/obj/clothing/accessories.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index f170cf7f967..97e6e3a7532 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index 9606e11d63e..0f3668ce102 100644 Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi deleted file mode 100644 index 83c1ffedf20..00000000000 Binary files a/icons/obj/clothing/ties.dmi and /dev/null differ diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index a6849c2d955..2860c160085 100644 Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index 811c95536af..94f7b420f4b 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ diff --git a/interface/menu.dm b/interface/menu.dm index 4bebd5b2023..8e7045cb620 100644 --- a/interface/menu.dm +++ b/interface/menu.dm @@ -1,5 +1,5 @@ /* -/datum/menu/Example/verb/Example() +/datum/verbs/menu/Example/verb/Example() set name = "" //if this starts with @ the verb is not created and name becomes the command to invoke. set desc = "" //desc is the text given to this entry in the menu //You can not use src in these verbs. It will be the menu at compile time, but the client at runtime. @@ -7,126 +7,40 @@ GLOBAL_LIST_EMPTY(menulist) -/world/proc/load_menu() - for (var/typepath in subtypesof(/datum/menu)) - new typepath() - -/datum/menu - var/name - var/list/children - var/datum/menu/myparent - var/list/verblist +/datum/verbs/menu var/checkbox = CHECKBOX_NONE //checkbox type. var/default //default checked type. //Set to true to append our children to our parent, //Rather then add us as a node (used for having more then one checkgroups in the same menu) - var/abstract = FALSE -/datum/menu/New() - var/ourentry = GLOB.menulist[type] - children = list() - verblist = list() - if (ourentry) - if (islist(ourentry)) //some of our childern already loaded - Add_children(ourentry) - else - stack_trace("Menu item double load: [type]") - qdel(src) - return +/datum/verbs/menu/GetList() + return GLOB.menulist - GLOB.menulist[type] = src +/datum/verbs/menu/HandleVerb(list/entry, verbpath, client/C) + var/datum/verbs/menu/verb_true_parent = GLOB.menulist[verblist[verbpath]] + var/true_checkbox = verb_true_parent.checkbox + if (true_checkbox != CHECKBOX_NONE) + var/checkedverb = verb_true_parent.Get_checked(C) + if (true_checkbox == CHECKBOX_GROUP) + if (verbpath == checkedverb) + entry["is-checked"] = TRUE + else + entry["is-checked"] = FALSE + else if (true_checkbox == CHECKBOX_TOGGLE) + entry["is-checked"] = checkedverb - Load_verbs(type, typesof("[type]/verb")) + entry["command"] = ".updatemenuchecked \"[verb_true_parent.type]\" \"[verbpath]\"\n[entry["command"]]" + entry["can-check"] = TRUE + entry["group"] = "[verb_true_parent.type]" + return list2params(entry) - var/datum/menu/parent = GLOB.menulist[parent_type] - if (!parent) - GLOB.menulist[parent_type] = list(src) - else if (islist(parent)) - parent += src - else - parent.Add_children(list(src)) - -/datum/menu/proc/Set_parent(datum/menu/parent) - myparent = parent - if (abstract) - myparent.Add_children(children) - var/list/verblistoftypes = list() - for(var/thing in verblist) - LAZYADD(verblistoftypes[verblist[thing]], thing) - - for(var/verbparenttype in verblistoftypes) - myparent.Load_verbs(verbparenttype, verblistoftypes[verbparenttype]) - -/datum/menu/proc/Add_children(list/kids) - if (abstract && myparent) - myparent.Add_children(kids) - return - - for(var/thing in kids) - var/datum/menu/menuitem = thing - menuitem.Set_parent(src) - if (!menuitem.abstract) - children += menuitem - -/datum/menu/proc/Load_verbs(verb_parent_type, list/verbs) - if (abstract && myparent) - myparent.Load_verbs(verb_parent_type, verbs) - return - - for (var/verbpath in verbs) - verblist[verbpath] = verb_parent_type - -/datum/menu/proc/Generate_list(client/C) - . = list() - if (length(children)) - for (var/thing in children) - var/datum/menu/child = thing - var/list/childlist = child.Generate_list(C) - if (childlist) - var/childname = "[child]" - if (childname == "[child.type]") - var/list/tree = splittext(childname, "/") - childname = tree[tree.len] - .[child.type] = "parent=[url_encode(type)];name=[url_encode(childname)]" - . += childlist - - - - for (var/thing in verblist) - var/atom/verb/verbpath = thing - if (!verbpath) - stack_trace("Bad VERB in [type] verblist: [english_list(verblist)]") - var/list/entry = list() - entry["parent"] = "[type]" - entry["name"] = verbpath.desc - if (copytext(verbpath.name,1,2) == "@") - entry["command"] = copytext(verbpath.name,2) - else - entry["command"] = replacetext(verbpath.name, " ", "-") - var/datum/menu/verb_true_parent = GLOB.menulist[verblist[verbpath]] - var/true_checkbox = verb_true_parent.checkbox - if (true_checkbox != CHECKBOX_NONE) - var/checkedverb = verb_true_parent.Get_checked(C) - if (true_checkbox == CHECKBOX_GROUP) - if (verbpath == checkedverb) - entry["is-checked"] = TRUE - else - entry["is-checked"] = FALSE - else if (true_checkbox == CHECKBOX_TOGGLE) - entry["is-checked"] = checkedverb - - entry["command"] = ".updatemenuchecked \"[verb_true_parent.type]\" \"[verbpath]\"\n[entry["command"]]" - entry["can-check"] = TRUE - entry["group"] = "[verb_true_parent.type]" - .[verbpath] = list2params(entry) - -/datum/menu/proc/Get_checked(client/C) +/datum/verbs/menu/proc/Get_checked(client/C) return C.prefs.menuoptions[type] || default || FALSE -/datum/menu/proc/Load_checked(client/C) //Loads the checked menu item into a new client. Used by icon menus to invoke the checked item. +/datum/verbs/menu/proc/Load_checked(client/C) //Loads the checked menu item into a new client. Used by icon menus to invoke the checked item. return -/datum/menu/proc/Set_checked(client/C, verbpath) +/datum/verbs/menu/proc/Set_checked(client/C, verbpath) if (checkbox == CHECKBOX_GROUP) C.prefs.menuoptions[type] = verbpath C.prefs.save_preferences() @@ -142,7 +56,7 @@ GLOBAL_LIST_EMPTY(menulist) verbpath = text2path(verbpath) if (!menutype || !verbpath) return - var/datum/menu/M = GLOB.menulist[menutype] + var/datum/verbs/menu/M = GLOB.menulist[menutype] if (!M) return if (!(verbpath in typesof("[menutype]/verb"))) @@ -150,7 +64,7 @@ GLOBAL_LIST_EMPTY(menulist) M.Set_checked(src, verbpath) -/datum/menu/Icon/Load_checked(client/C) //So we can be lazy, we invoke the "checked" menu item on menu load. +/datum/verbs/menu/Icon/Load_checked(client/C) //So we can be lazy, we invoke the "checked" menu item on menu load. var/atom/verb/verbpath = Get_checked(C) if (!verbpath || !(verbpath in typesof("[type]/verb"))) return @@ -159,45 +73,45 @@ GLOBAL_LIST_EMPTY(menulist) else winset(C, null, "command = [replacetext(verbpath.name, " ", "-")]") -/datum/menu/Icon/Size +/datum/verbs/menu/Icon/Size checkbox = CHECKBOX_GROUP - default = /datum/menu/Icon/Size/verb/iconstretchtofit + default = /datum/verbs/menu/Icon/Size/verb/iconstretchtofit -/datum/menu/Icon/Size/verb/iconstretchtofit() +/datum/verbs/menu/Icon/Size/verb/iconstretchtofit() set name = "@.winset \"mapwindow.map.icon-size=0\"" set desc = "&Auto (stretch-to-fit)" -/datum/menu/Icon/Size/verb/icon96() +/datum/verbs/menu/Icon/Size/verb/icon96() set name = "@.winset \"mapwindow.map.icon-size=96\"" set desc = "&96x96 (3x)" -/datum/menu/Icon/Size/verb/icon64() +/datum/verbs/menu/Icon/Size/verb/icon64() set name = "@.winset \"mapwindow.map.icon-size=64\"" set desc = "&64x64 (2x)" -/datum/menu/Icon/Size/verb/icon48() +/datum/verbs/menu/Icon/Size/verb/icon48() set name = "@.winset \"mapwindow.map.icon-size=48\"" set desc = "&48x48 (1.5x)" -/datum/menu/Icon/Size/verb/icon32() +/datum/verbs/menu/Icon/Size/verb/icon32() set name = "@.winset \"mapwindow.map.icon-size=32\"" set desc = "&32x32 (1x)" -/datum/menu/Icon/Scaling +/datum/verbs/menu/Icon/Scaling checkbox = CHECKBOX_GROUP name = "Scaling Mode" - default = /datum/menu/Icon/Scaling/verb/NN + default = /datum/verbs/menu/Icon/Scaling/verb/NN -/datum/menu/Icon/Scaling/verb/NN() +/datum/verbs/menu/Icon/Scaling/verb/NN() set name = "@.winset \"mapwindow.map.zoom-mode=distort\"" set desc = "Nearest Neighbor" -/datum/menu/Icon/Scaling/verb/PS() +/datum/verbs/menu/Icon/Scaling/verb/PS() set name = "@.winset \"mapwindow.map.zoom-mode=normal\"" set desc = "Point Sampling" -/datum/menu/Icon/Scaling/verb/BL() +/datum/verbs/menu/Icon/Scaling/verb/BL() set name = "@.winset \"mapwindow.map.zoom-mode=blur\"" set desc = "Bilinear" diff --git a/strings/brain_damage_lines.json b/strings/brain_damage_lines.json index 6af0f4b8910..a1a44431dea 100644 --- a/strings/brain_damage_lines.json +++ b/strings/brain_damage_lines.json @@ -67,7 +67,8 @@ "kamelien", "eksrey", "glowey skin", - "fungal tb" + "fungal tb", + "stun gloves" ], "george": [ diff --git a/strings/tips.txt b/strings/tips.txt index 591ba0c04b8..fa2bd82c395 100644 --- a/strings/tips.txt +++ b/strings/tips.txt @@ -150,11 +150,11 @@ As a Revolutionary, cargo can be your best friend or your worst nightmare. In th As a Revolutionary, your main power comes from how quickly you spread. Convert people as fast as you can and overwhelm the heads of staff before security can arm up. As a Changeling, the Extract DNA sting counts for your genome absorb objective, but does not let you respec your powers. As a Changeling, you can absorb someone by strangling them and using the Absorb verb; this gives you the ability to rechoose your powers, the DNA of whoever you absorbed, the memory of the absorbed, and some samples of things the absorbed said. -As a Cultist, invest in taking over xenobio, an adamantine golem army can quickly be converted into cultists and constructs. As a Cultist, do not cause too much chaos before your objective is completed. If the shuttle gets called too soon, you may not have enough time to win. As a Cultist, your team starts off very weak, but if necessary can quickly convert everything they have into raw power. Make sure you have the numbers and equipment to support going loud, or the cult will fall flat on its face. As a Cultist, the Blood Boil rune will deal massive amounts of brute damage to non-cultists, stamina damage to Ratvarian scum, and some damage to fellow cultists of Nar-Sie nearby, but will create a fire where the rune stands on use. As a Cultist, you can create an army of manifested goons using a combination of the Manifest rune, which creates homunculi from ghosts, and the Blood Drain rune, which drains life from anyone standing on any blood drain rune. +As a Cultist or Servant, check the alert in the upper-right of your screen for all the details about your cult's current status and objective. As a Servant, your Clockwork Slab fits in pockets and does not need to be held to communicate with other Servants. As a Servant, remember that while the selection of scripture and tools Servant cyborgs get is limited, it is still extremely useful, and some of it is unique; for example, engineering and janitor cyborgs get a proselytizer that can use their own power in addition to its own. As a Servant, the Judicial Visor is an effective defensive combat tool in small spaces, as it stuns and mutes anyone still on it after 3 seconds. It is also useful for stunning already-stunned enemies for long enough to convert them or finish them off. @@ -172,7 +172,6 @@ As a Servant, Volt Void will drain power from nearby Sigils of Transmission to u As a Servant, Fellowship Armory invokes much faster for each nearby servant and attempts to provide each affected servant with powerful armor against melee, bullet, and bomb attacks. The gauntlets provided are also immune to elecricity. As a Servant, Spatial Gateway can teleport to any living Servant or Clockwork Obelisk, and gains additional uses and duration for each Servant assisting in the invocation. As a Servant, creating and activating the Gateway to the Celestial Derelict is your ultimate goal, and you must defend it with all the tools you have available. -As a Servant, once Ratvar has arrived, all of your tools gain a massive boost in power and will, in general, have no cost and work at double speed. As a Servant, you can impale human targets with a Ratvarian Spear by pulling them, then attacking them. This does massive damage and stuns them, and should effectively win the fight. As a Servant, Sentinel's Compromise can instantly return you or another Servant to a fighting state by converting half of all their brute, burn, and oxygen damage to toxin, effectively halving the damage they have. Clockwork Floors will also rapidly heal toxin damage in Servants, allowing the Compromise more effectiveness. As a Servant, Belligerent and Taunting Tirade are extremely powerful for disabling and disrupting large groups of enemies, though they render you somewhat vulnerable, as Belligerent requires that you stand still, and Taunting Tirade makes you extremely obvious. diff --git a/tgstation.dme b/tgstation.dme index 5855bb0f9cc..835d3ac80d3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -235,6 +235,7 @@ #include "code\datums\ruins.dm" #include "code\datums\shuttles.dm" #include "code\datums\soullink.dm" +#include "code\datums\verbs.dm" #include "code\datums\antagonists\antag_datum.dm" #include "code\datums\antagonists\datum_clockcult.dm" #include "code\datums\antagonists\datum_cult.dm" @@ -438,6 +439,7 @@ #include "code\game\gamemodes\clock_cult\clock_structures\interdiction_lens.dm" #include "code\game\gamemodes\clock_cult\clock_structures\mania_motor.dm" #include "code\game\gamemodes\clock_cult\clock_structures\ocular_warden.dm" +#include "code\game\gamemodes\clock_cult\clock_structures\prolonging_prism.dm" #include "code\game\gamemodes\clock_cult\clock_structures\ratvar_the_clockwork_justicar.dm" #include "code\game\gamemodes\clock_cult\clock_structures\taunting_trail.dm" #include "code\game\gamemodes\clock_cult\clock_structures\tinkerers_cache.dm" @@ -715,7 +717,6 @@ #include "code\game\objects\items\bodybag.dm" #include "code\game\objects\items\candle.dm" #include "code\game\objects\items\cardboard_cutouts.dm" -#include "code\game\objects\items\charter.dm" #include "code\game\objects\items\control_wand.dm" #include "code\game\objects\items\crayons.dm" #include "code\game\objects\items\dehy_carp.dm" @@ -784,6 +785,7 @@ #include "code\game\objects\items\weapons\AI_modules.dm" #include "code\game\objects\items\weapons\airlock_painter.dm" #include "code\game\objects\items\weapons\cards_ids.dm" +#include "code\game\objects\items\weapons\charter.dm" #include "code\game\objects\items\weapons\chrono_eraser.dm" #include "code\game\objects\items\weapons\cigs_lighters.dm" #include "code\game\objects\items\weapons\clown_items.dm" @@ -1171,7 +1173,7 @@ #include "code\modules\clothing\masks\gasmask.dm" #include "code\modules\clothing\masks\hailer.dm" #include "code\modules\clothing\masks\miscellaneous.dm" -#include "code\modules\clothing\neck\ties.dm" +#include "code\modules\clothing\neck\neck.dm" #include "code\modules\clothing\outfits\ert.dm" #include "code\modules\clothing\outfits\standard.dm" #include "code\modules\clothing\shoes\bananashoes.dm" @@ -1193,12 +1195,12 @@ #include "code\modules\clothing\suits\toggles.dm" #include "code\modules\clothing\suits\utility.dm" #include "code\modules\clothing\suits\wiz_robe.dm" +#include "code\modules\clothing\under\accessories.dm" #include "code\modules\clothing\under\color.dm" #include "code\modules\clothing\under\miscellaneous.dm" #include "code\modules\clothing\under\pants.dm" #include "code\modules\clothing\under\shorts.dm" #include "code\modules\clothing\under\syndicate.dm" -#include "code\modules\clothing\under\ties.dm" #include "code\modules\clothing\under\trek.dm" #include "code\modules\clothing\under\jobs\civilian.dm" #include "code\modules\clothing\under\jobs\engineering.dm" @@ -2104,6 +2106,7 @@ #include "code\modules\surgery\organs\helpers.dm" #include "code\modules\surgery\organs\lungs.dm" #include "code\modules\surgery\organs\organ_internal.dm" +#include "code\modules\surgery\organs\tails.dm" #include "code\modules\surgery\organs\tongue.dm" #include "code\modules\surgery\organs\vocal_cords.dm" #include "code\modules\tgui\external.dm" diff --git a/tools/minibot/config.py b/tools/minibot/config.py index c0ffc55bed6..8888753ab71 100644 --- a/tools/minibot/config.py +++ b/tools/minibot/config.py @@ -1,7 +1,6 @@ # Configuration for the minibot.py bot starts here server = "irc.rizon.net" port = 6667 -nudge_port = 45678 channels = ["#asdfgbus", "#botbus"] defaultchannel = "#asdfgbus" diff --git a/tools/minibot/minibot.py b/tools/minibot/minibot.py index cc5ac1a5b4d..92192c0264c 100644 --- a/tools/minibot/minibot.py +++ b/tools/minibot/minibot.py @@ -73,7 +73,7 @@ def setup_irc_socket(): def setup_nudge_socket(): s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.bind(("", nudge_port)) # localhost:nudge_port + s.bind(("", 45678)) # localhost:nudge_port s.listen(5) logger.info("Nudge socket up and listening") return s diff --git a/tools/minibot/nudge.py b/tools/minibot/nudge.py index afc2cf38b09..1af5c928fa6 100644 --- a/tools/minibot/nudge.py +++ b/tools/minibot/nudge.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3 -from config import * import sys import pickle import socket @@ -17,7 +16,7 @@ def pack(): def nudge(data): s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect(("localhost", nudge_port)) + s.connect(("localhost", 45678)) s.send(data) s.close()