From 5da9822c3212aa8fa8c47878ef2e940741ca9207 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sun, 4 Jun 2017 19:05:41 -0700 Subject: [PATCH 01/42] Update ores_coins.dm --- code/modules/mining/ores_coins.dm | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 595df2a3df9..6da5d30ee1d 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -188,6 +188,7 @@ 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/attacher = "UNKNOWN" + var/det_timer /obj/item/weapon/twohanded/required/gibtonite/Destroy() qdel(wires) @@ -213,7 +214,9 @@ 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 @@ -237,8 +240,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 +263,17 @@ 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), det_time) + +/obj/item/weapon/twohanded/required/gibtonite/proc/detonate() + if(primed) + if(quality == 3) + explosion(src.loc,2,4,9,adminlog = notify_admins) + else if(quality == 2) + explosion(src.loc,1,2,5,adminlog = notify_admins) + else if(quality == 1) + explosion(src.loc,-1,1,3,adminlog = notify_admins) + qdel(src) /obj/item/weapon/ore/Initialize() ..() From 94758b7c189d339cbc9ae66b8cc2d5a43fa75af4 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sun, 4 Jun 2017 19:10:07 -0700 Subject: [PATCH 02/42] Update ores_coins.dm --- code/modules/mining/ores_coins.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 6da5d30ee1d..022314be068 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -263,9 +263,9 @@ 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)]") - det_timer = addtimer(CALLBACK(src, .proc/detonate), det_time) + det_timer = addtimer(CALLBACK(src, .proc/detonate, notify_admins), det_time) -/obj/item/weapon/twohanded/required/gibtonite/proc/detonate() +/obj/item/weapon/twohanded/required/gibtonite/proc/detonate(notify_admins) if(primed) if(quality == 3) explosion(src.loc,2,4,9,adminlog = notify_admins) From b8950b2fa0b9026239eaadd4deda0be3023934ce Mon Sep 17 00:00:00 2001 From: Jordie Date: Mon, 5 Jun 2017 16:19:24 +1000 Subject: [PATCH 03/42] adds temp index to query for converting to rounds --- SQL/database_changelog.txt | 2 ++ 1 file changed, 2 insertions(+) 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. From 226a37b2ca3a8d01ae2243150a1da36d00d0e6b0 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 5 Jun 2017 11:52:20 -0400 Subject: [PATCH 04/42] Graceful shutdown now asks the server to kill it --- code/modules/server_tools/server_tools.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/server_tools/server_tools.dm b/code/modules/server_tools/server_tools.dm index 725c9f82c09..ed9c43fb50a 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() From dd313992c1236f4cf8432b9af431071ba4ce79e1 Mon Sep 17 00:00:00 2001 From: Akke Date: Tue, 6 Jun 2017 04:47:52 +0100 Subject: [PATCH 05/42] lowers gel cost to 1 from 5 --- code/modules/reagents/chemistry/recipes/others.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 0bc843a6054..b535812652b 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 From 0150de51c39f79c82324b48ad0b0175f370c580e Mon Sep 17 00:00:00 2001 From: Shadowlight213 Date: Mon, 5 Jun 2017 20:58:12 -0700 Subject: [PATCH 06/42] Adrenaline and freedom implants in rnd have been replaced with tracking and chem ones --- .../items/weapons/implants/implant_track.dm | 6 +++++ .../research/designs/medical_designs.dm | 24 +++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) 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/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") From 8b398d6e0f6f0d9bc15947a62c1e8f7daea9f881 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 6 Jun 2017 10:06:59 -0400 Subject: [PATCH 07/42] Hardcodes the legacy nudge port --- tools/minibot/config.py | 1 - tools/minibot/minibot.py | 2 +- tools/minibot/nudge.py | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) 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() From aed491564a70e6cd1cd289da0c1772185d32653f Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 6 Jun 2017 10:30:44 -0400 Subject: [PATCH 08/42] Removes legacy LateInitialize support --- code/game/atoms.dm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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) From db323e2e3bddcca86977168bf57c368001a3136e Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Tue, 6 Jun 2017 10:32:07 -0400 Subject: [PATCH 09/42] Tinkerer's Daemons are no longer totally disabled if you drop below the servant requirement --- code/__DEFINES/clockcult.dm | 2 +- code/_onclick/hud/alert.dm | 5 +-- .../scripture_applications.dm | 15 +------ .../clock_structures/tinkerers_daemon.dm | 44 ++++++++++++------- 4 files changed, 31 insertions(+), 35 deletions(-) diff --git a/code/__DEFINES/clockcult.dm b/code/__DEFINES/clockcult.dm index 5ea3bc7a70f..0bcf75c6ab7 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 diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index b2cc7b5c9c9..9a22b7c30a1 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -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/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm index c3e40692c20..c079cbb9257 100644 --- a/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm +++ b/code/game/gamemodes/clock_cult/clock_scriptures/scripture_applications.dm @@ -240,7 +240,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 +257,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_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) From cffc8683257be59ce633a3f8aa57138af9f00cb2 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Tue, 6 Jun 2017 11:25:03 -0400 Subject: [PATCH 10/42] KA modkits in necropolis chests are now design discs to force miners to bring back minerals (#28098) --- .../mining/lavaland/necropolis_chests.dm | 68 +++++++++++++++++-- 1 file changed, 63 insertions(+), 5 deletions(-) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 59dcc324f8b..3778ffdc525 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -28,7 +28,7 @@ if(7) new /obj/item/weapon/pickaxe/diamond(src) if(8) - new /obj/item/borg/upgrade/modkit/resonator_blasts(src) + new /obj/item/weapon/disk/design_disk/modkit_disc/resonator_blast(src) if(9) new /obj/item/organ/brain/alien(src) if(10) @@ -38,7 +38,7 @@ if(12) new /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker(src) if(13) - new /obj/item/borg/upgrade/modkit/cooldown/repeater(src) + new /obj/item/weapon/disk/design_disk/modkit_disc/rapid_repeater(src) if(14) new /obj/item/weapon/nullrod/scythe/talking(src) if(15) @@ -46,7 +46,7 @@ if(16) new /obj/item/weapon/guardiancreator(src) if(17) - new /obj/item/borg/upgrade/modkit/aoe/turfs/andmobs(src) + new /obj/item/weapon/disk/design_disk/modkit_disc/mob_and_turf_aoe(src) if(18) new /obj/item/device/warp_cube/red(src) if(19) @@ -70,12 +70,70 @@ new /obj/item/borg/upgrade/modkit/lifesteal(src) new /obj/item/weapon/bedsheet/cult(src) if(28) - new /obj/item/borg/upgrade/modkit/bounty(src) + new /obj/item/weapon/disk/design_disk/modkit_disc/bounty(src) +//KA modkit design discs +/obj/item/weapon/disk/design_disk/modkit_disc + name = "KA Mod Disk" + desc = "A design disc containing the design for a unique kinetic accelerator modkit." + icon_state = "datadisk1" + var/modkit_design = /datum/design/unique_modkit +/obj/item/weapon/disk/design_disk/modkit_disc/Initialize() + . = ..() + blueprints[1] = new modkit_design + +/obj/item/weapon/disk/design_disk/modkit_disc/mob_and_turf_aoe + name = "Offensive Mining Explosion Mod Disk" + modkit_design = /datum/design/unique_modkit/offensive_turf_aoe + +/obj/item/weapon/disk/design_disk/modkit_disc/rapid_repeater + name = "Rapid Repeater Mod Disk" + modkit_design = /datum/design/unique_modkit/rapid_repeater + +/obj/item/weapon/disk/design_disk/modkit_disc/resonator_blast + name = "Resonator Blast Mod Disk" + modkit_design = /datum/design/unique_modkit/resonator_blast + +/obj/item/weapon/disk/design_disk/modkit_disc/bounty + name = "Death Syphon Mod Disk" + modkit_design = /datum/design/unique_modkit/bounty + +/datum/design/unique_modkit + category = list("Mining Designs", "Cyborg Upgrade Modules") + req_tech = list("materials" = 12) //can't be normally obtained + build_type = PROTOLATHE | MECHFAB + +/datum/design/unique_modkit/offensive_turf_aoe + name = "Kinetic Accelerator Offensive Mining Explosion Mod" + desc = "A device which causes kinetic accelerators to fire AoE blasts that destroy rock and damage creatures." + id = "hyperaoemod" + materials = list(MAT_METAL = 7000, MAT_GLASS = 3000, MAT_SILVER = 3000, MAT_GOLD = 3000, MAT_DIAMOND = 4000) + build_path = /obj/item/borg/upgrade/modkit/aoe/turfs/andmobs + +/datum/design/unique_modkit/rapid_repeater + name = "Kinetic Accelerator Rapid Repeater Mod" + desc = "A device which greatly reduces a kinetic accelerator's cooldown on striking a living target or rock, but greatly increases its base cooldown." + id = "repeatermod" + materials = list(MAT_METAL = 5000, MAT_GLASS = 5000, MAT_URANIUM = 8000, MAT_BLUESPACE = 2000) + build_path = /obj/item/borg/upgrade/modkit/cooldown/repeater + +/datum/design/unique_modkit/resonator_blast + name = "Kinetic Accelerator Resonator Blast Mod" + desc = "A device which causes kinetic accelerators to fire shots that leave and detonate resonator blasts." + id = "resonatormod" + materials = list(MAT_METAL = 5000, MAT_GLASS = 5000, MAT_SILVER = 5000, MAT_URANIUM = 5000) + build_path = /obj/item/borg/upgrade/modkit/resonator_blasts + +/datum/design/unique_modkit/bounty + name = "Kinetic Accelerator Death Syphon Mod" + desc = "A device which causes kinetic accelerators to permenantly gain damage against creature types killed with it." + id = "bountymod" + materials = list(MAT_METAL = 4000, MAT_SILVER = 4000, MAT_GOLD = 4000, MAT_BLUESPACE = 4000) + reagents_list = list("blood" = 40) + build_path = /obj/item/borg/upgrade/modkit/bounty //Spooky special loot - /obj/item/device/wisp_lantern name = "spooky lantern" desc = "This lantern gives off no light, but is home to a friendly wisp." From 6bebd52d65b6c29f753236aecc96d1b5dff42d7b Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Tue, 6 Jun 2017 08:25:05 -0700 Subject: [PATCH 11/42] Automatic changelog generation for PR #28098 [ci skip] --- html/changelogs/AutoChangeLog-pr-28098.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-28098.yml diff --git a/html/changelogs/AutoChangeLog-pr-28098.yml b/html/changelogs/AutoChangeLog-pr-28098.yml new file mode 100644 index 00000000000..646ebab943f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28098.yml @@ -0,0 +1,4 @@ +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." From 75007ece1bcb81e552039397a9484c2a3cfb5c47 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 6 Jun 2017 11:34:10 -0400 Subject: [PATCH 12/42] Hang up holocalls with an action (#28100) --- code/datums/holocall.dm | 17 +++++++++++++++++ code/game/machinery/hologram.dm | 15 --------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index 54809a708ac..4e7490f8eed 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -15,6 +15,7 @@ var/mob/camera/aiEye/remote/holo/eye //user's eye, once connected var/obj/effect/overlay/holo_pad_hologram/hologram //user's hologram, once connected + var/datum/action/innate/end_holocall/hangup //hangup action var/call_start_time @@ -42,6 +43,8 @@ //cleans up ALL references :) /datum/holocall/Destroy() + QDEL_NULL(hangup) + var/user_good = !QDELETED(user) if(user_good) user.reset_perspective() @@ -144,6 +147,8 @@ user.reset_perspective(eye) eye.setLoc(H.loc) + hangup = new(eye, src) + //Checks the validity of a holocall and qdels itself if it's not. Returns TRUE if valid, FALSE otherwise /datum/holocall/proc/Check() for(var/I in dialed_holopads) @@ -166,3 +171,15 @@ if(!.) testing("Holocall Check fail") qdel(src) + +/datum/action/innate/end_holocall + name = "End Holocall" + button_icon_state = "camera_off" + var/datum/holocall/hcall + +/datum/action/innate/end_holocall/New(Target, datum/holocall/HC) + ..() + hcall = HC + +/datum/action/innate/end_holocall/Activate() + hcall.Disconnect(hcall.calling_holopad) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index f7f0897ebd0..7e1c510f24a 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -105,26 +105,11 @@ Possible to do for anyone motivated enough: return return ..() -/obj/machinery/holopad/proc/CheckCallClose() - for(var/I in holo_calls) - var/datum/holocall/HC = I - if(usr == HC.eye) - HC.Disconnect(HC.calling_holopad) //disconnect via clicking the called holopad - return TRUE - return FALSE - -/obj/machinery/holopad/Click(location,control,params) - if(!CheckCallClose()) - return ..() - /obj/machinery/holopad/AltClick(mob/living/carbon/human/user) if(isAI(user)) hangup_all_calls() return - if(!CheckCallClose()) - interact(user) - /obj/machinery/holopad/interact(mob/living/carbon/human/user) //Carn: Hologram requests. if(!istype(user)) return From 0bbe9b6aa29fd0e57f00a94c462b93b66052d3c7 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Tue, 6 Jun 2017 08:39:11 -0700 Subject: [PATCH 13/42] Hulks now take 10 hits to destroy dominators up from 2 (#28081) --- code/game/gamemodes/gang/dominator.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/gamemodes/gang/dominator.dm b/code/game/gamemodes/gang/dominator.dm index 66dacd4219f..f04e5567024 100644 --- a/code/game/gamemodes/gang/dominator.dm +++ b/code/game/gamemodes/gang/dominator.dm @@ -1,5 +1,6 @@ #define DOM_BLOCKED_SPAM_CAP 6 #define DOM_REQUIRED_TURFS 30 +#define DOM_HULK_HITS_REQUIRED 10 /obj/machinery/dominator name = "dominator" @@ -20,6 +21,9 @@ var/datum/effect_system/spark_spread/spark_system var/obj/effect/countdown/dominator/countdown +/obj/machinery/dominator/hulk_damage() + return (max_integrity - integrity_failure) / DOM_HULK_HITS_REQUIRED + /proc/dominator_excessive_walls(atom/A) var/open = 0 for(var/turf/T in view(3, A)) From 3fb4ea123e20294b114c91c00031a164eb923a79 Mon Sep 17 00:00:00 2001 From: Mark9013100 Date: Mon, 5 Jun 2017 14:06:36 -0400 Subject: [PATCH 14/42] [Delta] Misc map fixes --- .../map_files/Deltastation/DeltaStation2.dmm | 2841 +++++++++++++---- 1 file changed, 2218 insertions(+), 623 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 5764c1db7b8..fbac2643c6d 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" = ( @@ -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" = ( @@ -37572,6 +38069,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 +38113,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 +38136,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 +39168,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 +39208,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 +39262,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 +39295,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 +39311,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 +39330,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 +39365,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 +39378,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 +40233,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 +40936,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 +41071,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 +41086,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 +41192,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 +41239,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 +41433,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 +41643,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" = ( @@ -41598,6 +42152,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 +42377,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 +42577,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 +42600,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 +43069,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 +43089,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 +44189,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 +45141,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 +46233,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" = ( @@ -45703,6 +46284,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 +47169,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 +47389,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 +47539,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 +47704,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 +47767,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 +47880,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 +48686,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 +48980,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 +49016,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 +49081,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 +49135,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 +49286,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 +49839,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 +49915,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 +50124,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 +50178,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 +50287,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 +50441,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 +50696,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 +50719,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 +50768,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 +51130,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 +51573,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 +52117,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 +52252,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 +52380,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 +54657,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 +55595,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 +55981,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 +56134,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 +56484,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 +56567,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 +56789,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 +57290,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 +58415,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 +58441,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 +58470,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 +58578,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 +58655,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 +58838,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 +58853,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 +58872,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 +58886,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 +59237,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 +59331,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 +59429,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 +59868,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" = ( @@ -59299,6 +60020,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 +60187,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 +60580,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 +60933,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 +60949,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 +61048,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 +61111,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 +61198,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 +61232,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" = ( @@ -61033,6 +61781,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 +61809,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 +61955,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 +62575,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 +62606,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 +62666,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 +63372,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 +64484,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 +65000,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 +65368,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" = ( @@ -64966,6 +65744,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 +65936,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 +66135,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 +67024,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 +67037,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 +67057,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 +67099,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 +67119,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 +67133,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 +67146,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 +67244,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 +67259,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 +67373,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 +67662,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 +67758,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 +67853,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 +67952,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" = ( @@ -67187,6 +68016,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 +68476,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 +68660,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 +68785,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 +69463,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 +69573,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 +69701,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 +69880,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 +69894,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 +69922,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 +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) "cIq" = ( @@ -69088,6 +69950,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 +69978,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 +69993,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 +70183,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" = ( @@ -69585,6 +70459,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 +70559,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 +70876,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 +70966,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 +71272,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 +72065,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 +72202,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 +72236,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 +72300,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 +72502,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 +72682,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 +72957,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 +73085,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 +73128,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 +73231,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 +73403,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 +74124,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 +74199,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 +74476,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 +74495,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 +74902,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 +75423,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 +75443,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 +75902,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 +76020,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 +76038,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 +76554,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 +77162,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 +77392,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 +78202,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 +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) "cZK" = ( @@ -77367,6 +78334,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 +78357,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 +78375,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 +78595,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 +78606,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 +78624,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 +78641,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 +78662,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 +78711,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 +78767,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" = ( @@ -78373,6 +79370,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" = ( @@ -78755,6 +79755,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 +79931,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 +80023,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" = ( @@ -79683,6 +80692,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 +80769,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 +80962,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 +81243,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 +81276,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 +81393,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 +81405,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 +81415,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 +81431,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 +81449,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 +81475,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 +81488,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 +81510,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 +81529,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 +82043,6 @@ }, /area/hallway/primary/aft) "dhQ" = ( -/turf/open/floor/plating, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/table, @@ -81446,6 +82496,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 +82539,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 +82679,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 +82744,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 +83011,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 +83116,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 +83197,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 +83432,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 +83455,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 +83693,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 +83787,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 +83879,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 +83997,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 +84179,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 +84267,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 +84388,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 +84427,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 +84770,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 +84979,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 +85015,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 +85197,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 +85245,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 +85927,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 +85980,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 +86055,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 +86504,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 +86727,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 +86804,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 +87175,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 +87198,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 +87214,9 @@ dir = 8; pixel_x = 24 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, /turf/open/floor/plasteel, /area/science/research) "dsA" = ( @@ -86104,6 +87247,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 +87262,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 +87350,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 +87788,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 +88273,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 +89072,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 +89368,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 +89397,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 +89473,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 +89804,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 +89868,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 +90026,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 +90202,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 +90791,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 +91088,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 +91214,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 +92116,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 +92175,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 +92260,9 @@ icon_state = "intact"; dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/science/mixing) "dCC" = ( @@ -91460,6 +92656,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 +93059,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 +93101,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 +93122,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 +93256,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 +93275,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 +93309,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 +93441,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 +93840,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 +94089,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 +94323,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 +94395,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 +94700,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 +94787,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 +94806,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 +94819,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 +94834,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 +94906,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 +94925,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 +95290,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 +95309,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 +95336,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 +95517,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 +96122,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 +96272,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 +96290,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 +96311,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 +96328,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 +96954,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 +97010,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 +97145,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 +97233,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 +97284,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 +97297,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 +97619,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 +98067,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 +98288,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 +98651,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 +99022,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 +99040,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 +99185,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 +99256,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 +99507,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 +99856,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 +100030,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 +100594,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 +100802,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 +100936,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 +100956,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 +100976,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 +100992,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 +101190,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 +101266,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 +101919,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 +101937,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 +101961,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 +102006,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 +102063,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 +102364,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 +102475,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 +102493,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 +102691,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 +102784,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 +102893,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 +103258,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 +103417,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 +103486,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 +104415,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 +104489,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" = ( @@ -104034,6 +105441,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 +105902,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 +105915,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 +105929,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 +105943,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 +106436,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 +106926,7 @@ dir = 8; icon_state = "diagonalWall3" }, -/area/space) +/area/shuttle/syndicate) "ejD" = ( /turf/closed/wall/mineral/plastitanium, /area/space) @@ -107174,6 +108599,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 +111383,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 +111634,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 +111891,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 +112148,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 +112398,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 +112655,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 +112912,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 +113169,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 +113426,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 +113683,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 +113940,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 +114197,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 +114454,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 +114720,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 +114977,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 +115237,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 +115495,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 +117819,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 +118070,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 +118327,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 +118584,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 +118835,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 +119091,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 +119348,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 +119605,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 +119862,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 +120119,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 +120376,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 +120633,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 +120890,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 +121156,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 +121413,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 +121673,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 +121931,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 +137680,7 @@ bou bou bOd bPY -bSm +epi bUq bWg bWg @@ -138173,9 +139768,9 @@ cHW cHW cHW cOH -cQx -cRP -cTA +epl +epm +epn cOH cHW cHW @@ -139886,7 +141481,7 @@ akc alc amd anm -aol +eph aip aqf aib @@ -141673,9 +143268,9 @@ edp edp edp een -acj +epf aci -acj +epg agl agN ahu @@ -142689,14 +144284,14 @@ aaf aaf aaf aax -ach +epb aax aaf aaf aaf aaf aax -acj +epd aax aaf aaf @@ -143203,14 +144798,14 @@ aax aaD abR aax -acj +epc aax acE acV adg adr aax -ach +epe aax abT aaD @@ -162837,10 +164432,10 @@ cqf cqf cqf cqf -cEE +epj cqf cqf -cIU +epk cqf cqf cqf From b8094b48f3be3fe537ac4927cc90c2620a8fd181 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 6 Jun 2017 14:27:27 -0400 Subject: [PATCH 15/42] Fixes logged out spawning new_players (#28105) --- code/controllers/subsystem/ticker.dm | 2 +- code/modules/mob/dead/new_player/new_player.dm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 22b35da4987..2d0bcf907cd 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -432,7 +432,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/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 = "" From e80bf88bb9aaea82c6fbc4fd428619b0699278be Mon Sep 17 00:00:00 2001 From: Tacolizard Date: Tue, 6 Jun 2017 11:41:43 -0700 Subject: [PATCH 16/42] add and implement icon --- code/_onclick/hud/parallax.dm | 6 ++++++ icons/effects/parallax.dmi | Bin 145457 -> 153094 bytes 2 files changed, 6 insertions(+) mode change 100644 => 100755 code/_onclick/hud/parallax.dm mode change 100644 => 100755 icons/effects/parallax.dmi 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/icons/effects/parallax.dmi b/icons/effects/parallax.dmi old mode 100644 new mode 100755 index a770bf8667d9f30b3b690c7717a3134242a758b1..b7a003d1bb0f0d1b883acca70ca535fc8ba27e74 GIT binary patch delta 11032 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 delta 3335 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 Date: Tue, 6 Jun 2017 15:36:25 -0400 Subject: [PATCH 17/42] fixed fixes #28120 fixes #28136 --- code/game/objects/items/weapons/tools.dm | 2 ++ 1 file changed, 2 insertions(+) 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 From 91537a2bf8fa1f3d5e94da80e3c706ff71d7473f Mon Sep 17 00:00:00 2001 From: QualityVan Date: Tue, 6 Jun 2017 15:52:06 -0400 Subject: [PATCH 18/42] Fixes surplus rifle unloaded icon being named wrong --- icons/obj/guns/projectile.dmi | Bin 32938 -> 32940 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi index a6849c2d955d469199af19cb3840d75fa3d0efc4..2860c160085daadc75cc6cd1c8a08efdcf4601b5 100644 GIT binary patch delta 931 zcmV;U16=&7fdZ_70+1wsg?dz2bVOxyV{&P5bZKvH004NLote#U+d2@1*Y;Bg?Y6p* zlHkrd|}WfilUgp9v>VLAZPYhVWZq$OjPzhC+G6!2=0NR{Q`)l`cN3(G@w# z1!a+p+Go`D1zRU^Eei(Jd0^Ql(IZI}J;l0QL=)GwFbI35F@#7dQMqj9!SW?t`z8(R zOY%ZCg(z-7)@9d!U=WZ+*)_55K7w3>aqR=hbr|;v!@wxOAR07#oLTM~W(Cgk!U)cZm zFuKQGJKPm9^?@9m10Tp?8SsG|6u%GTpy+)d2gU9Kxw0XDSXUDU>}4~^SOtqU>vWt^ zUp~RIxAvw+R|DC7!2+Q!G;Uk=>_=k;uTXByvDiW_u2buE%5GGO%AP5Zh)D6L zThvYwbP*Ln4-Ec(y#(&>3wp-U@>0E{v(-;@`}kDCLb_f#MPteFKSm_ zJQIfbl^29|x*mUOz-~ct&t1o`t#{>n>&)_+qx%Pc-lExcZ~WMfb&0cWr!siXXW*Fk zW{CQ1m|ORv;%@nO-P#laLhd)`P4omd?AN?sYk1ebaLxODv-&#ox@zsMrl4Y`Z&IyP z&Fi9-SDn{I%v2eqXJJ&g{06Y2f+#6ZtFBA0;PUr!ei2cy*`^9J)<_9hWHKoO;Ibm~QnLX~GI zdijI05u=mH?>T?sb@@8dXO-WJA84dLvSn!Z}}Fky9lVBa-*km+z0&mi@2eYNSsaPkm@%O_w6e-ws%5OH8Als6nakdS1>PheE(YU_hM*mTeL}l2p-Ctjk3-aa{|8uxA=Wh?EkQ%jP;*zNBm4rD1(Z zp2(&U#RbT^>>3Pz0ZHU#T`YQliM>HGTN1A%eK3=+_lXF6 zsGTC{A}WF&82s&e3Ebaj^oXP7rFuilXW|VFjIemu@%qT*6_YniK483vi$~Kx)TX?6 zCJgf{F9_{)J^s>w-HhU%n~q^yZ_4-9E6Zz+ZXbAmk7m=o^J5#OH&94x!=5Qq6e^HKj-aI!@Kl_bKY*7#n+j)RZDL*1r;-WlWL)A z-WDyq>bxytrXrC9XD2xwkcUyH1I5~k^1i0L8Q|xACzNpIhG4=t%UXnlFvy$OMH(QI zqY+Slzux=vVRYb|Nbk=F271&Hxdin7d^m|X7_Cm3H<&-NcZt9OiYSGnLoZ?!sysu{ z%b%2u7@b6Z&-oj#%h#cQ1m!beAfXH$tWe^YcF1p1LM@#b|6xGMP9V@?P8{qgh4l;+ zxj~LGn6bQ6QI2fLmqTwv%2GJz%j Date: Tue, 6 Jun 2017 20:05:18 +0000 Subject: [PATCH 19/42] Automatic changelog compile, [ci skip] --- html/changelog.html | 1 + html/changelogs/.all_changelog.yml | 2 ++ html/changelogs/AutoChangeLog-pr-28098.yml | 4 ---- 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-28098.yml diff --git a/html/changelog.html b/html/changelog.html index 1ce1f4107f7..f99228cb253 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -62,6 +62,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:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 091a293167e..bf90cea3038 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. 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." From b976845de3c6b432b111f4ef4625991333119f8f Mon Sep 17 00:00:00 2001 From: swindly Date: Tue, 6 Jun 2017 19:40:01 -0400 Subject: [PATCH 20/42] Weaponizes station charters (#28111) --- .../objects/items/{ => weapons}/charter.dm | 20 +++++++++---------- code/modules/admin/topic.dm | 2 +- code/modules/jobs/job_types/captain.dm | 2 +- tgstation.dme | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) rename code/game/objects/items/{ => weapons}/charter.dm (89%) 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/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/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/tgstation.dme b/tgstation.dme index 5855bb0f9cc..16b18655272 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -715,7 +715,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 +783,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" From 24c3561a928808e52636ba696d8c1156702014b6 Mon Sep 17 00:00:00 2001 From: Shadowlight213 Date: Tue, 6 Jun 2017 18:13:08 -0700 Subject: [PATCH 21/42] Changeling transform sting is stealthy again (#28088) --- .../gamemodes/changeling/powers/tiny_prick.dm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) 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 From 1c86ddbc5824a5dfa8abf81b54dab7b22147a2cb Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Tue, 6 Jun 2017 18:13:09 -0700 Subject: [PATCH 22/42] Automatic changelog generation for PR #28088 [ci skip] --- html/changelogs/AutoChangeLog-pr-28088.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-28088.yml diff --git a/html/changelogs/AutoChangeLog-pr-28088.yml b/html/changelogs/AutoChangeLog-pr-28088.yml new file mode 100644 index 00000000000..1dacadc9d7d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28088.yml @@ -0,0 +1,5 @@ +author: "Shadowlight213" +delete-after: True +changes: + - 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" From 55d4fb8cca759ffbf15168038ee787d8130c286c Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Tue, 6 Jun 2017 21:18:14 -0400 Subject: [PATCH 23/42] Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power (#28108) --- .../clock_helpers/slab_abilities.dm | 19 ++-------- .../clock_cult/clock_items/clockwork_slab.dm | 6 +-- .../clock_scriptures/scripture_cyborg.dm | 6 --- .../clock_scriptures/scripture_scripts.dm | 37 ++++--------------- .../effects/temporary_visuals/clockcult.dm | 12 ++---- 5 files changed, 17 insertions(+), 63 deletions(-) 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/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_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/objects/effects/temporary_visuals/clockcult.dm b/code/game/objects/effects/temporary_visuals/clockcult.dm index 1eae2a3c643..d68008260c6 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) From 0728cf47272704ecc7a7229748277d6f3a6b749f Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Tue, 6 Jun 2017 18:18:15 -0700 Subject: [PATCH 24/42] Automatic changelog generation for PR #28108 [ci skip] --- html/changelogs/AutoChangeLog-pr-28108.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-28108.yml diff --git a/html/changelogs/AutoChangeLog-pr-28108.yml b/html/changelogs/AutoChangeLog-pr-28108.yml new file mode 100644 index 00000000000..29ad6437dcd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28108.yml @@ -0,0 +1,6 @@ +author: "Joan" +delete-after: True +changes: + - 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." From e6bfb7f449b4d5084e1d30f9e698fb959c30801f Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Tue, 6 Jun 2017 21:21:26 -0400 Subject: [PATCH 25/42] Refactors datum verbs to be general (#28109) --- code/datums/verbs.dm | 101 +++++++++++++ code/modules/admin/adminmenu.dm | 4 +- code/modules/client/client_procs.dm | 8 +- code/modules/client/preferences_toggles.dm | 76 +++++----- code/world.dm | 2 +- interface/menu.dm | 162 +++++---------------- tgstation.dme | 1 + 7 files changed, 187 insertions(+), 167 deletions(-) create mode 100644 code/datums/verbs.dm diff --git a/code/datums/verbs.dm b/code/datums/verbs.dm new file mode 100644 index 00000000000..2c124d3114b --- /dev/null +++ b/code/datums/verbs.dm @@ -0,0 +1,101 @@ +/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]") + +//modify outlist for each entry in Generate_list +/datum/verbs/proc/HandleVerb(list/outlist, atom/verb/verbpath, ...) + +/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, " ", "-") + + HandleVerb(arglist(list(entry, verbpath) + args)) + .[verbpath] = entry + +/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/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/client/client_procs.dm b/code/modules/client/client_procs.dm index faf2d0ad6dc..3bf57375f47 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) 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/world.dm b/code/world.dm index 7b81dfd7831..526e4cf7ee4 100644 --- a/code/world.dm +++ b/code/world.dm @@ -33,7 +33,7 @@ load_motd() load_admins() - load_menu() + LoadVerbs(/datum/verbs/menu) if(config.usewhitelist) load_whitelist() LoadBans() diff --git a/interface/menu.dm b/interface/menu.dm index 4bebd5b2023..a2220d529fc 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,44 @@ 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/Generate_list() + . = ..() + for(var/I in .) + .[I] = list2params(.[I]) - Load_verbs(type, typesof("[type]/verb")) +/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 - 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)) + entry["command"] = ".updatemenuchecked \"[verb_true_parent.type]\" \"[verbpath]\"\n[entry["command"]]" + entry["can-check"] = TRUE + entry["group"] = "[verb_true_parent.type]" -/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 +60,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 +68,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 +77,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/tgstation.dme b/tgstation.dme index 16b18655272..db30de6b1f8 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" From 8413960d8e6cd24ae2fae989fb3f25402fe2da96 Mon Sep 17 00:00:00 2001 From: Expletive Date: Tue, 6 Jun 2017 18:26:56 -0700 Subject: [PATCH 26/42] A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115) --- _maps/RandomZLevels/centcomAway.dmm | 4 +- .../map_files/Deltastation/DeltaStation2.dmm | 12 +- _maps/map_files/MetaStation/MetaStation.dmm | 6 +- _maps/map_files/generic/Centcomm.dmm | 16 +- code/game/gamemodes/objective_items.dm | 2 +- code/game/machinery/vending.dm | 4 +- code/game/objects/effects/spawners/bundle.dm | 4 +- .../objects/items/weapons/storage/boxes.dm | 2 +- .../objects/items/weapons/storage/lockbox.dm | 17 +- .../crates_lockers/closets/job_closets.dm | 12 +- .../crates_lockers/closets/secure/security.dm | 10 +- code/modules/cargo/packs.dm | 2 +- code/modules/clothing/clothing.dm | 65 +-- .../clothing/neck/{ties.dm => neck.dm} | 15 +- code/modules/clothing/outfits/standard.dm | 2 +- .../under/{ties.dm => accessories.dm} | 486 +++++++++--------- code/modules/crafting/recipes.dm | 2 +- code/modules/jobs/job_types/civilian.dm | 2 +- code/modules/jobs/job_types/security.dm | 14 +- .../mob/living/carbon/human/examine.dm | 12 +- .../hostile/mining_mobs/hivelord.dm | 2 +- .../modules/spells/spell_types/devil_boons.dm | 2 +- icons/mob/accessories.dmi | Bin 0 -> 7735 bytes icons/mob/ties.dmi | Bin 10864 -> 0 bytes icons/obj/clothing/accessories.dmi | Bin 0 -> 6954 bytes icons/obj/clothing/neck.dmi | Bin 2698 -> 2555 bytes icons/obj/clothing/ties.dmi | Bin 12457 -> 0 bytes tgstation.dme | 4 +- 28 files changed, 358 insertions(+), 339 deletions(-) rename code/modules/clothing/neck/{ties.dm => neck.dm} (92%) rename code/modules/clothing/under/{ties.dm => accessories.dm} (63%) create mode 100644 icons/mob/accessories.dmi delete mode 100644 icons/mob/ties.dmi create mode 100644 icons/obj/clothing/accessories.dmi delete mode 100644 icons/obj/clothing/ties.dmi 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/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index fbac2643c6d..30e5a3b946d 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -31026,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 @@ -104668,7 +104668,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 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 77d983a2293..10944caebc8 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" @@ -57181,7 +57181,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/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/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/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/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/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 3bf99fb4256..fa6b0be45ec 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" 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..6779700ddf0 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 @@ -171,7 +171,7 @@ new /obj/item/clothing/head/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/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index fbce7a705dd..6c09b824023 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -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/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 8a943b4c268..fcbaace6fb9 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -529,7 +529,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 +541,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 +587,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 +620,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 +660,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 +722,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/neck/ties.dm b/code/modules/clothing/neck/neck.dm similarity index 92% rename from code/modules/clothing/neck/ties.dm rename to code/modules/clothing/neck/neck.dm index 59dc504098a..de4858e23e8 100644 --- a/code/modules/clothing/neck/ties.dm +++ b/code/modules/clothing/neck/neck.dm @@ -160,17 +160,6 @@ /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" - -//////////////// -//OONGA BOONGA// -//////////////// - -/obj/item/clothing/neck/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) \ No newline at end of file + item_color = "bling" \ No newline at end of file diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 6344ef22d73..ff60b5366eb 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -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/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..4e3864dbaf4 100644 --- a/code/modules/jobs/job_types/security.dm +++ b/code/modules/jobs/job_types/security.dm @@ -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/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/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/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/icons/mob/accessories.dmi b/icons/mob/accessories.dmi new file mode 100644 index 0000000000000000000000000000000000000000..22c42e1eae77f987d024dba2b18afc5ae20f45cb GIT binary patch literal 7735 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 literal 0 HcmV?d00001 diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi deleted file mode 100644 index 19b36bfc948d2a59a1c497e8ecd5c97430ddc584..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10864 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 IZw&qa8(3_r>;M1& diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi new file mode 100644 index 0000000000000000000000000000000000000000..99c203cc167e183097bf24b4c39f051b86d03d89 GIT binary patch literal 6954 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 ZM0Bv8N>LgyioN^-sDrhYE0kV`{tpIJrVjuB literal 0 HcmV?d00001 diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi index 9606e11d63ec616331724dcb524e8324d55e35cc..0f3668ce102b10edb3d8771d178df6bcd28f1bf6 100644 GIT binary patch delta 2259 zcmZ9Odpy(oAICqN&6df=kdTeC(MHHEG_%|)x#d@@$W%fXRAO}5mr{$&$~~5DKOIqW zs6?2g+fL<{ONkwq<#HyMhUPar&iV8A$NTYoKL2_B{Z7+a#Pip|NR_6>Fpg3Ql%3#Z znFHE5Itc&(iwpGK3FwlZ!^>KDID%uSpw zEbQBZLt6`-Yf7W2?IkDG(Km0>P3oY-XFAW=;m*(*?NwVq7ayKMi#43> zgZJsk0_N?WRev3lZ0;w|vD(%3)>vZ!K$UNGcMD<{N%JwBefnP7m!4lqdE4@(v&6$k z4W@ok3+eISu<-DDV2rR!m{KaQ+}yaa?6Gr1?)LWM#V6lpwfMZ8|L8DKuzGNsIx(qJjcr{M29P!UHTi)iC{<8$xApV%l-FI}>`6@q|m|u9&OCCnuQV z<{0W`__JkArwOkhtENWHE0EkX@`EQ%z~;+clJ~!dU858Jgb1We*p$dH{}RBX+Y4Qf zYsuZ7F70!TdDj^xVJR;S%ns*~uTPhP1EUI#gmnAIbW7XfLyN)&!sp8TrK}SQskC&( zi+-k0FKA!~*Up_E-CX2MN&oe=?YFIBARIPUZcBXI=+&$VcKt-Gc z#(w(5;Sp8V#1{E;%r0o4*pslzc-!cfp;Q%bdg=h`D?!U&Zg4b`@u~!icqfon5;%9? zW&60|pt&~|-WpTSgdj0q6Jo~qBG*)H#fUuD*PIwYs0K<%MAi1tY@2p5X%LfFG; z-?ck?GKb_ow8xA!FdB&vY{~_NCI`KG9)S>t^@(#aX3NZ&-3|+jX`78B6-28Nv(TT%eS%j*y|7u6l_m{y{)>V6m%>Yl|}um zdVb6@0&`#~+$6wT+bngkOdx3YEnOhXo{w}dE}|Au;StcPf@AszSk}hH-s{%qFm5w& zju}7xQ}(&J`R?59V;5>Bm0?j_;SX;KG~Z1%%Hx@1-lI_Dk(sfk(hJCZVfC;Q zbtH$e(wd`%NbX=Orhc1rBNS1+zqg)QRAM{T%)ll-W>^R{TA{L$WEK!5e@TgR%FD6? zzE&^_v?&|zm~jF2S>E4Y_@Es|!v4xrqhGFH=jxgeOw|nyBlxQp<%&kSdr;Ld#{MJF z{an9WE>B+ahGg~Q2KfyKmRi}p>RNA~3HNduAcEhy^N*NclE*qW#|F}RE{}E0`bF5Z zF4Z74flg#IyuNKyMmKhz$K#D=;6A##(TiYDwlSW3knj?Sh+z_Ubt1H?1$ zDfEYd0V{@inK>E|^1d1>R+&(n+?kD!GpeB2@SmS>0cxPm3VYguvI!S2&Up{mhw= z{CaqxK`I*tPFbA!M+12(dOn;b#bOg{KOkkAl3NR0a*Kql8RjW1+v@mCmB<^U)iL7& z8mjelh)usut%?Rq@3o6us)`btZ38z1q<^{ho9;3#0nsTLffLZ-T;F^ZdPh>mQ+{{# zrQ^ZfiywIW?$c+`>IYlL)e@Wesba~TMECqRoLpRIzJasdSRVae6v%BToSD&1v8ANY z>k#lZZXiS<;xf#THLCvv=#217p?A=O+qktFgK3_&>bTu@gBKnd0yr9t&FHDJH$mWV zM*5X8$KBCHqKoaIu%BDAH00+D;-Ey;pLz8F0o z)pG0}y@*D9k=;kJQRmU4e_&XZeQ6&HzsF+76XGPu$INJtRSz*WsFk&h<%yy7LwlINWz+p!>Q(TtMFO^AODl3wm+^tmtCH*yvnFFr7vKEVyQIJ!r)H}|NW zVc5!$?8Z0u_o25~X8xGuXeZAsDlX6(lwtC;AMl}5=YMm&Px~b+z`HE@60hoBPk`s&(d~x?ZMWKy zp^Icz>&|#`ruAzRb*&YPZS{qSwX=EqkW~o*f*jFmIyU%&uvMyl)l>MmXV(kXw+%_! dR8gwjpkb11bt`sv(JB3J2VJvmX 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 T^$rUhJV?OY#M-#dkdp8(AroHK diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi deleted file mode 100644 index 83c1ffedf20abd4f10b63150ad4b8e105e2917de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12457 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 OKu$_YvP#@I^nU Date: Tue, 6 Jun 2017 18:26:57 -0700 Subject: [PATCH 27/42] Automatic changelog generation for PR #28115 [ci skip] --- html/changelogs/AutoChangeLog-pr-28115.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-28115.yml diff --git a/html/changelogs/AutoChangeLog-pr-28115.yml b/html/changelogs/AutoChangeLog-pr-28115.yml new file mode 100644 index 00000000000..07df9e0f41d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28115.yml @@ -0,0 +1,11 @@ +author: "Expletive" +delete-after: True +changes: + - 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." From 407ff24e46ad2cd0c1c8799e5849fc50f115b2c6 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Tue, 6 Jun 2017 18:41:44 -0700 Subject: [PATCH 28/42] Automatic changelog generation for PR #28151 [ci skip] --- html/changelogs/AutoChangeLog-pr-28151.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-28151.yml diff --git a/html/changelogs/AutoChangeLog-pr-28151.yml b/html/changelogs/AutoChangeLog-pr-28151.yml new file mode 100644 index 00000000000..64a7ff3c25a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28151.yml @@ -0,0 +1,4 @@ +author: "QualityVan" +delete-after: True +changes: + - bugfix: "Surplus rifles are no longer invisible while unloaded" From c5fce5b01ec4aed6812f4f8d1586a09bc22e5e5f Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Wed, 7 Jun 2017 00:06:18 -0700 Subject: [PATCH 29/42] gas miners only update overlays when they actually need to (#28114) * Update miner.dm * Update miner.dm --- .../atmospherics/machinery/other/miner.dm | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) 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)) From 473600180aaf27fabf819990799ad4396aa9dbd0 Mon Sep 17 00:00:00 2001 From: sybil Date: Wed, 7 Jun 2017 08:44:52 +0000 Subject: [PATCH 30/42] Automatic changelog compile, [ci skip] --- html/changelog.html | 52 +++++++++++----------- html/changelogs/.all_changelog.yml | 25 +++++++++++ html/changelogs/AutoChangeLog-pr-28088.yml | 5 --- html/changelogs/AutoChangeLog-pr-28108.yml | 6 --- html/changelogs/AutoChangeLog-pr-28115.yml | 11 ----- html/changelogs/AutoChangeLog-pr-28151.yml | 4 -- 6 files changed, 52 insertions(+), 51 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-28088.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-28108.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-28115.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-28151.yml diff --git a/html/changelog.html b/html/changelog.html index f99228cb253..2d9e95ce776 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -55,6 +55,33 @@ -->
      +

      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:

        @@ -1476,31 +1503,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 bf90cea3038..d3e692325e9 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -11716,3 +11716,28 @@ 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 diff --git a/html/changelogs/AutoChangeLog-pr-28088.yml b/html/changelogs/AutoChangeLog-pr-28088.yml deleted file mode 100644 index 1dacadc9d7d..00000000000 --- a/html/changelogs/AutoChangeLog-pr-28088.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Shadowlight213" -delete-after: True -changes: - - 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" diff --git a/html/changelogs/AutoChangeLog-pr-28108.yml b/html/changelogs/AutoChangeLog-pr-28108.yml deleted file mode 100644 index 29ad6437dcd..00000000000 --- a/html/changelogs/AutoChangeLog-pr-28108.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Joan" -delete-after: True -changes: - - 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." diff --git a/html/changelogs/AutoChangeLog-pr-28115.yml b/html/changelogs/AutoChangeLog-pr-28115.yml deleted file mode 100644 index 07df9e0f41d..00000000000 --- a/html/changelogs/AutoChangeLog-pr-28115.yml +++ /dev/null @@ -1,11 +0,0 @@ -author: "Expletive" -delete-after: True -changes: - - 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." diff --git a/html/changelogs/AutoChangeLog-pr-28151.yml b/html/changelogs/AutoChangeLog-pr-28151.yml deleted file mode 100644 index 64a7ff3c25a..00000000000 --- a/html/changelogs/AutoChangeLog-pr-28151.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "QualityVan" -delete-after: True -changes: - - bugfix: "Surplus rifles are no longer invisible while unloaded" From 73882dcc49a7e731116c1451a5f35e5da6e6b655 Mon Sep 17 00:00:00 2001 From: Jordie Date: Wed, 7 Jun 2017 22:37:53 +1000 Subject: [PATCH 31/42] Fix to round_id and .getserverlog (#28130) --- code/__HELPERS/files.dm | 2 +- code/controllers/subsystem/blackbox.dm | 4 ++-- code/modules/admin/DB_ban/functions.dm | 2 +- code/modules/client/client_procs.dm | 2 +- code/world.dm | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) 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/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/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/client/client_procs.dm b/code/modules/client/client_procs.dm index 3bf57375f47..9e78479bff1 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -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/world.dm b/code/world.dm index 526e4cf7ee4..21e88f7629a 100644 --- a/code/world.dm +++ b/code/world.dm @@ -29,7 +29,7 @@ SetupLogs() if(!RunningService()) //tgs2 support - GLOB.revdata.DownloadPRDetails() + GLOB.revdata.DownloadPRDetails() load_motd() load_admins() @@ -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() From 570b2127944b276b68f6c0fc568b5a76f9ed25c2 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Wed, 7 Jun 2017 07:07:14 -0700 Subject: [PATCH 32/42] Automatic changelog generation for PR #28124 [ci skip] --- html/changelogs/AutoChangeLog-pr-28124.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-28124.yml diff --git a/html/changelogs/AutoChangeLog-pr-28124.yml b/html/changelogs/AutoChangeLog-pr-28124.yml new file mode 100644 index 00000000000..3b02e2419b6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28124.yml @@ -0,0 +1,5 @@ +author: "Shadowlight213" +delete-after: True +changes: + - rscadd: "Tracking implants and chem implants have been added to rnd" + - rscdel: "Adrenaline and freedom implants have been removed from rnd" From 3528770b0d5a1f568aa988c282d86a036b1ec8cf Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Wed, 7 Jun 2017 07:08:33 -0700 Subject: [PATCH 33/42] Automatic changelog generation for PR #28135 [ci skip] --- html/changelogs/AutoChangeLog-pr-28135.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-28135.yml diff --git a/html/changelogs/AutoChangeLog-pr-28135.yml b/html/changelogs/AutoChangeLog-pr-28135.yml new file mode 100644 index 00000000000..ed9579831e8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28135.yml @@ -0,0 +1,6 @@ +author: "Joan" +delete-after: True +changes: + - 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." From 99138f12d0c84bca628ff32f98b30633d3bc11fe Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Wed, 7 Jun 2017 07:13:58 -0700 Subject: [PATCH 34/42] I might HAVE accidently made dualwielding hilariously OP again so have a nerf! (#28125) --- code/modules/projectiles/gun.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 From 12d522dbc09c51b5db5d93fdb30ddf2ab59bf2a6 Mon Sep 17 00:00:00 2001 From: Expletive Date: Wed, 7 Jun 2017 12:15:33 -0700 Subject: [PATCH 35/42] Organs for catgirls (#28148) --- .../carbon/human/species_types/humans.dm | 10 +++++++- code/modules/surgery/organs/ears.dm | 21 +++++++++++++++++ code/modules/surgery/organs/tails.dm | 23 +++++++++++++++++++ tgstation.dme | 1 + 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 code/modules/surgery/organs/tails.dm 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/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/tgstation.dme b/tgstation.dme index 5ef25d3c942..7b5150230cc 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2105,6 +2105,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" From 2e120dbe7ea2ae8cc959960be15a880d7d8a7dbb Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Wed, 7 Jun 2017 12:15:35 -0700 Subject: [PATCH 36/42] Automatic changelog generation for PR #28148 [ci skip] --- html/changelogs/AutoChangeLog-pr-28148.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-28148.yml diff --git a/html/changelogs/AutoChangeLog-pr-28148.yml b/html/changelogs/AutoChangeLog-pr-28148.yml new file mode 100644 index 00000000000..850a69c2408 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28148.yml @@ -0,0 +1,5 @@ +author: "Nanotrasen Plastic Surgery Advert" +delete-after: True +changes: + - 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." From c03b0e5f1918afa6f85956927f4ff01d1cbb4dce Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 7 Jun 2017 15:16:51 -0400 Subject: [PATCH 37/42] Makes processing subsystems respect qdel and PROCESS_KILL (#28146) --- code/controllers/subsystem/processing/processing.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 From a0e54334fbc508a2f04663b44968dcfeae360be1 Mon Sep 17 00:00:00 2001 From: tgstation-server Date: Wed, 7 Jun 2017 12:17:59 -0700 Subject: [PATCH 38/42] Automatic changelog generation for PR #28142 [ci skip] --- html/changelogs/AutoChangeLog-pr-28142.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-28142.yml diff --git a/html/changelogs/AutoChangeLog-pr-28142.yml b/html/changelogs/AutoChangeLog-pr-28142.yml new file mode 100644 index 00000000000..28434d00134 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-28142.yml @@ -0,0 +1,4 @@ +author: "NanoTrasen Public Relations Department" +delete-after: True +changes: + - 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." From fab4e638987a4d36fdacff02b41fd40ecddc5173 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Wed, 7 Jun 2017 12:18:23 -0700 Subject: [PATCH 39/42] Cere Dirty Var cleanup (#28141) --- _maps/map_files/Cerestation/cerestation.dmm | 3066 +++++++------------ 1 file changed, 1080 insertions(+), 1986 deletions(-) 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 From 6e59b20716275b9ed8d082465d89320810814730 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Wed, 7 Jun 2017 12:55:18 -0700 Subject: [PATCH 40/42] Syndicate Uplink - Typos & Grammar mk2 (#28145) --- code/modules/uplink/uplink_item.dm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) 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 From 365330c9e63160df4bef655962de83b90da6b05a Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Wed, 7 Jun 2017 16:11:57 -0700 Subject: [PATCH 41/42] Update ores_coins.dm --- code/modules/mining/ores_coins.dm | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 022314be068..fcb2eb38a9c 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,9 +189,9 @@ 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 @@ -219,7 +224,7 @@ 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 ..() @@ -263,16 +268,17 @@ 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)]") - det_timer = addtimer(CALLBACK(src, .proc/detonate, notify_admins), det_time) + 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) - if(quality == 3) - explosion(src.loc,2,4,9,adminlog = notify_admins) - else if(quality == 2) - explosion(src.loc,1,2,5,adminlog = notify_admins) - else if(quality == 1) - explosion(src.loc,-1,1,3,adminlog = notify_admins) + switch(quality) + if(GIBTONITE_QUALITY_HIGH) + explosion(src.loc,2,4,9,adminlog = notify_admins) + if(GIBTONITE_QUALITY_MEDIUM) + explosion(src.loc,1,2,5,adminlog = notify_admins) + if(GIBTONITE_QUALITY_LOW) + explosion(src.loc,0,1,3,adminlog = notify_admins) qdel(src) /obj/item/weapon/ore/Initialize() From aedc90be5010e752ece8a988bea26aea14a66b9a Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Wed, 7 Jun 2017 16:12:24 -0700 Subject: [PATCH 42/42] Update ores_coins.dm --- code/modules/mining/ores_coins.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index fcb2eb38a9c..93686cd7c8b 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -274,11 +274,11 @@ if(primed) switch(quality) if(GIBTONITE_QUALITY_HIGH) - explosion(src.loc,2,4,9,adminlog = notify_admins) + explosion(src,2,4,9,adminlog = notify_admins) if(GIBTONITE_QUALITY_MEDIUM) - explosion(src.loc,1,2,5,adminlog = notify_admins) + explosion(src,1,2,5,adminlog = notify_admins) if(GIBTONITE_QUALITY_LOW) - explosion(src.loc,0,1,3,adminlog = notify_admins) + explosion(src,0,1,3,adminlog = notify_admins) qdel(src) /obj/item/weapon/ore/Initialize()