From 9a7bdd09b195cb3d64f82ea193a91ef54c91198a Mon Sep 17 00:00:00 2001 From: ynot01 Date: Wed, 22 May 2024 21:32:18 -0400 Subject: [PATCH 01/26] add departmental node globals for fast access --- .../modules/research/techweb/_techweb_node.dm | 32 +++++++++++++++---- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm index 5bf1cff4a57c..15ef792e9431 100644 --- a/code/modules/research/techweb/_techweb_node.dm +++ b/code/modules/research/techweb/_techweb_node.dm @@ -1,4 +1,9 @@ - +GLOBAL_LIST_EMPTY(security_nodes) +GLOBAL_LIST_EMPTY(medical_nodes) +GLOBAL_LIST_EMPTY(cargo_nodes) +GLOBAL_LIST_EMPTY(service_nodes) +GLOBAL_LIST_EMPTY(science_nodes) +GLOBAL_LIST_EMPTY(engineering_nodes) //Techweb nodes are GLOBAL, there should only be one instance of them in the game. Persistant changes should never be made to them in-game. //USE SSRESEARCH PROCS TO OBTAIN REFERENCES. DO NOT REFERENCE OUTSIDE OF SSRESEARCH OR YOU WILL FUCK UP GC. @@ -25,12 +30,25 @@ /datum/techweb_node/proc/Initialize() //Make lists associative for lookup - for(var/id in prereq_ids) - prereq_ids[id] = TRUE - for(var/id in design_ids) - design_ids[id] = TRUE - for(var/id in unlock_ids) - unlock_ids[id] = TRUE + for(var/pre_id in prereq_ids) + prereq_ids[pre_id] = TRUE + for(var/des_id in design_ids) + design_ids[des_id] = TRUE + var/datum/design/design = SSresearch.techweb_designs[des_id] + if(design.departmental_flags & (DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_ARMORY)) + GLOB.security_nodes |= id + if(design.departmental_flags & DEPARTMENTAL_FLAG_MEDICAL) + GLOB.medical_nodes |= id + if(design.departmental_flags & DEPARTMENTAL_FLAG_CARGO) + GLOB.cargo_nodes |= id + if(design.departmental_flags & DEPARTMENTAL_FLAG_SERVICE) + GLOB.service_nodes |= id + if(design.departmental_flags & DEPARTMENTAL_FLAG_SCIENCE) + GLOB.science_nodes |= id + if(design.departmental_flags & DEPARTMENTAL_FLAG_ENGINEERING) + GLOB.engineering_nodes |= id + for(var/unl_id in unlock_ids) + unlock_ids[unl_id] = TRUE /datum/techweb_node/Destroy() SSresearch.techweb_nodes -= id From 3aae78b6caa59cccfe0f90545a2c00df89e8e2de Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 01:19:18 -0400 Subject: [PATCH 02/26] add console --- .../circuitboards/computer_circuitboards.dm | 15 ++- .../research/reward_system/_reward_system.dm | 122 ++++++++++++++++++ .../research/reward_system/security.dm | 7 + .../modules/research/techweb/_techweb_node.dm | 19 --- .../tgui/interfaces/DepartmentReward.tsx | 71 ++++++++++ yogstation.dme | 2 + 6 files changed, 212 insertions(+), 24 deletions(-) create mode 100644 code/modules/research/reward_system/_reward_system.dm create mode 100644 code/modules/research/reward_system/security.dm create mode 100644 tgui/packages/tgui/interfaces/DepartmentReward.tsx diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 3f1f019a59f9..6722353bb8f1 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -176,6 +176,11 @@ //Generic +/obj/item/circuitboard/computer/department_reward + name = "Departmental Research Console (Computer Board)" + greyscale_colors = CIRCUIT_COLOR_GENERIC + build_path = /obj/machinery/computer/department_reward + /obj/item/circuitboard/computer/arcade/amputation name = "Mediborg's Amputation Adventure (Computer Board)" greyscale_colors = CIRCUIT_COLOR_GENERIC @@ -354,7 +359,7 @@ /obj/item/circuitboard/computer/rdconsole/production name = "R&D Console Production Only (Computer Board)" build_path = /obj/machinery/computer/rdconsole/production - + /obj/item/circuitboard/computer/rdconsole/multitool_act(mob/living/user, obj/item/I) . = ..() user.visible_message(span_notice("[user] fiddles with [src]."), span_notice( "You fiddle with [src].")) @@ -397,8 +402,8 @@ return TRUE if(I.use_tool(src, user, 2 SECONDS, volume = 75)) unlocked = FALSE - to_chat(user, span_notice("You melt the solder back into place, restoring the connections in the traces.")) - + to_chat(user, span_notice("You melt the solder back into place, restoring the connections in the traces.")) + /obj/item/circuitboard/computer/rdservercontrol name = "R&D Server Control (Computer Board)" @@ -423,7 +428,7 @@ /obj/item/circuitboard/computer/xenobiology/syndicateicemoon name = "Syndicate Xenobiology Console (Computer Board)" build_path = /obj/machinery/computer/camera_advanced/xenobio/syndicateicemoon - + /obj/item/circuitboard/computer/shuttle/flight_control name = "Shuttle Flight Control (Computer Board)" build_path = /obj/machinery/computer/custom_shuttle @@ -520,7 +525,7 @@ obj_flags |= EMAGGED to_chat(user, span_notice("You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.")) return TRUE - + /obj/item/circuitboard/computer/cargo/express name = "Express Supply Console (Computer Board)" build_path = /obj/machinery/computer/cargo/express diff --git a/code/modules/research/reward_system/_reward_system.dm b/code/modules/research/reward_system/_reward_system.dm new file mode 100644 index 000000000000..ad378d62dbf8 --- /dev/null +++ b/code/modules/research/reward_system/_reward_system.dm @@ -0,0 +1,122 @@ +// Filled out in code/modules/research/techweb/_techweb_node.dm Initialize() +// Lists of IDs (strings) which can be accessed via SSresearch.techweb_node_by_id(id) +// Assoc list, id = TRUE +GLOBAL_LIST_EMPTY(security_nodes) +GLOBAL_LIST_EMPTY(medical_nodes) +GLOBAL_LIST_EMPTY(cargo_nodes) +GLOBAL_LIST_EMPTY(service_nodes) +GLOBAL_LIST_EMPTY(science_nodes) +GLOBAL_LIST_EMPTY(engineering_nodes) +// A reward system framework for crew: By doing their jobs, they get to progress towards research nodes for their department +// Must be implemented very carefully to avoid exploitation, it should be very boring or annoying to try and exploit it at least +/obj/machinery/computer/department_reward + name = "departmental research console (ERROR)" + desc = "A primitive version of the famous R&D console used to unlock department-relevant research." + icon_screen = "rdcomp" + icon_keyboard = "rd_key" + circuit = /obj/item/circuitboard/computer/department_reward + light_color = LIGHT_COLOR_BLUE + var/datum/techweb/linked_techweb + var/list/nodes_available = null // pass by reference, not .Copy() + var/points = 0 + var/department_display = "ERROR" + +/obj/machinery/computer/department_reward/Initialize(mapload) + . = ..() + linked_techweb = SSresearch.science_tech + +/obj/machinery/computer/department_reward/proc/check_reward() + return 0 + +/obj/machinery/computer/department_reward/process() + if(stat & (NOPOWER|BROKEN)) + return // we dont return PROCESS_KILL because it's already handled in /obj/machinery + points += check_reward() + +/obj/machinery/computer/department_reward/ui_interact(mob/user, datum/tgui/ui) + if(stat & (NOPOWER|BROKEN)) + return FALSE + if(nodes_available != null && length(nodes_available) == 0) + for(var/node_id in SSresearch.techweb_nodes) + var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_id) + for(var/des_id in node.design_ids) + var/datum/design/design = SSresearch.techweb_design_by_id(des_id) + if(design.departmental_flags & ALL) // usually mech or nanite or other abstract stuff + continue + if(design.departmental_flags & (DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_ARMORY)) + GLOB.security_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_MEDICAL) + GLOB.medical_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_CARGO) + GLOB.cargo_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_SERVICE) + GLOB.service_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_SCIENCE) + GLOB.science_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_ENGINEERING) + GLOB.engineering_nodes[node.id] = TRUE + CHECK_TICK + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "DepartmentReward", name) + ui.open() + +/obj/machinery/computer/department_reward/ui_assets(mob/user) + return list( + get_asset_datum(/datum/asset/spritesheet/research_designs), + ) + +/obj/machinery/computer/department_reward/ui_data(mob/user) + var/list/data = list() + data["points"] = points + data["department"] = department_display + data["nodes"] = list() + if(nodes_available) + for(var/node_id in nodes_available) + if(!nodes_available[node_id]) + continue + if(linked_techweb.researched_nodes[node_id]) + continue + if(!linked_techweb.visible_nodes[node_id] && !linked_techweb.available_nodes[node_id]) + continue + var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_id) + var/node_price = node.get_price(linked_techweb)[TECHWEB_POINT_TYPE_GENERIC] + if(!node_price) + continue + var/node_entry = list() + node_entry["name"] = node.display_name + node_entry["purchasable"] = node_price < points + node_entry["price"] = node.price_display(linked_techweb)[TECHWEB_POINT_TYPE_GENERIC] + node_entry["designs"] = list() + for(var/design_id in node.design_ids) + node_entry["designs"] |= design_id + data["nodes"] += list(node_entry) + return data + +/obj/machinery/computer/department_reward/ui_act(action, params) + if(..()) + return + + if(stat & (NOPOWER|BROKEN)) + return + + switch(action) + if("purchase") + var/node_id = params["node_id"] + if(!(nodes_available[node_id])) + return + if(linked_techweb.researched_nodes[node_id]) + return + if(!linked_techweb.visible_nodes[node_id] && !linked_techweb.available_nodes[node_id]) + return + var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_id) + var/node_price = node.get_price(linked_techweb)[TECHWEB_POINT_TYPE_GENERIC] + if(!node_price) + return + if(node_price >= points) + return + if(!linked_techweb.research_node_id(node_id, TRUE, FALSE)) + return + points -= node_price + say("Researched [node.display_name]!") + return TRUE diff --git a/code/modules/research/reward_system/security.dm b/code/modules/research/reward_system/security.dm new file mode 100644 index 000000000000..64a5ffefedcf --- /dev/null +++ b/code/modules/research/reward_system/security.dm @@ -0,0 +1,7 @@ +/obj/machinery/computer/department_reward/security + name = "departmental research console (Security)" + department_display = "Security" + +/obj/machinery/computer/department_reward/security/Initialize(mapload) + nodes_available = GLOB.security_nodes + . = ..() diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm index 15ef792e9431..8b528fc12114 100644 --- a/code/modules/research/techweb/_techweb_node.dm +++ b/code/modules/research/techweb/_techweb_node.dm @@ -1,9 +1,3 @@ -GLOBAL_LIST_EMPTY(security_nodes) -GLOBAL_LIST_EMPTY(medical_nodes) -GLOBAL_LIST_EMPTY(cargo_nodes) -GLOBAL_LIST_EMPTY(service_nodes) -GLOBAL_LIST_EMPTY(science_nodes) -GLOBAL_LIST_EMPTY(engineering_nodes) //Techweb nodes are GLOBAL, there should only be one instance of them in the game. Persistant changes should never be made to them in-game. //USE SSRESEARCH PROCS TO OBTAIN REFERENCES. DO NOT REFERENCE OUTSIDE OF SSRESEARCH OR YOU WILL FUCK UP GC. @@ -34,19 +28,6 @@ GLOBAL_LIST_EMPTY(engineering_nodes) prereq_ids[pre_id] = TRUE for(var/des_id in design_ids) design_ids[des_id] = TRUE - var/datum/design/design = SSresearch.techweb_designs[des_id] - if(design.departmental_flags & (DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_ARMORY)) - GLOB.security_nodes |= id - if(design.departmental_flags & DEPARTMENTAL_FLAG_MEDICAL) - GLOB.medical_nodes |= id - if(design.departmental_flags & DEPARTMENTAL_FLAG_CARGO) - GLOB.cargo_nodes |= id - if(design.departmental_flags & DEPARTMENTAL_FLAG_SERVICE) - GLOB.service_nodes |= id - if(design.departmental_flags & DEPARTMENTAL_FLAG_SCIENCE) - GLOB.science_nodes |= id - if(design.departmental_flags & DEPARTMENTAL_FLAG_ENGINEERING) - GLOB.engineering_nodes |= id for(var/unl_id in unlock_ids) unlock_ids[unl_id] = TRUE diff --git a/tgui/packages/tgui/interfaces/DepartmentReward.tsx b/tgui/packages/tgui/interfaces/DepartmentReward.tsx new file mode 100644 index 000000000000..a2a10c208efa --- /dev/null +++ b/tgui/packages/tgui/interfaces/DepartmentReward.tsx @@ -0,0 +1,71 @@ +import { useBackend } from '../backend'; +import { Button, Box, Icon, Stack, Section } from '../components'; +import { Window } from '../layouts'; +import { classes } from '../../common/react'; + +type ResearchNode = { + name: string; + purchasable: boolean; + price: number; + designs: string[]; +} + +type DepartmentRewardData = { + points: number; + department: string; + nodes: ResearchNode[]; +}; + +export const DepartmentReward = (props, context) => { + const { data } = useBackend(context); + const { + points, + department, + nodes = [], + } = data; + const { act } = useBackend(context); + return ( + + +
+ + {nodes.map((node, index) => + ( + + + + {node.name} + + + + {node.designs.map((design, mindex) => + () + )} + + + +
+ + + ); +}; diff --git a/yogstation.dme b/yogstation.dme index 96fbbe87698e..fe1411b11c74 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -3641,6 +3641,8 @@ #include "code\modules\research\nanites\nanite_programs\suppression.dm" #include "code\modules\research\nanites\nanite_programs\utility.dm" #include "code\modules\research\nanites\nanite_programs\weapon.dm" +#include "code\modules\research\reward_system\_reward_system.dm" +#include "code\modules\research\reward_system\security.dm" #include "code\modules\research\techweb\__techweb_helpers.dm" #include "code\modules\research\techweb\_techweb.dm" #include "code\modules\research\techweb\_techweb_node.dm" From 249d8dca70487e8d2a039e9268cdeae6a5ad4022 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 01:38:31 -0400 Subject: [PATCH 03/26] fix all nodes never showing up --- code/modules/research/reward_system/_reward_system.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/reward_system/_reward_system.dm b/code/modules/research/reward_system/_reward_system.dm index ad378d62dbf8..54bd7d0ffaf8 100644 --- a/code/modules/research/reward_system/_reward_system.dm +++ b/code/modules/research/reward_system/_reward_system.dm @@ -41,7 +41,7 @@ GLOBAL_LIST_EMPTY(engineering_nodes) var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_id) for(var/des_id in node.design_ids) var/datum/design/design = SSresearch.techweb_design_by_id(des_id) - if(design.departmental_flags & ALL) // usually mech or nanite or other abstract stuff + if(design.departmental_flags & ALL == ALL) // usually mech or nanite or other abstract stuff continue if(design.departmental_flags & (DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_ARMORY)) GLOB.security_nodes[node.id] = TRUE From 489e7128598f53ab67e4cd848ea3090936c07216 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 02:10:22 -0400 Subject: [PATCH 04/26] more tweaks on the console --- .../research/reward_system/_reward_system.dm | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/code/modules/research/reward_system/_reward_system.dm b/code/modules/research/reward_system/_reward_system.dm index 54bd7d0ffaf8..06b3100a7597 100644 --- a/code/modules/research/reward_system/_reward_system.dm +++ b/code/modules/research/reward_system/_reward_system.dm @@ -41,20 +41,19 @@ GLOBAL_LIST_EMPTY(engineering_nodes) var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_id) for(var/des_id in node.design_ids) var/datum/design/design = SSresearch.techweb_design_by_id(des_id) - if(design.departmental_flags & ALL == ALL) // usually mech or nanite or other abstract stuff - continue - if(design.departmental_flags & (DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_ARMORY)) - GLOB.security_nodes[node.id] = TRUE - if(design.departmental_flags & DEPARTMENTAL_FLAG_MEDICAL) - GLOB.medical_nodes[node.id] = TRUE - if(design.departmental_flags & DEPARTMENTAL_FLAG_CARGO) - GLOB.cargo_nodes[node.id] = TRUE - if(design.departmental_flags & DEPARTMENTAL_FLAG_SERVICE) - GLOB.service_nodes[node.id] = TRUE - if(design.departmental_flags & DEPARTMENTAL_FLAG_SCIENCE) - GLOB.science_nodes[node.id] = TRUE - if(design.departmental_flags & DEPARTMENTAL_FLAG_ENGINEERING) - GLOB.engineering_nodes[node.id] = TRUE + if(design.departmental_flags != ALL) + if(design.departmental_flags & (DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_ARMORY)) + GLOB.security_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_MEDICAL) + GLOB.medical_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_CARGO) + GLOB.cargo_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_SERVICE) + GLOB.service_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_SCIENCE) + GLOB.science_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_ENGINEERING) + GLOB.engineering_nodes[node.id] = TRUE CHECK_TICK ui = SStgui.try_update_ui(user, src, ui) if(!ui) @@ -86,10 +85,13 @@ GLOBAL_LIST_EMPTY(engineering_nodes) var/node_entry = list() node_entry["name"] = node.display_name node_entry["purchasable"] = node_price < points - node_entry["price"] = node.price_display(linked_techweb)[TECHWEB_POINT_TYPE_GENERIC] + node_entry["price"] = node_price node_entry["designs"] = list() + var/design_count = 0 for(var/design_id in node.design_ids) - node_entry["designs"] |= design_id + design_count++ + if(design_count <= 14) + node_entry["designs"] |= design_id data["nodes"] += list(node_entry) return data From 5650f31ba3ee4dc1f7dd170332e48538660e0baa Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 02:16:41 -0400 Subject: [PATCH 05/26] move department caching to SSresearch --- code/controllers/subsystem/research.dm | 21 +++++++++++++++++++ .../research/reward_system/_reward_system.dm | 19 ----------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index 21f998f831de..79170038b970 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -51,6 +51,7 @@ SUBSYSTEM_DEF(research) point_types = TECHWEB_POINT_TYPE_LIST_ASSOCIATIVE_NAMES initialize_all_techweb_designs() initialize_all_techweb_nodes() + cache_department_designs() science_tech = new /datum/techweb/science ruin_tech = new /datum/techweb/ruin admin_tech = new /datum/techweb/admin @@ -282,3 +283,23 @@ SUBSYSTEM_DEF(research) else techweb_boost_items[path] = list(node.id = node.boost_item_paths[path]) CHECK_TICK + +/datum/controller/subsystem/research/proc/cache_department_designs() + for(var/node_id in techweb_nodes) + var/datum/techweb_node/node = techweb_node_by_id(node_id) + for(var/des_id in node.design_ids) + var/datum/design/design = techweb_design_by_id(des_id) + if(design.departmental_flags != ALL) + if(design.departmental_flags & (DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_ARMORY)) + GLOB.security_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_MEDICAL) + GLOB.medical_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_CARGO) + GLOB.cargo_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_SERVICE) + GLOB.service_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_SCIENCE) + GLOB.science_nodes[node.id] = TRUE + if(design.departmental_flags & DEPARTMENTAL_FLAG_ENGINEERING) + GLOB.engineering_nodes[node.id] = TRUE + CHECK_TICK diff --git a/code/modules/research/reward_system/_reward_system.dm b/code/modules/research/reward_system/_reward_system.dm index 06b3100a7597..3896ffa61fd4 100644 --- a/code/modules/research/reward_system/_reward_system.dm +++ b/code/modules/research/reward_system/_reward_system.dm @@ -36,25 +36,6 @@ GLOBAL_LIST_EMPTY(engineering_nodes) /obj/machinery/computer/department_reward/ui_interact(mob/user, datum/tgui/ui) if(stat & (NOPOWER|BROKEN)) return FALSE - if(nodes_available != null && length(nodes_available) == 0) - for(var/node_id in SSresearch.techweb_nodes) - var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_id) - for(var/des_id in node.design_ids) - var/datum/design/design = SSresearch.techweb_design_by_id(des_id) - if(design.departmental_flags != ALL) - if(design.departmental_flags & (DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_ARMORY)) - GLOB.security_nodes[node.id] = TRUE - if(design.departmental_flags & DEPARTMENTAL_FLAG_MEDICAL) - GLOB.medical_nodes[node.id] = TRUE - if(design.departmental_flags & DEPARTMENTAL_FLAG_CARGO) - GLOB.cargo_nodes[node.id] = TRUE - if(design.departmental_flags & DEPARTMENTAL_FLAG_SERVICE) - GLOB.service_nodes[node.id] = TRUE - if(design.departmental_flags & DEPARTMENTAL_FLAG_SCIENCE) - GLOB.science_nodes[node.id] = TRUE - if(design.departmental_flags & DEPARTMENTAL_FLAG_ENGINEERING) - GLOB.engineering_nodes[node.id] = TRUE - CHECK_TICK ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "DepartmentReward", name) From 13c37a7c472fd5e06abd0fa02927106e7a512259 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 02:44:59 -0400 Subject: [PATCH 06/26] security point generation --- code/game/area/Space_Station_13_areas.dm | 8 +++++- code/game/machinery/doors/brigdoors.dm | 2 +- .../research/reward_system/_reward_system.dm | 6 ++--- .../research/reward_system/security.dm | 26 +++++++++++++++++++ 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 557472601dc3..b33f7a37f70e 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -918,6 +918,12 @@ NOTE: there are two lists of areas in the end of this file: centcom and station minimap_color = "#530505" lights_always_start_on = TRUE +/area/security/brig_cell + name = "Brig Cell" + icon_state = "sec_prison" + minimap_color = "#530505" + lights_always_start_on = TRUE + /area/security/prison/hallway name = "Prison Wing Hallway" @@ -1289,7 +1295,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station ambience_index = AMBIENCE_DANGER minimap_color = "#4f4e3a" airlock_wires = /datum/wires/airlock/ai - + /area/ai_monitored/secondarydatacore name = "AI Secondary Datacore Monitoring" icon_state = "ai" diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index fe12396a1ff7..4dbe5724e2a0 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -157,7 +157,7 @@ playsound(loc, 'sound/machines/ping.ogg', 50, 1) else if(!desired_name) say("No prisoner name inputted, security record not updated.") - + return 1 diff --git a/code/modules/research/reward_system/_reward_system.dm b/code/modules/research/reward_system/_reward_system.dm index 3896ffa61fd4..f45b09f2da88 100644 --- a/code/modules/research/reward_system/_reward_system.dm +++ b/code/modules/research/reward_system/_reward_system.dm @@ -25,13 +25,13 @@ GLOBAL_LIST_EMPTY(engineering_nodes) . = ..() linked_techweb = SSresearch.science_tech -/obj/machinery/computer/department_reward/proc/check_reward() +/obj/machinery/computer/department_reward/proc/check_reward(delta_time) return 0 -/obj/machinery/computer/department_reward/process() +/obj/machinery/computer/department_reward/process(delta_time) if(stat & (NOPOWER|BROKEN)) return // we dont return PROCESS_KILL because it's already handled in /obj/machinery - points += check_reward() + points += check_reward(delta_time) /obj/machinery/computer/department_reward/ui_interact(mob/user, datum/tgui/ui) if(stat & (NOPOWER|BROKEN)) diff --git a/code/modules/research/reward_system/security.dm b/code/modules/research/reward_system/security.dm index 64a5ffefedcf..2eb95b8d9533 100644 --- a/code/modules/research/reward_system/security.dm +++ b/code/modules/research/reward_system/security.dm @@ -5,3 +5,29 @@ /obj/machinery/computer/department_reward/security/Initialize(mapload) nodes_available = GLOB.security_nodes . = ..() + +/obj/machinery/computer/department_reward/security/check_reward(delta_time) + . = 0 + + // Criminals in brig cells with an active timer + var/list/criminals = list() + for(var/obj/machinery/door_timer/timer in SSmachines.processing) + if(timer.timing && timer.desired_name) + timer.desired_name += criminals + CHECK_TICK + for(var/area/security/brig_cell/cell in GLOB.the_station_areas) + var/list/cell_humans = cell.get_all_contents_type(/mob/living/carbon/human) + for(var/mob/living/carbon/human/guy as anything in cell_humans) + if(guy.real_name in criminals) + . += delta_time * 10 // 600 points per minute of captured criminal + CHECK_TICK + + // Perma prisoners with no access + for(var/area/security/prison/perma in GLOB.the_station_areas) + var/list/permad_humans = perma.get_all_contents_type(/mob/living/carbon/human) + for(var/mob/living/carbon/human/guy as anything in permad_humans) + var/obj/item/idcard = guy.get_idcard() + var/access = idcard?.GetAccess() + if(access == null || length(access) == 0) + . += delta_time * 10 // 600 points per minute of captured criminal + CHECK_TICK From 947a9a3f610725843859f4465e90b2626c841a75 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 02:49:54 -0400 Subject: [PATCH 07/26] boxstation changes --- _maps/map_files/YogStation/YogStation.dmm | 63 +++++++++-------------- 1 file changed, 24 insertions(+), 39 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 22cf6388283d..24dfce61fb02 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -397,7 +397,6 @@ }, /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ - light_on = 0; pixel_x = 6; pixel_y = 4 }, @@ -721,7 +720,7 @@ name = "Cell 1 Locker" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "aeB" = ( /obj/machinery/power/tracker, /obj/structure/cable/yellow{ @@ -840,7 +839,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "afN" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/yellow{ @@ -1576,7 +1575,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "aly" = ( /obj/effect/turf_decal/bot_white, /obj/machinery/flasher/portable, @@ -1772,7 +1771,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "amw" = ( /obj/effect/spawner/structure/window/reinforced/shutter, /turf/open/floor/plating, @@ -2278,7 +2277,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "aqo" = ( /obj/structure/dresser, /turf/open/floor/wood, @@ -4104,7 +4103,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "aDG" = ( /obj/machinery/button/door{ id = "briggate"; @@ -13545,6 +13544,7 @@ pixel_y = -32 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/structure/filingcabinet, /turf/open/floor/plasteel, /area/security/main) "clf" = ( @@ -14965,9 +14965,7 @@ /area/engine/atmos/distro) "cCl" = ( /obj/effect/decal/cleanable/cobweb, -/obj/machinery/computer/atmos_sim{ - mode = 1 - }, +/obj/machinery/computer/atmos_sim, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "cCD" = ( @@ -16017,7 +16015,7 @@ name = "Cell 3 Locker" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "cRZ" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -23536,8 +23534,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "fyS" = ( -/obj/structure/filingcabinet, /obj/effect/turf_decal/trimline/secred/filled/line/lower, +/obj/machinery/computer/department_reward/security{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/main) "fza" = ( @@ -28226,7 +28226,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -32486,7 +32485,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -38157,7 +38155,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /obj/effect/turf_decal/trimline/white/filled/corner/lower, @@ -38835,7 +38832,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -38849,7 +38845,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /turf/open/floor/plasteel, @@ -49707,9 +49702,7 @@ /area/quartermaster/miningdock) "oYF" = ( /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "oYU" = ( @@ -50811,9 +50804,7 @@ "psO" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "pth" = ( @@ -51856,24 +51847,19 @@ icon_state = "0-4" }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; pixel_y = -27 }, /obj/item/radio/intercom{ - anyai = 1; - broadcasting = 0; freerange = 1; frequency = 1447; name = "Private Channel"; pixel_y = 20 }, /obj/item/radio/intercom{ - broadcasting = 0; freerange = 1; - listening = 1; name = "Common Channel"; pixel_y = -37 }, @@ -56611,7 +56597,7 @@ /obj/structure/bed, /obj/item/bedsheet/prisoner, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "rxG" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ @@ -63804,8 +63790,7 @@ /area/bridge) "ucR" = ( /obj/machinery/computer/atmos_sim{ - dir = 4; - mode = 1 + dir = 4 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, /turf/open/floor/plasteel/white, @@ -66035,7 +66020,7 @@ name = "Cell 2 Locker" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "uWS" = ( /obj/item/crowbar, /obj/item/wrench, @@ -66864,7 +66849,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -70367,7 +70351,6 @@ /obj/machinery/requests_console{ department = "AI"; departmentType = 5; - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/circuit/telecomms/server, @@ -73781,7 +73764,6 @@ dir = 6 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 6 }, /turf/open/floor/plasteel, @@ -74127,6 +74109,9 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/security/main) +"xUS" = ( +/turf/closed/wall, +/area/security/brig_cell) "xUX" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -102820,8 +102805,8 @@ agj mKD qhW agj -agj -agj +xUS +xUS aiX tRq aKE @@ -103848,8 +103833,8 @@ lIb lLO wYv agj -agj -agj +xUS +xUS aiX tEI jmL From 024526693efcff9b277f37df8d7eee3a9ca2f096 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 02:56:32 -0400 Subject: [PATCH 08/26] rest of the maps --- .../AsteroidStation/AsteroidStation.dmm | 280 +++------ _maps/map_files/DonutStation/DonutStation.dmm | 548 +++++------------- _maps/map_files/GaxStation/GaxStation.dmm | 144 ++--- _maps/map_files/IceMeta/IceMeta.dmm | 50 +- 4 files changed, 280 insertions(+), 742 deletions(-) diff --git a/_maps/map_files/AsteroidStation/AsteroidStation.dmm b/_maps/map_files/AsteroidStation/AsteroidStation.dmm index 13d5253e89b5..caaa7048ef9a 100644 --- a/_maps/map_files/AsteroidStation/AsteroidStation.dmm +++ b/_maps/map_files/AsteroidStation/AsteroidStation.dmm @@ -69,9 +69,7 @@ /turf/closed/wall, /area/quartermaster/qm) "aaD" = ( -/obj/machinery/airalarm/directional/south{ - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/south, /obj/structure/table, /obj/item/reagent_containers/glass/bottle/ethanol{ pixel_x = -5; @@ -183,9 +181,7 @@ /turf/open/floor/carpet, /area/crew_quarters/cryopods) "abM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "abP" = ( @@ -2594,7 +2590,6 @@ "axy" = ( /obj/structure/chair/comfy{ dir = 4; - icon_state = "comfychair"; tag = "" }, /obj/machinery/light/broken{ @@ -5888,9 +5883,7 @@ /turf/open/floor/plasteel, /area/engine/foyer) "bcH" = ( -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -6849,7 +6842,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "btv" = ( /obj/effect/turf_decal/bot, /obj/effect/decal/cleanable/dirt/dust, @@ -8650,8 +8643,7 @@ /area/medical/sleeper) "cah" = ( /obj/machinery/camera{ - c_tag = "Theatre Stage"; - dir = 2 + c_tag = "Theatre Stage" }, /obj/item/radio/intercom{ dir = 8; @@ -9308,6 +9300,9 @@ /obj/structure/sign/poster/official/space_cops{ pixel_y = -32 }, +/obj/machinery/computer/department_reward/security{ + dir = 1 + }, /turf/open/floor/plasteel, /area/security/main) "cij" = ( @@ -11537,7 +11532,6 @@ /obj/structure/cable, /obj/machinery/power/apc{ areastring = "/area/medical/storage"; - dir = 2; name = "Medbay Storage APC"; pixel_y = -23 }, @@ -11998,8 +11992,7 @@ /obj/machinery/camera{ c_tag = "Medbay Treatment Center"; dir = 8; - network = list("ss13","medbay"); - pixel_x = 0 + network = list("ss13","medbay") }, /turf/open/floor/plasteel/dark, /area/medical/sleeper) @@ -12416,9 +12409,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hor) "dfv" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/plasteel/dark, /area/science/mixing) "dfz" = ( @@ -15327,7 +15318,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "ebX" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 28 @@ -15947,7 +15938,6 @@ "ekL" = ( /obj/machinery/requests_console{ department = "Mining"; - departmentType = 0; name = "Mining RC"; pixel_x = 32; pixel_y = 29 @@ -16785,7 +16775,6 @@ "evS" = ( /obj/machinery/light, /obj/structure/tank_dispenser/oxygen{ - layer = 2.9; pixel_x = -1; pixel_y = 2 }, @@ -16953,7 +16942,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "ezP" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -17469,7 +17458,6 @@ /obj/structure/cable, /obj/machinery/power/apc{ areastring = "/area/medical/storage/backroom"; - dir = 2; name = "Medical Backrooms APC"; pixel_y = -23 }, @@ -17832,9 +17820,7 @@ icon_state = "1-2"; tag = "" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/dark, /area/medical/sleeper) "eNk" = ( @@ -18382,9 +18368,7 @@ /turf/open/floor/plasteel, /area/hydroponics) "eUU" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel, /area/engine/atmos/distro) "eVg" = ( @@ -18605,9 +18589,7 @@ }, /area/crew_quarters/bar) "eZj" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 }, @@ -21667,9 +21649,6 @@ /area/security/prison) "fYo" = ( /obj/machinery/door/window/southleft{ - base_state = "left"; - dir = 2; - icon_state = "left"; name = "Kitchen Delivery"; req_access_txt = "28" }, @@ -22546,9 +22525,6 @@ /area/engine/atmos/distro) "gng" = ( /obj/machinery/door/window/southleft{ - base_state = "left"; - dir = 2; - icon_state = "left"; name = "Bar Delivery"; req_access_txt = "25" }, @@ -24188,9 +24164,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/starboard/fore) "gND" = ( @@ -27024,9 +26998,7 @@ /area/science/xenobiology) "hGo" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -27297,9 +27269,7 @@ /turf/open/floor/plasteel, /area/engine/atmos/hfr) "hKm" = ( -/obj/structure/table/glass{ - name = "glass table" - }, +/obj/structure/table/glass, /obj/machinery/cell_charger, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 @@ -27583,9 +27553,7 @@ /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) "hOq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "hOL" = ( @@ -28608,9 +28576,7 @@ /area/bridge/meeting_room) "ihh" = ( /obj/structure/table/glass, -/obj/machinery/airalarm/directional/south{ - pixel_y = -24 - }, +/obj/machinery/airalarm/directional/south, /obj/item/storage/firstaid/fire{ pixel_x = 3; pixel_y = 3 @@ -28733,9 +28699,7 @@ /turf/open/floor/plasteel/dark, /area/bridge) "ija" = ( -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -29632,8 +29596,7 @@ dir = 8 }, /obj/machinery/computer/atmos_sim{ - dir = 8; - mode = 1 + dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 6 @@ -30908,17 +30871,9 @@ /obj/effect/turf_decal/trimline/brown/filled/corner/lower, /turf/open/floor/plasteel/dark, /area/bridge) -"iTl" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/crew_quarters/locker) "iTs" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -31698,7 +31653,7 @@ dir = 5 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "jdn" = ( /obj/machinery/firealarm{ pixel_y = 26 @@ -32132,8 +32087,7 @@ dir = 8 }, /obj/machinery/door/poddoor/preopen{ - id = "executionfireblast"; - name = "blast door" + id = "executionfireblast" }, /obj/machinery/door/airlock/security/glass{ name = "Transfer Chamber"; @@ -32290,7 +32244,6 @@ /obj/machinery/requests_console{ department = "AI"; departmentType = 5; - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/circuit/telecomms/server, @@ -36288,9 +36241,7 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai_upload_foyer) "kxB" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/plasteel/white, /area/science/mixing) "kxL" = ( @@ -37125,7 +37076,7 @@ pixel_y = -7 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "kOw" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 @@ -37621,7 +37572,6 @@ /area/medical/medbay/aft) "kXj" = ( /obj/item/reagent_containers/food/snacks/fish/goldfish{ - bitecount = 0; length = 1; weight = 2 }, @@ -39281,12 +39231,6 @@ /obj/effect/turf_decal/trimline/green/warning/lower, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) -"lBg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/engine/atmos/hfr) "lBP" = ( /obj/machinery/conveyor{ id = "QMLoad" @@ -40400,8 +40344,7 @@ icon_state = "0-2" }, /obj/machinery/door/poddoor/preopen{ - id = "executionfireblast"; - name = "blast door" + id = "executionfireblast" }, /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -40708,9 +40651,7 @@ /area/maintenance/starboard/fore) "lYP" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -41325,9 +41266,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/structure/cable{ icon_state = "4-8" }, @@ -43982,7 +43921,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "mWR" = ( /obj/structure/chair/office{ dir = 4 @@ -44494,12 +44433,6 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower, /turf/open/floor/plasteel, /area/hallway/primary/central) -"nda" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/central) "ndb" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -44551,9 +44484,7 @@ /turf/open/floor/plating/asteroid, /area/space/nearstation) "ndK" = ( -/obj/machinery/airalarm/directional/west{ - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 }, @@ -47367,8 +47298,7 @@ dir = 4 }, /obj/machinery/door/poddoor/preopen{ - id = "cell3 blast"; - name = "blast door" + id = "cell3 blast" }, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -48096,9 +48026,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "okt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/white, /area/medical/storage/backroom) "okv" = ( @@ -48994,8 +48922,7 @@ "oyn" = ( /obj/machinery/door/airlock{ name = "Hydroponics Maintenance"; - req_access_txt = "35"; - req_one_access_txt = "0" + req_access_txt = "35" }, /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -49417,7 +49344,7 @@ pixel_y = -7 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "oEN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -49915,7 +49842,6 @@ "oLK" = ( /obj/structure/chair/comfy{ dir = 4; - icon_state = "comfychair"; tag = "" }, /obj/machinery/light/broken, @@ -52118,8 +52044,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower, /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom, /obj/machinery/computer/atmos_sim{ - dir = 1; - mode = 1 + dir = 1 }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) @@ -52177,9 +52102,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, -/obj/machinery/airalarm/directional/west{ - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/white, /area/medical/sleeper) "puV" = ( @@ -54027,9 +53950,7 @@ /area/security/brig) "pXG" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -58642,8 +58563,7 @@ pixel_y = 1 }, /obj/machinery/door/poddoor/preopen{ - id = "executionfireblast"; - name = "blast door" + id = "executionfireblast" }, /turf/open/floor/plating, /area/security/execution/transfer) @@ -60390,6 +60310,14 @@ /obj/effect/turf_decal/trimline/blue/filled/line/lower, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"rTV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/plasteel, +/area/security/brig_cell) "rTY" = ( /obj/machinery/power/apc{ areastring = "/area/engine/foyer"; @@ -60607,7 +60535,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "rWP" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -61828,9 +61756,7 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "sps" = ( -/obj/machinery/airalarm/directional/west{ - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 }, @@ -61990,9 +61916,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/hallway/primary/starboard) "srW" = ( @@ -62004,7 +61928,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "srY" = ( /obj/machinery/light_switch{ pixel_x = -25 @@ -62076,9 +62000,7 @@ /area/hallway/secondary/entry) "stF" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -63023,7 +62945,6 @@ pixel_y = 3 }, /obj/item/flashlight/lamp/green{ - light_on = 0; pixel_x = -6; pixel_y = 11 }, @@ -67534,8 +67455,7 @@ "tYo" = ( /obj/structure/cable, /obj/machinery/door/poddoor/preopen{ - id = "executionfireblast"; - name = "blast door" + id = "executionfireblast" }, /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -68311,8 +68231,7 @@ icon_state = "1-2" }, /obj/machinery/door/poddoor/preopen{ - id = "executionfireblast"; - name = "blast door" + id = "executionfireblast" }, /turf/open/floor/plating, /area/security/execution/transfer) @@ -68937,8 +68856,7 @@ dir = 4 }, /obj/machinery/door/poddoor/preopen{ - id = "cell2 blast"; - name = "blast door" + id = "cell2 blast" }, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -69175,9 +69093,7 @@ /area/security/execution/transfer) "uAH" = ( /obj/structure/table/wood, -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -70620,7 +70536,6 @@ }, /obj/machinery/vending/wallhypo{ dir = 1; - pixel_x = 0; pixel_y = -28 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower, @@ -70651,9 +70566,7 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/effect/turf_decal/tile/red{ - dir = 2 - }, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, @@ -71225,9 +71138,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/port/fore) "vlg" = ( @@ -71304,7 +71215,7 @@ pixel_y = -7 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "vmt" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -72324,6 +72235,9 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/nobottom, /turf/open/floor/plasteel, /area/engine/atmos/hfr) +"vEn" = ( +/turf/closed/wall, +/area/security/brig_cell) "vEv" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/medical, @@ -75419,24 +75333,19 @@ icon_state = "0-4" }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; pixel_y = -27 }, /obj/item/radio/intercom{ - anyai = 1; - broadcasting = 0; freerange = 1; frequency = 1447; name = "Private Channel"; pixel_y = 20 }, /obj/item/radio/intercom{ - broadcasting = 0; freerange = 1; - listening = 1; name = "Common Channel"; pixel_y = -37 }, @@ -76492,8 +76401,7 @@ dir = 4 }, /obj/machinery/door/poddoor/preopen{ - id = "cell1 blast"; - name = "blast door" + id = "cell1 blast" }, /turf/open/floor/plasteel/dark, /area/security/prison) @@ -76879,7 +76787,6 @@ pixel_y = 5 }, /obj/item/pen/red{ - pixel_x = 0; pixel_y = 5 }, /turf/open/floor/carpet, @@ -77361,13 +77268,6 @@ /obj/structure/chair/stool/bar, /turf/open/floor/eighties, /area/maintenance/starboard/fore) -"xdI" = ( -/obj/effect/turf_decal/box/corners{ - dir = 1; - icon_state = "box_corners" - }, -/turf/open/floor/engine, -/area/science/xenobiology) "xdL" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -77765,9 +77665,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plasteel, /area/engine/atmos/pumproom) "xkS" = ( @@ -78249,7 +78147,6 @@ dir = 4 }, /obj/item/radio/intercom{ - anyai = 1; broadcasting = 1; frequency = 1423; listening = 0; @@ -78363,9 +78260,7 @@ /obj/structure/disposalpipe/segment{ dir = 2 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/starboard/fore) "xvF" = ( @@ -79846,15 +79741,6 @@ }, /turf/open/floor/plating, /area/maintenance/central) -"xSH" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/fore) "xTc" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -80191,9 +80077,7 @@ /turf/open/floor/plating, /area/maintenance/port) "xYM" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/central) "xYX" = ( @@ -98201,7 +98085,7 @@ aii aii aii aii -iTl +awU alR meo aoq @@ -103631,7 +103515,7 @@ uxp fFP oIN nsk -nda +iNl oQP jsE aQo @@ -110012,7 +109896,7 @@ gjq gjq gjq gjq -xSH +kPF ycw jbn aiZ @@ -110236,7 +110120,7 @@ oJL eHc qQt ydt -jrb +rTV jdm jfT vob @@ -110750,8 +110634,8 @@ dTn gbu jQA aDL -aDL -aDL +vEn +vEn aQv pEr aZW @@ -111264,7 +111148,7 @@ cTq vQW qQt ggP -jrb +rTV jdm jzS lUQ @@ -111778,8 +111662,8 @@ cTq gbu vPY aDL -aDL -aDL +vEn +vEn aQv bIM aZW @@ -112292,7 +112176,7 @@ cTq eHc qQt pMD -jrb +rTV jdm jfT lUQ @@ -112339,16 +112223,16 @@ okp vGq nFW adX -xdI +faj aFu xxt -xdI +faj aFu obD -xdI +faj aFu obD -xdI +faj aFu tdf aBD @@ -130101,7 +129985,7 @@ qIN tEi odT tEi -lBg +eBw uzL nxO hVs diff --git a/_maps/map_files/DonutStation/DonutStation.dmm b/_maps/map_files/DonutStation/DonutStation.dmm index 8fab5a60f78c..640cc0b57442 100644 --- a/_maps/map_files/DonutStation/DonutStation.dmm +++ b/_maps/map_files/DonutStation/DonutStation.dmm @@ -4,7 +4,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /obj/machinery/door/firedoor/border_only{ @@ -209,13 +208,11 @@ "aen" = ( /obj/structure/sign/directions/medical{ dir = 8; - icon_state = "direction_med"; pixel_x = -31; pixel_y = 32 }, /obj/structure/sign/directions/science{ dir = 8; - icon_state = "direction_sci"; pixel_x = -31; pixel_y = 24 }, @@ -529,8 +526,7 @@ /area/maintenance/starboard) "alK" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater{ - dir = 4; - icon_state = "heater" + dir = 4 }, /turf/open/floor/plasteel, /area/science/mixing) @@ -1417,6 +1413,9 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/virology) +"aDe" = ( +/turf/closed/wall, +/area/security/brig_cell) "aDi" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/machinery/firealarm{ @@ -1484,8 +1483,7 @@ /area/chapel/office) "aFm" = ( /obj/structure/particle_accelerator/power_box{ - dir = 1; - icon_state = "power_box" + dir = 1 }, /turf/open/floor/engine, /area/engine/engineering) @@ -1739,9 +1737,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "aKB" = ( @@ -1770,8 +1766,7 @@ "aLg" = ( /obj/machinery/camera{ c_tag = "Civilian - Library Lounge"; - dir = 8; - network = list("ss13") + dir = 8 }, /turf/open/floor/wood, /area/library) @@ -1982,7 +1977,6 @@ "aQs" = ( /obj/machinery/door/airlock/atmos{ name = "Atmospherics Foyer"; - req_access_txt = "0"; req_one_access_txt = "24;10" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -2126,11 +2120,9 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Research - Toxins Storage"; - dir = 2; network = list("ss13","Research") }, /obj/machinery/airalarm{ - dir = 2; pixel_y = 24 }, /obj/machinery/electrolyzer, @@ -2155,8 +2147,7 @@ /area/hallway/primary/central) "aUq" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - dir = 8; - icon_state = "freezer_1" + dir = 8 }, /turf/open/floor/plasteel/dark, /area/science/server) @@ -2178,8 +2169,7 @@ /area/escapepodbay) "aUK" = ( /obj/machinery/computer/station_alert{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/machinery/light_switch{ pixel_x = -24 @@ -2196,7 +2186,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "aVm" = ( /obj/structure/table, /obj/item/book/manual/wiki/security_space_law, @@ -2479,9 +2469,7 @@ "bbd" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "0" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 1 }, @@ -2569,9 +2557,7 @@ /area/ai_monitored/secondarydatacore) "bcF" = ( /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip, /turf/open/floor/plasteel, /area/hallway/primary/central) "bcM" = ( @@ -2736,7 +2722,6 @@ /obj/structure/table/glass, /obj/machinery/power/apc{ areastring = "/area/medical/virology"; - dir = 2; name = "Virology APC"; pixel_y = -23 }, @@ -2863,12 +2848,11 @@ /obj/structure/bed, /obj/machinery/camera{ c_tag = "Security - Cell 4"; - dir = 2; network = list("ss13","Security") }, /obj/item/bedsheet/prisoner, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "bhD" = ( /obj/structure/chair/wood/wings, /obj/effect/landmark/start/chaplain, @@ -2876,9 +2860,7 @@ pixel_y = 28 }, /obj/machinery/camera{ - c_tag = "Civilian - Chapel Office"; - dir = 2; - network = list("ss13") + c_tag = "Civilian - Chapel Office" }, /turf/open/floor/plasteel/grimy, /area/chapel/office) @@ -3838,7 +3820,6 @@ /area/engine/engineering) "bBN" = ( /obj/docking_port/stationary{ - dir = 1; dwidth = 1; height = 4; name = "escape pod four loader"; @@ -3950,9 +3931,7 @@ /turf/open/floor/plasteel/white, /area/science/research) "bEV" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -3999,7 +3978,6 @@ /area/crew_quarters/kitchen) "bFx" = ( /obj/machinery/requests_console{ - announcementConsole = 0; department = "Medbay"; departmentType = 1; name = "Medbay RC"; @@ -4295,7 +4273,6 @@ dir = 9 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 9 }, /turf/open/floor/plasteel, @@ -4694,7 +4671,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /obj/machinery/camera{ @@ -4956,7 +4932,6 @@ "bYZ" = ( /obj/machinery/mecha_part_fabricator, /obj/machinery/button/door{ - dir = 2; id = "robotics2"; name = "Shutters Control Button"; pixel_y = 24; @@ -5263,7 +5238,6 @@ }, /obj/machinery/camera{ c_tag = "Medical - Genetics"; - dir = 2; network = list("ss13","Medical") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ @@ -5880,8 +5854,7 @@ }, /obj/machinery/camera{ c_tag = "Cargo - Main 2"; - dir = 8; - network = list("ss13") + dir = 8 }, /obj/structure/extinguisher_cabinet{ pixel_x = 28 @@ -6067,12 +6040,11 @@ /obj/structure/bed, /obj/machinery/camera{ c_tag = "Security - Cell 3"; - dir = 2; network = list("ss13","Security") }, /obj/item/bedsheet/prisoner, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "cuV" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 4 @@ -6189,9 +6161,7 @@ /area/medical/storage) "cwM" = ( /obj/machinery/camera{ - c_tag = "Civilian - Chapel Main 2"; - dir = 2; - network = list("ss13") + c_tag = "Civilian - Chapel Main 2" }, /obj/machinery/light_switch{ pixel_y = 24 @@ -6276,8 +6246,7 @@ /area/crew_quarters/kitchen) "cyk" = ( /obj/machinery/computer/rdconsole/core{ - dir = 8; - icon_state = "computer" + dir = 8 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower, /turf/open/floor/plasteel, @@ -6321,8 +6290,7 @@ /obj/item/screwdriver, /obj/machinery/camera{ c_tag = "Cargo - Main 1"; - dir = 4; - network = list("ss13") + dir = 4 }, /obj/machinery/power/apc{ areastring = "/area/quartermaster/office"; @@ -6645,8 +6613,7 @@ req_access_txt = "20" }, /obj/machinery/camera{ - c_tag = "Bridge - Captain's Office"; - dir = 2 + c_tag = "Bridge - Captain's Office" }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) @@ -6852,7 +6819,6 @@ "cIU" = ( /obj/machinery/camera{ c_tag = "Security - Main Hall 3"; - dir = 2; network = list("ss13","Security") }, /obj/structure/disposalpipe/segment{ @@ -6883,7 +6849,6 @@ "cKp" = ( /obj/machinery/camera{ c_tag = "Research - Main 4"; - dir = 2; network = list("ss13","Research") }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ @@ -7282,7 +7247,6 @@ }, /obj/machinery/camera{ c_tag = "Medical - Treatment Centre"; - dir = 2; network = list("ss13","Medical") }, /turf/open/floor/plasteel/white, @@ -7313,9 +7277,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "cTq" = ( @@ -7545,7 +7507,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /turf/open/floor/plasteel, @@ -7681,8 +7642,7 @@ /area/science/xenobiology) "daq" = ( /obj/machinery/computer/prisoner{ - dir = 8; - icon_state = "computer" + dir = 8 }, /obj/machinery/light{ dir = 4 @@ -7905,9 +7865,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "deM" = ( @@ -8592,8 +8550,7 @@ "dvH" = ( /obj/machinery/camera{ c_tag = "Civilian - Chapel Main 1"; - dir = 4; - network = list("ss13") + dir = 4 }, /turf/open/floor/wood, /area/hallway/primary/central) @@ -8754,8 +8711,7 @@ }, /obj/machinery/camera{ c_tag = "Cargo - Docking Bay South"; - dir = 1; - network = list("ss13") + dir = 1 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -8914,8 +8870,7 @@ /area/maintenance/port/aft) "dDI" = ( /obj/machinery/camera{ - c_tag = "Bridge - AI Upload 1"; - dir = 2 + c_tag = "Bridge - AI Upload 1" }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) @@ -9189,7 +9144,6 @@ "dIw" = ( /obj/machinery/power/apc{ areastring = "/area/security/checkpoint/science"; - dir = 2; name = "Science Checkpoint APC"; pixel_y = -23 }, @@ -9258,8 +9212,7 @@ /area/security/brig) "dKr" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4; - icon_state = "freezer" + dir = 4 }, /obj/machinery/light{ dir = 8 @@ -9614,6 +9567,7 @@ /obj/machinery/airalarm{ pixel_y = 24 }, +/obj/structure/filingcabinet, /turf/open/floor/plasteel, /area/security/main) "dQk" = ( @@ -9652,7 +9606,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /obj/item/kirbyplants/random, @@ -9964,7 +9917,6 @@ }, /obj/machinery/camera{ c_tag = "Medical - Virology Backroom"; - dir = 2; network = list("ss13","Medical") }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ @@ -10496,7 +10448,6 @@ icon_state = "4-8" }, /obj/machinery/airalarm{ - dir = 2; pixel_y = 24 }, /turf/open/floor/plasteel/showroomfloor, @@ -10604,7 +10555,6 @@ /area/medical/virology) "emS" = ( /obj/docking_port/stationary{ - dir = 1; dwidth = 5; height = 7; name = "Cargo Bay"; @@ -10667,7 +10617,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /turf/open/floor/plasteel, @@ -10913,8 +10862,7 @@ "etK" = ( /obj/machinery/camera{ c_tag = "Civilian - Dorm Main 1"; - dir = 4; - network = list("ss13") + dir = 4 }, /obj/machinery/vending/coffee, /turf/open/floor/plasteel, @@ -11402,7 +11350,6 @@ /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; name = "Prison Intercom (General)"; pixel_y = 24; prison_radio = 1 @@ -11664,15 +11611,13 @@ /area/crew_quarters/heads/hor) "eKV" = ( /obj/machinery/computer/aifixer{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 }, /obj/machinery/camera{ c_tag = "Research - Research Director's Office"; - dir = 2; network = list("ss13","Research") }, /turf/open/floor/carpet/purple, @@ -11887,8 +11832,7 @@ pixel_y = 24 }, /obj/machinery/camera{ - c_tag = "Hallway - Central West 2"; - dir = 2 + c_tag = "Hallway - Central West 2" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 @@ -11990,8 +11934,7 @@ req_access_txt = "5" }, /obj/effect/mapping_helpers/airlock/unres{ - dir = 8; - icon_state = "airlock_unres_helper" + dir = 8 }, /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -12173,9 +12116,7 @@ dir = 5 }, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip, /turf/open/floor/plasteel, /area/engine/atmos) "eUs" = ( @@ -12243,7 +12184,6 @@ /obj/structure/table/reinforced, /obj/machinery/computer/security/telescreen{ dir = 4; - icon_state = "telescreen"; name = "Test Chamber Monitor"; network = list("xeno"); pixel_y = 2 @@ -12259,7 +12199,6 @@ icon_state = "4-8" }, /obj/machinery/airalarm{ - dir = 2; pixel_y = 24 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -12367,16 +12306,14 @@ "eXI" = ( /obj/structure/frame/computer{ anchored = 1; - dir = 8; - icon_state = "0" + dir = 8 }, /obj/item/stack/cable_coil/cut, /turf/open/floor/wood, /area/quartermaster/warehouse) "eXN" = ( /obj/machinery/computer/apc_control{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/item/radio/intercom{ pixel_x = -28 @@ -13179,8 +13116,7 @@ /area/engine/atmos) "fra" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - dir = 8; - icon_state = "freezer_1" + dir = 8 }, /turf/open/floor/plasteel/white, /area/science/xenobiology) @@ -13317,7 +13253,6 @@ /area/security/brig) "fsv" = ( /obj/machinery/conveyor{ - dir = 2; id = "NTMSLoad2"; name = "on ramp" }, @@ -13346,9 +13281,7 @@ "ftc" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, /area/engine/atmos) @@ -13367,7 +13300,6 @@ "ftr" = ( /obj/machinery/camera{ c_tag = "Atmospherics - Nitrous Oxide Tank"; - dir = 2; network = list("ss13","Atmospherics") }, /turf/open/floor/engine/n2o{ @@ -13501,24 +13433,19 @@ icon_state = "0-4" }, /obj/item/radio/intercom{ - anyai = 1; freerange = 1; listening = 0; name = "Custom Channel"; pixel_y = -27 }, /obj/item/radio/intercom{ - anyai = 1; - broadcasting = 0; freerange = 1; frequency = 1447; name = "Private Channel"; pixel_y = 20 }, /obj/item/radio/intercom{ - broadcasting = 0; freerange = 1; - listening = 1; name = "Common Channel"; pixel_y = -37 }, @@ -13571,9 +13498,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ dir = 8 }, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip, /turf/open/floor/plasteel, /area/hallway/primary/central) "fvS" = ( @@ -14361,7 +14286,6 @@ c_tag = "Holodeck" }, /obj/machinery/airalarm{ - dir = 2; pixel_y = 24 }, /turf/open/floor/plasteel, @@ -14448,10 +14372,10 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "fOg" = ( -/obj/structure/filingcabinet, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 1 }, +/obj/machinery/computer/department_reward/security, /turf/open/floor/plasteel, /area/security/main) "fOr" = ( @@ -14467,8 +14391,7 @@ /area/crew_quarters/theatre) "fOJ" = ( /obj/machinery/computer/rdservercontrol{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -15139,8 +15062,7 @@ "geq" = ( /obj/structure/frame/computer{ anchored = 1; - dir = 4; - icon_state = "0" + dir = 4 }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/stripes/line{ @@ -15692,14 +15614,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; name = "Prison Intercom (General)"; pixel_x = -2; pixel_y = 25; prison_radio = 1 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "grj" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/engine, @@ -15723,7 +15644,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "grP" = ( /obj/machinery/door/airlock/public/glass{ name = "Dorms" @@ -15937,9 +15858,7 @@ /obj/machinery/newscaster/security_unit{ pixel_x = -32 }, -/obj/machinery/computer/communications{ - dir = 2 - }, +/obj/machinery/computer/communications, /obj/structure/sign/plaques/golden/captain{ pixel_y = 32 }, @@ -15994,9 +15913,7 @@ /area/ai_monitored/secondarydatacore) "gxo" = ( /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, @@ -16320,8 +16237,7 @@ dir = 4 }, /obj/machinery/camera{ - c_tag = "Bridge - Entrance"; - dir = 2 + c_tag = "Bridge - Entrance" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 @@ -17644,7 +17560,6 @@ dir = 4 }, /obj/item/radio/intercom{ - dir = 2; pixel_y = -28 }, /obj/structure/cable{ @@ -17722,7 +17637,6 @@ /obj/machinery/ntnet_relay, /obj/machinery/power/apc{ areastring = "/area/tcommsat/server"; - dir = 2; name = "Telecomms Servers APC"; pixel_y = -23 }, @@ -18296,8 +18210,7 @@ "hBm" = ( /obj/structure/table, /obj/machinery/chem_dispenser/drinks/beer{ - dir = 4; - icon_state = "booze_dispenser" + dir = 4 }, /obj/structure/sign/poster/official/high_class_martini{ pixel_x = -32 @@ -18354,8 +18267,7 @@ }, /obj/machinery/camera{ c_tag = "Telecomms - Hallway North"; - dir = 4; - network = list("ss13") + dir = 4 }, /obj/machinery/light/small{ dir = 8 @@ -18757,8 +18669,7 @@ /area/chapel/office) "hJO" = ( /obj/machinery/computer/shuttle/labor{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/machinery/airalarm{ dir = 1; @@ -18816,9 +18727,7 @@ "hLG" = ( /obj/machinery/washing_machine, /obj/machinery/camera{ - c_tag = "Civilian - Dorm Laundry Room"; - dir = 2; - network = list("ss13") + c_tag = "Civilian - Dorm Laundry Room" }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/dorms) @@ -18954,7 +18863,6 @@ /obj/item/clothing/mask/breath, /obj/machinery/power/apc{ areastring = "/area/medical/genetics/cloning"; - dir = 2; name = "Cloning Lab APC"; pixel_y = -23 }, @@ -19189,8 +19097,7 @@ }, /obj/machinery/camera{ c_tag = "Civilian - Library Main 1"; - dir = 8; - network = list("ss13") + dir = 8 }, /obj/machinery/light_switch{ pixel_x = 24 @@ -19525,7 +19432,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /turf/open/floor/plasteel, @@ -19645,8 +19551,7 @@ /area/maintenance/aft) "igP" = ( /obj/machinery/computer/security/labor{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 @@ -19859,7 +19764,6 @@ /obj/machinery/button/door{ id = "podescape"; name = "Pod Bay Control"; - normaldoorcontrol = 0; pixel_x = 8; pixel_y = 24 }, @@ -19944,7 +19848,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /turf/open/floor/plasteel, @@ -20129,7 +20032,6 @@ /obj/effect/decal/cleanable/dirt, /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; name = "Prison Intercom (General)"; pixel_y = 24; prison_radio = 1 @@ -20312,7 +20214,6 @@ pixel_y = 7 }, /obj/item/flashlight/lamp/green{ - light_on = 0; pixel_x = 6; pixel_y = 6 }, @@ -21067,9 +20968,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "iQu" = ( @@ -21130,8 +21029,7 @@ }, /obj/machinery/camera{ c_tag = "Cargo - Quartermaster's Office"; - dir = 4; - network = list("ss13") + dir = 4 }, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 9 @@ -21310,9 +21208,7 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "0" - }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor/border_only{ dir = 4 }, @@ -21416,8 +21312,7 @@ /area/maintenance/port/fore) "iXv" = ( /obj/machinery/computer/atmos_sim{ - dir = 8; - mode = 1 + dir = 8 }, /obj/machinery/light{ dir = 4 @@ -21549,7 +21444,6 @@ dir = 1 }, /obj/machinery/button/door{ - dir = 2; id = "QMLoaddoor"; layer = 4; name = "Loading Doors"; @@ -21557,8 +21451,7 @@ pixel_y = 24 }, /obj/machinery/camera{ - c_tag = "Cargo - Docking Bay North"; - network = list("ss13") + c_tag = "Cargo - Docking Bay North" }, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -22355,7 +22248,6 @@ /obj/structure/closet/secure_closet/engineering_chief, /obj/machinery/power/apc{ areastring = "/area/crew_quarters/heads/chief"; - dir = 2; name = "Chief Engineer's Office APC"; pixel_y = -23 }, @@ -22510,9 +22402,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip, /turf/open/floor/plasteel, /area/engine/atmos) "jvg" = ( @@ -22892,7 +22782,6 @@ "jCt" = ( /obj/machinery/camera{ c_tag = "Research - Server Room"; - dir = 2; network = list("ss13","Research") }, /obj/machinery/airalarm/server{ @@ -22962,7 +22851,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /obj/machinery/door/firedoor/border_only, @@ -23048,9 +22936,7 @@ /area/library) "jEs" = ( /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip, /obj/effect/turf_decal/trimline/green/filled/corner/lower{ dir = 1 }, @@ -23117,8 +23003,7 @@ /area/quartermaster/storage) "jFz" = ( /obj/structure/particle_accelerator/fuel_chamber{ - dir = 1; - icon_state = "fuel_chamber" + dir = 1 }, /turf/open/floor/engine, /area/engine/engineering) @@ -23576,7 +23461,6 @@ /obj/structure/closet/radiation, /obj/machinery/camera{ c_tag = "Atmospherics - Main 4"; - dir = 2; network = list("ss13","Atmospherics") }, /turf/open/floor/plasteel, @@ -23949,7 +23833,6 @@ "jWo" = ( /obj/machinery/camera{ c_tag = "Research - Xenobiology Cell 3"; - dir = 2; network = list("ss13","Research","Xenobiology") }, /turf/open/floor/engine, @@ -24130,7 +24013,6 @@ /obj/machinery/requests_console{ department = "AI"; departmentType = 5; - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/circuit/telecomms/server, @@ -25038,7 +24920,6 @@ "kvv" = ( /obj/machinery/power/apc{ areastring = "/area/crew_quarters/heads/cmo"; - dir = 2; name = "CMO's Office APC"; pixel_y = -23 }, @@ -25088,7 +24969,6 @@ /obj/structure/lattice, /obj/machinery/camera/motion{ c_tag = "Secure - External Telecomm Sat South"; - dir = 2; network = list("Telecom") }, /turf/open/space/basic, @@ -25099,7 +24979,6 @@ /area/library) "kxJ" = ( /obj/machinery/conveyor{ - dir = 2; id = "NTMSLoad2"; name = "on ramp" }, @@ -25144,8 +25023,7 @@ "kyZ" = ( /obj/machinery/modular_computer/console/preset/engineering, /obj/machinery/camera{ - c_tag = "Bridge - Main 3"; - dir = 2 + c_tag = "Bridge - Main 3" }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 1 @@ -25458,9 +25336,7 @@ /turf/open/floor/plating, /area/ai_monitored/storage/satellite) "kJE" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/wood, @@ -25515,7 +25391,6 @@ dir = 5 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 5 }, /obj/structure/disposalpipe/segment{ @@ -25619,7 +25494,6 @@ "kNH" = ( /obj/machinery/camera{ c_tag = "Research - Experimentor Bay"; - dir = 2; network = list("ss13","Research") }, /turf/open/floor/engine, @@ -25681,9 +25555,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "kPh" = ( @@ -25775,8 +25647,7 @@ /area/maintenance/aft) "kQo" = ( /obj/machinery/camera{ - c_tag = "Bridge - AI Upload 2"; - dir = 2 + c_tag = "Bridge - AI Upload 2" }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai_upload) @@ -25949,7 +25820,6 @@ "kUg" = ( /obj/machinery/power/apc{ areastring = "/area/escapepodbay"; - dir = 2; name = "Podbay APC"; pixel_y = -23 }, @@ -26143,9 +26013,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "kYn" = ( @@ -26611,9 +26479,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ dir = 8 }, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip, /turf/open/floor/plasteel, /area/engine/atmos) "liC" = ( @@ -27282,7 +27148,6 @@ }, /obj/machinery/camera{ c_tag = "Medical - Front Lobby"; - dir = 2; network = list("ss13","Medical") }, /turf/open/floor/plasteel/white, @@ -27331,7 +27196,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /turf/open/floor/plasteel, @@ -27391,8 +27255,7 @@ /area/hallway/secondary/exit/departure_lounge) "lBI" = ( /obj/structure/bodycontainer/morgue{ - dir = 1; - icon_state = "morgue1" + dir = 1 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 6 @@ -27740,7 +27603,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -28700,7 +28562,6 @@ }, /obj/machinery/camera{ c_tag = "Medical - Main"; - dir = 2; network = list("ss13","Medical") }, /turf/open/floor/plasteel/white, @@ -28749,9 +28610,7 @@ dir = 1 }, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/plasteel, @@ -28849,7 +28708,6 @@ "mgV" = ( /obj/machinery/camera{ c_tag = "Atmospherics - Distro Loop"; - dir = 2; network = list("ss13","Atmospherics") }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ @@ -28979,7 +28837,6 @@ "mki" = ( /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay"; - req_access_txt = "0"; req_one_access_txt = "31;48" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -29628,8 +29485,7 @@ /area/library) "mwX" = ( /obj/machinery/computer/telecomms/server{ - dir = 8; - icon_state = "computer" + dir = 8 }, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) @@ -29747,7 +29603,7 @@ pixel_y = 28 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "mzt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -29808,9 +29664,7 @@ "mBf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip, /turf/open/floor/plasteel, /area/engine/atmos) "mBt" = ( @@ -30264,8 +30118,7 @@ /area/quartermaster/storage) "mLX" = ( /obj/machinery/computer/cargo/request{ - dir = 8; - icon_state = "computer" + dir = 8 }, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 5 @@ -30436,7 +30289,6 @@ dir = 5 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 5 }, /obj/machinery/light{ @@ -30649,8 +30501,7 @@ "mTO" = ( /obj/machinery/camera{ c_tag = "Psychiatrist Office"; - dir = 4; - network = list("ss13") + dir = 4 }, /obj/machinery/light_switch{ pixel_x = -23; @@ -31079,9 +30930,7 @@ /turf/open/floor/plasteel, /area/engine/engineering) "naO" = ( -/obj/machinery/light/small/built{ - dir = 2 - }, +/obj/machinery/light/small/built, /turf/open/floor/wood, /area/maintenance/port/fore) "naS" = ( @@ -31223,7 +31072,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /obj/structure/closet/emcloset, @@ -31387,7 +31235,6 @@ "nhR" = ( /obj/machinery/requests_console{ department = "Tool Storage"; - departmentType = 0; pixel_x = -30 }, /turf/open/floor/plasteel, @@ -31678,7 +31525,6 @@ }, /obj/structure/sign/directions/supply{ dir = 1; - icon_state = "direction_supply"; pixel_y = 42 }, /obj/structure/sign/directions/command{ @@ -31923,7 +31769,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /turf/open/floor/plasteel, @@ -32023,8 +31868,7 @@ /obj/machinery/power/solar_control{ dir = 8; id = "aftstarboard"; - name = "Starboard Quarter Solar Control"; - track = 0 + name = "Starboard Quarter Solar Control" }, /obj/structure/cable{ icon_state = "0-2" @@ -32987,9 +32831,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/aft) "nMU" = ( @@ -33320,9 +33162,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "nVx" = ( @@ -33531,7 +33371,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /obj/machinery/door/firedoor/border_only{ @@ -33670,7 +33509,6 @@ dir = 8 }, /obj/machinery/button/door{ - dir = 2; id = "Skynet_launch"; name = "Mech Bay Door Control"; pixel_x = 24; @@ -33784,9 +33622,7 @@ dir = 4 }, /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel, @@ -33887,9 +33723,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/fitness) "ofy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/wood, /area/library) "ofN" = ( @@ -34133,7 +33967,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /obj/structure/closet/emcloset, @@ -34342,7 +34175,6 @@ }, /obj/machinery/camera{ c_tag = "Atmospherics - Incinerator Main 1"; - dir = 2; network = list("ss13","Atmospherics") }, /turf/open/floor/plasteel, @@ -34504,7 +34336,6 @@ }, /obj/machinery/camera{ c_tag = "Atmospherics - Incinerator Access Hall"; - dir = 2; network = list("ss13","Atmospherics") }, /obj/machinery/airalarm{ @@ -34562,8 +34393,7 @@ dir = 1 }, /obj/effect/mapping_helpers/airlock/unres{ - dir = 8; - icon_state = "airlock_unres_helper" + dir = 8 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -34795,9 +34625,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "oCS" = ( @@ -34845,7 +34673,6 @@ "oDF" = ( /obj/machinery/space_heater, /obj/machinery/firealarm{ - dir = 2; pixel_y = 24 }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ @@ -34947,9 +34774,7 @@ /obj/structure/cable{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23 - }, +/obj/machinery/power/apc/auto_name/north, /turf/open/floor/plasteel, /area/engine/engine_smes) "oGB" = ( @@ -34964,7 +34789,6 @@ /area/engine/atmos) "oGK" = ( /obj/machinery/door/window/westleft{ - dir = 8; name = "Monkey Pen"; req_access_txt = "9" }, @@ -35014,8 +34838,7 @@ icon_state = "4-8" }, /obj/effect/mapping_helpers/airlock/unres{ - dir = 8; - icon_state = "airlock_unres_helper" + dir = 8 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -35029,7 +34852,6 @@ }, /obj/machinery/camera{ c_tag = "Atmospherics - Main 3"; - dir = 2; network = list("ss13","Atmospherics") }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ @@ -35642,7 +35464,6 @@ /area/security/courtroom) "oWP" = ( /obj/docking_port/stationary/random{ - dir = 1; name = "lavaland"; shuttle_id = "pod_lavaland2" }, @@ -35770,7 +35591,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "paM" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -36001,7 +35822,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /obj/machinery/camera{ @@ -36070,8 +35890,7 @@ /area/maintenance/disposal/incinerator) "pjJ" = ( /obj/machinery/computer/med_data{ - dir = 8; - icon_state = "computer" + dir = 8 }, /turf/open/floor/carpet, /area/security/detectives_office) @@ -36189,8 +36008,7 @@ /obj/machinery/lapvend, /obj/machinery/camera{ c_tag = "Cargo - Front Lobby"; - dir = 4; - network = list("ss13") + dir = 4 }, /turf/open/floor/plasteel, /area/quartermaster/office) @@ -36346,7 +36164,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -36420,7 +36237,7 @@ icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "prf" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/plasteel, @@ -36589,9 +36406,7 @@ /obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ dir = 4 }, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip, /turf/open/floor/plasteel, /area/engine/atmos) "ptj" = ( @@ -36834,8 +36649,7 @@ /area/engine/engineering) "pze" = ( /obj/machinery/computer/atmos_alert{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ dir = 8 @@ -36894,8 +36708,7 @@ }, /obj/machinery/camera{ c_tag = "Civilian - Tool Storage"; - dir = 4; - network = list("ss13") + dir = 4 }, /obj/structure/cable{ icon_state = "1-4" @@ -37526,7 +37339,6 @@ dir = 1 }, /obj/machinery/airalarm{ - dir = 2; pixel_y = 24 }, /turf/open/floor/plasteel/white, @@ -37596,7 +37408,6 @@ /area/science/research) "pOV" = ( /obj/machinery/door/airlock/maintenance{ - req_access_txt = "0"; req_one_access_txt = "6;12;50" }, /obj/structure/cable{ @@ -37964,9 +37775,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "pXj" = ( @@ -38044,8 +37853,7 @@ /area/crew_quarters/fitness) "pYL" = ( /obj/machinery/modular_computer/console/preset/command{ - dir = 8; - icon_state = "console" + dir = 8 }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 6 @@ -38151,7 +37959,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -38359,8 +38166,7 @@ req_access_txt = "5" }, /obj/effect/mapping_helpers/airlock/unres{ - dir = 8; - icon_state = "airlock_unres_helper" + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -38773,8 +38579,7 @@ "qoh" = ( /obj/structure/table, /obj/machinery/chem_dispenser/drinks{ - dir = 4; - icon_state = "soda_dispenser" + dir = 4 }, /obj/machinery/camera{ c_tag = "Service - Bar Counter"; @@ -39024,9 +38829,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "qsT" = ( @@ -39181,7 +38984,6 @@ }, /obj/machinery/camera{ c_tag = "Engineering - Starboard Aux Solars Access"; - dir = 2; network = list("ss13","Engineering") }, /turf/open/floor/plating, @@ -39249,7 +39051,6 @@ "qxv" = ( /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay"; - req_access_txt = "0"; req_one_access_txt = "31;48" }, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ @@ -39399,9 +39200,7 @@ /obj/effect/turf_decal/trimline/engiyellow/filled/corner/lower{ dir = 4 }, -/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip, /obj/effect/turf_decal/trimline/atmos/warning/lower/corner/flip{ dir = 4 }, @@ -39409,7 +39208,6 @@ /area/engine/atmos) "qAF" = ( /obj/machinery/mineral/stacking_machine{ - input_dir = 4; output_dir = 4; stack_amt = 10 }, @@ -39630,8 +39428,7 @@ /area/maintenance/disposal/incinerator) "qHn" = ( /obj/machinery/computer/mech_bay_power_console{ - dir = 1; - icon_state = "computer" + dir = 1 }, /obj/structure/cable{ icon_state = "0-8" @@ -39653,8 +39450,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/door/airlock/maintenance{ - req_access_txt = "63"; - req_one_access_txt = "0" + req_access_txt = "63" }, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/firedoor/border_only, @@ -40165,13 +39961,11 @@ icon_state = "0-4" }, /obj/machinery/airalarm{ - dir = 2; pixel_y = 24 }, /obj/machinery/camera{ c_tag = "Civilian - Garden Main 1"; - dir = 4; - network = list("ss13") + dir = 4 }, /obj/effect/turf_decal/siding/wideplating, /turf/open/floor/grass, @@ -40250,7 +40044,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /obj/structure/closet/firecloset, @@ -40475,7 +40268,7 @@ pixel_y = 28 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "qZx" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -40560,8 +40353,7 @@ /area/quartermaster/warehouse) "rcJ" = ( /obj/structure/particle_accelerator/particle_emitter/center{ - dir = 1; - icon_state = "emitter_center" + dir = 1 }, /turf/open/floor/engine, /area/engine/engineering) @@ -40600,7 +40392,6 @@ "rdK" = ( /obj/machinery/power/apc{ areastring = "/area/security/brig"; - dir = 2; name = "Brig APC"; pixel_y = -23 }, @@ -40725,7 +40516,6 @@ "rgs" = ( /obj/structure/sign/directions/command{ dir = 4; - icon_state = "direction_bridge"; pixel_x = 32; pixel_y = 24 }, @@ -40735,7 +40525,6 @@ }, /obj/structure/sign/directions/security{ dir = 4; - icon_state = "direction_sec"; pixel_x = 32; pixel_y = 32 }, @@ -41545,7 +41334,6 @@ /obj/structure/bed, /obj/machinery/camera{ c_tag = "Medical - Virology Isolation A"; - dir = 2; network = list("ss13","Medical","Virology") }, /obj/item/bedsheet/medical/virology, @@ -41557,8 +41345,7 @@ /area/maintenance/disposal/incinerator) "rAA" = ( /obj/machinery/camera{ - c_tag = "Telecomms - Observatory"; - dir = 2 + c_tag = "Telecomms - Observatory" }, /turf/open/floor/wood, /area/tcommsat/computer) @@ -41861,7 +41648,6 @@ /obj/structure/table, /obj/machinery/camera{ c_tag = "Medical - Virology Isolation B"; - dir = 2; network = list("ss13","Medical","Virology") }, /turf/open/floor/plasteel/white, @@ -42074,7 +41860,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -42755,8 +42540,7 @@ /obj/effect/turf_decal/siding/wood, /obj/machinery/camera{ c_tag = "Civilian - Library Main 2"; - dir = 8; - network = list("ss13") + dir = 8 }, /turf/open/floor/wood, /area/library) @@ -42931,7 +42715,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /turf/open/floor/plasteel, @@ -43520,8 +43303,7 @@ /area/hallway/primary/central) "sve" = ( /obj/machinery/computer/station_alert{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/machinery/requests_console{ department = "Atmospherics"; @@ -43895,7 +43677,6 @@ "sAQ" = ( /obj/machinery/camera{ c_tag = "Security - Cell 1"; - dir = 2; network = list("ss13","Security") }, /obj/machinery/computer/secure_data, @@ -44138,9 +43919,7 @@ /area/crew_quarters/kitchen) "sEq" = ( /obj/structure/table, -/obj/item/clothing/head/that{ - throwforce = 1 - }, +/obj/item/clothing/head/that, /obj/item/toy/figure/bartender, /obj/structure/sign/plaques/deempisi{ pixel_y = 24 @@ -44223,7 +44002,6 @@ /obj/structure/cable, /obj/machinery/power/apc/highcap/ten_k{ areastring = "/area/engine/engineering"; - dir = 2; name = "Engine Room APC"; pixel_y = -23 }, @@ -44501,9 +44279,7 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/power/apc/auto_name/north{ - pixel_y = 23 - }, +/obj/machinery/power/apc/auto_name/north, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "sMI" = ( @@ -44725,7 +44501,6 @@ dir = 4 }, /obj/machinery/airalarm{ - dir = 2; pixel_y = 24 }, /turf/open/floor/plasteel, @@ -44877,7 +44652,6 @@ /obj/machinery/reagentgrinder, /obj/structure/table/wood, /obj/machinery/airalarm{ - dir = 2; pixel_y = 24 }, /turf/open/floor/wood, @@ -45459,8 +45233,7 @@ /area/tcommsat/server) "tiq" = ( /obj/machinery/camera{ - c_tag = "Hallway - Central Southeast 1"; - dir = 2 + c_tag = "Hallway - Central Southeast 1" }, /turf/open/floor/plasteel, /area/hallway/primary/central) @@ -46197,8 +45970,7 @@ /area/science/robotics/lab) "tyd" = ( /obj/machinery/computer/robotics{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -46567,7 +46339,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -46657,7 +46428,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /obj/structure/disposalpipe/segment, @@ -47127,7 +46897,6 @@ /obj/structure/closet/l3closet, /obj/machinery/camera{ c_tag = "Medical - Virology Airlock"; - dir = 2; network = list("ss13","Medical") }, /obj/effect/turf_decal/stripes/line{ @@ -47167,7 +46936,6 @@ "tSn" = ( /obj/machinery/power/apc{ areastring = "/area/science/research"; - dir = 2; name = "Science Main APC"; pixel_y = -23 }, @@ -47423,8 +47191,7 @@ /obj/machinery/light, /obj/machinery/camera{ c_tag = "Civilian - Garden Main 2"; - dir = 1; - network = list("ss13") + dir = 1 }, /turf/open/floor/grass, /area/hydroponics/garden) @@ -47591,8 +47358,7 @@ /area/medical/virology) "ubf" = ( /obj/machinery/computer/rdconsole/robotics{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/machinery/light{ dir = 8 @@ -47618,8 +47384,7 @@ }, /obj/machinery/camera{ c_tag = "Cargo - Disposals Office"; - dir = 8; - network = list("ss13") + dir = 8 }, /turf/open/floor/plasteel, /area/quartermaster/sorting) @@ -47838,8 +47603,7 @@ /area/engine/engineering) "ufk" = ( /obj/structure/particle_accelerator/particle_emitter/right{ - dir = 1; - icon_state = "emitter_right" + dir = 1 }, /turf/open/floor/engine, /area/engine/engineering) @@ -48297,7 +48061,6 @@ /area/solar/starboard/fore) "uqn" = ( /obj/machinery/airalarm{ - dir = 2; pixel_y = 24 }, /turf/open/floor/carpet, @@ -48370,9 +48133,7 @@ icon_state = "1-4" }, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "urW" = ( @@ -48385,7 +48146,6 @@ /obj/item/clothing/head/wig/random, /obj/machinery/power/apc{ areastring = "/area/crew_quarters/theatre"; - dir = 2; name = "Theatre APC"; pixel_y = -23 }, @@ -48702,7 +48462,6 @@ icon_state = "2-8" }, /obj/machinery/requests_console{ - announcementConsole = 0; department = "Engineering"; departmentType = 4; name = "Engineering RC"; @@ -48863,7 +48622,6 @@ icon_state = "1-8" }, /obj/item/radio/intercom{ - dir = 2; pixel_y = -28 }, /obj/machinery/camera{ @@ -49315,7 +49073,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /obj/structure/disposalpipe/segment{ @@ -49443,8 +49200,7 @@ /area/medical/psych) "uQm" = ( /obj/machinery/computer/mecha{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/structure/window/reinforced{ dir = 8 @@ -49668,8 +49424,7 @@ /area/engine/atmos) "uUo" = ( /obj/machinery/computer/message_monitor{ - dir = 4; - icon_state = "computer" + dir = 4 }, /obj/machinery/light{ dir = 8 @@ -49961,8 +49716,7 @@ dir = 1 }, /obj/machinery/power/terminal{ - dir = 8; - icon_state = "term" + dir = 8 }, /obj/structure/cable{ icon_state = "0-4" @@ -51053,9 +50807,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "vAs" = ( @@ -51487,8 +51239,7 @@ }, /obj/machinery/camera{ c_tag = "Civilian - Commissary"; - dir = 1; - network = list("ss13") + dir = 1 }, /turf/open/floor/plasteel, /area/vacant_room/commissary) @@ -51810,8 +51561,7 @@ pixel_y = 24 }, /obj/machinery/camera{ - c_tag = "Bridge - Breakroom"; - dir = 2 + c_tag = "Bridge - Breakroom" }, /obj/effect/turf_decal/trimline/dark_blue/filled/line/lower{ dir = 1 @@ -52337,7 +52087,6 @@ "wcK" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ - dir = 2; id = "NTMSLoad2"; name = "on ramp" }, @@ -52602,8 +52351,7 @@ }, /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; - req_access_txt = "63"; - req_one_access_txt = "0" + req_access_txt = "63" }, /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -52614,7 +52362,6 @@ "wjm" = ( /obj/machinery/camera{ c_tag = "Research - Xenobiology Cell 2"; - dir = 2; network = list("ss13","Research","Xenobiology") }, /turf/open/floor/engine, @@ -52782,7 +52529,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/machinery/camera{ c_tag = "Research - Xenobiology Northen Kill Chamber"; - dir = 2; network = list("ss13","Research","Xenobiology") }, /turf/open/floor/circuit/telecomms, @@ -52827,7 +52573,6 @@ "wpc" = ( /obj/structure/table, /obj/machinery/button/massdriver{ - dir = 2; id = "toxinsdriver"; pixel_x = 5 }, @@ -52903,8 +52648,7 @@ /area/bridge) "wqF" = ( /obj/structure/particle_accelerator/end_cap{ - dir = 1; - icon_state = "end_cap" + dir = 1 }, /turf/open/floor/engine, /area/engine/engineering) @@ -52951,8 +52695,7 @@ /area/bridge) "wsx" = ( /obj/machinery/computer/cargo{ - dir = 8; - icon_state = "computer" + dir = 8 }, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ dir = 6 @@ -53234,8 +52977,7 @@ "wwP" = ( /obj/structure/frame/computer{ anchored = 1; - dir = 8; - icon_state = "0" + dir = 8 }, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -53606,7 +53348,6 @@ /area/science/research) "wDU" = ( /obj/machinery/button/door{ - dir = 2; id = "engsm"; name = "Radiation Shutters Control"; pixel_y = 24; @@ -54010,7 +53751,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /obj/machinery/door/firedoor/border_only, @@ -54323,7 +54063,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /obj/item/kirbyplants/random, @@ -54449,7 +54188,6 @@ "wVz" = ( /obj/machinery/camera{ c_tag = "Research - Xenobiology Cell 1"; - dir = 2; network = list("ss13","Research","Xenobiology") }, /turf/open/floor/engine, @@ -54604,8 +54342,7 @@ dir = 6 }, /obj/machinery/camera{ - c_tag = "Bridge - Captain's Private Quarters"; - dir = 2 + c_tag = "Bridge - Captain's Private Quarters" }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 @@ -54777,9 +54514,7 @@ /area/maintenance/port/aft) "xcY" = ( /obj/machinery/camera{ - c_tag = "Civilian - Crematorium"; - dir = 2; - network = list("ss13") + c_tag = "Civilian - Crematorium" }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -54911,7 +54646,6 @@ /area/storage/primary) "xgb" = ( /obj/docking_port/stationary{ - dir = 1; dwidth = 3; height = 5; name = "mining shuttle bay"; @@ -55356,7 +55090,6 @@ /area/security/detectives_office) "xno" = ( /obj/machinery/requests_console{ - announcementConsole = 0; department = "Medbay"; departmentType = 1; name = "Medbay RC"; @@ -55443,7 +55176,6 @@ }, /obj/machinery/requests_console{ department = "Mining"; - departmentType = 0; pixel_y = 30 }, /obj/effect/turf_decal/trimline/brown/filled/line/lower{ @@ -55532,7 +55264,6 @@ "xrd" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/northleft{ - dir = 1; name = "Engineering Desk"; req_one_access_txt = "32;19" }, @@ -55624,11 +55355,10 @@ icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "xsb" = ( /obj/machinery/camera{ - c_tag = "Hallway - Central West 1"; - dir = 2 + c_tag = "Hallway - Central West 1" }, /obj/structure/sign/directions/medical{ dir = 8; @@ -55640,7 +55370,6 @@ }, /obj/structure/sign/directions/evac{ dir = 8; - icon_state = "direction_evac"; pixel_y = 42 }, /obj/effect/turf_decal/trimline/engiyellow/filled/line/lower{ @@ -56308,8 +56037,7 @@ /obj/structure/closet/wardrobe/green, /obj/machinery/camera{ c_tag = "Civilian - Dorm Main 2"; - dir = 4; - network = list("ss13") + dir = 4 }, /turf/open/floor/plasteel, /area/crew_quarters/dorms) @@ -56342,8 +56070,7 @@ /area/security/brig) "xIF" = ( /obj/structure/particle_accelerator/particle_emitter/left{ - dir = 1; - icon_state = "emitter_left" + dir = 1 }, /turf/open/floor/engine, /area/engine/engineering) @@ -57233,12 +56960,11 @@ }, /obj/machinery/camera{ c_tag = "Security - Cell 2"; - dir = 2; network = list("ss13","Security") }, /obj/item/bedsheet/prisoner, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "xZI" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -57396,7 +57122,6 @@ "ycE" = ( /obj/machinery/camera{ c_tag = "Research - Toxins Main 2"; - dir = 2; network = list("ss13","Research") }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -57423,7 +57148,6 @@ "ycU" = ( /obj/machinery/power/apc{ areastring = "/area/medical/chemistry"; - dir = 2; name = "Chemistry APC"; pixel_y = -23 }, @@ -57612,7 +57336,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /obj/machinery/door/firedoor/border_only{ @@ -57629,7 +57352,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -102218,7 +101940,7 @@ wNb jzR cuQ pqT -vra +aDe qZs aVd gUR @@ -102472,10 +102194,10 @@ tub jzR xcE grK -vra +aDe mzd aVd -vra +aDe gri pas gUR @@ -102729,7 +102451,7 @@ lsL vra xYV aVd -vra +aDe gri pas vra diff --git a/_maps/map_files/GaxStation/GaxStation.dmm b/_maps/map_files/GaxStation/GaxStation.dmm index fcc9b740c0af..4e2c5171e79e 100644 --- a/_maps/map_files/GaxStation/GaxStation.dmm +++ b/_maps/map_files/GaxStation/GaxStation.dmm @@ -265,7 +265,6 @@ /area/ai_monitored/turret_protected/ai_upload) "afI" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 2; on = 1 }, /turf/open/floor/plasteel/dark, @@ -3203,7 +3202,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /turf/open/floor/plasteel, @@ -3669,9 +3667,7 @@ /area/chapel/office) "bPR" = ( /obj/structure/closet/firecloset, -/obj/effect/turf_decal/stripes/line{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/line, /obj/machinery/light, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -4169,9 +4165,7 @@ /area/bridge) "caE" = ( /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "caI" = ( @@ -5289,7 +5283,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -5448,7 +5441,6 @@ /area/medical/sleeper) "cEl" = ( /obj/structure/sign/departments/minsky/engineering/atmospherics{ - pixel_x = 0; pixel_y = 32 }, /obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2, @@ -5951,9 +5943,7 @@ "cPM" = ( /obj/machinery/light, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "cPQ" = ( @@ -6246,8 +6236,7 @@ /area/science/robotics/lab) "cXz" = ( /obj/structure/sign/departments/minsky/research/genetics{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/turf_decal/trimline/purple/filled/line/lower{ dir = 8 @@ -6374,7 +6363,7 @@ dir = 9 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "dal" = ( /obj/machinery/door/airlock/research/glass{ name = "Kill Chamber"; @@ -7240,7 +7229,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -7812,8 +7800,7 @@ "dJQ" = ( /obj/machinery/oven, /obj/machinery/camera{ - c_tag = "Kitchen"; - dir = 2 + c_tag = "Kitchen" }, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -8194,14 +8181,12 @@ }, /obj/machinery/camera{ c_tag = "Escape Southeast"; - dir = 9; - network = list("ss13") + dir = 9 }, /obj/effect/turf_decal/trimline/white/filled/line/lower{ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /obj/effect/turf_decal/stripes/corner, @@ -8335,8 +8320,7 @@ /area/maintenance/department/eva) "dYQ" = ( /obj/item/radio/intercom{ - pixel_x = 29; - pixel_y = 0 + pixel_x = 29 }, /obj/machinery/button/massdriver{ id = "toxinsdriver"; @@ -8387,7 +8371,7 @@ pixel_x = -24 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "eal" = ( /obj/effect/decal/cleanable/blood/gibs/old, /obj/effect/decal/cleanable/dirt, @@ -8909,8 +8893,7 @@ /area/hallway/primary/port) "emj" = ( /obj/machinery/camera{ - c_tag = "Kitchen"; - dir = 2 + c_tag = "Kitchen" }, /obj/machinery/firealarm{ pixel_y = 28 @@ -8932,7 +8915,6 @@ layer = 4; name = "Test Chamber Telescreen"; network = list("toxins"); - pixel_x = 0; pixel_y = -30 }, /turf/open/floor/plasteel, @@ -9275,8 +9257,7 @@ /obj/machinery/camera{ c_tag = "Medbay North"; dir = 5; - network = list("ss13","medbay"); - pixel_x = 0 + network = list("ss13","medbay") }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 @@ -9711,7 +9692,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /turf/open/floor/plasteel, @@ -10445,7 +10425,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /turf/open/floor/plasteel, @@ -11287,8 +11266,7 @@ /obj/machinery/camera{ c_tag = "Surgery Operating"; dir = 9; - network = list("ss13","medbay"); - pixel_x = 0 + network = list("ss13","medbay") }, /obj/machinery/light_switch{ pixel_x = 24 @@ -13211,7 +13189,6 @@ pixel_x = 28 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -13437,8 +13414,7 @@ }, /obj/effect/turf_decal/trimline/purple/filled/end, /obj/machinery/computer/atmos_sim{ - dir = 1; - mode = 1 + dir = 1 }, /turf/open/floor/plasteel/white, /area/science/mixing) @@ -14002,7 +13978,6 @@ "gBR" = ( /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; - req_access_txt = "0"; req_one_access_txt = "1; 63" }, /obj/machinery/door/firedoor/border_only{ @@ -14832,7 +14807,6 @@ /obj/item/radio/intercom{ dir = 4; name = "Station Intercom (General)"; - pixel_x = 0; pixel_y = 27 }, /turf/open/floor/plasteel/dark, @@ -15123,7 +15097,6 @@ /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_exterior"; name = "Physical Core Access"; - req_access_txt = "0"; req_one_access_txt = "30, 70" }, /turf/open/floor/plating, @@ -15624,7 +15597,6 @@ "hrX" = ( /obj/structure/table, /obj/structure/reagent_dispensers/virusfood{ - pixel_x = 0; pixel_y = 30 }, /obj/effect/turf_decal/trimline/green/filled/line/lower{ @@ -15814,9 +15786,7 @@ icon_state = "4-8" }, /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "hwC" = ( @@ -16235,7 +16205,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -16621,7 +16590,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /turf/open/floor/plasteel, @@ -17019,7 +16987,6 @@ }, /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /turf/open/floor/plasteel, @@ -19325,7 +19292,7 @@ icon_state = "2-4" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "jjH" = ( /obj/effect/turf_decal/bot_white/left, /turf/open/floor/plasteel/dark, @@ -19834,7 +19801,7 @@ name = "Cell 3 Locker" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "jxA" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor/border_only{ @@ -19919,8 +19886,7 @@ pixel_y = -28 }, /obj/machinery/computer/atmos_sim{ - dir = 8; - mode = 1 + dir = 8 }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) @@ -20026,7 +19992,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /turf/open/floor/plasteel, @@ -20302,7 +20267,6 @@ pixel_x = 32 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel/dark, @@ -20348,7 +20312,6 @@ /obj/machinery/light, /obj/effect/turf_decal/trimline/brown/filled/line/lower, /obj/structure/sign/departments/minsky/supply/cargo{ - pixel_x = 0; pixel_y = -32 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -21503,7 +21466,7 @@ icon_state = "1-8" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "knb" = ( /obj/machinery/chem_heater, /turf/open/floor/plasteel/white, @@ -22740,7 +22703,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /turf/open/floor/plasteel, @@ -25065,7 +25027,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /turf/open/floor/plasteel, @@ -25406,7 +25367,6 @@ }, /obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /turf/open/floor/plasteel, @@ -25970,7 +25930,6 @@ "mxY" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green{ - light_on = 0; pixel_x = -6; pixel_y = 8 }, @@ -26080,8 +26039,7 @@ /obj/machinery/camera{ c_tag = "Surgery Observation"; dir = 5; - network = list("ss13","medbay"); - pixel_x = 0 + network = list("ss13","medbay") }, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) @@ -26505,8 +26463,7 @@ /obj/machinery/camera{ c_tag = "Engineering Supermatter Fore"; dir = 6; - network = list("ss13","engine"); - pixel_x = 0 + network = list("ss13","engine") }, /turf/open/floor/engine, /area/engine/engineering) @@ -27509,7 +27466,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -27633,9 +27589,7 @@ }, /obj/effect/turf_decal/trimline/white/filled/line/lower, /obj/machinery/light, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /turf/open/floor/plasteel, /area/hallway/secondary/exit) "nsK" = ( @@ -29833,6 +29787,9 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/machinery/computer/department_reward/security{ + dir = 8 + }, /turf/open/floor/plasteel, /area/security/main) "ozt" = ( @@ -30589,7 +30546,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -31799,7 +31755,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /turf/open/floor/plasteel, @@ -32167,7 +32122,6 @@ "pHK" = ( /obj/machinery/door/airlock/maintenance{ name = "Security Maintenance"; - req_access_txt = "0"; req_one_access_txt = "1; 63" }, /obj/machinery/door/firedoor/border_only{ @@ -32461,7 +32415,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /turf/open/floor/plasteel, @@ -33365,7 +33318,7 @@ pixel_x = -24 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "qiG" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -34637,9 +34590,7 @@ /area/medical/genetics/cloning) "qTj" = ( /obj/effect/turf_decal/trimline/white/filled/line/lower, -/obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220 - }, +/obj/effect/turf_decal/trimline/secred/warning/lower, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -35151,7 +35102,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "rfN" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/firedoor/border_only{ @@ -36008,7 +35959,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /turf/open/floor/plasteel, @@ -37057,7 +37007,6 @@ dir = 8 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 8 }, /turf/open/floor/plasteel, @@ -37371,7 +37320,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower/corner/flip{ @@ -38387,7 +38335,6 @@ "sKm" = ( /obj/effect/turf_decal/trimline/brown/filled/line/lower, /obj/structure/sign/departments/minsky/supply/cargo{ - pixel_x = 0; pixel_y = -32 }, /turf/open/floor/plasteel, @@ -39361,7 +39308,6 @@ dir = 10 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 10 }, /turf/open/floor/plasteel, @@ -39506,8 +39452,7 @@ /area/teleporter) "tjM" = ( /obj/structure/sign/departments/minsky/security/security{ - pixel_x = 32; - pixel_y = 0 + pixel_x = 32 }, /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 4 @@ -39554,6 +39499,9 @@ /obj/effect/turf_decal/trimline/brown/filled/corner/lower, /turf/open/floor/plasteel, /area/quartermaster/office) +"tkN" = ( +/turf/closed/wall, +/area/security/brig_cell) "tlg" = ( /turf/open/floor/plating, /area/maintenance/department/science/central) @@ -39585,7 +39533,6 @@ dir = 1 }, /obj/structure/sign/departments/minsky/research/genetics{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel, @@ -41037,7 +40984,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -41348,8 +41294,7 @@ /area/security/checkpoint/customs) "uiR" = ( /obj/structure/sign/departments/minsky/medical/medical2{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/effect/turf_decal/trimline/blue/filled/line/lower{ dir = 8 @@ -41769,7 +41714,6 @@ dir = 1 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 1 }, /turf/open/floor/plasteel, @@ -41907,8 +41851,7 @@ /area/science/xenobiology) "uAj" = ( /obj/structure/sign/departments/minsky/medical/medical2{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /obj/machinery/light{ dir = 8 @@ -42298,7 +42241,6 @@ pixel_y = 3 }, /obj/machinery/vending/wallgene{ - pixel_x = 0; pixel_y = 28 }, /turf/open/floor/plasteel/white, @@ -43161,7 +43103,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -44051,7 +43992,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -45337,7 +45277,6 @@ dir = 4 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -45353,8 +45292,7 @@ dir = 4 }, /obj/machinery/camera{ - c_tag = "Theatre Stage"; - dir = 2 + c_tag = "Theatre Stage" }, /turf/open/floor/wood, /area/crew_quarters/theatre) @@ -47071,7 +47009,6 @@ /obj/machinery/door/airlock/command/glass{ id_tag = "secondary_aicore_interior"; name = "Physical Core Access"; - req_access_txt = "0"; req_one_access_txt = "30, 70" }, /turf/open/floor/plating, @@ -48325,7 +48262,6 @@ dir = 1 }, /obj/structure/sign/departments/minsky/medical/medical2{ - pixel_x = 0; pixel_y = 32 }, /turf/open/floor/plasteel, @@ -48347,7 +48283,6 @@ dir = 5 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 5 }, /turf/open/floor/plasteel, @@ -48635,7 +48570,6 @@ pixel_x = 32 }, /obj/effect/turf_decal/trimline/secred/warning/lower{ - alpha = 220; dir = 4 }, /turf/open/floor/plasteel, @@ -49634,7 +49568,7 @@ icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "yge" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -74118,8 +74052,8 @@ hdw rBc mqx ycy -ycy -ycy +tkN +tkN qBn emd lmD @@ -75146,8 +75080,8 @@ wfe aBl wiJ qBn -ycy -ycy +tkN +tkN qBn kwC fCP diff --git a/_maps/map_files/IceMeta/IceMeta.dmm b/_maps/map_files/IceMeta/IceMeta.dmm index 5990a4418afe..6081ab1617e1 100644 --- a/_maps/map_files/IceMeta/IceMeta.dmm +++ b/_maps/map_files/IceMeta/IceMeta.dmm @@ -2499,7 +2499,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "aMq" = ( /obj/machinery/door/poddoor/shutters{ id = "Skynet_launch"; @@ -11951,7 +11951,7 @@ dir = 5 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "dzV" = ( /obj/structure/table, /obj/item/storage/firstaid/regular{ @@ -12105,7 +12105,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "dCG" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -13392,9 +13392,7 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/west{ - pixel_x = -25 - }, +/obj/machinery/power/apc/auto_name/west, /turf/open/floor/plasteel, /area/engine/engine_smes) "dWi" = ( @@ -13780,7 +13778,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "eco" = ( /turf/open/floor/circuit/green, /area/science/robotics/mechbay) @@ -20161,7 +20159,7 @@ /obj/effect/decal/cleanable/dirt, /obj/item/bedsheet/prisoner, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "fYg" = ( /obj/machinery/requests_console{ announcementConsole = 1; @@ -21025,7 +21023,7 @@ dir = 8 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "gjH" = ( /obj/structure/table, /obj/item/toner, @@ -21366,7 +21364,7 @@ dir = 4 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "gov" = ( /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 @@ -23393,8 +23391,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /obj/machinery/computer/atmos_sim{ - dir = 4; - mode = 1 + dir = 4 }, /turf/open/floor/plasteel, /area/science/mixing) @@ -32303,6 +32300,7 @@ /obj/effect/turf_decal/trimline/secred/filled/line/lower{ dir = 8 }, +/obj/machinery/computer/department_reward/security, /turf/open/floor/plasteel, /area/security/main) "jvl" = ( @@ -33710,7 +33708,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "jPB" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -34116,7 +34114,7 @@ dir = 5 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "jWr" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Cargo Bay Bridge Access" @@ -51441,8 +51439,7 @@ "oPd" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/computer/atmos_sim{ - dir = 4; - mode = 1 + dir = 4 }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) @@ -57909,6 +57906,9 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/cmo) +"qHR" = ( +/turf/closed/wall, +/area/security/brig_cell) "qHT" = ( /obj/structure/cable{ icon_state = "4-8" @@ -61202,7 +61202,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "rJq" = ( /obj/structure/window/reinforced, /obj/structure/table, @@ -62494,9 +62494,7 @@ /turf/open/floor/plasteel/white, /area/medical/sleeper) "san" = ( -/obj/machinery/airalarm/directional/west{ - pixel_x = -24 - }, +/obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -75534,7 +75532,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "vGd" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -81844,7 +81842,7 @@ dir = 9 }, /turf/open/floor/plasteel, -/area/security/brig) +/area/security/brig_cell) "xti" = ( /obj/machinery/atmospherics/pipe/manifold/yellow/visible{ dir = 4 @@ -241941,8 +241939,8 @@ suD aoc mdB ulr -ulr -ulr +qHR +qHR qin aqS cMp @@ -242969,8 +242967,8 @@ suD aoc cyq ulr -ulr -ulr +qHR +qHR qin gQX qcv From 77949ffe491b815b743e6d668854f14ff51fd167 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 02:58:06 -0400 Subject: [PATCH 09/26] biome suggestions --- code/modules/research/reward_system/security.dm | 4 ++-- tgui/packages/tgui/interfaces/DepartmentReward.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/research/reward_system/security.dm b/code/modules/research/reward_system/security.dm index 2eb95b8d9533..1353abc9bc01 100644 --- a/code/modules/research/reward_system/security.dm +++ b/code/modules/research/reward_system/security.dm @@ -19,7 +19,7 @@ var/list/cell_humans = cell.get_all_contents_type(/mob/living/carbon/human) for(var/mob/living/carbon/human/guy as anything in cell_humans) if(guy.real_name in criminals) - . += delta_time * 10 // 600 points per minute of captured criminal + . += delta_time * 2.1 // 126 points per minute of captured criminal CHECK_TICK // Perma prisoners with no access @@ -29,5 +29,5 @@ var/obj/item/idcard = guy.get_idcard() var/access = idcard?.GetAccess() if(access == null || length(access) == 0) - . += delta_time * 10 // 600 points per minute of captured criminal + . += delta_time * 2.1 // 126 points per minute of captured criminal CHECK_TICK diff --git a/tgui/packages/tgui/interfaces/DepartmentReward.tsx b/tgui/packages/tgui/interfaces/DepartmentReward.tsx index a2a10c208efa..653ebc3c068e 100644 --- a/tgui/packages/tgui/interfaces/DepartmentReward.tsx +++ b/tgui/packages/tgui/interfaces/DepartmentReward.tsx @@ -34,7 +34,7 @@ export const DepartmentReward = (props, context) => { fontSize={1} height={7} fill - backgroundColor='blue' + backgroundColor='grey' key={'node'+index}> From 96e9a279ec55b35078291501e040d91a324dc45a Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 02:59:23 -0400 Subject: [PATCH 10/26] add desc --- code/modules/research/reward_system/security.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/research/reward_system/security.dm b/code/modules/research/reward_system/security.dm index 1353abc9bc01..1c56d75b3c96 100644 --- a/code/modules/research/reward_system/security.dm +++ b/code/modules/research/reward_system/security.dm @@ -1,5 +1,6 @@ /obj/machinery/computer/department_reward/security name = "departmental research console (Security)" + desc = "A primitive version of the famous R&D console used to unlock department-relevant research. This one is powered by incarcerated criminals." department_display = "Security" /obj/machinery/computer/department_reward/security/Initialize(mapload) From 461ef3e7dd3402f01419a93f9b0cca1d552f0d4d Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 03:00:23 -0400 Subject: [PATCH 11/26] add special board --- .../objects/items/circuitboards/computer_circuitboards.dm | 5 +++++ code/modules/research/reward_system/security.dm | 1 + 2 files changed, 6 insertions(+) diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 6722353bb8f1..f693302f1730 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -181,6 +181,11 @@ greyscale_colors = CIRCUIT_COLOR_GENERIC build_path = /obj/machinery/computer/department_reward +/obj/item/circuitboard/computer/department_reward + name = "Departmental Research Console (Security) (Computer Board)" + greyscale_colors = CIRCUIT_COLOR_SECURITY + build_path = /obj/machinery/computer/department_reward/security + /obj/item/circuitboard/computer/arcade/amputation name = "Mediborg's Amputation Adventure (Computer Board)" greyscale_colors = CIRCUIT_COLOR_GENERIC diff --git a/code/modules/research/reward_system/security.dm b/code/modules/research/reward_system/security.dm index 1c56d75b3c96..824f27784233 100644 --- a/code/modules/research/reward_system/security.dm +++ b/code/modules/research/reward_system/security.dm @@ -2,6 +2,7 @@ name = "departmental research console (Security)" desc = "A primitive version of the famous R&D console used to unlock department-relevant research. This one is powered by incarcerated criminals." department_display = "Security" + circuit = /obj/item/circuitboard/computer/department_reward/security /obj/machinery/computer/department_reward/security/Initialize(mapload) nodes_available = GLOB.security_nodes From 7413416d6a8ceddf475e17d16284d32b9548376b Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 03:01:10 -0400 Subject: [PATCH 12/26] revert whitespace change --- code/game/machinery/doors/brigdoors.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 4dbe5724e2a0..fe12396a1ff7 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -157,7 +157,7 @@ playsound(loc, 'sound/machines/ping.ogg', 50, 1) else if(!desired_name) say("No prisoner name inputted, security record not updated.") - + return 1 From dbc32c9599c59360a8e5cdd5eaa7a2ee87faebf3 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 03:12:41 -0400 Subject: [PATCH 13/26] oops --- code/modules/research/reward_system/security.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/reward_system/security.dm b/code/modules/research/reward_system/security.dm index 824f27784233..26528ee01024 100644 --- a/code/modules/research/reward_system/security.dm +++ b/code/modules/research/reward_system/security.dm @@ -15,7 +15,7 @@ var/list/criminals = list() for(var/obj/machinery/door_timer/timer in SSmachines.processing) if(timer.timing && timer.desired_name) - timer.desired_name += criminals + criminals += timer.desired_name CHECK_TICK for(var/area/security/brig_cell/cell in GLOB.the_station_areas) var/list/cell_humans = cell.get_all_contents_type(/mob/living/carbon/human) From 71c7521e4a4e8241f8114e01e100f990b97c81a9 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 03:14:07 -0400 Subject: [PATCH 14/26] Update computer_circuitboards.dm --- code/game/objects/items/circuitboards/computer_circuitboards.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index f693302f1730..362e4a31e1c3 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -181,7 +181,7 @@ greyscale_colors = CIRCUIT_COLOR_GENERIC build_path = /obj/machinery/computer/department_reward -/obj/item/circuitboard/computer/department_reward +/obj/item/circuitboard/computer/department_reward/security name = "Departmental Research Console (Security) (Computer Board)" greyscale_colors = CIRCUIT_COLOR_SECURITY build_path = /obj/machinery/computer/department_reward/security From 9e1ffefc920ff316f59ae3c0ec6d235a6c69131b Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 03:36:07 -0400 Subject: [PATCH 15/26] the_station_areas is actually just a list of types --- code/modules/research/reward_system/security.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/research/reward_system/security.dm b/code/modules/research/reward_system/security.dm index 26528ee01024..98cf3864d4e6 100644 --- a/code/modules/research/reward_system/security.dm +++ b/code/modules/research/reward_system/security.dm @@ -17,19 +17,19 @@ if(timer.timing && timer.desired_name) criminals += timer.desired_name CHECK_TICK - for(var/area/security/brig_cell/cell in GLOB.the_station_areas) + for(var/area/security/brig_cell/cell in GLOB.areas) var/list/cell_humans = cell.get_all_contents_type(/mob/living/carbon/human) for(var/mob/living/carbon/human/guy as anything in cell_humans) - if(guy.real_name in criminals) + if(guy.real_name in criminals && guy.stat == CONSCIOUS) . += delta_time * 2.1 // 126 points per minute of captured criminal CHECK_TICK // Perma prisoners with no access - for(var/area/security/prison/perma in GLOB.the_station_areas) + for(var/area/security/prison/perma in GLOB.areas) var/list/permad_humans = perma.get_all_contents_type(/mob/living/carbon/human) for(var/mob/living/carbon/human/guy as anything in permad_humans) var/obj/item/idcard = guy.get_idcard() var/access = idcard?.GetAccess() - if(access == null || length(access) == 0) + if(access == null || length(access) == 0 && guy.stat == CONSCIOUS) . += delta_time * 2.1 // 126 points per minute of captured criminal CHECK_TICK From 933ae2a3949ba2c0264bae1c468cf2210c5c125c Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 03:37:16 -0400 Subject: [PATCH 16/26] make sure guy is crew --- code/modules/research/reward_system/security.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/reward_system/security.dm b/code/modules/research/reward_system/security.dm index 98cf3864d4e6..2ebca1765917 100644 --- a/code/modules/research/reward_system/security.dm +++ b/code/modules/research/reward_system/security.dm @@ -20,7 +20,7 @@ for(var/area/security/brig_cell/cell in GLOB.areas) var/list/cell_humans = cell.get_all_contents_type(/mob/living/carbon/human) for(var/mob/living/carbon/human/guy as anything in cell_humans) - if(guy.real_name in criminals && guy.stat == CONSCIOUS) + if(guy.real_name in criminals && guy.stat == CONSCIOUS && guy.mind?.assigned_role in GLOB.crew_positions) . += delta_time * 2.1 // 126 points per minute of captured criminal CHECK_TICK @@ -30,6 +30,6 @@ for(var/mob/living/carbon/human/guy as anything in permad_humans) var/obj/item/idcard = guy.get_idcard() var/access = idcard?.GetAccess() - if(access == null || length(access) == 0 && guy.stat == CONSCIOUS) + if(access == null || length(access) == 0 && guy.stat == CONSCIOUS && guy.mind?.assigned_role in GLOB.crew_positions) . += delta_time * 2.1 // 126 points per minute of captured criminal CHECK_TICK From 265a2812d8aa5de0e4bf49f3a63116e747dff9c3 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Thu, 23 May 2024 03:46:18 -0400 Subject: [PATCH 17/26] add purchase ability and disable skipping --- code/modules/research/reward_system/_reward_system.dm | 5 +++-- tgui/packages/tgui/interfaces/DepartmentReward.tsx | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/modules/research/reward_system/_reward_system.dm b/code/modules/research/reward_system/_reward_system.dm index f45b09f2da88..6f07f84f0ff6 100644 --- a/code/modules/research/reward_system/_reward_system.dm +++ b/code/modules/research/reward_system/_reward_system.dm @@ -57,7 +57,7 @@ GLOBAL_LIST_EMPTY(engineering_nodes) continue if(linked_techweb.researched_nodes[node_id]) continue - if(!linked_techweb.visible_nodes[node_id] && !linked_techweb.available_nodes[node_id]) + if(!linked_techweb.available_nodes[node_id]) continue var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_id) var/node_price = node.get_price(linked_techweb)[TECHWEB_POINT_TYPE_GENERIC] @@ -65,6 +65,7 @@ GLOBAL_LIST_EMPTY(engineering_nodes) continue var/node_entry = list() node_entry["name"] = node.display_name + node_entry["id"] = node_id node_entry["purchasable"] = node_price < points node_entry["price"] = node_price node_entry["designs"] = list() @@ -90,7 +91,7 @@ GLOBAL_LIST_EMPTY(engineering_nodes) return if(linked_techweb.researched_nodes[node_id]) return - if(!linked_techweb.visible_nodes[node_id] && !linked_techweb.available_nodes[node_id]) + if(!linked_techweb.available_nodes[node_id]) return var/datum/techweb_node/node = SSresearch.techweb_node_by_id(node_id) var/node_price = node.get_price(linked_techweb)[TECHWEB_POINT_TYPE_GENERIC] diff --git a/tgui/packages/tgui/interfaces/DepartmentReward.tsx b/tgui/packages/tgui/interfaces/DepartmentReward.tsx index 653ebc3c068e..55c318437dff 100644 --- a/tgui/packages/tgui/interfaces/DepartmentReward.tsx +++ b/tgui/packages/tgui/interfaces/DepartmentReward.tsx @@ -5,6 +5,7 @@ import { classes } from '../../common/react'; type ResearchNode = { name: string; + id: string; purchasable: boolean; price: number; designs: string[]; @@ -57,7 +58,9 @@ export const DepartmentReward = (props, context) => {