diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 69893a3b68a..6a6d87c2d1e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -8,17 +8,20 @@ refer to the [Issue Report](#issues) section, as well as the [Issue Report Template](ISSUE_TEMPLATE.md). ## Commenting -If you comment on an active pull request, or issue report, make sure your comment is +If you comment on an active pull request or issue report, make sure your comment is concise and to the point. Comments on issue reports or pull requests should be relevant and friendly, not attacks on the author or adages about something minimally relevant. -If you believe an issue report is not a "bug", please report it to the Maintainers, or -point out specifically and concisely your reasoning in a comment on the issue report. +If you believe an issue report is not a "bug", please point out specifically and concisely your reasoning in a comment on the issue itself. + +#### Guidelines: + * Comments on Pull Requests and Issues should remain relevant to the subject in question and not derail discussions. + * Under no circumstances are users to be attacked for their ideas or contributions. All participants on a given PR or issue are expected to be civil. Failure to do so will result in disciplinary action.
+ For more details, see the [Code of Conduct](../CODE_OF_CONDUCT.md). ## Issues The Issues section is not a place to request features, or ask for things to be changed because you think they should be that way; The Issues section is specifically for -reporting bugs in the code. Refer to ISSUE_TEMPLATE for the exact format that your Issue -should be in. +reporting bugs in the code. #### Guidelines: * Issue reports should be as detailed as possible, and if applicable, should include @@ -57,21 +60,21 @@ actual development. * While we have no issue helping contributors (and especially new contributors) bring reasonably sized contributions up to standards via the pull request review process, larger contributions are expected to pass a higher bar of completeness and code quality *before* you open a pull request. Maintainers may close such pull requests that are deemed to be substantially flawed. You should take some time to discuss with maintainers or other contributors on how to improve the changes. #### Using Changelog - * Tags used in changelog include add/rscadd, del/rscdel, fix/fixes, typo/spellcheck. - * Without specifying a name it will default to using your GitHub name. - Some examples -``` -:cl: -add: The ability to change the color of wires -del: Deleted depreciated wire merging now handled in parent -fix: Moving wires now follows the user input instead of moving the stack -/:cl: -``` -``` -:cl: N3X15 -typo: Fixes some misspelled words under Using Changelog -/:cl: -``` + * The tags able to be used in the changelog are: `add/soundadd/imageadd`, `del/sounddel/imagedel`, `tweak`, `fix`, `wip`, `spellcheck`, and `experiment`. + * Without specifying a name it will default to using your GitHub name. Some examples include: + + ``` + :cl: + add: The ability to change the color of wires + del: Deleted depreciated wire merging now handled in parent + fix: Moving wires now follows the user input instead of moving the stack + /:cl: + ``` + ``` + :cl: UsernameHere + spellcheck: Fixes some misspelled words under Using Changelog + /:cl: + ``` ## Specifications @@ -113,14 +116,13 @@ datum code ``` -The use of this is not allowed in this project *unless the majority of the file is already relatively pathed* as it makes finding definitions via full text -searching next to impossible. The only exception is the variables of an object may be nested to the object, but must not nest further. +The use of this format is **not** allowed in this project, as it makes finding definitions via full text searching next to impossible. The only exception is the variables of an object may be nested to the object, but must not nest further. The previous code made compliant: ```DM /datum/datum1 - var/varname1 + var/varname1 = 1 var/varname2 var/static/varname3 var/static/varname4 @@ -129,6 +131,7 @@ The previous code made compliant: code /datum/datum1/proc/proc2() code + /datum/datum1/datum2 varname1 = 0 /datum/datum1/datum2/proc/proc3() @@ -139,11 +142,11 @@ The previous code made compliant: ``` ### User Interfaces -All new user interfaces in the game must be created using the TGUI framework. Documentation can be found inside the `tgui/docs` folder. +All new user interfaces in the game must be created using the TGUI framework. Documentation can be found inside the [`tgui/docs`](../tgui/docs) folder, and the [`README.md`](../tgui/README.md) file. This is to ensure all ingame UIs are snappy and respond well. An exception is made for user interfaces which are purely for OOC actions (Such as character creation, or anything admin related) ### No overriding type safety checks -The use of the : operator to override type safety checks is not allowed. You must cast the variable to the proper type. +The use of the `:` operator to override type safety checks is not allowed. You must cast the variable to the proper type. ### Type paths must begin with a / eg: `/datum/thing`, not `datum/thing` @@ -156,11 +159,11 @@ will still be, in actuality, `/datum/arbitrary`. Write your code to reflect this It is rarely allowed to put type paths in a text format, as there are no compile errors if the type path no longer exists. Here is an example: ```DM -//Good -var/path_type = /obj/item/baseball_bat - //Bad var/path_type = "/obj/item/baseball_bat" + +//Good +var/path_type = /obj/item/baseball_bat ``` ### Do not use `\The`. @@ -170,17 +173,18 @@ The only exception to this rule is when dealing with items "belonging" to a mob, ever forming. ```DM +//Bad +var/atom/A +"\The [A]" + //Good var/atom/A "[A]" - -//Bad -"\The [A]" ``` ### Use the pronoun library instead of `\his` macros. -We have a system in code/\_\_HELPERS/pronouns.dm for addressing all forms of pronouns. This is useful in a number of ways; - * BYOND's \his macro can be unpredictable on what object it references. +We have a system in [`code/__HELPERS/pronouns.dm`](../code/__HELPERS/pronouns.dm) for addressing all forms of pronouns. This is useful in a number of ways; + * BYOND's `\his` macro can be unpredictable on what object it references. Take this example: `"[user] waves \his [user.weapon] around, hitting \his opponents!"`. This will end up referencing the user's gender in the first occurence, but what about the second? It'll actually print the gender set on the weapon he's carrying, which is unintended - and there's no way around this. @@ -189,14 +193,14 @@ We have a system in code/\_\_HELPERS/pronouns.dm for addressing all forms of pro The way to avoid these problems is to use the pronoun system. Instead of `"[user] waves \his arms."`, you can do `"[user] waves [user.p_their()] arms."` -``` -//Good -"[H] waves [H.p_their()] hands!" -"[user] waves [H.p_their()] [user.weapon] around, hitting [H.p_their()] opponents!"` - +```DM //Bad "[H] waves \his hands!" "[user] waves \his [user.weapon] around, hitting \his opponents!" + +//Good +"[H] waves [H.p_their()] hands!" +"[user] waves [H.p_their()] [user.weapon] around, hitting [H.p_their()] opponents!"` ``` ### Use `[A.UID()]` over `\ref[A]` @@ -207,24 +211,30 @@ if the original datum has been deleted - BYOND recycles the references. UID's are actually unique; they work off of a global counter and are not recycled. Each datum has one assigned to it when it's created, which can be accessed by `[datum.UID()]`. You can use this as a snap-in replacement for `\ref` by changing any `locate(ref)` calls in your code to `locateUID(ref)`. -Usage of this system is mandatory for any /Topic( calls, and will produce errors in Dream Daemon if it's not used. ``, not `Link!" -### Use var/name format when declaring variables +//Good +"Link!" +``` + +### Use `var/name` format when declaring variables While DM allows other ways of declaring variables, this one should be used for consistency. ### Tabs, not spaces You must use tabs to indent your code, NOT SPACES. -(You may use spaces to align something, but you should tab to the block level first, then add the remaining spaces) +(You may use spaces to align something, but you should tab to the block level first, then add the remaining spaces.) ### No hacky code -Hacky code, such as adding specific checks (ex: `istype(src, /obj/whatever)`), is highly discouraged and only allowed when there is ***no*** other option. ( -Protip: 'I couldn't immediately think of a proper way so thus there must be no other option' is not gonna cut it here! If you can't think of anything else, say that outright and admit that you need help with it. Maintainers exist for exactly that reason.) +Hacky code, such as adding specific checks (ex: `istype(src, /obj/whatever)`), is highly discouraged and only allowed when there is ***no*** other option. (Protip: 'I couldn't immediately think of a proper way so thus there must be no other option' is not gonna cut it here! If you can't think of anything else, say that outright and admit that you need help with it. Maintainers, PR Reviewers, and other contributors who can help you exist for exactly that reason.) You can avoid hacky code by using object-oriented methodologies, such as overriding a function (called "procs" in DM) or sectioning code into functions and then overriding them as required. -The same also applies to bugfix - If an invalid value is being passed into a proc from something that shouldn't have that value, don't fix it on the proc itself, fix it at its origin! (Where feasible) +The same also applies to bugfixes - If an invalid value is being passed into a proc from something that shouldn't have that value, don't fix it on the proc itself, fix it at its origin! (Where feasible) ### No duplicated code Copying code from one place to another may be suitable for small, short-time projects, but Paradise is a long-term project and highly discourages this. @@ -236,220 +246,226 @@ First, read the comments in [this BYOND thread](http://www.byond.com/forum/?post There are two key points here: -1) Defining a list in the variable's definition calls a hidden proc - init. If you have to define a list at startup, do so in New() (or preferably Initialize()) and avoid the overhead of a second call (Init() and then New()) +1) Defining a list in the variable's definition calls a hidden proc - init. If you have to define a list at startup, do so in `New()` (or preferably `Initialize()`) and avoid the overhead of a second call (`init()` and then `New()`) 2) It also consumes more memory to the point where the list is actually required, even if the object in question may never use it! Remember: although this tradeoff makes sense in many cases, it doesn't cover them all. Think carefully about your addition before deciding if you need to use it. ### Prefer `Initialize()` over `New()` for atoms -Our game controller is pretty good at handling long operations and lag, but it can't control what happens when the map is loaded, which calls `New` for all atoms on the map. If you're creating a new atom, use the `Initialize` proc to do what you would normally do in `New`. This cuts down on the number of proc calls needed when the world is loaded. +Our game controller is pretty good at handling long operations and lag, but it can't control what happens when the map is loaded, which calls `New()` for all atoms on the map. If you're creating a new atom, use the `Initialize()` proc to do what you would normally do in `New()`. This cuts down on the number of proc calls needed when the world is loaded. -While we normally encourage (and in some cases, even require) bringing out of date code up to date when you make unrelated changes near the out of date code, that is not the case for `New` -> `Initialize` conversions. These systems are generally more dependant on parent and children procs so unrelated random conversions of existing things can cause bugs that take months to figure out. +While we normally encourage (and in some cases, even require) bringing out of date code up to date when you make unrelated changes near the out of date code, that is not the case for `New()` -> `Initialize()` conversions. These systems are generally more dependent on parent and children procs, so unrelated random conversions of existing things can cause bugs that take months to figure out. -### No implicit var/ -When you declare a parameter in a proc, the var/ is implicit. Do not include any implicit var/ when declaring a variable. +### No implicit `var/` +When you declare a parameter in a proc, the `var/` is implicit. Do not include any implicit `var/` when declaring a variable. +```DM +//Bad +/obj/item/proc1(var/mob/input1, var/input2) + code -I.e. -Bad: -```` -obj/item/proc1(var/input1, var/input2) -```` -Good: - -```` -obj/item/proc1(input1, input2) -```` +//Good +/obj/item/proc1(mob/input1, input2) + code +``` ### No magic numbers or strings -This means stuff like having a "mode" variable for an object set to "1" or "2" with no clear indicator of what that means. Make these #defines with a name that -more clearly states what it's for. For instance: -````DM +This means stuff like having a "mode" variable for an object set to "1" or "2" with no clear indicator of what that means. Make these #defines with a name that more clearly states what it's for. For instance: +```DM +//Bad /datum/proc/do_the_thing(thing_to_do) - switch(thing_to_do) - if(1) - (...) - if(2) - (...) -```` + switch(thing_to_do) + if(1) + do_stuff() + if(2) + do_other_stuff() +``` There's no indication of what "1" and "2" mean! Instead, you should do something like this: -````DM +```DM +//Good #define DO_THE_THING_REALLY_HARD 1 #define DO_THE_THING_EFFICIENTLY 2 + /datum/proc/do_the_thing(thing_to_do) - switch(thing_to_do) - if(DO_THE_THING_REALLY_HARD) - (...) - if(DO_THE_THING_EFFICIENTLY) - (...) -```` + switch(thing_to_do) + if(DO_THE_THING_REALLY_HARD) + do_stuff() + if(DO_THE_THING_EFFICIENTLY) + do_other_stuff() +``` This is clearer and enhances readability of your code! Get used to doing it! ### Control statements (if, while, for, etc) -* All control statements must not contain code on the same line as the statement (`if(condition) return`) * All control statements comparing a variable to a number should use the formula of `thing` `operator` `number`, not the reverse (eg: `if(count <= 10)` not `if(10 >= count)`) * All control statements must be spaced as `if()`, with the brackets touching the keyword. -* Do not use one-line control statements. - Instead of doing - ``` +* All control statements must not contain code on the same line as the statement. + + ```DM + //Bad if(x) return - ``` - You should do - ``` + + //Good if(x) - return + return ``` ### Player Output -Due to the use of "Goonchat", Paradise requires a special syntax for outputting text messages to players. Instead of `mob/client/world << "message"`, -you must use `to_chat(mob/client/world, "message")`. Failure to do so will lead to your code not working. +Due to the use of "Goonchat", Paradise requires a special syntax for outputting text messages to players. Instead of `mob << "message"`, you must use `to_chat(mob, "message")`. Failure to do so will lead to your code not working. -### Use early return +### Use early returns Do not enclose a proc in an if-block when returning on a condition is more feasible. This is bad: ````DM /datum/datum1/proc/proc1() - if(thing1) - if(!thing2) - if(thing3 == 30) - do stuff + if(thing1) + if(!thing2) + if(thing3 == 30) + do stuff ```` This is good: ````DM /datum/datum1/proc/proc1() - if(!thing1) - return - if(thing2) - return - if(thing3 != 30) - return - do stuff + if(!thing1) + return + if(thing2) + return + if(thing3 != 30) + return + do stuff ```` This prevents nesting levels from getting deeper then they need to be. -### Uses addtimer() instead of sleep() or spawn() -If you need to call a proc after a set amount of time, use addtimer() instead of spawn() / sleep() where feasible. -Although it is more complex, it is more performant and unlike spawn() or sleep(), it can be cancelled. +### Use `addtimer()` instead of `sleep()` or `spawn()` +If you need to call a proc after a set amount of time, use `addtimer()` instead of `spawn()` / `sleep()` where feasible. +Though more complex, this method has greater performance. Additionally, unlike `spawn()` or `sleep()`, it can be cancelled. For more details, see https://github.com/tgstation/tgstation/pull/22933. -Look for code example on how to properly use it. +Look for code examples on how to properly use it. +```DM +//Bad +/datum/datum1/proc/proc1(target) + spawn(5 SECONDS) + target.dothing(arg1, arg2, arg3) -This is bad: -````DM -/datum/datum1/proc/proc1() - spawn(5) - dothing(arg1, arg2, arg3) -```` -This is good: -````DM - addtimer(CALLBACK(procsource, .proc/dothing, arg1, arg2, arg3), waittime, timertype) -```` +//Good +/datum/datum1/proc/proc1(target) + addtimer(CALLBACK(target, .proc/dothing, arg1, arg2, arg3), 5 SECONDS) +``` This prevents nesting levels from getting deeper then they need to be. ### Operators #### Spacing -* Operators that should be separated by spaces - * Boolean and logic operators like &&, || <, >, ==, etc (but not !) - * Bitwise AND & and OR | - * Argument separator operators like , (and ; when used in a forloop) - * Assignment operators like = or += or the like - * Math operators like +, -, /, or \* -* Operators that should not be separated by spaces - * Access operators like . and : - * Parentheses () - * logical not ! +* Operators that should be separated by spaces: + * Boolean and logic operators like `&&`, `||` `<`, `>`, `==`, etc. (But not `!`) + * Bitwise AND `&` and OR `|`. + * Argument separator operators like `,`. (and `;` when used in a forloop) + * Assignment operators like `=` or `+=` or the like. + * Math operators like `+`, `-`, `/`, or `*`. +* Operators that should NOT be separated by spaces: + * Access operators like `.` and `:`. + * Parentheses `()`. + * Logical not `!`. #### Use -* Bitwise AND - '&' - * Should be written as ```bitfield & bitflag``` NEVER ```bitflag & bitfield```, both are valid, but the latter is confusing and nonstandard. +* Bitwise AND `&` + * Should be written as `bitfield & bitflag` NEVER `bitflag & bitfield`, both are valid, but the latter is confusing and nonstandard. * Associated lists declarations must have their key value quoted if it's a string - * WRONG: list(a = "b") - * RIGHT: list("a" = "b") + + ```DM + //Bad + list(a = "b") + + //Good + list("a" = "b") + ``` #### Bitflags -* We prefer using bitshift operators instead of directly typing out the value. I.E. +* We prefer using bitshift operators instead of directly typing out the value. I.E: + ``` #define MACRO_ONE (1<<0) #define MACRO_TWO (1<<1) #define MACRO_THREE (1<<2) ``` - Is preferable to + Is preferable to: ``` #define MACRO_ONE 1 #define MACRO_TWO 2 #define MACRO_THREE 4 ``` - This make the code more readable and less prone to error + While it may initially look intimidating, `(1<Arbitrary text") - ``` - * Good: - ``` - visible_message("Arbitrary text") - ``` + * To display messages to all mobs that can view `user`, you should use `visible_message()`. + + ```DM + //Bad + for(var/mob/M in viewers(user)) + M.show_message("Arbitrary text") + + //Good + user.visible_message("Arbitrary text") + ``` * You should not use color macros (`\red, \blue, \green, \black`) to color text, - instead, you should use span classes. `red text`, - `blue text`. - * Bad: + instead, you should use span classes. `Red text`, `Blue text`. + ``` - to_chat("\red Red Text \black black text") - ``` - * Good: - ``` - to_chat("Red Textblack text") + //Bad + to_chat(user, "\red Red text \black Black text") + + //Good + to_chat(user, "Red textBlack text") ``` * To use variables in strings, you should **never** use the `text()` operator, use embedded expressions directly in the string. - * Bad: - ``` - to_chat(text("[] is leaking []!", src.name, src.liquid_type)) - ``` - * Good: - ``` - to_chat("[src] is leaking [liquid_type]") - ``` + + ```DM + //Bad + to_chat(user, text("[] is leaking []!", name, liquid_type)) + + //Good + to_chat(user, "[name] is leaking [liquid_type]!") + ``` * To reference a variable/proc on the src object, you should **not** use `src.var`/`src.proc()`. The `src.` in these cases is implied, so you should just use `var`/`proc()`. - * Bad: - ``` - var/user = src.interactor - src.fillReserves(user) - ``` - * Good: - ``` - var/user = interactor - fillReserves(user) - ``` + ```DM + //Bad + var/user = src.interactor + src.fill_reserves(user) + + //Good + var/user = interactor + fill_reserves(user) + ``` ### Develop Secure Code -* Player input must always be escaped safely, we recommend you use stripped_input in all cases where you would use input. Essentially, just always treat input from players as inherently malicious and design with that use case in mind +* Player input must always be escaped safely, we recommend you use `stripped_input()` in all cases where you would use input. Essentially, just always treat input from players as inherently malicious and design with that use case in mind. * Calls to the database must be escaped properly - use proper parameters (values starting with a :). You can then replace these with a list of parameters, and these will be properly escaped during the query, and prevent any SQL injection. - * Good: - ```dm - var/datum/db_query/query_watch = SSdbcore.NewQuery("SELECT reason FROM [format_table_name("watch")] WHERE ckey=:target_ckey", list( - "target_ckey" = target_ckey - )) // Note the use of parameters on the above line and :target_ckey in the query - ``` - * Bad: - ```dm - var/datum/db_query/query_watch = SSdbcore.NewQuery("SELECT reason FROM [format_table_name("watch")] WHERE ckey='[target_ckey]'") - ``` + ```DM + //Bad + var/datum/db_query/query_watch = SSdbcore.NewQuery("SELECT reason FROM [format_table_name("watch")] WHERE ckey='[target_ckey]'") + + //Good + var/datum/db_query/query_watch = SSdbcore.NewQuery("SELECT reason FROM [format_table_name("watch")] WHERE ckey=:target_ckey", list( + "target_ckey" = target_ckey + )) // Note the use of parameters on the above line and :target_ckey in the query. + ``` * All calls to topics must be checked for correctness. Topic href calls can be easily faked by clients, so you should ensure that the call is valid for the state the item is in. Do not rely on the UI code to provide only valid topic calls, because it won't. @@ -467,13 +483,13 @@ SS13 has a lot of legacy code that's never been updated. Here are some examples ### SQL * Do not use the shorthand sql insert format (where no column names are specified) because it unnecessarily breaks all queries on minor column changes and prevents using these tables for tracking outside related info such as in a connected site/forum. -* Use parameters for queries (Mentioned above in) [###Develop Secure Code](###Develop Secure Code) +* Use parameters for queries, as mentioned above in [Develop Secure Code](#develop-secure-code). -* Always check your queries for success with if(!query.warn_execute()). By using this standard format, you can ensure the correct log messages are used +* Always check your queries for success with `if(!query.warn_execute())`. By using this standard format, you can ensure the correct log messages are used. -* Always qdel() your queries after you are done with them, this cleans up the results and helps things run smoother +* Always `qdel()` your queries after you are done with them, this cleans up the results and helps things run smoother. -* All changes to the database's layout(schema) must be specified in the database changelog in SQL, as well as reflected in the schema files +* All changes to the database's layout (schema) must be specified in the database changelog in SQL, as well as reflected in the schema file. * Any time the schema is changed the `SQL_VERSION` defines must be incremented, as well as the example config, with an appropriate conversion kit placed in the SQL/updates folder. @@ -536,7 +552,7 @@ in the SQL/updates folder. * External areas, or areas where depressurisation is expected and normal, should use airless turf variants to prevent additional atmospherics load. * Edits in mapping tools should generally be possible to replicate in-game. For this reason, avoid stacking multiple structures on the same tile (i.e. placing a light and an APC on the same wall.) ### Other Notes -* Code should be modular where possible; if you are working on a new addition, then strongly consider putting it in its own file unless it makes sense to put it with similar ones (i.e. a new tool would go in the "tools.dm" file) +* Code should be modular where possible; if you are working on a new addition, then strongly consider putting it in its own file unless it makes sense to put it with similar ones (i.e. a new tool would go in the `tools.dm` file) * Bloated code may be necessary to add a certain feature, which means there has to be a judgement over whether the feature is worth having or not. You can help make this decision easier by making sure your code is modular. * You are expected to help maintain the code that you add, meaning that if there is a problem then you are likely to be approached in order to fix any issues, runtimes, or bugs. @@ -546,38 +562,38 @@ in the SQL/updates folder. * All new var/proc names should use the American English spelling of words. This is for consistency with BYOND. ### Dream Maker Quirks/Tricks -Like all languages, Dream Maker has its quirks, some of them are beneficial to us, like these +Like all languages, Dream Maker has its quirks, some of them are beneficial to us, like these: #### In-To for-loops -```for(var/i = 1, i <= some_value, i++)``` is a fairly standard way to write an incremental for loop in most languages (especially those in the C family), but -DM's ```for(var/i in 1 to some_value)``` syntax is oddly faster than its implementation of the former syntax; where possible, it's advised to use DM's syntax. ( -Note, the ```to``` keyword is inclusive, so it automatically defaults to replacing ```<=```; if you want ```<``` then you should write it as ```1 to -some_value-1```). +`for(var/i = 1, i <= some_value, i++)` is a fairly standard way to write an incremental for loop in most languages (especially those in the C family), but +DM's `for(var/i in 1 to some_value)` syntax is oddly faster than its implementation of the former syntax; where possible, it's advised to use DM's syntax. ( +Note, the `to` keyword is inclusive, so it automatically defaults to replacing `<=`; if you want `<` then you should write it as `1 to +some_value-1`). -HOWEVER, if either ```some_value``` or ```i``` changes within the body of the for (underneath the ```for(...)``` header) or if you are looping over a list AND +HOWEVER, if either `some_value` or `i` changes within the body of the for (underneath the `for(...)` header) or if you are looping over a list AND changing the length of the list then you can NOT use this type of for-loop! -### for(var/A in list) VS for(var/i in 1 to list.len) +### `for(var/A in list)` VS `for(var/i in 1 to list.len)` The former is faster than the latter, as shown by the following profile results: -https://file.house/zy7H.png +https://file.house/zy7H.png
Code used for the test in a readable format: https://pastebin.com/w50uERkG #### Istypeless for loops A name for a differing syntax for writing for-each style loops in DM. It's NOT DM's standard syntax, hence why this is considered a quirk. Take a look at this: ```DM -var/list/bag_of_items = list(sword, apple, coinpouch, sword, sword) +var/list/bag_of_items = list(sword1, apple, coinpouch, sword2, sword3) var/obj/item/sword/best_sword for(var/obj/item/sword/S in bag_of_items) if(!best_sword || S.damage > best_sword.damage) best_sword = S ``` The above is a simple proc for checking all swords in a container and returning the one with the highest damage, and it uses DM's standard syntax for a -for-loop by specifying a type in the variable of the for's header that DM interprets as a type to filter by. It performs this filter using ```istype()``` (or -some internal-magic similar to ```istype()``` - this is BYOND, after all). This is fine in its current state for ```bag_of_items```, but if ```bag_of_items``` +for-loop by specifying a type in the variable of the for's header that DM interprets as a type to filter by. It performs this filter using `istype()` (or +some internal-magic similar to `istype()` - this is BYOND, after all). This is fine in its current state for `bag_of_items`, but if `bag_of_items` contained ONLY swords, or only SUBTYPES of swords, then the above is inefficient. For example: ```DM -var/list/bag_of_swords = list(sword, sword, sword, sword) +var/list/bag_of_swords = list(sword1, sword2, sword3, sword4) var/obj/item/sword/best_sword for(var/obj/item/sword/S in bag_of_swords) if(!best_sword || S.damage > best_sword.damage) @@ -585,10 +601,10 @@ for(var/obj/item/sword/S in bag_of_swords) ``` specifies a type for DM to filter by. -With the previous example that's perfectly fine, we only want swords, but here the bag only contains swords? Is DM still going to try to filter because we gave +With the previous example that's perfectly fine, we only want swords, but if the bag only contains swords? Is DM still going to try to filter because we gave it a type to filter by? YES, and here comes the inefficiency. Wherever a list (or other container, such as an atom (in which case you're technically accessing their special contents list, but that's irrelevant)) contains datums of the same datatype or subtypes of the datatype you require for your loop's body, -you can circumvent DM's filtering and automatic ```istype()``` checks by writing the loop as such: +you can circumvent DM's filtering and automatic `istype()` checks by writing the loop as such: ```DM var/list/bag_of_swords = list(sword, sword, sword, sword) var/obj/item/sword/best_sword @@ -607,7 +623,7 @@ eg: var/mob/living/carbon/human/H = YOU_THE_READER H.gib() ``` -However, DM also has a dot variable, accessed just as `.` on its own, defaulting to a value of null. Now, what's special about the dot operator is that it is automatically returned (as in the `return` statement) at the end of a proc, provided the proc does not already manually return (`return count` for example.) Why is this special? +However, DM also has a dot *variable*, accessed just as `.` on its own, defaulting to a value of null. Now, what's special about the dot operator is that it is automatically returned (as in the `return` statement) at the end of a proc, provided the proc does not already manually return (`return count` for example.) Why is this special? With `.` being everpresent in every proc, can we use it as a temporary variable? Of course we can! However, the `.` operator cannot replace a typecasted variable - it can hold data any other var in DM can, it just can't be accessed as one, although the `.` operator is compatible with a few operators that look weird but work perfectly fine, such as: `.++` for incrementing `.'s` value, or `.[1]` for accessing the first element of `.`, provided that it's a list. @@ -627,7 +643,7 @@ There is also an undocumented keyword called `static` that has the same behaviou ### Global Vars -All new global vars must use the defines in code/\_\_DEFINES/\_globals.dm. Basic usage is as follows: +All new global vars must use the defines in [`code/__DEFINES/_globals.dm`](../code/__DEFINES/_globals.dm). Basic usage is as follows: To declare a global var: ```DM @@ -648,13 +664,13 @@ responsible for properly tagging new pull requests and issues, moderating commen pull requests/issues, and merging/closing pull requests. ### Maintainer List -* [Fox P McCloud](https://github.com/Fox-McCloud) -* [Crazy Lemon](https://github.com/Crazylemon64) -* [Ansari](https://github.com/variableundefined) * [AffectedArc07](https://github.com/AffectedArc07) +* [Ansari](https://github.com/variableundefined) +* [Crazy Lemon](https://github.com/Crazylemon64) +* [Fox P McCloud](https://github.com/Fox-McCloud) ### Maintainer instructions -* Do not `self-merge`; this refers to the practice of opening a pull request, then +* Do not "self-merge"; this refers to the practice of opening a pull request, then merging it yourself. A different maintainer must review and merge your pull request, no matter how trivial. This is to ensure quality. * A subset of this instruction: Do not push directly to the repository, always make a diff --git a/.vscode/settings.json b/.vscode/settings.json index b6d5ddfed6d..a413f2f4dfd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,4 +2,4 @@ "workbench.editorAssociations": { "*.dmi": "imagePreview.previewEditor" } -} \ No newline at end of file +} diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 0a5a95c69ac..e0924f274e8 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -235,7 +235,7 @@ "adv" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/machinery/light/small{ dir = 8 @@ -433,9 +433,6 @@ }, /area/hallway/secondary/entry) "aeM" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -482,6 +479,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "afb" = ( @@ -511,9 +516,8 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -527,8 +531,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -542,14 +546,10 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/sign/electricshock{ pixel_y = -32 }, /obj/machinery/door/airlock/engineering{ - icon_state = "door_closed"; name = "Fore Starboard Solar Access"; req_access_txt = "10" }, @@ -611,11 +611,9 @@ }, /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "solar_chapel_inner"; locked = 1; name = "Engineering External Access"; - req_access = null; req_access_txt = "13" }, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -658,11 +656,9 @@ }, /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "solar_chapel_outer"; locked = 1; name = "Engineering External Access"; - req_access = null; req_access_txt = "10;13" }, /turf/simulated/floor/plasteel, @@ -701,7 +697,7 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -723,7 +719,7 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -24 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, @@ -754,13 +750,30 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "afM" = ( -/turf/simulated/wall/mineral/plastitanium, -/area/shuttle/arrival/station) -"afN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/entry) +"afN" = ( /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "afO" = ( @@ -779,21 +792,30 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" }, /area/hallway/secondary/entry) "afQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + d2 = 8; + icon_state = "1-8" }, /turf/simulated/floor/plasteel{ dir = 8; @@ -801,7 +823,7 @@ }, /area/hallway/secondary/entry) "afR" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/plasteel{ @@ -817,19 +839,16 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "age" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/structure/sign/vacuum{ + pixel_x = -32 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, +/turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "agf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/light{ dir = 4 }, @@ -898,8 +917,12 @@ layer = 4; pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/east, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "ago" = ( @@ -912,13 +935,6 @@ }, /area/hallway/secondary/entry) "agp" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -939,8 +955,10 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "agB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "agC" = ( @@ -948,6 +966,9 @@ pixel_x = 32 }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "agD" = ( @@ -961,32 +982,38 @@ /turf/simulated/floor/plating, /area/shuttle/arrival/station) "agH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/east, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "agI" = ( /turf/simulated/wall/r_wall, /area/security/podbay) "agJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/wall/r_wall, -/area/security/podbay) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/entry) "agK" = ( /turf/simulated/wall/r_wall, /area/engine/mechanic_workshop/hanger) "agL" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; - name = "KEEP CLEAR: DOCKING AREA" - }, -/turf/simulated/wall/r_wall, +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/engine/vacuum, /area/engine/mechanic_workshop/hanger) "agT" = ( /obj/item/clothing/suit/storage/hazardvest, @@ -1030,11 +1057,6 @@ id = 100000 }, /obj/item/gps, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - external_pressure_bound = 101; - on = 1 - }, /obj/machinery/newscaster/security_unit{ pixel_y = 32 }, @@ -1043,30 +1065,15 @@ }, /area/security/podbay) "agZ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /obj/structure/table/reinforced, /obj/item/flashlight, /obj/item/radio{ pixel_y = 6 }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/machinery/camera{ c_tag = "Sec Pod Office"; network = list("Security","SS13") }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1080,8 +1087,8 @@ pixel_y = 24 }, /obj/structure/cable{ - d2 = 8; - icon_state = "0-8" + d2 = 2; + icon_state = "0-2" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -1130,13 +1137,20 @@ /obj/machinery/camera{ c_tag = "Hanger North" }, -/obj/effect/decal/warning_stripes/yellow/partial, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "ahg" = ( -/obj/effect/decal/warning_stripes/yellow/partial, -/turf/simulated/floor/engine, -/area/engine/mechanic_workshop/hanger) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/entry) "ahh" = ( /obj/item/radio/intercom{ pixel_y = 28 @@ -1144,60 +1158,74 @@ /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "ahi" = ( -/obj/machinery/door_control{ - desc = "A remote control-switch for the pod doors."; - id = "secpodbay"; - name = "Pod Door Control"; - pixel_y = 24 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/effect/decal/warning_stripes/yellow/partial, -/turf/simulated/floor/engine, -/area/engine/mechanic_workshop/hanger) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/entry) "ahj" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/podbay) +"ahk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/security/podbay) +"ahl" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; - pixel_y = 32 + pixel_x = 32; + pixel_y = null }, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) -"ahk" = ( -/obj/structure/spacepoddoor{ - luminosity = 3 - }, -/turf/simulated/floor/engine, -/area/engine/mechanic_workshop/hanger) -"ahl" = ( -/obj/effect/decal/warning_stripes/east, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/engine/vacuum, -/area/engine/mechanic_workshop/hanger) "ahv" = ( /obj/structure/lattice, /turf/space, /area/hallway/secondary/entry) "ahw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Auxiliary Storage"; req_one_access_txt = "65;12" }, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) -"ahy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/maintenance/fore) +"ahy" = ( /obj/machinery/door/airlock/glass{ name = "Vacant Office"; req_access_txt = "12" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/vacantoffice) "ahz" = ( -/obj/machinery/door/airlock/external, +/obj/machinery/door/airlock/external{ + locked = 1 + }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) @@ -1219,11 +1247,11 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "ahD" = ( -/obj/effect/landmark{ - name = "HONKsquad" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/turf/simulated/floor/mineral/titanium/blue, -/area/shuttle/arrival/station) +/turf/simulated/floor/engine, +/area/engine/mechanic_workshop/hanger) "ahE" = ( /obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock" @@ -1239,20 +1267,26 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "ahG" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/podbay) "ahH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1262,9 +1296,8 @@ }, /area/security/podbay) "ahI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -1275,48 +1308,53 @@ name = "Security Pods"; req_access_txt = "71" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/podbay) "ahK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/engine/mechanic_workshop/hanger) -"ahL" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) +"ahL" = ( +/obj/machinery/door_control{ + desc = "A remote control-switch for the pod doors."; + id = "npodbay"; + name = "Pod Door Control"; + pixel_x = 32; + pixel_y = null + }, +/turf/simulated/floor/engine, +/area/engine/mechanic_workshop/hanger) "ahM" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/engine/vacuum, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; + name = "KEEP CLEAR: DOCKING AREA" + }, +/turf/simulated/wall/r_wall, /area/engine/mechanic_workshop/hanger) "ahT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/east, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"ahU" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/entry) "ahV" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/mineral/titanium/blue, @@ -1329,21 +1367,22 @@ "ahX" = ( /obj/structure/closet/secure_closet/security, /obj/item/spacepod_equipment/weaponry/laser, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/podbay) "ahY" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/door_control{ + desc = "A remote control-switch for the pod doors."; + id = "npodbay"; + name = "Pod Door Control"; + pixel_y = -24; + req_access_txt = "71" }, +/turf/simulated/floor/engine, /area/security/podbay) "ahZ" = ( /turf/simulated/floor/plasteel{ @@ -1357,9 +1396,6 @@ /obj/effect/landmark/start{ name = "Security Pod Pilot" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1372,6 +1408,9 @@ dir = 4; pixel_x = 28 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1381,19 +1420,30 @@ name = "Security Pods"; req_access_txt = "71" }, +/obj/effect/decal/warning_stripes/west, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/podbay) "aig" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/structure/spacepoddoor{ + luminosity = 3 }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) +/obj/machinery/door/poddoor/multi_tile/three_tile_ver{ + id_tag = "secpodbay"; + req_access_txt = "71" + }, +/turf/simulated/floor/engine, +/area/security/podbay) "aik" = ( /obj/machinery/light{ dir = 1 @@ -1429,29 +1479,14 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aip" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) -"aiq" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/effect/decal/warning_stripes/red/partial, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/engine{ - icon_state = "stage_stairs"; - name = "reinforced stairs" - }, -/area/security/podbay) -"air" = ( -/obj/effect/decal/warning_stripes/red/partial, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/entry) +"air" = ( +/obj/effect/decal/warning_stripes/red/partial, /turf/simulated/floor/engine{ icon_state = "stage_stairs"; name = "reinforced stairs" @@ -1466,9 +1501,6 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "ait" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 @@ -1485,44 +1517,45 @@ /turf/simulated/floor/plasteel, /area/security/podbay) "aiu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/spacepoddoor{ + luminosity = 3 }, -/turf/simulated/wall/r_wall, -/area/security/podbay) +/obj/machinery/door/poddoor/multi_tile/four_tile_ver{ + id_tag = "npodbay" + }, +/turf/simulated/floor/engine, +/area/engine/mechanic_workshop/hanger) "aiv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/southwestcorner, +/obj/machinery/door_control{ + desc = "A remote control-switch for the pod doors."; + id = "npodbay"; + name = "Pod Door Control"; + pixel_x = -24; + req_access_txt = "71" + }, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "aiw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/engine, +/obj/effect/decal/warning_stripes/east, +/obj/machinery/light/small, +/turf/simulated/floor/engine/vacuum, /area/engine/mechanic_workshop/hanger) "aix" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "aiy" = ( /obj/structure/spacepoddoor{ luminosity = 3 }, -/obj/machinery/door/poddoor/multi_tile/four_tile_ver{ - id_tag = "secpodbay" - }, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "aiz" = ( /obj/effect/decal/warning_stripes/east, -/obj/machinery/light/small, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/engine/vacuum, /area/engine/mechanic_workshop/hanger) "aiA" = ( @@ -1534,9 +1567,6 @@ dir = 8 }, /obj/structure/reagent_dispensers/fueltank, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/red/hollow, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -1547,9 +1577,6 @@ layer = 2.9 }, /obj/machinery/space_heater, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/red/hollow, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -1590,37 +1617,43 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"aiJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/entry) "aiK" = ( /obj/machinery/vending/cola, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aiL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aiM" = ( /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/floodlight{ + on = 1 }, /turf/simulated/floor/engine, -/area/security/podbay) +/area/engine/mechanic_workshop/hanger) "aiN" = ( /turf/simulated/floor/engine, /area/security/podbay) @@ -1635,11 +1668,12 @@ /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "aiT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/east, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aiU" = ( @@ -1661,10 +1695,6 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "aiW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/rack{ dir = 1 }, @@ -1691,19 +1721,14 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aiY" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/engine, -/area/security/podbay) +/area/engine/mechanic_workshop/hanger) "ajd" = ( /obj/item/radio/beacon, /obj/effect/decal/warning_stripes/yellow, @@ -1716,10 +1741,6 @@ network = list("Security","SS13"); pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/red/hollow, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -1730,52 +1751,31 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "ajg" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /obj/machinery/hologram/holopad, /turf/simulated/floor/engine, /area/security/podbay) "ajh" = ( /obj/spacepod/sec{ + dir = 4; req_access_txt = "71" }, /turf/simulated/floor/engine, /area/security/podbay) "aji" = ( -/obj/machinery/floodlight{ - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) -"ajx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/entry) "ajy" = ( /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"ajB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/entry) "ajC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/red/hollow, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -1793,45 +1793,72 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "ajG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 }, +/turf/simulated/floor/engine, +/area/engine/mechanic_workshop/hanger) +"ajH" = ( /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"ajH" = ( -/turf/simulated/wall, -/area/security/podbay) "ajI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall, -/area/security/podbay) -"ajJ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/wall, -/area/security/podbay) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/maintenance/fore2) +"ajJ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/maintenance/fore2) "ajK" = ( /obj/effect/decal/warning_stripes/northwestcorner, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "ajL" = ( -/obj/effect/decal/warning_stripes/southeastcorner, -/turf/simulated/floor/engine, -/area/engine/mechanic_workshop/hanger) +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/maintenance/fore2) "ajM" = ( -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/engine, -/area/engine/mechanic_workshop/hanger) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/maintenance/fore2) "ajN" = ( -/obj/effect/decal/warning_stripes/southwestcorner, -/turf/simulated/floor/engine, -/area/engine/mechanic_workshop/hanger) +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/maintenance/fore2) "ajX" = ( /obj/docking_port/stationary{ dir = 8; @@ -1844,14 +1871,16 @@ /turf/space, /area/space) "ajY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) +/area/maintenance/fore2) "ajZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -1869,32 +1898,31 @@ layer = 4; pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/east, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "akc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/mechanic_workshop) "akd" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/camera{ c_tag = "Mechanic's Office" }, @@ -1914,6 +1942,17 @@ name = "Mechanic's Workshop Requests Console"; pixel_y = 30 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -1933,21 +1972,33 @@ name = "north bump"; pixel_y = 24 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/rack, +/obj/random/toolbox, +/obj/item/wrench, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/mechanic_workshop) "akf" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Mechanic Workshop"; - req_access_txt = "70" - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/engine, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, /area/engine/mechanic_workshop) "akg" = ( /obj/structure/cable{ @@ -1955,6 +2006,14 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/mecha_part_fabricator/spacepod, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "akh" = ( @@ -1964,18 +2023,33 @@ icon_state = "2-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "aki" = ( -/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "akj" = ( -/obj/effect/decal/warning_stripes/west, /obj/machinery/camera{ c_tag = "Hanger South"; dir = 8 }, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK"; + pixel_x = 32; + pixel_y = null + }, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "akw" = ( @@ -2006,59 +2080,36 @@ /area/engine/mechanic_workshop) "akC" = ( /obj/machinery/computer/podtracker, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/engine/mechanic_workshop) -"akD" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/mechanic_workshop) "akE" = ( -/obj/structure/table/reinforced, -/obj/item/stack/sheet/plasteel, -/obj/item/stack/rods, -/obj/item/storage/box/lights/mixed, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/mechanic_workshop) "akF" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/engine/mechanic_workshop) -"akG" = ( -/obj/machinery/mecha_part_fabricator/spacepod, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/door/airlock/engineering/glass{ + name = "Mechanic Workshop"; + req_access_txt = "70" }, /turf/simulated/floor/engine, -/area/engine/mechanic_workshop/hanger) -"akH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/area/engine/mechanic_workshop) +"akG" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "arrival" }, +/area/hallway/secondary/entry) +"akH" = ( /obj/structure/cable{ d1 = 1; d2 = 2; @@ -2067,7 +2118,6 @@ /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "akI" = ( -/obj/effect/decal/warning_stripes/west, /obj/machinery/firealarm{ dir = 4; pixel_x = 28 @@ -2086,15 +2136,23 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "akV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ name = "Mechanic Workshop"; req_access_txt = "70" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plasteel, /area/engine/mechanic_workshop) "akY" = ( @@ -2125,9 +2183,6 @@ }, /area/engine/mechanic_workshop) "ald" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/chair/office/light{ dir = 8 }, @@ -2145,26 +2200,18 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/mechanic_workshop) "alf" = ( -/obj/structure/rack, +/obj/structure/table/reinforced, +/obj/item/stack/sheet/plasteel, +/obj/item/stack/rods, +/obj/item/storage/box/lights/mixed, /obj/machinery/alarm{ dir = 1; - pixel_y = -25 - }, -/obj/random/toolbox, -/obj/random/toolbox, -/obj/item/wrench, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -2218,28 +2265,34 @@ /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "alk" = ( -/obj/effect/decal/warning_stripes/northeastcorner, -/turf/simulated/floor/engine, -/area/engine/mechanic_workshop/hanger) +/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/turf/simulated/wall, +/area/maintenance/fore2) "all" = ( -/obj/effect/decal/warning_stripes/north, /obj/machinery/light/small, /turf/simulated/floor/engine, /area/engine/mechanic_workshop/hanger) "alm" = ( -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/engine, -/area/engine/mechanic_workshop/hanger) -"als" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/vacuum{ - pixel_x = -32 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" + }, +/area/hallway/secondary/entry) +"als" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "alt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/vacuum{ pixel_x = 32 }, @@ -2247,7 +2300,6 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "alu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/status_display{ layer = 4; pixel_x = 32 @@ -2273,19 +2325,13 @@ /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) "alx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/status_display{ - layer = 4; - pixel_x = -32 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "aly" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/status_display{ layer = 4; pixel_x = 32 @@ -2307,13 +2353,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Mechanic Workshop"; req_access_txt = "70" }, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "alA" = ( /turf/simulated/wall/r_wall, /area/engine/mechanic_workshop) @@ -2328,7 +2373,6 @@ /turf/space, /area/space) "alG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/status_display{ layer = 4; pixel_x = -32 @@ -2348,15 +2392,11 @@ /obj/structure/computerframe, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) -"alI" = ( -/turf/simulated/wall, -/area/maintenance/fsmaint) "alJ" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "alK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/status_display{ layer = 4; pixel_x = 32 @@ -2367,16 +2407,6 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) -"alL" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) "alM" = ( /obj/structure/cable{ d1 = 2; @@ -2389,12 +2419,12 @@ dir = 5; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "alN" = ( /obj/effect/spawner/window/reinforced, /obj/structure/barricade/wooden, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "alO" = ( /obj/machinery/vending/snack, /obj/effect/decal/cleanable/cobweb, @@ -2402,25 +2432,25 @@ dir = 1; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "alP" = ( /obj/machinery/vending/cola, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "alQ" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "alR" = ( /obj/structure/chair/stool, /obj/machinery/alarm{ - pixel_y = 22 + pixel_y = 24 }, /obj/machinery/light/small{ dir = 1 @@ -2429,7 +2459,7 @@ dir = 1; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "alS" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/maintenance, @@ -2440,14 +2470,14 @@ dir = 1; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "alT" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "alW" = ( /obj/structure/lattice, /obj/structure/lattice, @@ -2459,14 +2489,13 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "alY" = ( /obj/machinery/door/airlock/external{ id_tag = "ferry_home"; @@ -2476,18 +2505,35 @@ /area/hallway/secondary/entry) "alZ" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "ama" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark{ name = "blobstart" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amc" = ( /obj/structure/cable{ d1 = 1; @@ -2496,36 +2542,66 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amd" = ( /obj/structure/door_assembly/door_assembly_mhatch, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "ame" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amf" = ( /obj/effect/decal/cleanable/insectguts, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amh" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aml" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -2541,16 +2617,6 @@ }, /turf/simulated/floor/plating, /area/security/permabrig) -"amv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) -"amw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) "amx" = ( /obj/effect/spawner/window/reinforced, /obj/structure/sign/securearea{ @@ -2567,38 +2633,32 @@ /turf/simulated/floor/plating, /area/hallway/secondary/entry) "amz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "amA" = ( /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "amB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "amC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /obj/item/trash/candy, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amE" = ( /obj/structure/cable{ d1 = 1; @@ -2606,9 +2666,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, @@ -2616,67 +2673,51 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/landmark{ name = "blobstart" }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amI" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amL" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "amM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "amN" = ( /obj/structure/sign/pods, /turf/simulated/wall, /area/hallway/secondary/entry) -"amO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" - }, -/area/maintenance/fsmaint) "amP" = ( /obj/structure/cable{ d1 = 1; @@ -2689,52 +2730,53 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amQ" = ( /obj/structure/table/wood, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amR" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/vomit, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amS" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amT" = ( /obj/machinery/light/small, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amU" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "amV" = ( /obj/structure/table/wood, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "ang" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/entry) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "red" + }, +/area/maintenance/fore2) "ani" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/plasteel{ @@ -2742,36 +2784,13 @@ icon_state = "arrival" }, /area/hallway/secondary/entry) -"anj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "arrival" - }, -/area/hallway/secondary/entry) "ank" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitecorner" }, /area/hallway/secondary/entry) "anl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "arrival" - }, -/area/hallway/secondary/entry) -"anm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; @@ -2779,9 +2798,6 @@ }, /area/hallway/secondary/entry) "ann" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light{ dir = 1 }, @@ -2790,23 +2806,11 @@ icon_state = "arrival" }, /area/hallway/secondary/entry) -"ano" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "arrival" - }, -/area/hallway/secondary/entry) "anp" = ( /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -2827,26 +2831,12 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "arrival" - }, -/area/hallway/secondary/entry) -"anr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" }, /area/hallway/secondary/entry) "ans" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light{ dir = 1 }, @@ -2859,16 +2849,14 @@ }, /area/hallway/secondary/entry) "ant" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" }, /area/hallway/secondary/entry) "anu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "arrival" @@ -2880,10 +2868,6 @@ icon_state = "arrival" }, /area/hallway/secondary/entry) -"anx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) "any" = ( /obj/effect/spawner/random_spawners/wall_rusted_maybe, /turf/simulated/wall, @@ -2905,17 +2889,17 @@ /obj/item/reagent_containers/food/snacks/meat/slab, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "anB" = ( /obj/structure/sign/nosmoking_2, /turf/simulated/wall, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "anC" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "anH" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -2934,6 +2918,9 @@ }, /area/hallway/secondary/entry) "anI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, @@ -2942,7 +2929,9 @@ }, /area/hallway/secondary/entry) "anJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -2951,36 +2940,21 @@ }, /area/hallway/secondary/entry) "anK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, /area/hallway/secondary/entry) "anL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, -/turf/simulated/floor/plasteel{ - icon_state = "arrival" - }, -/area/hallway/secondary/entry) -"anM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "arrival" - }, -/area/hallway/secondary/entry) -"anN" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -2996,7 +2970,9 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -3005,15 +2981,22 @@ }, /area/hallway/secondary/entry) "anP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, /area/hallway/secondary/entry) "anQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -3021,23 +3004,19 @@ }, /area/hallway/secondary/entry) "anR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/entry) -"anS" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/secondary/entry) "anT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -3047,21 +3026,26 @@ }, /area/hallway/secondary/entry) "anU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/secondary/entry) "anV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -3069,39 +3053,38 @@ }, /area/hallway/secondary/entry) "anW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Arrivals Hall Starboard"; dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, /area/hallway/secondary/entry) "anX" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/extinguisher_cabinet{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "arrival" }, /area/hallway/secondary/entry) "anY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -3121,8 +3104,10 @@ pixel_y = 2 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aob" = ( /obj/structure/cable{ d1 = 1; @@ -3131,16 +3116,16 @@ tag = "" }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aoc" = ( /obj/item/broken_bottle, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aod" = ( /turf/simulated/floor/plasteel{ icon_state = "red" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aoe" = ( /obj/structure/table, /obj/random/toolbox, @@ -3155,7 +3140,7 @@ /turf/simulated/floor/plasteel{ icon_state = "whitehall" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aog" = ( /obj/effect/decal/cleanable/cobweb2, /obj/machinery/newscaster{ @@ -3169,11 +3154,8 @@ /turf/simulated/floor/plasteel{ icon_state = "red" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aoh" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/machinery/light/small{ dir = 1 }, @@ -3181,7 +3163,7 @@ /turf/simulated/floor/plasteel{ icon_state = "whitehall" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aoi" = ( /obj/structure/sink/kitchen{ desc = "A sink used for washing one's hands and face. It looks rusty and home-made"; @@ -3192,7 +3174,7 @@ /turf/simulated/floor/plasteel{ icon_state = "whitehall" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aon" = ( /obj/structure/cable{ d1 = 1; @@ -3200,19 +3182,17 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aoo" = ( /turf/simulated/wall, /area/security/vacantoffice) "aop" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/wall, -/area/security/vacantoffice) +/area/security/customs) "aoq" = ( /obj/structure/cable{ d1 = 1; @@ -3220,20 +3200,15 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aor" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aos" = ( /turf/simulated/wall, /area/bridge) @@ -3246,19 +3221,11 @@ /turf/simulated/floor/plating, /area/bridge) "aou" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "arrival" }, /area/hallway/secondary/entry) -"aov" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/entry) "aow" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -3276,7 +3243,7 @@ /turf/simulated/floor/plasteel{ icon_state = "red" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aoy" = ( /obj/machinery/vending/cigarette, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -3299,7 +3266,6 @@ }, /area/hallway/secondary/entry) "aoB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -3317,15 +3283,11 @@ /turf/simulated/floor/plating, /area/security/checkpoint2) "aoE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aoF" = ( /obj/machinery/vending/coffee, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -3340,75 +3302,51 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) -"aoH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aoI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aoJ" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aoK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" - }, -/area/maintenance/fsmaint) -"aoL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/turf/simulated/floor/plasteel{ + icon_state = "redfull" + }, +/area/maintenance/fore2) +"aoL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aoM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, -/area/maintenance/fsmaint) -"aoN" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" - }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aoP" = ( /obj/docking_port/stationary{ dir = 2; @@ -3428,13 +3366,13 @@ dir = 8; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aoS" = ( /obj/structure/table, /obj/random/toolbox, /obj/item/wrench, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aoT" = ( /obj/structure/table/wood, /obj/item/folder, @@ -3485,7 +3423,6 @@ }, /area/security/vacantoffice) "aoY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ pixel_y = 32 @@ -3495,11 +3432,12 @@ }, /area/security/vacantoffice) "aoZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light_switch{ pixel_x = 26; pixel_y = 26 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -3532,18 +3470,6 @@ icon_state = "carpet" }, /area/security/vacantoffice) -"apd" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/turf/simulated/floor/plasteel, -/area/security/vacantoffice) "ape" = ( /obj/structure/table/reinforced, /obj/item/storage/box/ids, @@ -3551,7 +3477,7 @@ dir = 9; icon_state = "blue" }, -/area/bridge) +/area/security/customs) "apf" = ( /obj/structure/cable{ d1 = 1; @@ -3560,11 +3486,12 @@ tag = "" }, /obj/machinery/photocopier, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "blue" }, -/area/bridge) +/area/security/customs) "apg" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ @@ -3578,20 +3505,16 @@ dir = 5; icon_state = "blue" }, -/area/bridge) +/area/security/customs) "aph" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "api" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -3642,11 +3565,8 @@ }, /area/security/checkpoint2) "apo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "app" = ( /obj/structure/cable{ d1 = 2; @@ -3654,15 +3574,12 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "apq" = ( /obj/structure/cable{ d1 = 4; @@ -3670,9 +3587,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 1 @@ -3681,20 +3595,7 @@ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) -"apr" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aps" = ( /obj/structure/cable{ d1 = 4; @@ -3702,12 +3603,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "apt" = ( /obj/structure/cable{ d1 = 1; @@ -3718,18 +3616,18 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "apu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/secondary/entry) "apv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -3744,14 +3642,14 @@ dir = 4; icon_state = "redcorner" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "apx" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "apy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -3759,7 +3657,7 @@ dir = 1; icon_state = "whitehall" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "apz" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, @@ -3767,7 +3665,7 @@ dir = 1; icon_state = "red" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "apA" = ( /obj/structure/table, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -3775,7 +3673,7 @@ dir = 1; icon_state = "whitehall" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "apF" = ( /obj/machinery/power/tracker, /obj/structure/cable{ @@ -3799,21 +3697,18 @@ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "apJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "apK" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "apL" = ( /obj/structure/chair/office/light{ dir = 1 @@ -3828,31 +3723,36 @@ }, /area/security/vacantoffice) "apN" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/security/vacantoffice) +/turf/simulated/floor/plating, +/area/security/customs) "apO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/security/vacantoffice) -"apP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/area/security/vacantoffice) +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/maintenance/fore2) +"apP" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "redfull" + }, +/area/maintenance/fore2) "apQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -3893,17 +3793,13 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "apV" = ( /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -3913,12 +3809,12 @@ dir = 8; icon_state = "blue" }, -/area/bridge) +/area/security/customs) "apW" = ( /obj/structure/table, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/machinery/kitchen_machine/microwave, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -3926,24 +3822,27 @@ dir = 1; icon_state = "red" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "apX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_x = 26; pixel_y = 26 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "blue" }, -/area/bridge) +/area/security/customs) "apY" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -24 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -3951,11 +3850,13 @@ dir = 1; icon_state = "red" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "apZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -3968,18 +3869,27 @@ /obj/machinery/camera{ c_tag = "Arrivals Lobby" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/hallway/secondary/entry) "aqb" = ( /obj/structure/chair/comfy/brown, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/hallway/secondary/entry) "aqc" = ( /obj/item/twohanded/required/kirbyplants, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -3989,25 +3899,22 @@ /obj/effect/landmark/start{ name = "Civilian" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/hallway/secondary/entry) "aqe" = ( /obj/structure/table/wood, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/hallway/secondary/entry) -"aqf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "redcorner" - }, -/area/hallway/secondary/entry) "aqg" = ( /obj/structure/cable{ d1 = 1; @@ -4021,20 +3928,20 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/bridge) +/area/security/customs) "aqh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_x = -26; pixel_y = 26 @@ -4045,24 +3952,24 @@ }, /area/security/checkpoint2) "aqi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ name = "Customs Desk"; req_access_txt = "19" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/bridge) +/area/security/customs) "aqj" = ( /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -4083,11 +3990,11 @@ /obj/effect/decal/cleanable/dirt, /obj/item/cigbutt/roach, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aql" = ( /obj/structure/girder, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aqm" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ @@ -4097,7 +4004,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aqn" = ( /obj/structure/rack, /obj/item/crowbar, @@ -4106,25 +4013,22 @@ /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aqo" = ( /obj/structure/closet/crate, /obj/item/flashlight, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aqp" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aqq" = ( /turf/simulated/wall/r_wall/rust, /area/security/permabrig) "aqu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ name = "Security Checkpoint"; @@ -4234,7 +4138,7 @@ dir = 8; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aqG" = ( /obj/machinery/conveyor{ dir = 4; @@ -4253,7 +4157,7 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aqI" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -28 @@ -4320,7 +4224,7 @@ dir = 10; icon_state = "blue" }, -/area/bridge) +/area/security/customs) "aqS" = ( /obj/structure/cable{ d1 = 1; @@ -4329,11 +4233,12 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/bridge) +/area/security/customs) "aqT" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, @@ -4342,9 +4247,8 @@ dir = 4; icon_state = "blue" }, -/area/bridge) +/area/security/customs) "aqU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "bluecorner" @@ -4362,27 +4266,25 @@ /turf/simulated/floor/carpet, /area/hallway/secondary/entry) "aqX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/entry) +"aqY" = ( +/obj/structure/chair/office/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/carpet, -/area/hallway/secondary/entry) -"aqY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/chair/comfy/brown{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/hallway/secondary/entry) +/area/security/vacantoffice) "aqZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -4402,6 +4304,9 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/hologram/holopad, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -4422,21 +4327,20 @@ }, /area/security/checkpoint2) "ard" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "are" = ( /turf/simulated/wall/rust, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "arf" = ( /obj/effect/decal/cleanable/cobweb, /obj/machinery/computer/arcade, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "arg" = ( /obj/structure/cable{ d2 = 2; @@ -4449,7 +4353,7 @@ pixel_y = 24 }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "arh" = ( /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/cleanable/dirt, @@ -4457,7 +4361,7 @@ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "ari" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -4466,7 +4370,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "arj" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/sign/poster/contraband/random{ @@ -4478,7 +4382,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aro" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -4534,6 +4438,9 @@ pixel_x = 2; pixel_y = 2 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -4542,6 +4449,9 @@ /obj/structure/chair/comfy/brown{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/wood{ broken = 1; icon_state = "wood-broken" @@ -4554,18 +4464,14 @@ }, /area/maintenance/electrical_shop) "arx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/wood{ - broken = 1; - icon_state = "wood-broken" +/turf/simulated/floor/plasteel{ + icon_state = "grimy" }, -/area/maintenance/electrical_shop) +/area/security/vacantoffice) "ary" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/computerframe, /obj/item/stack/cable_coil/random, /turf/simulated/floor/plasteel{ @@ -4581,11 +4487,11 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "arA" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -4598,10 +4504,16 @@ "arC" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/security/vacantoffice) "arD" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -4613,7 +4525,12 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -4626,6 +4543,9 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -4654,13 +4574,12 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "arI" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ @@ -4670,7 +4589,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "arJ" = ( /obj/machinery/camera{ c_tag = "Customs Desk"; @@ -4687,7 +4606,7 @@ /turf/simulated/floor/plasteel{ icon_state = "bluefull" }, -/area/bridge) +/area/security/customs) "arK" = ( /obj/structure/cable{ d1 = 1; @@ -4703,11 +4622,12 @@ /obj/structure/chair/office/dark{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/bridge) +/area/security/customs) "arL" = ( /obj/structure/cable{ d1 = 4; @@ -4722,7 +4642,7 @@ dir = 4; icon_state = "blue" }, -/area/bridge) +/area/security/customs) "arM" = ( /obj/structure/cable{ d1 = 1; @@ -4736,11 +4656,7 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/hologram/holopad, -/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -4749,14 +4665,26 @@ "arN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "arO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/hallway/secondary/entry) "arP" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/hallway/secondary/entry) "arQ" = ( @@ -4778,7 +4706,7 @@ req_access_txt = "19" }, /turf/simulated/floor/plasteel, -/area/bridge) +/area/security/customs) "arR" = ( /obj/structure/cable{ d1 = 4; @@ -4795,6 +4723,12 @@ pixel_x = -8; req_access_txt = "63" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -4815,6 +4749,12 @@ /obj/structure/chair/office/dark{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -4844,7 +4784,7 @@ name = "blobstart" }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "arV" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/cobweb, @@ -4852,14 +4792,14 @@ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "arW" = ( /obj/machinery/computer/arcade, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "arX" = ( /obj/machinery/computer/arcade, /obj/effect/decal/cleanable/dirt, @@ -4867,7 +4807,7 @@ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "arY" = ( /obj/structure/table/wood, /obj/item/toy/minimeteor, @@ -4881,7 +4821,7 @@ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "arZ" = ( /obj/structure/cable{ d1 = 1; @@ -4894,7 +4834,7 @@ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "asa" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -4903,14 +4843,14 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "asb" = ( /obj/structure/table/wood, /obj/item/clipboard, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "asc" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -4931,37 +4871,39 @@ }, /area/maintenance/auxsolarport) "asi" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "dark" + dir = 8; + icon_state = "neutralfull" }, -/area/maintenance/electrical_shop) +/area/hallway/secondary/entry) "asj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "dark" - }, -/area/maintenance/electrical_shop) +/turf/simulated/floor/carpet, +/area/hallway/secondary/entry) "ask" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "wood" + dir = 8; + icon_state = "neutralfull" }, -/area/maintenance/electrical_shop) +/area/hallway/secondary/entry) "asl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table/wood, /obj/item/clipboard, /obj/item/airalarm_electronics, @@ -4971,25 +4913,17 @@ }, /area/maintenance/electrical_shop) "asm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/maintenance/electrical_shop) "asn" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/maintenance/electrical_shop) +/obj/effect/spawner/window/reinforced, +/obj/structure/cable, +/turf/simulated/floor/plating, +/area/security/customs) "aso" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/computerframe, /obj/item/circuitboard/secure_data, /turf/simulated/floor/plasteel{ @@ -5002,11 +4936,11 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "asq" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "asr" = ( /obj/structure/chair/office/light, /turf/simulated/floor/plasteel{ @@ -5020,10 +4954,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -5048,13 +4978,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "asw" = ( /obj/machinery/status_display{ pixel_x = -32 @@ -5064,7 +4993,7 @@ dir = 9; icon_state = "blue" }, -/area/bridge) +/area/security/customs) "asx" = ( /obj/structure/cable{ d1 = 1; @@ -5072,14 +5001,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/bridge) +/area/security/customs) "asy" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -5088,14 +5015,13 @@ dir = 4; icon_state = "blue" }, -/area/bridge) +/area/security/customs) "asz" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, /turf/simulated/floor/plating, /area/bridge) "asA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 8; @@ -5103,33 +5029,35 @@ }, /area/hallway/secondary/entry) "asB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/secondary/entry) "asC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/chair/comfy/brown{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/hallway/secondary/entry) -"asD" = ( -/obj/machinery/atmospherics/unary/vent_pump{ dir = 8; - external_pressure_bound = 100; - on = 1 + icon_state = "neutralfull" + }, +/area/security/checkpoint2) +"asD" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" }, -/turf/simulated/floor/carpet, /area/hallway/secondary/entry) "asE" = ( /obj/structure/chair/comfy/brown{ @@ -5166,14 +5094,14 @@ "asI" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "asJ" = ( /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "asK" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, @@ -5181,7 +5109,7 @@ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "asL" = ( /obj/structure/cable{ d1 = 1; @@ -5193,13 +5121,13 @@ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "asM" = ( /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "asN" = ( /obj/structure/table/wood, /obj/item/coin/iron{ @@ -5213,14 +5141,14 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "asO" = ( /obj/structure/table/wood, /obj/item/folder/blue, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "asP" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, @@ -5285,8 +5213,13 @@ /turf/space, /area/maintenance/auxsolarport) "asW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" }, @@ -5304,10 +5237,15 @@ icon_state = "1-4" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/security/checkpoint2) "asY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 8; @@ -5315,7 +5253,6 @@ }, /area/hallway/secondary/entry) "asZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "redcorner" @@ -5412,6 +5349,9 @@ /obj/structure/table/wood, /obj/item/folder/red, /obj/item/pen, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -5423,10 +5363,13 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/chair/comfy/brown{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -5455,7 +5398,6 @@ }, /area/maintenance/electrical_shop) "atn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/computerframe, /obj/machinery/status_display{ pixel_x = 32 @@ -5469,11 +5411,11 @@ /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "atp" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "atq" = ( /obj/structure/table/wood, /obj/item/phone, @@ -5554,22 +5496,21 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "atz" = ( /obj/structure/closet/secure_closet, /obj/item/storage/secure/briefcase, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "blue" }, -/area/bridge) +/area/security/customs) "atA" = ( /obj/structure/cable{ d1 = 1; @@ -5577,12 +5518,14 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "blue" }, -/area/bridge) +/area/security/customs) "atB" = ( /obj/structure/filingcabinet, /obj/machinery/newscaster{ @@ -5592,11 +5535,11 @@ dir = 6; icon_state = "blue" }, -/area/bridge) +/area/security/customs) "atC" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/structure/chair/comfy/brown{ dir = 1 @@ -5653,6 +5596,9 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "red" @@ -5669,14 +5615,6 @@ icon_state = "red" }, /area/security/checkpoint2) -"atJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) "atK" = ( /obj/structure/cable{ d2 = 4; @@ -5712,15 +5650,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "atO" = ( /obj/structure/cable{ d1 = 4; @@ -5735,7 +5670,7 @@ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "atP" = ( /obj/structure/cable{ d1 = 4; @@ -5743,16 +5678,17 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "atQ" = ( /obj/structure/cable{ d1 = 1; @@ -5760,29 +5696,32 @@ icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "atR" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "atS" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "atT" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -5868,18 +5807,6 @@ icon_state = "dark" }, /area/engine/controlroom) -"auc" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "dark" - }, -/area/engine/controlroom) "aud" = ( /obj/machinery/camera{ c_tag = "Supermatter North"; @@ -5894,7 +5821,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" @@ -5919,7 +5845,7 @@ /obj/structure/table/wood, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/item/circuitboard/microwave, /obj/item/stack/sheet/glass{ @@ -5997,6 +5923,7 @@ /area/maintenance/electrical_shop) "aun" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -6013,7 +5940,6 @@ }, /area/maintenance/electrical_shop) "aup" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/wood, /obj/machinery/newscaster{ pixel_x = 32 @@ -6025,10 +5951,10 @@ }, /area/maintenance/electrical_shop) "auq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aur" = ( /obj/structure/cable{ d1 = 1; @@ -6036,12 +5962,11 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aus" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -6065,12 +5990,11 @@ req_access_txt = "63" }, /turf/simulated/floor/plasteel, -/area/security/checkpoint2) +/area/maintenance/fore2) "auu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "auv" = ( /obj/structure/cable{ d1 = 1; @@ -6082,14 +6006,14 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "auw" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aux" = ( /obj/structure/chair/stool, /obj/effect/decal/cleanable/dirt, @@ -6098,7 +6022,7 @@ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "auy" = ( /obj/structure/table/wood, /obj/item/toy/AI, @@ -6106,10 +6030,10 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "auz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -6172,23 +6096,30 @@ icon_state = "0-2" }, /obj/machinery/power/emitter, -/turf/simulated/floor/greengrid, +/turf/simulated/floor/plating, /area/engine/controlroom) "auG" = ( /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, /area/engine/controlroom) "auH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/greengrid, -/area/engine/controlroom) +/obj/structure/table/wood, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/hallway/secondary/entry) "auI" = ( /turf/simulated/floor/greengrid, /area/engine/controlroom) "auJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/greengrid, -/area/engine/controlroom) +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/fore2) "auK" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -6209,17 +6140,21 @@ }, /area/maintenance/electrical_shop) "auN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood{ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/electrical_shop) +/area/maintenance/fore) "auO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/rust, -/area/maintenance/electrical_shop) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "dark" + }, +/area/maintenance/fore2) "auP" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -6230,17 +6165,17 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "auQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "auR" = ( /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "auS" = ( /obj/structure/cable{ d1 = 2; @@ -6250,7 +6185,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "auT" = ( /obj/structure/cable{ d1 = 4; @@ -6263,7 +6198,7 @@ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "auU" = ( /obj/structure/cable{ d1 = 4; @@ -6275,16 +6210,7 @@ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) -"auV" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "auW" = ( /obj/structure/cable{ d1 = 4; @@ -6296,7 +6222,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "auX" = ( /obj/structure/cable{ d1 = 4; @@ -6309,13 +6235,12 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "auY" = ( /obj/structure/cable{ d1 = 4; @@ -6328,7 +6253,7 @@ pixel_y = 32 }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "auZ" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/window/reinforced{ @@ -6350,9 +6275,8 @@ dir = 5; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "avb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8 }, @@ -6381,15 +6305,12 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "ave" = ( /obj/structure/cable{ d1 = 4; @@ -6397,15 +6318,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, /obj/structure/barricade/wooden, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "avf" = ( /obj/structure/cable{ d1 = 1; @@ -6413,13 +6331,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Checkpoint Maintenance"; req_access_txt = "19" }, /turf/simulated/floor/plasteel, -/area/bridge) +/area/maintenance/fore) "avg" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -6428,7 +6345,6 @@ }, /area/hallway/secondary/entry) "avh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 4 }, @@ -6441,7 +6357,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "avj" = ( /obj/structure/cable{ d1 = 1; @@ -6452,7 +6368,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "avk" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance{ @@ -6463,7 +6379,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "avl" = ( /obj/structure/cable{ d1 = 1; @@ -6473,15 +6389,15 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "avm" = ( /obj/structure/table/wood, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "avn" = ( /obj/machinery/computer/arcade, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "avo" = ( /obj/structure/table/wood, /obj/item/lighter/random, @@ -6489,7 +6405,7 @@ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "avp" = ( /obj/structure/table/wood, /obj/item/clothing/glasses/regular/hipster, @@ -6497,7 +6413,7 @@ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "avq" = ( /obj/structure/table/wood, /obj/machinery/alarm{ @@ -6506,7 +6422,7 @@ }, /obj/item/toy/flash, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "avr" = ( /obj/structure/table/wood, /obj/item/toy/figure/crew/wizard, @@ -6514,14 +6430,14 @@ dir = 5; icon_state = "dark" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "avs" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, /area/maintenance/disposal) "avt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/disposal) "avu" = ( @@ -6556,31 +6472,18 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "avx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/black, /obj/item/clothing/glasses/meson, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/controlroom) -"avy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, -/area/engine/controlroom) "avz" = ( /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -6603,9 +6506,6 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -6615,31 +6515,17 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/controlroom) "avC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/controlroom) -"avD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, -/area/engine/controlroom) "avE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -6650,39 +6536,18 @@ d2 = 2; icon_state = "0-2" }, -/turf/simulated/floor/greengrid, +/turf/simulated/floor/plating, /area/engine/controlroom) "avG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" }, /area/engine/controlroom) -"avH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, -/area/engine/controlroom) "avI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/controlroom) -"avJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, -/area/engine/controlroom) "avK" = ( /obj/structure/table/reinforced, /obj/item/tank/internals/emergency_oxygen/engi, @@ -6698,7 +6563,7 @@ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "avM" = ( /obj/structure/cable{ d1 = 4; @@ -6714,7 +6579,7 @@ dir = 5; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "avN" = ( /obj/structure/cable{ d1 = 4; @@ -6728,18 +6593,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"avO" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "avP" = ( /obj/structure/cable{ d1 = 4; @@ -6747,11 +6601,14 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "avQ" = ( /obj/structure/cable{ d1 = 4; @@ -6762,35 +6619,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"avR" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/maintenance/fsmaint) -"avS" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "avT" = ( /obj/structure/cable{ d1 = 4; @@ -6798,15 +6631,18 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "avU" = ( /obj/structure/cable{ d1 = 4; @@ -6814,12 +6650,15 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "avV" = ( /obj/structure/cable{ d1 = 4; @@ -6827,11 +6666,14 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "avW" = ( /obj/structure/cable{ d1 = 1; @@ -6845,119 +6687,124 @@ icon_state = "2-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "avX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "avY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "avZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/girder, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"awa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/fore) +"awa" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 3; name = "3maintenance loot spawner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "awb" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"awc" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "awd" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "awe" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "awf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/maintenance/fsmaint) -"awg" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/maintenance/fore) "awh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -6966,35 +6813,38 @@ }, /area/hallway/secondary/entry) "awi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/hallway/secondary/entry) "awj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -7004,17 +6854,22 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/secondary/entry) "awl" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7029,13 +6884,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall1"; location = "hall15" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -7045,8 +6903,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -7057,7 +6915,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -7067,10 +6924,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -7079,25 +6932,19 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "awr" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aws" = ( /obj/structure/cable{ d1 = 1; @@ -7111,15 +6958,12 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "awt" = ( /obj/structure/cable{ d1 = 4; @@ -7127,15 +6971,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "awu" = ( /obj/structure/cable{ d1 = 4; @@ -7149,15 +6990,11 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "awv" = ( /obj/structure/cable{ d1 = 1; @@ -7165,14 +7002,16 @@ icon_state = "1-8" }, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aww" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, /obj/structure/barricade/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "awx" = ( /turf/simulated/wall/rust, /area/security/checkpoint2) @@ -7181,7 +7020,7 @@ dir = 4 }, /turf/simulated/wall, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "awz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7210,20 +7049,20 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/southeastcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/disposal) "awD" = ( /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/disposal/deliveryChute{ +/obj/structure/disposaloutlet{ dir = 4 }, /obj/machinery/conveyor{ - dir = 8; + dir = 4; id = "garbage" }, /obj/effect/decal/warning_stripes/southwest, @@ -7257,7 +7096,6 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "awG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/reinforced, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, @@ -7273,9 +7111,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ dir = 8; @@ -7283,9 +7118,8 @@ }, /area/engine/controlroom) "awI" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -7298,25 +7132,13 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, /area/engine/controlroom) -"awK" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/engine/controlroom) "awL" = ( /obj/structure/cable{ d1 = 4; @@ -7324,27 +7146,14 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, /area/engine/controlroom) "awM" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/engine/controlroom) +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/maintenance/fore) "awN" = ( /obj/structure/cable{ d1 = 4; @@ -7352,18 +7161,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" }, /area/engine/controlroom) "awO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -7378,9 +7181,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "caution" @@ -7393,7 +7193,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ dir = 8; @@ -7407,9 +7206,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -7422,8 +7218,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" @@ -7436,6 +7232,9 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -7451,7 +7250,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/item/clothing/suit/radiation, /obj/item/clothing/head/radiation, @@ -7459,22 +7258,28 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "awV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "awW" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall/rust, -/area/maintenance/fsmaint) +/area/maintenance/fore) "awX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/wall, -/area/maintenance/fsmaint) +/area/maintenance/fore) "awY" = ( /obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "awZ" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -7489,11 +7294,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/fsmaint) "axb" = ( @@ -7504,23 +7310,20 @@ /area/janitor) "axd" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "axe" = ( /turf/simulated/wall, /area/crew_quarters/toilet) "axf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/item/twohanded/required/kirbyplants, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" + dir = 5; + icon_state = "dark" }, -/area/hallway/secondary/entry) +/area/maintenance/fore2) "axg" = ( /obj/structure/cable{ d1 = 1; @@ -7528,17 +7331,16 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/hallway/secondary/entry) "axh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -7546,7 +7348,6 @@ }, /area/hallway/secondary/entry) "axi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -7565,213 +7366,196 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "axk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/secondary/entry) "axl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/hallway/secondary/entry) +/obj/effect/spawner/window/reinforced/plasma, +/turf/simulated/floor/plating, +/area/engine/controlroom) "axm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/wall, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "axn" = ( /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "axo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "axp" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "axq" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "axr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/fore2) +"axs" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"axs" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "axt" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "axu" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"axv" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plating, +/area/maintenance/fore2) +"axv" = ( /obj/structure/disposalpipe/junction{ dir = 8; icon_state = "pipe-j2"; tag = null }, -/turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) -"axw" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/maintenance/fore2) +"axw" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "axx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, /area/maintenance/disposal) "axy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7780,101 +7564,107 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "axz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/maintenance/disposal) "axA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, -/area/maintenance/disposal) -"axB" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/turf/simulated/floor/plasteel, +/area/maintenance/disposal) +"axB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/maintenance/disposal) "axC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/alarm{ dir = 1; pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/disposal) "axD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/maintenance/disposal) "axE" = ( -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, /obj/machinery/power/apc{ name = "south bump"; pixel_y = -24 @@ -7898,7 +7688,6 @@ }, /area/hallway/secondary/entry) "axG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, @@ -7909,7 +7698,8 @@ /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ dir = 8 }, -/turf/simulated/wall/r_wall, +/obj/effect/spawner/window/reinforced/plasma, +/turf/simulated/floor/plating, /area/engine/controlroom) "axI" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -7923,6 +7713,7 @@ dir = 4 }, /obj/effect/decal/warning_stripes/southeastcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/controlroom) "axK" = ( @@ -8005,11 +7796,11 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "axT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /obj/effect/decal/warning_stripes/southwestcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/controlroom) "axU" = ( @@ -8054,7 +7845,7 @@ "axY" = ( /obj/structure/grille, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "axZ" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ @@ -8062,7 +7853,7 @@ name = "2maintenance loot spawner" }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aya" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, @@ -8070,26 +7861,18 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "ayb" = ( /obj/structure/table/wood, /obj/item/clothing/gloves/color/white, /obj/item/clothing/head/collectable/rabbitears, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"ayc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "redblue" - }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "ayd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aye" = ( /obj/structure/cable{ d1 = 4; @@ -8097,9 +7880,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -8108,17 +7888,12 @@ }, /turf/simulated/floor/greengrid, /area/engine/controlroom) -"ayf" = ( -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/maintenance/fsmaint) "ayg" = ( /turf/simulated/floor/wood{ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "ayh" = ( /obj/structure/table/wood, /obj/item/camera_film, @@ -8126,7 +7901,7 @@ /turf/simulated/floor/plasteel{ icon_state = "wood" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "ayi" = ( /obj/structure/cable{ d1 = 1; @@ -8134,8 +7909,9 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -8220,9 +7996,8 @@ /area/janitor) "ayp" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "ayq" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, @@ -8275,39 +8050,33 @@ /turf/simulated/wall, /area/crew_quarters/toilet) "ayw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "ayx" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/hallway/secondary/entry) "ayy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -8332,31 +8101,30 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Warehouse Maintenance"; req_access_txt = "31" }, /turf/simulated/floor/plasteel, -/area/quartermaster/sorting) +/area/maintenance/fore2) "ayC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/quartermaster/sorting) +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/maintenance/fore) "ayD" = ( /turf/simulated/wall, /area/quartermaster/storage) "ayE" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Maintenance"; req_access_txt = "31" }, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) -"ayF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/maintenance/fore2) +"ayF" = ( /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -8379,8 +8147,8 @@ /turf/simulated/floor/plating, /area/maintenance/disposal) "ayI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/controlroom) "ayJ" = ( @@ -8406,17 +8174,7 @@ /turf/simulated/wall/r_wall, /area/engine/supermatter) "ayO" = ( -/obj/structure/grille, -/obj/structure/window/plasmareinforced, -/obj/structure/window/plasmareinforced{ - dir = 4 - }, -/obj/structure/window/plasmareinforced{ - dir = 1 - }, -/obj/structure/window/plasmareinforced{ - dir = 8 - }, +/obj/effect/spawner/window/reinforced/plasma, /turf/simulated/floor/plating, /area/engine/supermatter) "ayP" = ( @@ -8449,7 +8207,7 @@ icon_state = "pipe-c" }, /turf/simulated/wall, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "ayT" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 6 @@ -8458,7 +8216,7 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "ayU" = ( -/obj/effect/spawner/window/reinforced, +/obj/effect/spawner/window/reinforced/plasma, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, @@ -8472,19 +8230,20 @@ tag = "" }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/controlroom) "ayW" = ( /obj/effect/spawner/random_spawners/oil_maybe, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "ayX" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "ayY" = ( /obj/structure/table/wood, /obj/structure/mirror{ @@ -8496,58 +8255,36 @@ /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "ayZ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redblue" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aza" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "azb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"azc" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "azd" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "wood" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aze" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "azf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8569,19 +8306,14 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "azh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/table/reinforced, /obj/structure/mirror{ pixel_x = -26; @@ -8596,13 +8328,11 @@ /turf/simulated/floor/plasteel, /area/janitor) "azi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start{ name = "Janitor" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plating, /area/janitor) "azj" = ( @@ -8612,16 +8342,10 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/janitor) "azk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; @@ -8629,13 +8353,11 @@ }, /area/janitor) "azl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start{ name = "Janitor" }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitegreen" @@ -8651,12 +8373,11 @@ /area/janitor) "azn" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark{ name = "blobstart" }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "azo" = ( /obj/structure/mirror{ pixel_x = -26; @@ -8676,12 +8397,18 @@ /area/crew_quarters/toilet) "azp" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /area/crew_quarters/toilet) "azq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -8689,10 +8416,19 @@ /area/crew_quarters/toilet) "azr" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/crew_quarters/toilet) "azs" = ( /obj/item/twohanded/required/kirbyplants, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -8705,34 +8441,26 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" }, /area/crew_quarters/toilet) -"azu" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/fore) "azv" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/fore) "azw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/camera{ c_tag = "Fore Hallway North"; dir = 8 @@ -8768,12 +8496,10 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/quartermaster/sorting) "azB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small{ dir = 1 }, @@ -8825,7 +8551,7 @@ "azH" = ( /obj/structure/filingcabinet/filingcabinet, /obj/machinery/alarm{ - pixel_y = 22 + pixel_y = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -8852,13 +8578,14 @@ }, /area/quartermaster/storage) "azK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/yellow, /obj/structure/disposalpipe/sortjunction{ dir = 1; name = "Disposals Maint"; sortType = 1 }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -8941,12 +8668,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; - id_tag = "engsm"; - name = "Supermatter Blast Doors"; - opacity = 0 +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id_tag = "engsm" }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, @@ -8967,8 +8690,8 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/controlroom) "azW" = ( @@ -8978,30 +8701,19 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/engine/controlroom) -"azX" = ( +"azY" = ( +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 + }, +/obj/structure/window/plasmareinforced{ + dir = 4 + }, +/obj/machinery/power/rad_collector, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, -/obj/machinery/power/rad_collector, -/turf/simulated/floor/greengrid, -/area/engine/supermatter) -"azY" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6; - level = 1 - }, -/obj/structure/grille, -/obj/structure/window/plasmareinforced{ - dir = 4 - }, -/obj/structure/window/plasmareinforced{ - dir = 1 - }, -/obj/structure/window/plasmareinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/engine/supermatter) "azZ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -9013,36 +8725,32 @@ /turf/simulated/floor/engine, /area/engine/supermatter) "aAb" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - external_pressure_bound = 101; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/engine, /area/engine/supermatter) "aAc" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ +/obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 10 }, -/obj/structure/grille, -/obj/structure/window/plasmareinforced{ - dir = 4 - }, -/obj/structure/window/plasmareinforced{ - dir = 1 - }, /obj/structure/window/plasmareinforced{ dir = 8 }, -/turf/simulated/floor/plating, -/area/engine/supermatter) -"aAd" = ( +/obj/machinery/power/rad_collector, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/machinery/power/rad_collector, -/turf/simulated/floor/greengrid, +/turf/simulated/floor/engine, +/area/engine/supermatter) +"aAd" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/engine, /area/engine/supermatter) "aAe" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -9052,7 +8760,6 @@ /turf/space, /area/space/nearstation) "aAf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/unary/thermomachine/heater/on{ dir = 4 }, @@ -9071,26 +8778,6 @@ icon_state = "yellowfull" }, /area/engine/controlroom) -"aAh" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/engine/controlroom) "aAi" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 4 @@ -9109,38 +8796,49 @@ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aAk" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /obj/item/reagent_containers/food/drinks/bottle/whiskey, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aAl" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aAm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "redblue" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aAn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/dresser, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aAo" = ( /obj/structure/table/wood, /obj/item/camera, /turf/simulated/floor/plasteel{ icon_state = "wood" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aAp" = ( /obj/structure/chair/comfy/brown{ dir = 8 @@ -9149,33 +8847,33 @@ broken = 1; icon_state = "wood-broken" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aAq" = ( /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aAr" = ( /obj/machinery/photocopier, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aAs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/reinforced, /obj/item/storage/box/lights/mixed, /obj/item/storage/box/lights/mixed, /obj/item/lightreplacer, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /turf/simulated/floor/plasteel, /area/janitor) "aAt" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -9191,6 +8889,9 @@ }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -9198,12 +8899,18 @@ "aAv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/janitor) "aAw" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -9220,18 +8927,20 @@ /area/janitor) "aAy" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aAz" = ( /turf/simulated/wall/rust, /area/crew_quarters/toilet) "aAA" = ( /obj/machinery/light/small, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plating, /area/crew_quarters/toilet) "aAB" = ( @@ -9241,6 +8950,9 @@ /area/crew_quarters/toilet) "aAC" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -9274,44 +8986,48 @@ }, /area/crew_quarters/toilet) "aAF" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/fore) -"aAG" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/fore) -"aAH" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/junction{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/fore) +"aAG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ dir = 8; - initialize_directions = 11 + icon_state = "neutralfull" + }, +/area/hallway/primary/fore) +"aAH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -9328,22 +9044,21 @@ /obj/machinery/door/airlock{ name = "Auxillary Restrooms" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/toilet) "aAJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/quartermaster/sorting) @@ -9363,9 +9078,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -9373,90 +9087,118 @@ }, /area/quartermaster/sorting) "aAN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aAO" = ( +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/spawner/lootdrop/maintenance, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aAP" = ( +/obj/structure/closet/cardboard, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/closet/cardboard, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aAQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aAR" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" }, /area/quartermaster/sorting) "aAS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay"; req_access_txt = "31" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aAT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aAU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aAV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aAW" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aAX" = ( @@ -9465,9 +9207,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aAY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -9484,13 +9223,14 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "aBb" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plating, -/area/quartermaster/storage) +/area/maintenance/fore) "aBf" = ( /obj/structure/cable{ d1 = 4; @@ -9498,25 +9238,17 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; - id_tag = "engsm"; - name = "Supermatter Blast Doors"; - opacity = 0 - }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id_tag = "engsm" + }, /turf/simulated/floor/plating, /area/engine/supermatter) "aBg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aBh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 4 }, @@ -9524,39 +9256,45 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aBi" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 8; + initialize_directions = 11 }, -/obj/structure/grille, /obj/structure/window/plasmareinforced{ dir = 4 }, -/obj/structure/window/plasmareinforced{ - dir = 8 +/obj/machinery/power/rad_collector, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/engine/supermatter) "aBj" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/airlock/public/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/fore) "aBk" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 - }, -/obj/structure/grille, -/obj/structure/window/plasmareinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4; + initialize_directions = 11 }, /obj/structure/window/plasmareinforced{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/machinery/power/rad_collector, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/engine, /area/engine/supermatter) "aBl" = ( /obj/structure/cable{ @@ -9574,15 +9312,17 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aBm" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/engine/controlroom) +/area/hallway/secondary/entry) "aBn" = ( /obj/effect/decal/warning_stripes/arrow{ dir = 8 @@ -9602,7 +9342,7 @@ name = "2maintenance loot spawner" }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aBp" = ( /obj/structure/cable, /obj/machinery/power/apc{ @@ -9613,7 +9353,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aBq" = ( /obj/machinery/vending/autodrobe, /obj/machinery/light/small, @@ -9621,7 +9361,7 @@ dir = 8; icon_state = "redblue" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aBr" = ( /obj/structure/table/wood, /obj/item/clothing/shoes/jackboots, @@ -9630,9 +9370,8 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aBs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/wood, /obj/item/lipstick/random{ pixel_x = 3; @@ -9652,7 +9391,7 @@ /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aBt" = ( /obj/structure/table/wood, /obj/item/storage/fancy/crayons, @@ -9660,7 +9399,7 @@ /turf/simulated/floor/plasteel{ icon_state = "wood" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aBu" = ( /obj/structure/mirror{ pixel_x = -26; @@ -9682,15 +9421,15 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitepurple" }, /area/janitor) "aBw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small, /obj/item/reagent_containers/glass/bucket, /obj/item/mop, @@ -9738,11 +9477,11 @@ }, /area/janitor) "aBA" = ( -/obj/machinery/light/small, /obj/structure/disposalpipe/trunk{ dir = 8 }, /obj/machinery/disposal, +/obj/machinery/light/small, /obj/structure/extinguisher_cabinet{ pixel_x = 25 }, @@ -9750,23 +9489,22 @@ /turf/simulated/floor/plasteel, /area/janitor) "aBB" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/public/glass, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" }, -/area/hallway/primary/fore) -"aBC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/hallway/primary/fore) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/maintenance/fore) "aBD" = ( /obj/structure/cable{ d1 = 1; @@ -9774,42 +9512,34 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/fore) -"aBE" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/fore) +"aBE" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/table/reinforced, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" + dir = 5; + icon_state = "dark" }, -/area/hallway/primary/fore) +/area/crew_quarters/bar) "aBF" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/quartermaster/sorting) "aBG" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -9822,63 +9552,44 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/quartermaster/sorting) -"aBI" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/sorting) "aBJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aBK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aBL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/closet/crate/internals, /turf/simulated/floor/plating, /area/quartermaster/sorting) "aBM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aBN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "brown" - }, -/area/quartermaster/sorting) -"aBO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/maintenance/fore2) +"aBO" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay"; @@ -9895,9 +9606,6 @@ }, /area/quartermaster/storage) "aBQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel{ @@ -9905,17 +9613,6 @@ icon_state = "neutralfull" }, /area/quartermaster/storage) -"aBR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 - }, -/obj/effect/decal/warning_stripes/southwestcorner, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) "aBS" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -9924,14 +9621,12 @@ /area/quartermaster/storage) "aBT" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/storage) "aBU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/airlock/public/glass, @@ -9973,24 +9668,45 @@ /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aBZ" = ( -/obj/effect/spawner/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; + d1 = 4; + d2 = 8; + icon_state = "4-8"; tag = "" }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plating, -/area/quartermaster/storage) +/area/maintenance/fore2) "aCd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/engine/controlroom) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/maintenance/fore2) "aCe" = ( /obj/structure/cable{ d1 = 1; @@ -10005,37 +9721,33 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aCf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aCg" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 - }, -/obj/structure/grille, -/obj/structure/window/plasmareinforced, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers, /obj/structure/window/plasmareinforced{ dir = 4 }, -/obj/structure/window/plasmareinforced{ - dir = 8 +/obj/machinery/power/rad_collector, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/engine/supermatter) "aCh" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 - }, -/obj/structure/grille, -/obj/structure/window/plasmareinforced, -/obj/structure/window/plasmareinforced{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/visible/supply, /obj/structure/window/plasmareinforced{ dir = 8 }, -/turf/simulated/floor/plating, +/obj/machinery/power/rad_collector, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/engine, /area/engine/supermatter) "aCi" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ @@ -10058,22 +9770,34 @@ /turf/simulated/wall, /area/hydroponics/abandoned_garden) "aCm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/hydroponics/abandoned_garden) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/disposal) "aCn" = ( /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aCo" = ( /obj/effect/landmark{ name = "blobstart" }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aCp" = ( +/obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/janitor) +/turf/simulated/floor/plasteel, +/area/engine/controlroom) "aCq" = ( /obj/structure/cable{ d1 = 1; @@ -10081,11 +9805,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock{ name = "Custodial Closet"; req_access_txt = "26" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/janitor) "aCr" = ( @@ -10115,12 +9840,11 @@ /area/janitor) "aCt" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aCu" = ( /obj/machinery/light/small, /obj/machinery/newscaster{ @@ -10133,18 +9857,15 @@ /turf/simulated/floor/plating, /area/crew_quarters/toilet) "aCv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, @@ -10161,45 +9882,28 @@ /obj/machinery/vending/cigarette, /turf/simulated/floor/plating, /area/crew_quarters/toilet) -"aCy" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/fore) -"aCz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/fore) "aCA" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/quartermaster/sorting) "aCB" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/effect/landmark{ + name = "blobstart" }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/quartermaster/sorting) +/area/maintenance/fore) "aCC" = ( /obj/structure/cable{ d1 = 1; @@ -10207,32 +9911,22 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/sorting) "aCD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/landmark/start{ name = "Cargo Technician" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/sorting) "aCE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/landmark{ name = "blobstart" }, @@ -10242,18 +9936,12 @@ }, /area/quartermaster/sorting) "aCF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/sorting) "aCG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -10296,28 +9984,9 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aCL" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) -"aCM" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) +/obj/effect/decal/cleanable/fungus, +/turf/simulated/wall, +/area/maintenance/fore) "aCN" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -10335,53 +10004,26 @@ }, /area/quartermaster/storage) "aCP" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4"; - tag = "90Curve" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/quartermaster/storage) -"aCQ" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/area/crew_quarters/toilet) "aCR" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" +/turf/simulated/floor/plasteel{ + icon_state = "redbluefull" }, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/area/maintenance/fore) "aCS" = ( /obj/structure/cable{ d1 = 2; @@ -10396,17 +10038,15 @@ tag = "" }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aCT" = ( -/obj/machinery/atmospherics/unary/portables_connector, -/obj/structure/extinguisher_cabinet{ - pixel_x = -6; - pixel_y = 32 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/engine/controlroom) +/turf/simulated/floor/plating, +/area/maintenance/fore) "aCU" = ( /obj/structure/cable{ d1 = 2; @@ -10420,8 +10060,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aCV" = ( @@ -10439,12 +10079,6 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/engine/controlroom) -"aCX" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 - }, -/turf/simulated/wall/r_wall, -/area/engine/supermatter) "aCY" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 @@ -10469,8 +10103,8 @@ /turf/simulated/wall/r_wall, /area/engine/supermatter) "aDb" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 }, /turf/simulated/wall/r_wall, /area/engine/supermatter) @@ -10505,7 +10139,7 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aDg" = ( -/obj/effect/spawner/window/reinforced, +/obj/effect/spawner/window/reinforced/plasma, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, @@ -10525,11 +10159,13 @@ dir = 4 }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aDi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/northwestcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -10611,15 +10247,8 @@ icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aDt" = ( /obj/structure/cable{ d1 = 4; @@ -10627,57 +10256,8 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"aDu" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"aDv" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aDw" = ( /obj/structure/cable{ d1 = 4; @@ -10685,19 +10265,10 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aDx" = ( /obj/structure/cable{ d1 = 4; @@ -10710,16 +10281,15 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aDy" = ( /obj/structure/cable{ d1 = 4; @@ -10727,17 +10297,14 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aDz" = ( /obj/structure/cable{ d1 = 4; @@ -10745,19 +10312,17 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aDA" = ( /obj/structure/cable{ d1 = 1; @@ -10772,17 +10337,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aDC" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 10 @@ -10791,6 +10350,10 @@ /turf/space, /area/space/nearstation) "aDD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -10802,119 +10365,83 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 8; - icon_state = "pipe-j2s"; - name = "Bar Junction"; - sortType = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aDE" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aDF" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aDG" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aDH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/crew_quarters/toilet) -"aDI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/wall/rust, -/area/crew_quarters/toilet) -"aDJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/area/maintenance/fore) +"aDI" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/hallway/primary/fore) +/turf/simulated/floor/plasteel, +/area/quartermaster/storage) "aDK" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/sorting) "aDL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ name = "Cargo Bay Warehouse Maintenance"; req_access_txt = "31" @@ -10922,6 +10449,9 @@ /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aDM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -10934,12 +10464,6 @@ icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -10953,19 +10477,21 @@ /turf/simulated/floor/plating, /area/quartermaster/sorting) "aDO" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aDP" = ( @@ -11011,22 +10537,6 @@ }, /turf/simulated/floor/plasteel, /area/quartermaster/storage) -"aDU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) -"aDV" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) "aDW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/arrow{ @@ -11098,11 +10608,11 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8 }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aEf" = ( @@ -11113,17 +10623,21 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aEg" = ( -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA" +/turf/simulated/floor/plasteel{ + icon_state = "redbluefull" }, -/turf/simulated/wall/r_wall, -/area/engine/supermatter) +/area/maintenance/fore) "aEh" = ( /obj/machinery/atmospherics/binary/pump{ name = "Gas to Filter" }, +/obj/machinery/power/apc{ + cell_type = 25000; + dir = 1; + name = "Engineering Engine Super APC"; + pixel_x = -24; + shock_proof = 1 + }, /turf/simulated/floor/engine, /area/engine/supermatter) "aEi" = ( @@ -11131,6 +10645,10 @@ dir = 1; name = "Gas to Chamber" }, +/obj/machinery/alarm/engine{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/engine, /area/engine/supermatter) "aEj" = ( @@ -11139,14 +10657,16 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aEk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/light/small{ - dir = 1 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/hydroponics/abandoned_garden) +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) "aEl" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8; @@ -11173,6 +10693,7 @@ dir = 4 }, /obj/effect/decal/warning_stripes/northeastcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aEo" = ( @@ -11201,51 +10722,49 @@ /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) "aEs" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plasteel, -/area/hydroponics/abandoned_garden) +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 10 + }, +/turf/simulated/floor/engine, +/area/engine/supermatter) "aEt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutral" }, -/turf/simulated/floor/plasteel, -/area/hydroponics/abandoned_garden) +/area/maintenance/fore) "aEu" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aEv" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aEw" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aEx" = ( /obj/structure/cable{ d1 = 4; @@ -11258,7 +10777,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aEy" = ( /obj/structure/cable{ d1 = 4; @@ -11270,7 +10789,7 @@ /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aEz" = ( /obj/structure/cable{ d1 = 4; @@ -11278,12 +10797,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aEA" = ( /obj/structure/cable{ d1 = 4; @@ -11291,36 +10807,27 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aEB" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/crew_quarters/toilet) "aEC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/sortjunction{ dir = 8; name = "Custodial Junction"; - sortType = 11 + sortType = 22 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aED" = ( /obj/structure/cable{ d1 = 4; @@ -11328,58 +10835,26 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/fore) -"aEE" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/fore) "aEF" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aEG" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -11396,19 +10871,16 @@ /turf/simulated/floor/plasteel, /area/quartermaster/sorting) "aEI" = ( +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + sortType = 2 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - sortType = 21 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -11416,6 +10888,7 @@ }, /area/quartermaster/sorting) "aEJ" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -11427,12 +10900,13 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aEK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -11444,13 +10918,10 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -11463,7 +10934,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay"; @@ -11533,32 +11003,23 @@ icon_state = "neutralfull" }, /area/quartermaster/storage) -"aER" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) "aES" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 4; + icon_state = "neutral" }, -/area/quartermaster/storage) +/area/maintenance/fore) "aET" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -11566,23 +11027,23 @@ }, /area/quartermaster/storage) "aEU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/storage) "aEV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'RADIOACTIVE AREA'"; + icon_state = "radiation"; + name = "RADIOACTIVE AREA" }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 }, -/area/quartermaster/storage) +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "aEW" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -11723,6 +11184,7 @@ dir = 9 }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aFm" = ( @@ -11733,16 +11195,25 @@ /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) "aFn" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) "aFo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/hydroponics/abandoned_garden) +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'RADIOACTIVE AREA'"; + icon_state = "radiation"; + name = "RADIOACTIVE AREA" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 9 + }, +/turf/simulated/wall/r_wall, +/area/engine/supermatter) "aFp" = ( /obj/machinery/light{ dir = 8 @@ -11762,17 +11233,23 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aFr" = ( +/obj/machinery/door/airlock/multi_tile{ + name = "maintenance access"; + req_access_txt = "12" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, /area/crew_quarters/sleep) "aFs" = ( /obj/structure/table/wood, @@ -11783,6 +11260,7 @@ /area/crew_quarters/sleep) "aFt" = ( /obj/structure/closet/secure_closet/personal/cabinet, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -11812,10 +11290,19 @@ /turf/simulated/wall, /area/crew_quarters/sleep) "aFy" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/crew_quarters/sleep) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutral" + }, +/area/maintenance/fore) "aFz" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10 @@ -11827,20 +11314,24 @@ /turf/simulated/wall, /area/crew_quarters/bar) "aFB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/fore) "aFC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ pixel_x = 25 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -11864,29 +11355,31 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/quartermaster/sorting) "aFG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ - icon_state = "brown" + dir = 8; + icon_state = "neutralfull" }, -/area/quartermaster/sorting) +/area/quartermaster/storage) "aFH" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/quartermaster/sorting) +/turf/simulated/floor/plasteel, +/area/maintenance/fore) "aFI" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, @@ -11930,20 +11423,12 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aFP" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/door/airlock/external{ - id_tag = "supply_home"; - locked = 1; - name = "Cargo Docking Hatch"; - req_access_txt = "31" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel, -/area/quartermaster/storage) +/area/hydroponics/abandoned_garden) "aFQ" = ( /obj/machinery/light/small, /obj/machinery/newscaster{ @@ -11974,8 +11459,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aFW" = ( @@ -12012,11 +11497,6 @@ c_tag = "Supermatter South"; network = list("SS13","Engineering") }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -12034,9 +11514,6 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 23 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/supermatter) @@ -12064,15 +11541,14 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /obj/effect/decal/warning_stripes/northwestcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aGc" = ( -/obj/structure/cable, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -12083,12 +11559,14 @@ pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aGd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/table/reinforced, /obj/machinery/light/small, /obj/structure/extinguisher_cabinet{ @@ -12143,10 +11621,13 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aGi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -12177,8 +11658,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) "aGm" = ( @@ -12213,67 +11695,44 @@ /obj/structure/chair/office/dark{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/crew_quarters/sleep) "aGq" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/crew_quarters/sleep) "aGr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/crew_quarters/sleep) "aGs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "25" }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/crew_quarters/sleep) -"aGt" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light/small{ - dir = 1 - }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) -"aGu" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" + icon_state = "grimy" }, /area/crew_quarters/sleep) "aGv" = ( @@ -12312,7 +11771,6 @@ }, /area/crew_quarters/bar) "aGx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/sink/kitchen{ pixel_y = 28 }, @@ -12444,7 +11902,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -12456,6 +11913,7 @@ }, /area/hallway/primary/fore) "aGI" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -12467,17 +11925,17 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/fore) "aGJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -12491,24 +11949,13 @@ /obj/structure/disposalpipe/segment, /turf/simulated/wall, /area/quartermaster/office) -"aGM" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" +"aGN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) -"aGN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/quartermaster/office) +/area/hydroponics/abandoned_garden) "aGO" = ( /turf/simulated/wall, /area/security/checkpoint/supply) @@ -12530,8 +11977,9 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aGR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/southwestcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -12610,6 +12058,7 @@ tag = "" }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aHd" = ( @@ -12618,25 +12067,20 @@ /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) "aHe" = ( -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/engine/controlroom) -"aHf" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/engine/controlroom) -"aHg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 5 }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, /area/engine/controlroom) "aHh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -12645,15 +12089,6 @@ icon_state = "neutralfull" }, /area/engine/controlroom) -"aHi" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/engine/controlroom) "aHj" = ( /obj/machinery/hydroponics/soil, /obj/machinery/light/small, @@ -12661,17 +12096,9 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) -"aHk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/engine/controlroom) "aHl" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -12687,6 +12114,9 @@ icon_state = "2-4"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -12708,9 +12138,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, @@ -12770,9 +12203,10 @@ /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) "aHt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) "aHu" = ( @@ -12795,7 +12229,6 @@ /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) "aHw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hydroponics/soil, /obj/machinery/light/small, /obj/item/seeds/tower, @@ -12803,12 +12236,13 @@ /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) "aHx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance{ name = "Abandoned Garden" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hydroponics/abandoned_garden) "aHy" = ( @@ -12857,54 +12291,32 @@ }, /area/crew_quarters/sleep) "aHD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/crew_quarters/sleep) +/turf/simulated/floor/plasteel, +/area/hydroponics/abandoned_garden) "aHE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/dresser, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/crew_quarters/sleep) +/turf/simulated/floor/plasteel, +/area/hydroponics/abandoned_garden) "aHF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/turf/simulated/wall, -/area/crew_quarters/sleep) -"aHG" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) +/turf/simulated/floor/plasteel, +/area/hydroponics/abandoned_garden) "aHH" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 4; @@ -12912,29 +12324,24 @@ }, /area/crew_quarters/sleep) "aHI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/plasticflaps, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=4"; dir = 4; location = "Bar" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, /area/crew_quarters/bar) "aHJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, /area/crew_quarters/bar) "aHK" = ( /obj/structure/cable{ @@ -12943,30 +12350,15 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/crew_quarters/bar) -"aHL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/crew_quarters/bar) "aHM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -12974,11 +12366,11 @@ }, /area/crew_quarters/bar) "aHN" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -12986,52 +12378,43 @@ }, /area/crew_quarters/bar) "aHO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ name = "Bar Office"; req_access_txt = "25" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" }, /area/crew_quarters/bar) "aHP" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" }, /area/crew_quarters/bar) "aHQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "dark" + icon_state = "grimy" }, -/area/crew_quarters/bar) +/area/crew_quarters/sleep) "aHR" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, +/obj/structure/disposalpipe/segment, /obj/machinery/newscaster{ pixel_x = 32 }, @@ -13041,6 +12424,16 @@ }, /area/crew_quarters/bar) "aHS" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/disposalpipe/sortjunction{ + dir = 2; + icon_state = "pipe-j2s"; + name = "Bar Junction"; + sortType = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -13052,14 +12445,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 4; @@ -13090,12 +12475,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aHX" = ( /obj/structure/cable{ d1 = 4; @@ -13103,30 +12485,29 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aHY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ name = "Bar Office Maintenance"; req_access_txt = "25" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, /area/crew_quarters/bar) "aHZ" = ( /obj/structure/disposalpipe/trunk{ @@ -13225,18 +12606,24 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aIg" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/plasticflaps/mining, -/obj/machinery/conveyor/west{ - id = "QMLoad2" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/quartermaster/storage) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/primary/fore) "aIh" = ( /obj/machinery/conveyor/southeast{ id = "cargodelivery" @@ -13379,7 +12766,7 @@ in_use = 1 }, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -13443,9 +12830,6 @@ }, /area/maintenance/incinerator) "aIB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -13457,9 +12841,6 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -13470,9 +12851,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -13483,12 +12861,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/light, /obj/machinery/status_display{ pixel_y = -32 @@ -13503,9 +12875,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -13520,10 +12889,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -13540,9 +12905,8 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aII" = ( @@ -13552,9 +12916,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/warning_stripes/southeastcorner, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -13565,7 +12926,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/light, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -13582,9 +12942,6 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -13604,15 +12961,18 @@ /turf/simulated/floor/plating, /area/hydroponics/abandoned_garden) "aIN" = ( +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aIO" = ( /obj/machinery/door/poddoor{ id_tag = "justice_blast"; @@ -13626,11 +12986,13 @@ /turf/simulated/floor/plasteel, /area/security/execution) "aIP" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/window/reinforced, -/obj/structure/barricade/wooden, -/turf/simulated/floor/plating, -/area/hydroponics/abandoned_garden) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/quartermaster/storage) "aIQ" = ( /obj/structure/cable{ d1 = 1; @@ -13638,14 +13000,11 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aIR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /obj/machinery/camera{ c_tag = "Service Hall North"; @@ -13655,24 +13014,31 @@ /obj/machinery/newscaster{ pixel_x = -32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "aIS" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, /area/crew_quarters/bar) "aIT" = ( /obj/structure/lattice, @@ -13682,16 +13048,13 @@ /turf/space, /area/space/nearstation) "aIU" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/light/small{ dir = 4 }, @@ -13727,6 +13090,9 @@ /area/crew_quarters/bar) "aIY" = ( /obj/item/twohanded/required/kirbyplants, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -13742,12 +13108,16 @@ /obj/effect/landmark/start{ name = "Bartender" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" }, /area/crew_quarters/bar) "aJb" = ( +/obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet{ pixel_x = 25 }, @@ -13757,7 +13127,6 @@ }, /area/crew_quarters/bar) "aJc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 4; @@ -13775,12 +13144,13 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ name = "Delivery Office"; req_access_txt = "50" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/office) "aJf" = ( @@ -13790,7 +13160,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -13803,7 +13172,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ dir = 8; @@ -13832,24 +13200,12 @@ }, /area/security/checkpoint/supply) "aJk" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/security/checkpoint/supply) -"aJl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "red" - }, -/area/security/checkpoint/supply) "aJm" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -13859,9 +13215,6 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -13871,9 +13224,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -13883,9 +13233,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; @@ -13897,54 +13245,41 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/storage) "aJs" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/plasticflaps/mining, -/obj/machinery/conveyor/east{ - id = "QMLoad" - }, -/turf/simulated/floor/plating, -/area/quartermaster/storage) -"aJt" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/quartermaster/storage) -"aJu" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/effect/decal/warning_stripes/north, +/obj/machinery/door_control{ + id = "engsm"; + name = "Radiation Shutters Control"; + pixel_y = 24; + req_access_txt = "10" }, +/turf/simulated/floor/plasteel, +/area/engine/controlroom) +"aJt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/crew_quarters/sleep) +"aJu" = ( +/obj/effect/spawner/window/reinforced, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; @@ -13954,17 +13289,17 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "aJv" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/effect/decal/warning_stripes/northwestcorner, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" }, -/turf/simulated/floor/plating, /area/quartermaster/storage) "aJx" = ( /turf/simulated/wall, @@ -14004,9 +13339,6 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "aJF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ dir = 1; @@ -14027,10 +13359,10 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aJH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/decal/warning_stripes/southwestcorner, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -14060,11 +13392,9 @@ "aJK" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "solar_tool_outer"; locked = 1; name = "Engineering External Access"; - req_access = null; req_access_txt = "32" }, /obj/structure/cable{ @@ -14115,21 +13445,17 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, /area/maintenance/auxsolarport) "aJN" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, @@ -14224,7 +13550,6 @@ /turf/simulated/floor/plasteel, /area/maintenance/incinerator) "aJV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/biohazard, /turf/simulated/wall/r_wall, /area/engine/controlroom) @@ -14235,7 +13560,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Access"; @@ -14245,14 +13569,17 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aJX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/wall/r_wall, -/area/engine/controlroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/quartermaster/storage) "aJY" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -14261,7 +13588,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/engine/controlroom) "aJZ" = ( @@ -14277,6 +13603,8 @@ req_one_access_txt = "24" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aKa" = ( @@ -14285,7 +13613,7 @@ dir = 9; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aKb" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ @@ -14302,8 +13630,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aKd" = ( /obj/structure/cable{ d1 = 4; @@ -14311,11 +13642,11 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "aKe" = ( /obj/structure/cable{ d1 = 4; @@ -14323,12 +13654,14 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aKf" = ( /obj/structure/cable{ d1 = 4; @@ -14336,15 +13669,18 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aKg" = ( /obj/structure/cable{ d1 = 1; @@ -14358,17 +13694,18 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aKh" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -14380,6 +13717,7 @@ /obj/structure/table/wood, /obj/item/folder, /obj/item/pen, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -14407,14 +13745,12 @@ }, /area/crew_quarters/sleep) "aKm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/item/radio/intercom{ dir = 0; pixel_x = -28 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -14423,7 +13759,9 @@ "aKn" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, /area/crew_quarters/bar) "aKo" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -14431,11 +13769,9 @@ }, /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "solar_tool_inner"; locked = 1; name = "Engineering External Access"; - req_access = null; req_access_txt = "32" }, /obj/structure/cable{ @@ -14478,10 +13814,6 @@ }, /area/crew_quarters/bar) "aKt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/machinery/camera{ c_tag = "Fore Hallway North"; dir = 4 @@ -14492,26 +13824,24 @@ }, /area/hallway/primary/fore) "aKu" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/fore) "aKv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 1; on = 1 @@ -14523,7 +13853,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/office) "aKw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 4; @@ -14531,7 +13860,6 @@ }, /area/hallway/primary/fore) "aKx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/quartermaster/office) @@ -14542,9 +13870,7 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -14604,6 +13930,7 @@ /obj/structure/chair/office/dark{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -14637,18 +13964,13 @@ }, /area/quartermaster/storage) "aKG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) -"aKH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -14669,7 +13991,6 @@ /area/quartermaster/storage) "aKL" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/dirt, @@ -14759,15 +14080,24 @@ "aKZ" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -24 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/maintenance/auxsolarport) "aLa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, -/area/maintenance/auxsolarport) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/quartermaster/storage) "aLb" = ( /obj/structure/rack, /obj/item/storage/toolbox/emergency, @@ -14841,10 +14171,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -14867,22 +14193,19 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/maintenance/incinerator) "aLk" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ dir = 8; @@ -14924,9 +14247,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ name = "Turbine Generator Access"; @@ -14942,9 +14262,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -14954,10 +14271,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -14969,43 +14282,21 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aLr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/sign/electricshock{ pixel_y = -32 }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ - icon_state = "door_closed"; name = "Fore Port Solar Access"; req_access_txt = "32" }, /turf/simulated/floor/plasteel, /area/maintenance/auxsolarport) "aLs" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/engine/controlroom) -"aLt" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/engine/controlroom) "aLu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -15016,10 +14307,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -15047,37 +14334,30 @@ /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aLy" = ( /obj/structure/closet, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aLz" = ( /obj/machinery/light/small, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aLA" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) -"aLB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/spawner/random_spawners/grille_maybe, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aLC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random_spawners/grille_maybe, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aLD" = ( /obj/structure/cable{ d1 = 1; @@ -15085,14 +14365,14 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/small{ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aLE" = ( /obj/structure/table/wood, /obj/machinery/newscaster{ @@ -15106,64 +14386,58 @@ /obj/structure/chair/office/dark{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/crew_quarters/sleep) "aLG" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/crew_quarters/sleep) "aLH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/crew_quarters/sleep) "aLI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "25" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/crew_quarters/sleep) "aLJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) -"aLK" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) "aLL" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -15171,7 +14445,7 @@ /obj/machinery/disposal, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/machinery/newscaster{ layer = 3.3; @@ -15239,12 +14513,6 @@ /obj/structure/lattice/catwalk, /turf/space, /area/maintenance/auxsolarport) -"aLR" = ( -/obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/crew_quarters/bar/atrium) "aLS" = ( /obj/structure/chair/stool, /obj/effect/landmark/start{ @@ -15253,7 +14521,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aLT" = ( /obj/item/wrench, /obj/structure/lattice/catwalk, @@ -15288,22 +14556,28 @@ }, /area/quartermaster/office) "aLX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "brown" + dir = 8; + icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/quartermaster/storage) "aLY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -15316,9 +14590,9 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -15342,6 +14616,12 @@ /area/security/checkpoint/supply) "aMc" = ( /obj/machinery/computer/supplycomp, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "red" @@ -15354,19 +14634,19 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/security/checkpoint/supply) "aMe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -15375,72 +14655,67 @@ "aMf" = ( /obj/structure/closet/crate/internals, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/storage) "aMg" = ( -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "red" + dir = 5; + icon_state = "dark" }, -/area/quartermaster/storage) -"aMh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) +/area/crew_quarters/bar) "aMi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 5; + icon_state = "dark" }, -/area/quartermaster/storage) +/area/crew_quarters/bar) "aMj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 5; + icon_state = "dark" }, -/area/quartermaster/storage) +/area/crew_quarters/bar) "aMk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/landmark/start{ + name = "Bartender" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 5; + icon_state = "dark" }, -/area/quartermaster/storage) +/area/crew_quarters/bar) "aMl" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 5; + icon_state = "dark" }, -/area/quartermaster/storage) +/area/crew_quarters/bar) "aMp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -15468,9 +14743,6 @@ /turf/simulated/wall/r_wall, /area/security/execution) "aMw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ id_tag = null; @@ -15493,8 +14765,11 @@ /area/engine/controlroom) "aMz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, -/area/maintenance/incinerator) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/quartermaster/storage) "aMA" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/canister, @@ -15519,12 +14794,12 @@ /turf/simulated/floor/plasteel, /area/maintenance/incinerator) "aMD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/structure/dresser, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel{ + icon_state = "wood" }, -/turf/simulated/floor/plasteel, -/area/maintenance/incinerator) +/area/crew_quarters/sleep) "aME" = ( /obj/structure/cable{ d1 = 1; @@ -15532,6 +14807,9 @@ icon_state = "1-8" }, /obj/effect/decal/warning_stripes/southeastcorner, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -15567,7 +14845,6 @@ /turf/simulated/wall/r_wall, /area/maintenance/incinerator) "aMK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -15580,10 +14857,6 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aMM" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/engine/controlroom) @@ -15592,6 +14865,7 @@ pixel_x = 22 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/closet/radiation, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aMO" = ( @@ -15602,7 +14876,6 @@ }, /area/maintenance/incinerator) "aMP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, @@ -15614,18 +14887,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aMR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/light/small, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, @@ -15689,26 +14956,30 @@ /turf/simulated/wall, /area/maintenance/gambling_den) "aMX" = ( +/obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/maintenance/gambling_den) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "dark" + }, +/area/crew_quarters/bar) "aMY" = ( /turf/simulated/wall/rust, /area/maintenance/gambling_den) "aMZ" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aNa" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -15717,17 +14988,16 @@ }, /area/crew_quarters/sleep) "aNb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "wood" + dir = 8; + icon_state = "neutralfull" }, -/area/crew_quarters/sleep) +/area/quartermaster/storage) "aNc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light, /obj/structure/closet/wardrobe/mixed, /turf/simulated/floor/plasteel{ @@ -15735,43 +15005,34 @@ }, /area/crew_quarters/sleep) "aNd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/wood, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/crew_quarters/sleep) "aNe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/crew_quarters/sleep) +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/maintenance/fore) "aNf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -25 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "aNg" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ dir = 8; pixel_x = 24 @@ -15791,24 +15052,20 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) -"aNi" = ( -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aNj" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 4 }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aNk" = ( /obj/machinery/conveyor_switch/oneway{ id = "QMLoad" @@ -15831,13 +15088,6 @@ icon_state = "neutralfull" }, /area/quartermaster/office) -"aNn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/office) "aNo" = ( /obj/structure/cable{ d1 = 1; @@ -15845,16 +15095,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" }, /area/quartermaster/office) "aNp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/arrow, /obj/effect/decal/warning_stripes/yellow/partial, @@ -15876,7 +15122,6 @@ /obj/machinery/door_timer{ id = "Cargo Cell"; name = "Cargo Cell Timer"; - pixel_x = -32; pixel_y = -32 }, /turf/simulated/floor/plasteel{ @@ -15897,7 +15142,7 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/plasteel{ @@ -15912,7 +15157,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/machinery/camera{ c_tag = "Medbay Storage"; @@ -15932,14 +15177,18 @@ }, /area/quartermaster/storage) "aNu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/storage) "aNv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -15958,9 +15207,6 @@ icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ id_tag = "Cargo Cell"; @@ -15992,14 +15238,17 @@ }, /area/quartermaster/office) "aNy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/conveyor_switch/oneway{ id = "cargodisposals"; name = "Trash Filter Switch" }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/office) "aND" = ( @@ -16215,9 +15464,8 @@ /turf/simulated/wall/r_wall, /area/maintenance/incinerator) "aNU" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/engine, /area/maintenance/incinerator) @@ -16251,12 +15499,16 @@ /turf/simulated/floor/engine, /area/maintenance/incinerator) "aNX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/visible{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/wall/r_wall, -/area/maintenance/incinerator) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "wood" + }, +/area/crew_quarters/sleep) "aNY" = ( /obj/machinery/atmospherics/pipe/manifold/visible, /turf/simulated/floor/plasteel{ @@ -16271,9 +15523,10 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/computer/sm_monitor, /turf/simulated/floor/plasteel, /area/engine/controlroom) "aOa" = ( @@ -16288,11 +15541,15 @@ /turf/simulated/floor/plating, /area/atmos) "aOc" = ( -/obj/effect/spawner/window/reinforced, +/obj/structure/chair/stool/bar, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/atmos) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/crew_quarters/bar) "aOd" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -16302,7 +15559,6 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel{ dir = 8; @@ -16315,9 +15571,17 @@ /turf/simulated/floor/plating, /area/atmos) "aOf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, -/area/atmos) +/obj/machinery/conveyor{ + id = "cargodisposals" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/quartermaster/office) "aOg" = ( /turf/simulated/wall/r_wall, /area/atmos) @@ -16330,7 +15594,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "aOi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; @@ -16348,7 +15611,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "aOk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/sign/fire, /turf/simulated/wall/r_wall, /area/atmos) @@ -16369,10 +15631,11 @@ req_one_access_txt = "24" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/atmos) "aOn" = ( -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, @@ -16414,7 +15677,6 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -16432,43 +15694,29 @@ }, /area/maintenance/gambling_den) "aOv" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aOw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/crew_quarters/theatre) +/obj/effect/spawner/window/reinforced, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/security/checkpoint/supply) "aOx" = ( /turf/simulated/wall, /area/crew_quarters/theatre) -"aOy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) -"aOz" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) "aOA" = ( /obj/structure/table/wood, /obj/item/camera_film, @@ -16528,22 +15776,18 @@ dir = 5; icon_state = "dark" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aOG" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aOH" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aOI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/radio/intercom{ dir = 4; pixel_x = 28 @@ -16571,9 +15815,10 @@ }, /area/quartermaster/office) "aOL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -16628,24 +15873,16 @@ }, /area/security/checkpoint/supply) "aOQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/landmark/start{ - name = "Cargo Technician" - }, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "redyellowfull" }, -/area/quartermaster/storage) +/area/crew_quarters/bar) "aOR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "aOS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -16719,7 +15956,7 @@ "aPf" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/effect/decal/cleanable/dirt, /obj/item/twohanded/required/kirbyplants, @@ -16827,7 +16064,6 @@ autoclose = 0; frequency = 1449; heat_proof = 1; - icon_state = "door_locked"; id_tag = "gas_turbine_exterior"; locked = 1; name = "Turbine Exterior Airlock"; @@ -16842,10 +16078,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /turf/simulated/floor/engine, /area/maintenance/incinerator) "aPq" = ( @@ -16855,12 +16087,10 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/door/airlock/glass{ autoclose = 0; frequency = 1449; heat_proof = 1; - icon_state = "door_locked"; id_tag = "gas_turbine_interior"; locked = 1; name = "Turbine Interior Airlock"; @@ -16875,9 +16105,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -16890,9 +16117,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 8; @@ -16900,15 +16124,12 @@ }, /area/maintenance/incinerator) "aPt" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/binary/valve, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel{ @@ -16917,35 +16138,28 @@ }, /area/maintenance/incinerator) "aPu" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/atmos) -"aPv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "dark" + icon_state = "redyellowfull" }, -/area/atmos) +/area/crew_quarters/bar) +"aPv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small, +/turf/simulated/floor/plasteel, +/area/security/permabrig) "aPw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/landmark/start{ + name = "Clown" }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "dark" + icon_state = "redbluefull" }, -/area/atmos) +/area/crew_quarters/theatre) "aPx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plasteel{ dir = 1; @@ -16953,9 +16167,6 @@ }, /area/atmos) "aPy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/light{ dir = 1; in_use = 1 @@ -16970,9 +16181,6 @@ }, /area/atmos) "aPz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/item/radio/intercom{ pixel_y = 22 }, @@ -16982,18 +16190,16 @@ }, /area/atmos) "aPA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "dark" - }, -/area/atmos) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet, +/area/crew_quarters/bar/atrium) "aPB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/visible, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel{ @@ -17002,9 +16208,6 @@ }, /area/maintenance/incinerator) "aPC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/status_display{ pixel_y = 32 }, @@ -17017,15 +16220,13 @@ }, /area/atmos) "aPD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "dark" + icon_state = "brown" }, -/area/atmos) +/area/quartermaster/storage) "aPE" = ( /obj/machinery/camera{ c_tag = "Supermatter Entrance"; @@ -17036,11 +16237,12 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aPF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "dark" +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 }, +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel, /area/atmos) "aPG" = ( /obj/machinery/light{ @@ -17090,8 +16292,8 @@ }, /area/maintenance/gambling_den) "aPM" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /turf/simulated/floor/wood{ broken = 1; @@ -17105,10 +16307,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -17125,13 +16323,13 @@ }, /area/maintenance/gambling_den) "aPP" = ( -/obj/structure/dresser, /obj/machinery/newscaster{ pixel_y = 32 }, /obj/machinery/status_display{ pixel_x = -32 }, +/obj/structure/closet/secure_closet/clown, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, @@ -17198,13 +16396,13 @@ }, /area/crew_quarters/bar/atrium) "aPV" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "grimy" + icon_state = "wood" }, -/area/crew_quarters/bar/atrium) +/area/maintenance/gambling_den) "aPW" = ( /turf/simulated/floor/carpet, /area/crew_quarters/bar/atrium) @@ -17215,6 +16413,7 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet, /area/crew_quarters/bar/atrium) "aPY" = ( @@ -17232,21 +16431,14 @@ dir = 5; icon_state = "dark" }, -/area/crew_quarters/bar/atrium) -"aQa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aQb" = ( /obj/structure/table/wood, /obj/item/storage/pill_bottle/dice, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aQc" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/condiment/saltshaker{ @@ -17254,17 +16446,19 @@ pixel_y = 7 }, /obj/item/reagent_containers/food/condiment/peppermill, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aQd" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/cans/cola, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aQe" = ( /obj/structure/cable{ d2 = 4; @@ -17296,6 +16490,9 @@ /obj/effect/landmark/start{ name = "Cargo Technician" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -17315,9 +16512,9 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -17329,12 +16526,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -17411,9 +16602,6 @@ }, /area/quartermaster/storage) "aQo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/machinery/door/window/brigdoor/southright{ @@ -17443,13 +16631,16 @@ /turf/simulated/floor/plasteel, /area/quartermaster/office) "aQq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/quartermaster/storage) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "wood" + }, +/area/maintenance/gambling_den) "aQr" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/dirt, @@ -17476,7 +16667,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aQu" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light{ @@ -17500,17 +16691,15 @@ /area/quartermaster/storage) "aQw" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/structure/barricade/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plating, -/area/quartermaster/storage) +/area/maintenance/gambling_den) "aQx" = ( /obj/structure/table, /obj/item/book/manual/chef_recipes, @@ -17521,8 +16710,7 @@ /area/security/permabrig) "aQy" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, @@ -17637,12 +16825,12 @@ }, /area/maintenance/incinerator) "aQQ" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/table/reinforced, -/obj/structure/disposalpipe/segment, /obj/item/clipboard, /obj/item/folder/yellow, /obj/item/reagent_containers/food/pill/patch/silver_sulf, @@ -17666,14 +16854,19 @@ }, /area/maintenance/incinerator) "aQS" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "dark" + icon_state = "grimy" }, -/area/atmos) +/area/crew_quarters/bar/atrium) "aQT" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -17682,9 +16875,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/paper_bin, /obj/item/pen, /turf/simulated/floor/plasteel{ @@ -17696,9 +16886,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/dispenser, /turf/simulated/floor/plasteel{ dir = 1; @@ -17709,9 +16896,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/computer/atmoscontrol, /turf/simulated/floor/plasteel{ dir = 1; @@ -17722,9 +16906,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/computer/atmos_alert, /turf/simulated/floor/plasteel{ @@ -17737,9 +16918,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/wrench, /obj/item/crowbar, /obj/item/clothing/mask/gas, @@ -17757,8 +16935,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/emergency_oxygen, @@ -17785,9 +16962,6 @@ /turf/simulated/floor/plasteel, /area/engine/controlroom) "aRb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 8 @@ -17805,9 +16979,6 @@ }, /area/atmos) "aRc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 @@ -17823,23 +16994,31 @@ }, /area/atmos) "aRd" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, -/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + dir = 5; + icon_state = "dark" }, -/area/atmos) +/area/crew_quarters/bar) "aRe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/atmos) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/crew_quarters/bar) "aRf" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced{ @@ -17902,6 +17081,7 @@ "aRk" = ( /obj/structure/table/wood, /obj/item/storage/briefcase, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -17925,8 +17105,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair/stool, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -17951,6 +17131,7 @@ /obj/effect/landmark/start{ name = "Clown" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, @@ -17962,22 +17143,28 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, /area/crew_quarters/theatre) "aRs" = ( -/obj/structure/plasticflaps, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/crew_quarters/theatre) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/crew_quarters/bar) "aRt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, /area/crew_quarters/sleep) "aRu" = ( /obj/structure/cable{ @@ -17992,27 +17179,19 @@ icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 2; - icon_state = "pipe-j2s"; - name = "Theatre Junction"; - sortType = 14 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aRv" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/small{ dir = 4 }, @@ -18030,11 +17209,17 @@ }, /area/crew_quarters/bar/atrium) "aRx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/crew_quarters/bar/atrium) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/crew_quarters/bar) "aRy" = ( /obj/structure/chair/wood, /turf/simulated/floor/carpet, @@ -18055,64 +17240,30 @@ dir = 5; icon_state = "dark" }, -/area/crew_quarters/bar/atrium) -"aRB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aRC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/cheesiehonkers, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aRD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aRE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table/wood, /obj/item/deck/cards, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) -"aRF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/crew_quarters/bar/atrium) -"aRG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aRH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/arrow, /obj/effect/decal/warning_stripes/yellow/partial, /turf/simulated/floor/plasteel{ @@ -18120,37 +17271,7 @@ icon_state = "neutralcorner" }, /area/hallway/primary/fore) -"aRI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/fore) -"aRJ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/fore) "aRK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/light{ dir = 4 }, @@ -18199,16 +17320,16 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/quartermaster/office) "aRO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -18289,26 +17410,25 @@ }, /area/quartermaster/storage) "aRW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "brown" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/quartermaster/storage) -"aRX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "brown" + icon_state = "neutralcorner" + }, +/area/hallway/primary/fore) +"aRX" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" }, /area/quartermaster/storage) "aRY" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; @@ -18327,41 +17447,33 @@ /turf/simulated/wall, /area/quartermaster/qm) "aSc" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/quartermaster/qm) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/atmos) "aSd" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/turf/simulated/floor/plating, -/area/quartermaster/qm) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet, +/area/crew_quarters/bar/atrium) "aSe" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/quartermaster/qm) +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, +/area/hallway/primary/fore) "aSh" = ( /obj/structure/table/glass, /obj/item/reagent_containers/glass/bottle/morphine, @@ -18490,9 +17602,9 @@ /turf/simulated/floor/engine, /area/maintenance/incinerator) "aSz" = ( +/obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/maintenance/incinerator) "aSA" = ( @@ -18552,13 +17664,19 @@ /turf/simulated/floor/plasteel, /area/atmos) "aSG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 4 +/obj/structure/chair/office/dark{ + dir = 1 }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/atmos) +/obj/effect/landmark/start{ + name = "Cargo Technician" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/quartermaster/storage) "aSH" = ( /obj/structure/cable{ d1 = 1; @@ -18570,15 +17688,21 @@ dir = 4 }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/atmos) "aSI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ +/obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, /area/atmos) "aSJ" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -18626,7 +17750,9 @@ }, /area/maintenance/gambling_den) "aSQ" = ( -/obj/machinery/atmospherics/unary/vent_pump, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/wood{ broken = 1; icon_state = "wood-broken" @@ -18639,7 +17765,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -18651,18 +17782,17 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/door/airlock/maintenance{ + req_access_txt = "12" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, /turf/simulated/floor/plasteel, -/area/crew_quarters/theatre) +/area/maintenance/fore) "aST" = ( /obj/structure/cable{ d1 = 4; @@ -18670,18 +17800,13 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/machinery/hologram/holopad, +/obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/hologram/holopad, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redblue" - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel, /area/crew_quarters/theatre) "aSU" = ( /obj/structure/cable{ @@ -18690,37 +17815,33 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redblue" - }, +/turf/simulated/floor/plasteel, /area/crew_quarters/theatre) "aSV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redblue" - }, +/turf/simulated/floor/plasteel, /area/crew_quarters/theatre) "aSW" = ( /obj/structure/cable{ @@ -18734,14 +17855,13 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redblue" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +/turf/simulated/floor/plasteel, /area/crew_quarters/theatre) "aSX" = ( /obj/structure/cable{ @@ -18750,48 +17870,58 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plasteel, +/area/crew_quarters/theatre) +"aSY" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "redblue" - }, -/area/crew_quarters/theatre) -"aSY" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ req_access_txt = "46" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/theatre) "aSZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, /area/crew_quarters/sleep) "aTa" = ( +/obj/structure/disposalpipe/junction, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -18814,9 +17944,11 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, /area/crew_quarters/sleep) "aTb" = ( /obj/machinery/hologram/holopad, @@ -18833,15 +17965,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ req_access_txt = "25" }, /turf/simulated/floor/plasteel, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/sleep) "aTd" = ( /obj/structure/cable{ d1 = 4; @@ -18849,9 +17978,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -18864,15 +17990,18 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/crew_quarters/bar/atrium) "aTf" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/carpet, /area/crew_quarters/bar/atrium) "aTg" = ( @@ -18884,16 +18013,24 @@ /obj/structure/chair/wood{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/carpet, /area/crew_quarters/bar/atrium) "aTh" = ( /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aTi" = ( /obj/structure/window/reinforced{ dir = 4 @@ -18906,13 +18043,19 @@ /turf/simulated/floor/plasteel, /area/quartermaster/office) "aTj" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ desc = "\"This is a plaque in honour of our comrades on the G4407 Stations. Hopefully TG4407 model can live up to your fame and fortune.\" Scratched in beneath that is a crude image of a meteor and a spaceman. The spaceman is laughing. The meteor is exploding."; dir = 4; @@ -18921,20 +18064,16 @@ }, /area/hallway/primary/fore) "aTk" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/fore) -"aTl" = ( -/obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, -/area/quartermaster/office) +/area/maintenance/fore) "aTm" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -18949,14 +18088,14 @@ /turf/simulated/wall, /area/security/checkpoint/supply) "aTo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, /area/security/checkpoint/supply) "aTp" = ( @@ -18964,28 +18103,24 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aTq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, /area/security/checkpoint/supply) "aTr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "dark" - }, -/area/atmos) +/turf/simulated/floor/carpet, +/area/crew_quarters/bar/atrium) "aTs" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/metal{ @@ -19000,6 +18135,8 @@ /obj/structure/table/reinforced, /obj/item/stack/packageWrap, /obj/item/hand_labeler, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -19007,6 +18144,7 @@ /area/quartermaster/storage) "aTu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -19030,16 +18168,17 @@ /area/quartermaster/storage) "aTx" = ( /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; + d1 = 4; + d2 = 8; + icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "brown" + dir = 8; + icon_state = "neutralfull" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aTy" = ( /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/plasteel{ @@ -19069,9 +18208,6 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -19083,18 +18219,13 @@ }, /area/quartermaster/qm) "aTC" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" }, /area/quartermaster/qm) "aTD" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -19186,7 +18317,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/structure/table/reinforced, /obj/item/reagent_containers/glass/bottle/morphine, @@ -19317,14 +18448,14 @@ }, /area/security/execution) "aTS" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 + }, /turf/space, /area/space/nearstation) "aTT" = ( @@ -19335,27 +18466,28 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "dark" }, /area/atmos) "aTU" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/visible{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /turf/space, /area/space/nearstation) "aTV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aTW" = ( @@ -19402,6 +18534,12 @@ dir = 1; name = "Port to Turbine" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -19415,16 +18553,27 @@ dir = 1; name = "Port to Filter" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "aUc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -19440,16 +18589,23 @@ /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "aUe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -19495,14 +18651,13 @@ /turf/simulated/floor/plating, /area/atmos) "aUj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/crew_quarters/bar) "aUk" = ( /obj/structure/grille, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -19515,14 +18670,12 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; external_pressure_bound = 0; - external_pressure_bound_default = 0; - frequency = 1441; + frequency = 1443; + icon_state = "in"; id_tag = "air_out"; internal_pressure_bound = 2000; - internal_pressure_bound_default = 2000; on = 1; pressure_checks = 2; - pressure_checks_default = 2; pump_direction = 0 }, /turf/simulated/floor/engine/air, @@ -19538,11 +18691,14 @@ /turf/simulated/floor/engine/air, /area/atmos) "aUo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) +/obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/crew_quarters/bar) "aUp" = ( /turf/simulated/floor/plating, /area/maintenance/gambling_den) @@ -19553,23 +18709,12 @@ icon_state = "wood-broken" }, /area/maintenance/gambling_den) -"aUr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/chair/stool, -/turf/simulated/floor/plating, -/area/maintenance/gambling_den) "aUs" = ( /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood{ broken = 1; icon_state = "wood-broken" @@ -19582,9 +18727,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/gambling_den) "aUu" = ( @@ -19594,9 +18736,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, @@ -19614,23 +18753,22 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aUw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 +/obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/turf/simulated/wall, -/area/crew_quarters/theatre) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/crew_quarters/bar) "aUx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/mirror{ pixel_x = -26; pixel_y = 3 @@ -19640,9 +18778,6 @@ }, /area/crew_quarters/theatre) "aUy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/landmark/start{ name = "Mime" }, @@ -19651,9 +18786,6 @@ }, /area/crew_quarters/theatre) "aUz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -19663,9 +18795,6 @@ dir = 1 }, /obj/machinery/disposal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = 28 @@ -19676,43 +18805,50 @@ }, /area/crew_quarters/theatre) "aUB" = ( +/obj/structure/chair/stool, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/wall, -/area/crew_quarters/theatre) +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/crew_quarters/bar) "aUC" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/effect/decal/warning_stripes/arrow, /obj/effect/decal/warning_stripes/yellow/partial, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, /area/crew_quarters/sleep) "aUD" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "aUE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/turf/simulated/wall, -/area/crew_quarters/bar/atrium) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/quartermaster/office) "aUF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/wood, /obj/item/lipstick/random, /obj/item/lipstick/random, @@ -19723,13 +18859,13 @@ }, /area/crew_quarters/bar/atrium) "aUG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "grimy" + dir = 8; + icon_state = "neutralfull" }, -/area/crew_quarters/bar/atrium) +/area/quartermaster/storage) "aUH" = ( /obj/structure/chair/wood{ dir = 1 @@ -19741,31 +18877,25 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aUJ" = ( /obj/structure/table/wood, /obj/item/paicard, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) -"aUK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/chair/stool, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aUL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-y" }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aUM" = ( /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -19789,9 +18919,6 @@ }, /area/quartermaster/office) "aUO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/table/reinforced, /obj/item/folder/yellow, /obj/item/multitool, @@ -19809,23 +18936,27 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" }, /area/quartermaster/office) "aUQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "brown" + dir = 8; + icon_state = "neutralfull" }, -/area/quartermaster/office) +/area/atmos) "aUR" = ( /obj/machinery/ai_status_display{ pixel_y = 32 @@ -19848,6 +18979,7 @@ pixel_y = 30 }, /obj/item/storage/firstaid/regular, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -19948,49 +19080,24 @@ }, /area/quartermaster/storage) "aVb" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/item/twohanded/required/kirbyplants, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 4; icon_state = "brown" }, -/area/quartermaster/storage) +/area/quartermaster/office) "aVc" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/quartermaster/qm) -"aVd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "brown" - }, -/area/quartermaster/qm) -"aVe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK" }, +/turf/simulated/wall, /area/quartermaster/qm) "aVf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; @@ -20007,9 +19114,6 @@ /obj/structure/chair/office/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -20018,18 +19122,7 @@ "aVh" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/qm) -"aVi" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -20079,8 +19172,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 0; @@ -20259,11 +19351,9 @@ "aVB" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "perma_outer"; locked = 1; name = "Perma Brig External Access"; - req_access = null; req_access_txt = "63" }, /obj/structure/sign/securearea{ @@ -20354,14 +19444,9 @@ }, /area/atmos) "aVK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/green{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "caution" - }, -/area/atmos) +/obj/effect/spawner/random_spawners/wall_rusted_maybe, +/turf/simulated/wall, +/area/maintenance/fore) "aVL" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -20393,10 +19478,11 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -20433,25 +19519,16 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aVR" = ( -/obj/structure/grille, -/obj/structure/window/plasmareinforced, -/obj/structure/window/plasmareinforced{ - dir = 4 - }, -/obj/structure/window/plasmareinforced{ - dir = 1 - }, -/obj/structure/window/plasmareinforced{ - dir = 8 - }, +/obj/effect/spawner/window/reinforced/plasma, /turf/simulated/floor/plating, /area/atmos) "aVS" = ( /obj/machinery/air_sensor{ - frequency = 1441; - id_tag = "air_sensor" + frequency = 1443; + id_tag = "air_sensor"; + output = 7 }, /turf/simulated/floor/engine/air, /area/atmos) @@ -20477,34 +19554,21 @@ /turf/simulated/floor/plating, /area/maintenance/gambling_den) "aVX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/table/wood, -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/obj/structure/ore_box, +/obj/effect/decal/warning_stripes/yellow/hollow, +/turf/simulated/floor/plasteel, +/area/quartermaster/miningdock) "aVY" = ( -/obj/structure/table/wood, /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, -/obj/item/lipstick/random{ - pixel_x = -3; - pixel_y = -3 - }, -/obj/item/lipstick/random{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/lipstick/random{ - pixel_x = -1; - pixel_y = 1 - }, /obj/machinery/requests_console{ department = "Clown & Mime Office"; departmentType = 2; name = "Clown and Mime Requests Console"; pixel_x = -30 }, +/obj/structure/closet/secure_closet/mime, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -20520,7 +19584,7 @@ /obj/machinery/light, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/vending/autodrobe, /turf/simulated/floor/plasteel{ @@ -20536,19 +19600,31 @@ }, /area/crew_quarters/theatre) "aWc" = ( -/obj/structure/dresser, +/obj/structure/table/wood, +/obj/item/lipstick/random{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/lipstick/random{ + pixel_x = -3; + pixel_y = -3 + }, +/obj/item/lipstick/random{ + pixel_x = -1; + pixel_y = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, /area/crew_quarters/theatre) "aWd" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 4; @@ -20564,80 +19640,80 @@ }, /area/crew_quarters/bar/atrium) "aWf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/crew_quarters/bar/atrium) +/obj/structure/closet/emcloset, +/obj/effect/decal/warning_stripes/yellow, +/turf/simulated/floor/plasteel, +/area/quartermaster/miningdock) "aWg" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/snacks/chips, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aWh" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/cans/dr_gibb, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aWi" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/britcup, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aWj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aWk" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "redyellowfull" + }, +/area/crew_quarters/bar) +"aWl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/hallway/primary/fore) +"aWm" = ( +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Quartermaster Junction"; - sortType = 13 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/fore) -"aWl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/hallway/primary/fore) -"aWm" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/quartermaster/office) "aWn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/plasteel{ dir = 8; @@ -20645,10 +19721,6 @@ }, /area/quartermaster/office) "aWo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair/office/dark{ dir = 1 }, @@ -20666,36 +19738,22 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/office) "aWq" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 1; + icon_state = "neutralcorner" }, -/area/quartermaster/office) +/area/hallway/primary/fore) "aWr" = ( /obj/structure/cable{ d1 = 4; @@ -20703,9 +19761,6 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -20723,9 +19778,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -20738,9 +19790,6 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -20763,9 +19812,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" @@ -20778,12 +19824,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -20797,10 +19837,10 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 + dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -20814,11 +19854,10 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -20838,11 +19877,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -20850,11 +19887,9 @@ }, /area/quartermaster/storage) "aWB" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, /obj/structure/cable{ d1 = 2; @@ -20868,12 +19903,11 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -20882,23 +19916,30 @@ }, /area/quartermaster/storage) "aWC" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" +/obj/docking_port/stationary{ + dir = 4; + dwidth = 3; + height = 5; + id = "mining_home"; + name = "mining shuttle bay"; + width = 7 }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) +/turf/space, +/area/space) "aWD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -20907,13 +19948,19 @@ }, /area/quartermaster/qm) "aWE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -20922,15 +19969,21 @@ }, /area/quartermaster/qm) "aWF" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -20938,12 +19991,6 @@ }, /area/quartermaster/qm) "aWG" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/machinery/light, /obj/machinery/camera{ c_tag = "Arrivals North"; @@ -20953,32 +20000,21 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aWH" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/table/reinforced, /obj/item/folder/yellow, /obj/item/stamp/qm, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/qm) "aWI" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, /obj/structure/chair/office/dark{ dir = 8 }, @@ -21102,8 +20138,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -21210,17 +20245,13 @@ /obj/machinery/atmospherics/unary/vent_pump{ dir = 4; external_pressure_bound = 0; - external_pressure_bound_default = 0; frequency = 1441; + icon_state = "in"; id_tag = "co2_out"; initialize_directions = 1; internal_pressure_bound = 4000; - internal_pressure_bound_default = 4000; - layer = 2.4; - name = "co2 vent"; on = 1; pressure_checks = 2; - pressure_checks_default = 2; pump_direction = 0 }, /turf/simulated/floor/engine/co2, @@ -21319,7 +20350,6 @@ /turf/simulated/wall, /area/atmos) "aXp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Storage"; @@ -21335,10 +20365,11 @@ /turf/simulated/wall, /area/atmos) "aXr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -21398,10 +20429,13 @@ }, /area/atmos) "aXx" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ +/obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; - frequency = 1441; - id = "air_in" + frequency = 1443; + icon_state = "on"; + id = "air_in"; + on = 1; + volume_rate = 200 }, /turf/simulated/floor/engine/air, /area/atmos) @@ -21412,31 +20446,27 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aXz" = ( /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/power/apc{ dir = 8; name = "west bump"; pixel_x = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "aXA" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -21449,10 +20479,6 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -21504,11 +20530,15 @@ }, /area/crew_quarters/bar/atrium) "aXG" = ( -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "dark" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/area/crew_quarters/bar/atrium) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/atmos) "aXH" = ( /obj/item/radio/intercom{ dir = 0; @@ -21518,36 +20548,30 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aXI" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aXJ" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Cargo Junction"; - sortType = 13 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/fore) -"aXK" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, +/area/maintenance/fore) +"aXK" = ( /obj/structure/plasticflaps{ opacity = 1 }, @@ -21555,9 +20579,6 @@ /turf/simulated/floor/plasteel, /area/quartermaster/office) "aXL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 8; @@ -21565,51 +20586,39 @@ }, /area/quartermaster/office) "aXM" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/office) "aXN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/office) -"aXO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/office) +/area/atmos) "aXP" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/office) -"aXQ" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -21618,128 +20627,102 @@ }, /area/quartermaster/office) "aXR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, /turf/simulated/floor/plasteel, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aXS" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/office) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/quartermaster/miningdock) "aXT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" }, /area/quartermaster/office) "aXU" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/quartermaster/storage) "aXV" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" }, /area/quartermaster/storage) "aXW" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) -"aXX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) -"aXY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) -"aXZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) -"aYa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) -"aYb" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/storage) -"aYc" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/quartermaster/storage) +/area/atmos) +"aXX" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "browncorner" + }, +/area/hallway/primary/central) +"aXY" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/primary/central) +"aXZ" = ( +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) +"aYa" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + icon_state = "redfull" + }, +/area/crew_quarters/kitchen) +"aYc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/primary/fore) "aYd" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; @@ -21747,25 +20730,25 @@ }, /area/quartermaster/storage) "aYe" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plating, -/area/quartermaster/qm) -"aYf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/primary/fore) +"aYf" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" }, /area/quartermaster/qm) "aYg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -21775,10 +20758,6 @@ /obj/structure/chair/office/dark{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -21798,6 +20777,7 @@ pixel_y = 7 }, /obj/item/gps/mining, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -21888,15 +20868,17 @@ }, /area/security/execution) "aYt" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/quartermaster/storage) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/atmos) "aYu" = ( /obj/machinery/light/small{ dir = 8 @@ -21958,28 +20940,26 @@ }, /area/atmos) "aYB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 1; + icon_state = "greenblue" }, -/area/atmos) +/area/hydroponics) "aYC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "white" }, -/area/atmos) +/area/crew_quarters/kitchen) "aYD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/folder/yellow, /obj/item/lightreplacer, @@ -21987,17 +20967,16 @@ /turf/simulated/floor/plasteel, /area/atmos) "aYE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/wall, -/area/atmos) +/turf/simulated/floor/plasteel{ + icon_state = "redfull" + }, +/area/crew_quarters/kitchen) "aYF" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, @@ -22010,10 +20989,6 @@ }, /area/atmos) "aYG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 8; @@ -22042,7 +21017,10 @@ /turf/simulated/floor/plasteel, /area/atmos) "aYJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -22098,61 +21076,48 @@ "aYP" = ( /obj/machinery/space_heater, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aYQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" }, -/area/maintenance/fsmaint) -"aYR" = ( +/area/maintenance/fore) +"aYS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"aYS" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, +/area/maintenance/fore) +"aYT" = ( /obj/structure/disposalpipe/sortjunction{ dir = 8; icon_state = "pipe-j2s"; name = "Hydroponics Junction"; - sortType = 10 + sortType = 21 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"aYT" = ( /obj/structure/cable{ d1 = 1; d2 = 8; @@ -22175,30 +21140,15 @@ icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) -"aYU" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aYV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -22209,8 +21159,11 @@ /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "aYW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -22221,8 +21174,11 @@ req_access_txt = "12" }, /turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) +/area/maintenance/fore) "aYX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -22230,12 +21186,17 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "aYY" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -22247,7 +21208,6 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark{ name = "lightsout" }, @@ -22274,8 +21234,9 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aZc" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/light{ dir = 4 }, @@ -22286,9 +21247,8 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aZd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera{ c_tag = "Fore Hallway South"; dir = 4 @@ -22299,17 +21259,15 @@ }, /area/hallway/primary/fore) "aZe" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -22318,8 +21276,14 @@ "aZf" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "aZg" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -22327,45 +21291,37 @@ }, /area/quartermaster/office) "aZh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/quartermaster/office) -"aZi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/crew_quarters/kitchen) +"aZi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/office) "aZj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/office) "aZk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "white" }, -/area/quartermaster/office) +/area/crew_quarters/kitchen) "aZl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/folder, /turf/simulated/floor/plasteel{ @@ -22374,15 +21330,13 @@ }, /area/quartermaster/office) "aZm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" }, -/turf/simulated/wall, -/area/quartermaster/storage) +/area/hallway/primary/fore) "aZn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; @@ -22398,25 +21352,26 @@ }, /area/quartermaster/storage) "aZo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/quartermaster/storage) "aZp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "purple" }, /area/quartermaster/storage) "aZq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "brown" @@ -22433,23 +21388,24 @@ /turf/simulated/floor/plating, /area/security/permabrig) "aZs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay"; req_access_txt = "31" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/office) "aZt" = ( -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -22465,34 +21421,26 @@ }, /area/quartermaster/storage) "aZu" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/quartermaster/storage) "aZv" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "purple" }, /area/quartermaster/storage) "aZw" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/quartermaster/qm) +/turf/simulated/wall/r_wall, +/area/crew_quarters/heads/hos) "aZx" = ( /obj/machinery/photocopier, /obj/machinery/firealarm{ @@ -22525,12 +21473,9 @@ }, /area/quartermaster/qm) "aZA" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/camera{ c_tag = "Arrivals North"; @@ -22541,17 +21486,14 @@ }, /area/quartermaster/qm) "aZB" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/quartermaster/qm) "aZC" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -22594,7 +21536,7 @@ network = list("SS13","Security") }, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "redcorner" @@ -22705,20 +21647,12 @@ }, /area/security/permabrig) "aZN" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/flasher_button{ - id = "Cell 1"; - pixel_y = 27 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "redcorner" + dir = 8; + icon_state = "neutralfull" }, -/area/security/permabrig) +/area/hydroponics) "aZO" = ( /obj/structure/cable{ d1 = 4; @@ -22833,11 +21767,9 @@ "aZV" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "perma_inner"; locked = 1; name = "Perma Brig Exterior Access"; - req_access = null; req_access_txt = "67" }, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -22882,16 +21814,17 @@ /turf/simulated/floor/plasteel, /area/security/permabrig) "aZY" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) "aZZ" = ( +/obj/structure/disposalpipe/segment, /obj/item/radio/intercom{ dir = 4; pixel_x = 28 @@ -22900,15 +21833,15 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "baa" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) @@ -22936,10 +21869,13 @@ /turf/simulated/wall/mineral/titanium, /area/shuttle/pod_3) "bag" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ +/obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; frequency = 1441; - id = "co2_in" + icon_state = "on"; + id = "co2_in"; + on = 1; + pixel_y = 1 }, /turf/simulated/floor/engine/co2, /area/atmos) @@ -22958,9 +21894,6 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay"; @@ -23038,55 +21971,50 @@ /area/atmos) "baq" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/structure/closet/secure_closet/atmos_personal, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/atmos) "bar" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/atmos) -"bas" = ( -/obj/structure/closet/secure_closet/atmos_personal, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, -/area/atmos) -"bau" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/atmos) -"bav" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ dir = 8; - external_pressure_bound = 100; - on = 1 + icon_state = "neutralfull" }, +/area/hallway/primary/fore) +"bas" = ( +/obj/structure/closet/secure_closet/atmos_personal, +/obj/effect/decal/warning_stripes/northwest, +/turf/simulated/floor/plasteel, +/area/atmos) +"bau" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) +"bav" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway) "baw" = ( /obj/machinery/atmospherics/trinary/mixer{ dir = 1; @@ -23131,16 +22059,13 @@ /obj/machinery/atmospherics/unary/vent_pump{ dir = 8; external_pressure_bound = 0; - external_pressure_bound_default = 0; frequency = 1441; + icon_state = "in"; id_tag = "o2_out"; initialize_directions = 1; internal_pressure_bound = 4000; - internal_pressure_bound_default = 4000; - name = "oxygen vent"; on = 1; pressure_checks = 2; - pressure_checks_default = 2; pump_direction = 0 }, /turf/simulated/floor/engine/o2, @@ -23160,63 +22085,90 @@ /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "baD" = ( /obj/effect/spawner/random_spawners/grille_maybe, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "baE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/hydroponics) +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway) "baF" = ( /turf/simulated/wall, /area/hydroponics) "baG" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/wall, -/area/hydroponics) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "baH" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Hydroponics Maintenance"; req_access_txt = "35" }, /turf/simulated/floor/plasteel, -/area/hydroponics) +/area/maintenance/fore) "baI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 +/obj/effect/landmark/start{ + name = "Botanist" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" }, -/turf/simulated/wall, /area/hydroponics) "baJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" }, -/turf/simulated/wall, -/area/hydroponics) +/turf/simulated/floor/plating, +/area/crew_quarters/heads/hos) "baK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/door/firedoor, /obj/item/radio/intercom{ dir = 0; pixel_x = -28 }, /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, /area/crew_quarters/sleep) "baL" = ( /obj/structure/cable{ @@ -23225,15 +22177,19 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, /area/crew_quarters/sleep) "baM" = ( /obj/structure/kitchenspike, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, /area/crew_quarters/kitchen) "baN" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ @@ -23257,8 +22213,7 @@ "baP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -23281,7 +22236,7 @@ /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "baS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -23294,16 +22249,15 @@ }, /area/security/permabrig) "baT" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "baU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8 }, @@ -23321,7 +22275,7 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/autolathe, /obj/machinery/light_switch{ @@ -23338,15 +22292,21 @@ }, /area/quartermaster/office) "baW" = ( -/obj/structure/disposalpipe/trunk, /obj/machinery/disposal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/quartermaster/office) "baX" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -23419,11 +22379,6 @@ /obj/machinery/status_display, /turf/simulated/wall, /area/quartermaster/miningdock) -"bbg" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/quartermaster/miningdock) "bbh" = ( /obj/structure/cable{ d1 = 4; @@ -23431,15 +22386,17 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/hologram/holopad, /obj/effect/landmark/start{ name = "Quartermaster" }, -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -23450,6 +22407,9 @@ /turf/simulated/floor/plating, /area/quartermaster/miningdock) "bbj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -23461,18 +22421,15 @@ name = "Quartermaster"; req_access_txt = "41" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/qm) "bbk" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -23480,6 +22437,12 @@ }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -23490,26 +22453,10 @@ /turf/simulated/wall, /area/quartermaster/qm) "bbm" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/turf/simulated/floor/plasteel{ + icon_state = "grimy" }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable, -/turf/simulated/floor/plating, -/area/quartermaster/qm) +/area/crew_quarters/heads/hos) "bbn" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -23606,8 +22553,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -23888,7 +22834,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/start{ name = "Life Support Specialist" }, @@ -23962,7 +22907,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random_spawners/oil_maybe, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bcc" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/reagent_containers/glass/bucket, @@ -23973,42 +22918,31 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "bcd" = ( -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/hydroponics) "bce" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/hydroponics) "bcf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -6; pixel_y = 32 }, /obj/structure/closet/secure_closet/hydroponics, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/hydroponics) "bcg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/closet/secure_closet/hydroponics, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -24038,7 +22972,7 @@ /area/hydroponics) "bck" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/machinery/firealarm{ dir = 4; @@ -24049,10 +22983,6 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "bcl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/machinery/camera{ c_tag = "Service Hall South"; dir = 4; @@ -24064,7 +22994,12 @@ /obj/effect/decal/warning_stripes/yellow/partial{ dir = 1 }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, /area/crew_quarters/sleep) "bcm" = ( /obj/structure/cable{ @@ -24073,33 +23008,19 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, /area/crew_quarters/sleep) "bcn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/plasticflaps, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) -"bco" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/crew_quarters/kitchen) "bcp" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -24111,6 +23032,7 @@ }, /area/crew_quarters/kitchen) "bcr" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -24137,7 +23059,9 @@ "bcu" = ( /obj/structure/closet/secure_closet/freezer/meat, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, /area/crew_quarters/kitchen) "bcv" = ( /obj/structure/closet/secure_closet/freezer/meat, @@ -24145,16 +23069,18 @@ pixel_x = 25 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, /area/crew_quarters/kitchen) "bcw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass, /turf/simulated/floor/plasteel, -/area/crew_quarters/bar/atrium) +/area/crew_quarters/bar) "bcx" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/condiment/saltshaker, @@ -24176,7 +23102,7 @@ dir = 10 }, /obj/machinery/computer/general_air_control/large_tank_control{ - frequency = 1441; + frequency = 1443; input_tag = "air_in"; name = "Mixed Air Supply Control"; output_tag = "air_out"; @@ -24191,14 +23117,20 @@ "bcz" = ( /obj/structure/closet/chefcloset, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, /area/crew_quarters/kitchen) "bcA" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/quartermaster/office) +/obj/structure/chair{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" + }, +/area/construction/hallway) "bcB" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -24228,7 +23160,6 @@ }, /area/quartermaster/miningdock) "bcE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; @@ -24236,7 +23167,9 @@ }, /area/quartermaster/miningdock) "bcF" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -24258,9 +23191,6 @@ }, /area/quartermaster/miningdock) "bcI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining/glass{ name = "Cargo Bay"; @@ -24269,12 +23199,9 @@ /turf/simulated/floor/plasteel, /area/quartermaster/storage) "bcJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/structure/closet/secure_closet/cargotech, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -24283,26 +23210,19 @@ }, /area/quartermaster/storage) "bcK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/closet/secure_closet/cargotech, /obj/machinery/ai_status_display{ pixel_y = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/quartermaster/storage) "bcL" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light, /obj/machinery/newscaster{ layer = 3.3; @@ -24325,33 +23245,29 @@ }, /area/hallway/primary/fore) "bcN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/fore) "bcO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ name = "Mining Dock"; req_access_txt = "48" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bcP" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable, -/turf/simulated/floor/plating, -/area/quartermaster/miningdock) +/turf/simulated/wall, +/area/hallway/primary/port) "bcU" = ( /obj/structure/table/reinforced, /obj/item/folder/red, @@ -24517,17 +23433,13 @@ /obj/machinery/atmospherics/unary/vent_pump{ dir = 4; external_pressure_bound = 0; - external_pressure_bound_default = 0; frequency = 1441; + icon_state = "in"; id_tag = "tox_out"; initialize_directions = 1; internal_pressure_bound = 4000; - internal_pressure_bound_default = 4000; - layer = 2.4; - name = "plasma vent"; on = 1; pressure_checks = 2; - pressure_checks_default = 2; pump_direction = 0 }, /turf/simulated/floor/engine/plasma, @@ -24567,14 +23479,12 @@ }, /area/atmos) "bdq" = ( -/obj/machinery/atmospherics/unary/vent_pump, /obj/structure/closet/secure_closet/atmos_personal, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/atmos) "bdr" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -24611,10 +23521,12 @@ }, /area/atmos) "bdv" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ +/obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1441; - id = "o2_in" + icon_state = "on"; + id = "o2_in"; + on = 1 }, /turf/simulated/floor/engine/o2, /area/atmos) @@ -24626,24 +23538,18 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "bdx" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "greenblue" }, /area/hydroponics) "bdy" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "greenblue" @@ -24656,13 +23562,8 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -24676,10 +23577,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "greenblue" @@ -24698,7 +23598,7 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -24713,8 +23613,11 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -24731,6 +23634,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "greenblue" @@ -24743,10 +23649,13 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hydroponics) "bdF" = ( @@ -24756,15 +23665,18 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/glass{ name = "Hydroponics"; req_access_txt = "35" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) +/area/hydroponics) "bdG" = ( /obj/structure/cable{ d1 = 4; @@ -24778,11 +23690,12 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "bdH" = ( /obj/structure/cable{ @@ -24795,8 +23708,16 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, /area/crew_quarters/sleep) "bdI" = ( /obj/structure/cable{ @@ -24805,13 +23726,18 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/freezer{ req_access_txt = "28" }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, /area/crew_quarters/kitchen) "bdJ" = ( /obj/structure/cable{ @@ -24820,12 +23746,16 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, /area/crew_quarters/kitchen) "bdK" = ( /obj/structure/cable{ @@ -24837,6 +23767,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -24848,12 +23781,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/landmark/start{ name = "Chef" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -24865,10 +23798,8 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" @@ -24877,7 +23808,7 @@ "bdN" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/structure/rack, /obj/item/stack/packageWrap, @@ -24955,8 +23886,6 @@ }, /area/hallway/primary/fore) "bdW" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 1; @@ -24964,8 +23893,10 @@ }, /area/hallway/primary/fore) "bdX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" @@ -24978,17 +23909,18 @@ }, /area/hallway/primary/fore) "bdZ" = ( +/obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "dark" }, -/area/hallway/primary/fore) +/area/construction/hallway) "bea" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 8; @@ -24996,9 +23928,6 @@ }, /area/hallway/primary/fore) "beb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/arrow{ dir = 1 }, @@ -25011,11 +23940,13 @@ }, /area/hallway/primary/fore) "bec" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 1; - initialize_directions = 11 + icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -25029,20 +23960,14 @@ }, /area/quartermaster/miningdock) "bee" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) -"bef" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" }, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) +/area/hydroponics) "beg" = ( /obj/structure/chair/office/dark{ dir = 1 @@ -25057,34 +23982,36 @@ }, /area/quartermaster/miningdock) "bei" = ( -/obj/item/twohanded/required/kirbyplants, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "brown" }, /area/quartermaster/miningdock) "bej" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "purple" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/area/quartermaster/miningdock) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hydroponics) "bek" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" }, /area/quartermaster/miningdock) "bel" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/plasticflaps{ opacity = 1 }, @@ -25109,75 +24036,37 @@ icon_state = "brown" }, /area/quartermaster/miningdock) -"bep" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable, -/turf/simulated/floor/plating, -/area/quartermaster/miningdock) "beq" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "ber" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/turf/simulated/floor/plating, +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bes" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/external{ + id_tag = "mining_home"; + locked = 1; + name = "Mining Dock Airlock"; + req_access_txt = "48" }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, +/obj/structure/fans/tiny, +/turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bex" = ( /turf/simulated/wall/r_wall, /area/security/medbay) "bey" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ name = "Mining Dock"; @@ -25268,14 +24157,11 @@ }, /area/atmos) "beI" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, +/obj/machinery/computer/secure_data, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "grimy" }, -/area/atmos) +/area/crew_quarters/heads/hos) "beJ" = ( /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plasteel{ @@ -25290,12 +24176,11 @@ /turf/simulated/floor/plasteel, /area/atmos) "beL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, -/obj/item/twohanded/required/kirbyplants, +/obj/machinery/suit_storage_unit/atmos, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "caution" @@ -25303,7 +24188,6 @@ /area/atmos) "beM" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 8; @@ -25365,7 +24249,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "beT" = ( /obj/structure/closet/crate/hydroponics, /obj/item/cultivator, @@ -25381,18 +24265,18 @@ }, /area/hydroponics) "beV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ icon_state = "greenblue" }, /area/hydroponics) "beW" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -25400,10 +24284,6 @@ }, /area/hydroponics) "beX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/camera{ c_tag = "Hydroponics Backroom"; dir = 1 @@ -25423,9 +24303,8 @@ }, /area/hydroponics) "beZ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "greenblue" @@ -25439,7 +24318,7 @@ /obj/structure/plasticflaps, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/crew_quarters/sleep) +/area/hydroponics) "bfc" = ( /obj/structure/cable{ d1 = 1; @@ -25447,37 +24326,47 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, /area/crew_quarters/sleep) "bfd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutralcorner" + }, /area/crew_quarters/sleep) "bfe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, /obj/structure/kitchenspike, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, /area/crew_quarters/kitchen) "bff" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, /area/crew_quarters/kitchen) "bfg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, /area/crew_quarters/kitchen) "bfh" = ( /obj/structure/cable, @@ -25486,12 +24375,16 @@ pixel_y = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, /area/crew_quarters/kitchen) "bfi" = ( /obj/machinery/chem_master/condimaster, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, /area/crew_quarters/kitchen) "bfj" = ( /obj/machinery/newscaster{ @@ -25533,7 +24426,6 @@ }, /area/crew_quarters/kitchen) "bfo" = ( -/obj/structure/disposalpipe/segment, /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, /obj/machinery/door/firedoor, @@ -25546,7 +24438,6 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "bfp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -25570,16 +24461,10 @@ icon_state = "brown" }, /area/hallway/primary/fore) -"bfs" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/fore) "bft" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -25592,14 +24477,18 @@ }, /area/hallway/primary/fore) "bfv" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/hallway/primary/fore) +/area/atmos) "bfw" = ( /obj/machinery/light{ dir = 1; @@ -25625,11 +24514,15 @@ }, /area/quartermaster/miningdock) "bfy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "bluecorner" + }, +/area/hallway/primary/central) "bfz" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bfA" = ( @@ -25643,61 +24536,53 @@ }, /area/quartermaster/miningdock) "bfC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow, +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bfD" = ( +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purple" }, /area/quartermaster/miningdock) "bfE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/area/quartermaster/miningdock) +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "yellowcorner" + }, +/area/hallway/primary/port) "bfF" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/miningdock) "bfG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Shaft Miner" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 4; + icon_state = "yellowcorner" }, -/area/quartermaster/miningdock) +/area/hallway/primary/port) "bfH" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, /obj/effect/landmark/start{ name = "Shaft Miner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -25730,27 +24615,21 @@ icon_state = "purple" }, /area/quartermaster/miningdock) -"bfM" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) "bfN" = ( /obj/structure/closet/secure_closet/miner, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bfO" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable, -/turf/simulated/floor/plating, -/area/quartermaster/miningdock) +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plasteel, +/area/engine/gravitygenerator) "bfR" = ( /obj/structure/cable{ d2 = 2; @@ -25764,7 +24643,7 @@ /obj/structure/table/glass, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 9; @@ -25868,10 +24747,13 @@ }, /area/security/permabrig) "bga" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ +/obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; frequency = 1441; - id = "tox_in" + icon_state = "on"; + id = "tox_in"; + on = 1; + pixel_y = 1 }, /turf/simulated/floor/engine/plasma, /area/atmos) @@ -25914,13 +24796,12 @@ }, /area/atmos) "bge" = ( -/obj/effect/spawner/window/reinforced, +/obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/atmos) +/turf/simulated/floor/plasteel, +/area/engine/gravitygenerator) "bgf" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Storage"; @@ -25977,16 +24858,13 @@ /obj/machinery/atmospherics/unary/vent_pump{ dir = 8; external_pressure_bound = 0; - external_pressure_bound_default = 0; frequency = 1441; + icon_state = "in"; id_tag = "n2_out"; initialize_directions = 1; internal_pressure_bound = 4000; - internal_pressure_bound_default = 4000; - name = "n2 vent"; on = 1; pressure_checks = 2; - pressure_checks_default = 2; pump_direction = 0 }, /turf/simulated/floor/engine/n2, @@ -26006,19 +24884,18 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bgo" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bgp" = ( /obj/structure/sign/botany, /turf/simulated/wall, /area/hydroponics) "bgq" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ name = "Hydroponics"; @@ -26033,27 +24910,27 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ name = "Service Hall" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "bgs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/wall, -/area/crew_quarters/sleep) +/area/maintenance/starboard2) "bgt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/crew_quarters/kitchen) +/turf/simulated/wall/rust, +/area/maintenance/starboard2) "bgu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/freezer{ req_access_txt = "28" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "freezerfloor" + }, /area/crew_quarters/kitchen) "bgv" = ( /obj/machinery/hologram/holopad, @@ -26066,22 +24943,23 @@ }, /area/crew_quarters/kitchen) "bgw" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/fore) "bgx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -26099,21 +24977,6 @@ icon_state = "white" }, /area/crew_quarters/kitchen) -"bgz" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/fore) "bgA" = ( /obj/structure/table/reinforced, /obj/item/storage/bag/tray, @@ -26130,54 +24993,43 @@ }, /area/crew_quarters/kitchen) "bgC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" }, /area/hallway/primary/fore) "bgD" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/fore) "bgE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/fore) "bgF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-y" + }, +/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/fore) -"bgG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -26186,11 +25038,24 @@ icon_state = "neutralfull" }, /area/hallway/primary/fore) +"bgG" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/primary/fore) "bgH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -26208,29 +25073,29 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "bgJ" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/quartermaster/miningdock) +/turf/simulated/wall, +/area/crew_quarters/chief) "bgK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purple" }, /area/quartermaster/miningdock) "bgL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutral" + }, +/area/maintenance/fore) "bgM" = ( /obj/machinery/light{ dir = 1; @@ -26241,54 +25106,44 @@ /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bgN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) +/area/turret_protected/ai) "bgO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "purple" }, /area/quartermaster/miningdock) "bgP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "brown" }, /area/quartermaster/miningdock) "bgQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralfull" + icon_state = "yellow" }, -/area/quartermaster/miningdock) +/area/storage/primary) "bgR" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bgS" = ( @@ -26335,16 +25190,14 @@ }, /area/hallway/primary/central) "bgY" = ( -/obj/docking_port/stationary{ - dir = 4; - dwidth = 3; - height = 5; - id = "mining_home"; - name = "mining shuttle bay"; - width = 7 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/space, -/area/space) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/storage/primary) "bha" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -26464,15 +25317,17 @@ }, /area/atmos) "bhm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "caution" +/obj/structure/table/reinforced, +/obj/item/storage/toolbox/mechanical, +/obj/item/flashlight, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/atmos) +/turf/simulated/floor/plasteel, +/area/storage/primary) "bhn" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -26560,19 +25415,22 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "bhx" = ( -/obj/structure/disposalpipe/trunk, /obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/hydroponics) "bhy" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hydroponics) "bhz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/glass, /obj/item/storage/box/beakers, /obj/item/storage/box/syringes, @@ -26626,13 +25484,13 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "green" }, /area/crew_quarters/sleep) "bhG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/small{ dir = 1 }, @@ -26646,18 +25504,20 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "bhI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" }, /area/crew_quarters/kitchen) "bhJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/crew_quarters/kitchen) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/storage/primary) "bhK" = ( /obj/item/radio/intercom{ pixel_y = 28 @@ -26672,13 +25532,6 @@ icon_state = "redfull" }, /area/crew_quarters/kitchen) -"bhM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "browncorner" - }, -/area/hallway/primary/fore) "bhN" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/condiment/flour, @@ -26688,25 +25541,24 @@ }, /area/crew_quarters/kitchen) "bhO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/fore) "bhP" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -26717,6 +25569,7 @@ /obj/structure/table/reinforced, /obj/item/reagent_containers/food/snacks/dough, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -26729,6 +25582,9 @@ }, /area/crew_quarters/kitchen) "bhS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -26738,7 +25594,10 @@ }, /area/hallway/primary/fore) "bhT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -26750,12 +25609,26 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "bhV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/hallway/primary/fore) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/greengrid, +/area/turret_protected/ai) "bhW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -26765,19 +25638,12 @@ }, /area/hallway/primary/fore) "bhX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "bhY" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "browncorner" @@ -26796,7 +25662,11 @@ }, /area/quartermaster/miningdock) "bia" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -26805,30 +25675,47 @@ }, /area/quartermaster/miningdock) "bib" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) -"bic" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) +"bic" = ( +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plasteel, +/area/quartermaster/miningdock) "bid" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bie" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -26838,6 +25725,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -26850,22 +25738,30 @@ /obj/effect/decal/warning_stripes/yellow/partial{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "brown" }, /area/quartermaster/miningdock) "big" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purple" @@ -26878,14 +25774,20 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/miningdock) "bii" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -26898,10 +25800,12 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -26911,14 +25815,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/quartermaster/miningdock) "bik" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -26960,13 +25870,19 @@ /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bip" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ - d2 = 2; - icon_state = "0-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/quartermaster/miningdock) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/greengrid, +/area/turret_protected/ai) "biq" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -27091,7 +26007,7 @@ tag = "" }, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ @@ -27234,17 +26150,13 @@ /obj/machinery/atmospherics/unary/vent_pump{ dir = 4; external_pressure_bound = 0; - external_pressure_bound_default = 0; frequency = 1441; + icon_state = "in"; id_tag = "n2o_out"; initialize_directions = 1; internal_pressure_bound = 4000; - internal_pressure_bound_default = 4000; - layer = 2.4; - name = "n2o vent"; on = 1; pressure_checks = 2; - pressure_checks_default = 2; pump_direction = 0 }, /turf/simulated/floor/engine/n20, @@ -27271,6 +26183,12 @@ dir = 1; name = "Pure to Ports" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -27281,6 +26199,12 @@ dir = 1; name = "Mix to Ports" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -27291,6 +26215,12 @@ dir = 1; name = "Air to Ports" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -27302,6 +26232,12 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -27310,7 +26246,10 @@ "biS" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -27321,27 +26260,35 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "biU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "biV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 9 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -27349,37 +26296,29 @@ }, /area/atmos) "biW" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/atmos) +/area/storage/primary) "biX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralfull" + icon_state = "vault" }, -/area/atmos) +/area/turret_protected/ai) "biY" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "yellowcorner" }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/atmos) +/area/storage/primary) "biZ" = ( /obj/structure/window/reinforced{ dir = 4 @@ -27407,10 +26346,13 @@ }, /area/atmos) "bjb" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ +/obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; frequency = 1441; - id = "n2_in" + icon_state = "on"; + id = "n2_in"; + on = 1; + volume_rate = 200 }, /turf/simulated/floor/engine/n2, /area/atmos) @@ -27421,22 +26363,21 @@ dir = 8 }, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bjd" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bje" = ( /obj/structure/sink{ dir = 8; @@ -27445,7 +26386,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -27456,21 +26397,9 @@ icon_state = "greenblue" }, /area/hydroponics) -"bjg" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "greenblue" - }, -/area/hydroponics) "bjh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -27478,6 +26407,9 @@ }, /area/hydroponics) "bji" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -27487,6 +26419,9 @@ }, /area/hydroponics) "bjj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -27496,24 +26431,33 @@ }, /area/hydroponics) "bjk" = ( +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hydroponics) "bjl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ name = "Hydroponics"; req_access_txt = "35" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hydroponics) "bjm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -27529,17 +26473,16 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "bjo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -27549,45 +26492,35 @@ }, /area/crew_quarters/sleep) "bjp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ name = "Kitchen"; req_access_txt = "28" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "bjq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitehall" - }, -/area/crew_quarters/kitchen) -"bjr" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "redfull" + dir = 4; + icon_state = "whitehall" }, /area/crew_quarters/kitchen) "bjs" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -27596,26 +26529,10 @@ }, /area/crew_quarters/kitchen) "bjt" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" - }, -/area/crew_quarters/kitchen) -"bju" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/crew_quarters/kitchen) -"bjv" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -27623,12 +26540,6 @@ }, /area/crew_quarters/kitchen) "bjw" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/effect/landmark/start{ name = "Chef" }, @@ -27636,15 +26547,6 @@ icon_state = "redfull" }, /area/crew_quarters/kitchen) -"bjx" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - icon_state = "redfull" - }, -/area/crew_quarters/kitchen) "bjy" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -27655,39 +26557,36 @@ }, /area/crew_quarters/kitchen) "bjz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutral" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/hallway/primary/fore) +/area/crew_quarters/chief) "bjA" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/fore) "bjB" = ( +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + icon_state = "pipe-j2s"; + name = "Kitchen Junction"; + sortType = 21 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - icon_state = "pipe-j2s"; - name = "Kitchen Junction"; - sortType = 24 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -27703,21 +26602,21 @@ }, /area/hallway/primary/fore) "bjD" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/fore) -"bjE" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/hallway/primary/fore) +/area/storage/primary) +"bjE" = ( +/obj/machinery/bluespace_beacon, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/turret_protected/aisat) "bjF" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -27745,9 +26644,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bjJ" = ( @@ -27771,94 +26667,51 @@ }, /area/quartermaster/miningdock) "bjM" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/quartermaster/miningdock) "bjN" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "purple" }, /area/quartermaster/miningdock) "bjO" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ c_tag = "Atmospherics South-East"; dir = 1 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/quartermaster/miningdock) "bjP" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "purple" + dir = 4; + icon_state = "neutral" }, -/area/quartermaster/miningdock) +/area/crew_quarters/chief) "bjQ" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /turf/simulated/floor/plasteel{ icon_state = "brown" }, /area/quartermaster/miningdock) "bjR" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/chair/office/dark{ dir = 4 }, @@ -27868,12 +26721,6 @@ }, /area/quartermaster/miningdock) "bjS" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/table/reinforced, /obj/item/folder/yellow, /obj/item/gps/mining, @@ -27883,38 +26730,32 @@ }, /area/quartermaster/miningdock) "bjT" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/crew_quarters/chief) +"bjU" = ( /obj/structure/cable{ - d1 = 2; + d1 = 4; d2 = 8; - icon_state = "2-8"; + icon_state = "4-8"; tag = "" }, -/turf/simulated/floor/plating, -/area/quartermaster/miningdock) -"bjU" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "yellowcorner" }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/quartermaster/miningdock) +/area/hallway/primary/port) "bjY" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, @@ -28017,12 +26858,10 @@ icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -28096,7 +26935,7 @@ /area/security/main) "bkj" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/machinery/light{ dir = 1; @@ -28250,46 +27089,30 @@ /turf/simulated/floor/plasteel, /area/atmos) "bkA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/atmos) "bkB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/meter, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/atmos) "bkC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/machinery/meter, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/atmos) -"bkD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/atmos) "bkE" = ( /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/atmos) @@ -28300,60 +27123,54 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/atmos) "bkG" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/atmos) "bkH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/atmos) "bkI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plasteel, /area/atmos) "bkJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -28366,13 +27183,8 @@ icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -28385,10 +27197,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/southeastcorner, /turf/simulated/floor/plasteel, /area/atmos) @@ -28402,7 +27210,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bkM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/atmos) @@ -28434,7 +27241,7 @@ "bkR" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bkS" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/status_display{ @@ -28455,22 +27262,7 @@ icon_state = "neutralfull" }, /area/hydroponics) -"bkV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/hydroponics/constructable, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hydroponics) "bkW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hydroponics/constructable, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -28478,34 +27270,14 @@ icon_state = "neutralfull" }, /area/hydroponics) -"bkX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hydroponics) "bkY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "greenblue" - }, -/area/hydroponics) +/obj/item/toy/carpplushie/pink, +/turf/space, +/area/space) "bkZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/hydroponics) "bla" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/machinery/door/window/eastleft{ dir = 8; @@ -28520,9 +27292,6 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "blb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "greenblue" @@ -28535,15 +27304,11 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "bld" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -28562,9 +27327,6 @@ }, /area/security/permabrig) "blf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -28573,15 +27335,11 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "blg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/foodcart, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "blh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/light, /obj/machinery/vending/dinnerware, /obj/machinery/status_display{ @@ -28603,17 +27361,11 @@ }, /area/crew_quarters/kitchen) "blj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/icemachine, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "blk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/rack, /obj/item/storage/box/donkpockets, /obj/item/storage/box/donkpockets, @@ -28622,28 +27374,18 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "bll" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/reagent_containers/food/snacks/mint, /obj/item/reagent_containers/food/condiment/enzyme, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/reagentgrinder, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "blm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/machinery/reagentgrinder, -/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/kitchen_machine/grill, /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "bln" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light, /obj/machinery/processor, /obj/machinery/camera{ @@ -28653,9 +27395,6 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "blo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/toy/figure/crew/chef, @@ -28669,7 +27408,9 @@ }, /area/security/medbay) "blq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -28679,11 +27420,14 @@ }, /area/hallway/primary/fore) "blr" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/primary/fore) "bls" = ( @@ -28712,11 +27456,19 @@ }, /area/hallway/primary/fore) "blv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "brown" +/obj/structure/window/reinforced{ + dir = 8 }, -/area/hallway/primary/fore) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway) "blw" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light, @@ -28725,7 +27477,7 @@ }, /area/hallway/primary/fore) "blx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "brown" }, @@ -28770,20 +27522,21 @@ }, /area/quartermaster/miningdock) "blC" = ( -/obj/structure/ore_box, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) -"blD" = ( -/obj/structure/closet/emcloset, +/obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) -"blE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +"blD" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) +"blE" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/quartermaster/miningdock) "blF" = ( /obj/structure/cable{ d2 = 8; @@ -28803,27 +27556,42 @@ }, /area/quartermaster/miningdock) "blG" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/external{ - id_tag = "mining_home"; - locked = 1; - name = "Mining Dock Airlock"; - req_access_txt = "48" +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/structure/fans/tiny, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "vault" + }, +/area/turret_protected/aisat) "blH" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/crew_quarters/chief) "blI" = ( -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/obj/effect/spawner/window/reinforced, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK" + }, +/turf/simulated/floor/plating, /area/quartermaster/miningdock) "blJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/door/firedoor, @@ -28831,34 +27599,59 @@ name = "Mining Dock"; req_access_txt = "48" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "blK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/mining{ name = "Mining Dock"; req_access_txt = "48" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "blL" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/primary/port) "blM" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/quartermaster/miningdock) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/primary/port) "blN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/arrow{ @@ -28870,15 +27663,16 @@ /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "blO" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/quartermaster/miningdock) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway) "blR" = ( /obj/structure/cable{ d1 = 2; @@ -29017,13 +27811,13 @@ }, /area/security/main) "bmd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, /obj/item/folder/red, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -29086,7 +27880,7 @@ /area/security/hos) "bmk" = ( /turf/simulated/wall, -/area/security/hos) +/area/crew_quarters/heads/hos) "bml" = ( /obj/structure/dresser, /obj/machinery/newscaster{ @@ -29098,7 +27892,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/security/hos) +/area/crew_quarters/heads/hos) "bmm" = ( /obj/structure/bed, /obj/item/bedsheet/hos, @@ -29115,7 +27909,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/security/hos) +/area/crew_quarters/heads/hos) "bmn" = ( /obj/structure/table/wood, /obj/item/storage/secure/safe{ @@ -29128,7 +27922,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/security/hos) +/area/crew_quarters/heads/hos) "bmo" = ( /obj/structure/window/reinforced{ dir = 4 @@ -29177,10 +27971,13 @@ /turf/space, /area/space/nearstation) "bmt" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ +/obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; frequency = 1441; - id = "n2o_in" + icon_state = "on"; + id = "n2o_in"; + on = 1; + pixel_y = 1 }, /turf/simulated/floor/engine/n20, /area/atmos) @@ -29285,23 +28082,24 @@ /turf/simulated/floor/plasteel, /area/atmos) "bmG" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "bmH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, @@ -29336,7 +28134,6 @@ /obj/machinery/newscaster{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, @@ -29403,7 +28200,7 @@ name = "2maintenance loot spawner" }, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bmQ" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/light{ @@ -29422,17 +28219,24 @@ }, /area/hydroponics) "bmS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ +/obj/structure/showcase{ + density = 0; dir = 8; - icon_state = "neutralfull" + icon = 'icons/mob/robots.dmi'; + icon_state = "robot_old"; + name = "Cyborg Statue"; + pixel_x = 9; + pixel_y = 2 }, -/area/hydroponics) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/turret_protected/aisat) "bmT" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -29467,19 +28271,23 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ name = "Service Foyer" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/sleep) "bmY" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/crew_quarters/sleep) +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway) "bmZ" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -29513,9 +28321,6 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "bnc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/table/reinforced, /obj/item/clothing/suit/chef, /obj/item/kitchen/rollingpin, @@ -29544,7 +28349,6 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/kitchen) "bnf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -29587,21 +28391,26 @@ "bnj" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/plating, -/area/quartermaster/miningdock) -"bnk" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 1; d2 = 8; - icon_state = "1-8" + icon_state = "0-8" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 2; + id_tag = "ceprivacy"; + name = "CE Privacy Shutters" }, -/obj/structure/cable, /turf/simulated/floor/plating, -/area/quartermaster/miningdock) +/area/crew_quarters/chief) +"bnk" = ( +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/library) "bnn" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -29614,7 +28423,6 @@ icon_state = "2-8"; tag = "" }, -/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/prisonershuttle) "bno" = ( @@ -29670,11 +28478,11 @@ }, /area/security/brig) "bnt" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/structure/disposalpipe/segment, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -29779,13 +28587,13 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/security/hos) +/area/crew_quarters/heads/hos) "bnL" = ( /obj/machinery/computer/prisoner, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/security/hos) +/area/crew_quarters/heads/hos) "bnM" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -29793,15 +28601,6 @@ }, /turf/space, /area/space/nearstation) -"bnN" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/construction/hallway) "bnO" = ( /obj/structure/chair{ dir = 1 @@ -29818,17 +28617,6 @@ icon_state = "vault" }, /area/construction/hallway) -"bnQ" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/construction/hallway) "bnR" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -29921,27 +28709,21 @@ /turf/simulated/floor/plasteel, /area/atmos) "bob" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "boc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/light{ dir = 4 }, @@ -29956,14 +28738,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/turf/simulated/wall/r_wall, -/area/atmos) -"boe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/turf/simulated/wall/r_wall, -/area/atmos) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/engine/engineering) +"boe" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway) "bof" = ( /obj/machinery/hydroponics/constructable, /obj/structure/sign/botany{ @@ -29981,17 +28775,25 @@ }, /area/hydroponics) "boh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/seed_extractor, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/area/hydroponics) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/tcommsat/chamber) "boi" = ( /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -30027,25 +28829,18 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/central) "bon" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) +/turf/simulated/floor/bluegrid, +/area/tcommsat/chamber) "boo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -30103,45 +28898,44 @@ }, /area/hallway/primary/central) "bos" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" + icon_state = "yellowfull" }, -/area/hallway/primary/central) +/area/engine/engineering) "bot" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /area/hallway/primary/central) "bou" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "browncorner" + dir = 1; + icon_state = "yellow" }, -/area/hallway/primary/central) +/area/engine/engineering) "bov" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -30155,15 +28949,11 @@ }, /area/hallway/primary/central) "bow" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "browncorner" - }, -/area/hallway/primary/central) +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/engine/engineering) "box" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -30207,13 +28997,19 @@ }, /area/hallway/primary/central) "boA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, -/area/hallway/primary/central) +/area/engine/engineering) "boB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -30223,10 +29019,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -30236,6 +29028,9 @@ }, /area/hallway/primary/central) "boC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -30245,9 +29040,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -30261,29 +29053,25 @@ /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "boE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "boF" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) @@ -30304,6 +29092,9 @@ /turf/simulated/floor/plating, /area/security/prisonershuttle) "boK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -30313,9 +29104,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ name = "Mining Maintenance"; req_access_txt = "48" @@ -30345,7 +29133,7 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/machinery/computer/shuttle/labor, +/obj/machinery/computer/prisoner, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -30392,11 +29180,11 @@ }, /area/security/prisonershuttle) "boR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; @@ -30404,6 +29192,9 @@ }, /area/security/brig) "boS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -30413,9 +29204,6 @@ /obj/effect/landmark{ name = "lightsout" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -30432,6 +29220,9 @@ }, /area/security/main) "boU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -30444,9 +29235,6 @@ /obj/effect/landmark/start{ name = "Security Officer" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 8; @@ -30454,11 +29242,11 @@ }, /area/security/main) "boV" = ( -/obj/structure/table/reinforced, -/obj/item/storage/secure/briefcase, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/table/reinforced, +/obj/item/storage/secure/briefcase, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -30479,27 +29267,30 @@ }, /area/security/prisonershuttle) "boX" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/food/snacks/donut/jelly/cherryjelly, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/table/reinforced, +/obj/item/reagent_containers/food/snacks/donut/jelly/cherryjelly, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/security/main) "boY" = ( -/obj/machinery/photocopier, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/photocopier, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/security/main) "boZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -30507,29 +29298,29 @@ tag = "" }, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" }, /area/security/main) "bpa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/main) "bpb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -30547,9 +29338,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/command/glass{ name = "Head of Security"; req_access_txt = "58" @@ -30560,6 +29348,9 @@ }, /area/security/hos) "bpc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -30572,29 +29363,29 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/hos) "bpd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/security/hos) "bpe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -30612,9 +29403,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/wood, /obj/item/folder/red, /obj/item/stamp/hos, @@ -30624,15 +29412,15 @@ }, /area/security/hos) "bpf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/chair/comfy/brown{ dir = 8 }, @@ -30644,16 +29432,16 @@ }, /area/security/hos) "bpg" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -30695,7 +29483,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/security/hos) +/area/crew_quarters/heads/hos) "bpj" = ( /obj/structure/cable{ d1 = 4; @@ -30706,7 +29494,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/security/hos) +/area/crew_quarters/heads/hos) "bpk" = ( /obj/structure/cable{ d1 = 4; @@ -30718,7 +29506,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/security/hos) +/area/crew_quarters/heads/hos) "bpl" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -30737,7 +29525,7 @@ icon_state = "0-8" }, /turf/simulated/floor/plating, -/area/security/hos) +/area/crew_quarters/heads/hos) "bpm" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ @@ -30768,12 +29556,17 @@ }, /area/construction/hallway) "bpp" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/area/construction/hallway) +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/engine/engineering) "bpq" = ( /obj/structure/window/reinforced, /turf/simulated/floor/plasteel{ @@ -30788,17 +29581,10 @@ /area/shuttle/pod_3) "bps" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/construction/hallway) -"bpt" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, -/obj/structure/window/reinforced{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -30823,10 +29609,13 @@ /turf/simulated/floor/engine/vacuum, /area/atmos) "bpx" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ +/obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; frequency = 1441; - id = "mix_in" + icon_state = "on"; + id = "waste_in"; + on = 1; + pixel_y = 1 }, /turf/simulated/floor/engine/vacuum, /area/atmos) @@ -30959,62 +29748,47 @@ /turf/simulated/floor/plasteel, /area/atmos) "bpL" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/binary/pump{ dir = 4; name = "Air to External Air Ports"; on = 1; target_pressure = 101 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "bpM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4 - }, /obj/structure/sign/poster/official/work_for_a_future{ pixel_x = 32 }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10; + initialize_directions = 10 + }, /turf/simulated/floor/plasteel, /area/atmos) "bpN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/atmos) -"bpO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" }, -/obj/machinery/space_heater, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/atmos) -"bpP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/sleeping_agent, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/atmos) +/area/library) "bpQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/machinery/light{ dir = 1; @@ -31023,28 +29797,29 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/atmos) -"bpR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/atmos) "bpS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "grimy" + }, +/area/library) +"bpT" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/atmos) -"bpT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, -/turf/simulated/wall/r_wall, -/area/atmos) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "bpU" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -31053,16 +29828,16 @@ }, /area/hallway/primary/port) "bpV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/light/small{ dir = 1 }, @@ -31072,142 +29847,120 @@ }, /area/hallway/primary/port) "bpW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" }, /area/hallway/primary/port) -"bpX" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) "bpY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bpZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bqa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bqb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bqc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bqd" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bqe" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"bqf" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/junction{ - dir = 8; - icon_state = "pipe-j2" - }, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bqg" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -31219,13 +29972,8 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bqh" = ( /obj/machinery/hydroponics/constructable, /obj/machinery/newscaster{ @@ -31243,14 +29991,9 @@ }, /area/hydroponics) "bqj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/biogenerator, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hydroponics) +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/maintenance/starboard2) "bqk" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -31276,8 +30019,7 @@ /area/hydroponics) "bqm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -31286,6 +30028,10 @@ }, /area/hallway/primary/central) "bqn" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -31298,10 +30044,6 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -31314,47 +30056,31 @@ icon_state = "neutralfull" }, /area/hallway/primary/central) -"bqo" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/central) "bqp" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/central) "bqq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -31364,15 +30090,15 @@ }, /area/hallway/primary/central) "bqr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -31381,15 +30107,15 @@ }, /area/hallway/primary/central) "bqs" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall2"; location = "hall1" @@ -31400,6 +30126,10 @@ }, /area/hallway/primary/central) "bqt" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -31410,10 +30140,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -31477,6 +30203,7 @@ /turf/simulated/floor/plating, /area/bridge) "bqz" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -31492,7 +30219,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall14"; location = "hall13" @@ -31505,8 +30231,7 @@ "bqA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -31521,11 +30246,11 @@ /turf/simulated/wall/rust, /area/maintenance/starboard) "bqJ" = ( -/obj/machinery/hologram/holopad, -/obj/effect/decal/warning_stripes/yellow/hollow, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/hologram/holopad, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -31565,31 +30290,29 @@ }, /area/security/prisonershuttle) "bqQ" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" }, /area/security/brig) "bqR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -31629,15 +30352,15 @@ }, /area/security/brig) "bqT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -31854,8 +30577,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/structure/table/wood, /obj/item/clothing/mask/cigarette/cigar, @@ -31913,7 +30635,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/security/hos) +/area/crew_quarters/heads/hos) "brl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -31924,7 +30646,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/security/hos) +/area/crew_quarters/heads/hos) "brm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -31935,7 +30657,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/security/hos) +/area/crew_quarters/heads/hos) "brn" = ( /obj/machinery/computer/secure_data, /turf/simulated/floor/plasteel{ @@ -31946,7 +30668,7 @@ /obj/effect/spawner/window/reinforced, /obj/structure/cable, /turf/simulated/floor/plating, -/area/security/hos) +/area/crew_quarters/heads/hos) "brp" = ( /obj/structure/window/reinforced{ dir = 8 @@ -31985,28 +30707,25 @@ /turf/space, /area/space/nearstation) "brt" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/space, -/area/space/nearstation) +/turf/simulated/floor/plasteel{ + icon_state = "wood" + }, +/area/library) "bru" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "brv" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/space, -/area/space/nearstation) +/turf/simulated/floor/plasteel{ + icon_state = "wood" + }, +/area/library) "brw" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ @@ -32027,7 +30746,8 @@ "bry" = ( /obj/machinery/air_sensor{ frequency = 1441; - id_tag = "mix_sensor" + id_tag = "waste_sensor"; + output = 63 }, /turf/simulated/floor/engine/vacuum, /area/atmos) @@ -32144,59 +30864,31 @@ /area/atmos) "brK" = ( /obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 4 + dir = 10 }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/atmos) "brL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/binary/pump{ - dir = 8; - name = "External Waste Ports to Filter"; - on = 1; - target_pressure = 101 - }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel, /area/atmos) "brM" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, /turf/simulated/floor/plating, -/area/atmos) +/area/maintenance/starboard2) "brN" = ( /obj/machinery/space_heater, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/atmos) "brO" = ( /obj/machinery/portable_atmospherics/canister/sleeping_agent, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/atmos) "brP" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/atmos) -"brQ" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/atmos) @@ -32205,39 +30897,35 @@ /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/atmos) "brS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/turf/simulated/floor/plasteel, +/area/maintenance/starboard2) +"brT" = ( +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/wall/r_wall, -/area/atmos) -"brT" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellowcorner" + icon_state = "dark" }, -/area/hallway/primary/port) +/area/construction/hallway) "brU" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10 - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=engi3"; location = "engi2" @@ -32260,13 +30948,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/storage/tech) -"brY" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/wall, -/area/storage/tech) "brZ" = ( /obj/structure/cable{ d1 = 1; @@ -32274,14 +30955,9 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bsa" = ( /obj/machinery/hydroponics/constructable, /obj/structure/extinguisher_cabinet{ @@ -32291,23 +30967,18 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "bsb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, +/obj/structure/chair, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralfull" + icon_state = "vault" }, -/area/hydroponics) +/area/construction/hallway) "bsc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hydroponics) +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel, +/area/engine/engine_smes) "bsd" = ( /obj/structure/table/reinforced, /obj/item/seeds/lime, @@ -32357,8 +31028,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -32420,17 +31091,12 @@ }, /area/hallway/primary/central) "bso" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" + icon_state = "grimy" }, -/area/hallway/primary/central) +/area/library) "bsq" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32456,15 +31122,17 @@ }, /area/hallway/primary/central) "bst" = ( +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + name = "Quartermaster Junction"; + sortType = 3 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -32518,6 +31186,10 @@ /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bsD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -32530,26 +31202,25 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "bsE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/security/prisonershuttle) "bsF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/table/reinforced, /obj/item/phone, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -32558,15 +31229,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/security/prisonershuttle) "bsG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -32579,15 +31250,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" }, /area/security/prisonershuttle) "bsH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -32611,14 +31282,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, /area/security/prisonershuttle) "bsI" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -32626,16 +31298,10 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -32746,6 +31412,7 @@ tag = "" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/computer/shuttle/labor, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -32757,7 +31424,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/security/hos) +/area/crew_quarters/heads/hos) "btb" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -32770,33 +31437,36 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/security/hos) +/area/crew_quarters/heads/hos) "btc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/turret_protected/ai) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/library) "btd" = ( /turf/simulated/wall/r_wall, /area/turret_protected/ai) "bte" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, -/area/turret_protected/ai) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/library) "btf" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 4; external_pressure_bound = 0; - external_pressure_bound_default = 0; frequency = 1441; - id_tag = "mix_out"; + icon_state = "in"; + id_tag = "waste_out"; initialize_directions = 1; internal_pressure_bound = 4000; - internal_pressure_bound_default = 4000; - layer = 2.4; - name = "mix vent"; on = 1; pressure_checks = 2; - pressure_checks_default = 2; pump_direction = 0 }, /turf/simulated/floor/engine/vacuum, @@ -32843,12 +31513,14 @@ }, /area/atmos) "btk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/area/atmos) +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway) "btl" = ( /obj/machinery/atmospherics/binary/pump{ dir = 1; @@ -32870,7 +31542,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -32890,9 +31562,19 @@ /area/atmos) "bto" = ( /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/binary/pump{ + dir = 1; + name = "External Waste Ports to Filter"; + on = 1; + target_pressure = 101 + }, /turf/simulated/floor/plasteel, /area/atmos) "btp" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -32905,109 +31587,102 @@ icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "btq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, /turf/simulated/floor/plasteel, /area/atmos) "btr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Desk"; req_access_txt = "24" }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "bts" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "btt" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/portable_atmospherics/canister/sleeping_agent, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "btu" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 10; + initialize_directions = 10 + }, /turf/simulated/floor/plasteel, /area/atmos) "btv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -33018,10 +31693,14 @@ /turf/simulated/floor/plasteel, /area/atmos) "btx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/status_display, -/turf/simulated/wall/r_wall, -/area/atmos) +/obj/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/construction/hallway) "bty" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -33029,14 +31708,13 @@ }, /area/hallway/primary/port) "btz" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -33091,13 +31769,13 @@ /turf/simulated/floor/plasteel, /area/hydroponics) "btE" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -33106,18 +31784,18 @@ }, /area/hallway/primary/central) "btF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "btG" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop, @@ -33173,7 +31851,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/security/hos) +/area/crew_quarters/heads/hos) "btS" = ( /obj/machinery/door/airlock/external{ id_tag = "laborcamp_home"; @@ -33189,6 +31867,7 @@ /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "btU" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -33201,7 +31880,6 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/window/brigdoor{ dir = 1 }, @@ -33289,13 +31967,13 @@ /turf/simulated/floor/plating, /area/security/prisonershuttle) "bub" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -33430,7 +32108,7 @@ /obj/machinery/light, /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -33477,7 +32155,6 @@ }, /area/atmos) "bus" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/unary/thermomachine/freezer{ dir = 4 }, @@ -33547,11 +32224,11 @@ }, /area/atmos) "buy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/machinery/light/small, /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 5 + }, /turf/simulated/floor/plasteel, /area/atmos) "buz" = ( @@ -33561,59 +32238,68 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) "buA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light/small, /obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "buB" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/atmos) -"buC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/atmos) -"buD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" }, +/area/engine/engine_smes) +"buD" = ( /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "buE" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel, /area/atmos) "buF" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "buG" = ( @@ -33626,39 +32312,47 @@ /obj/effect/decal/warning_stripes/yellow/partial{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "buH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/atmos) "buI" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/hallway/primary/port) "buJ" = ( +/obj/structure/disposalpipe/junction, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/junction, /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 8 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -33757,13 +32451,13 @@ }, /area/hallway/primary/central) "buV" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -33797,7 +32491,7 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "bva" = ( /obj/structure/cable{ d1 = 1; @@ -33811,11 +32505,18 @@ }, /area/hallway/primary/central) "bvc" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "vault" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/area/security/nuke_storage) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/engine/engine_smes) "bvd" = ( /obj/machinery/light/small{ dir = 1 @@ -33836,10 +32537,7 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "vault" - }, +/turf/simulated/floor/greengrid, /area/security/nuke_storage) "bvf" = ( /obj/machinery/light/small{ @@ -33886,13 +32584,13 @@ /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "bvm" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/security/prisonershuttle) "bvn" = ( @@ -33970,6 +32668,9 @@ dir = 1; network = list("SS13","Minisat") }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -34090,7 +32791,6 @@ /turf/simulated/floor/plasteel, /area/atmos) "bvF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/binary/pump{ dir = 4; name = "Air to Distro"; @@ -34124,7 +32824,6 @@ }, /area/atmos) "bvI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/binary/pump{ dir = 4; name = "Air to Waste"; @@ -34149,10 +32848,13 @@ /turf/simulated/wall/r_wall, /area/atmos) "bvL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/sign/securearea, -/turf/simulated/wall/r_wall, -/area/atmos) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "wood" + }, +/area/library) "bvM" = ( /obj/structure/cable{ d1 = 1; @@ -34165,6 +32867,8 @@ name = "Atmospherics Access"; req_access_txt = "24" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/atmos) "bvN" = ( @@ -34188,15 +32892,15 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "bvP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -34208,40 +32912,37 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "bvQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/atmos) "bvR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/window{ base_state = "right"; dir = 1; @@ -34257,6 +32958,9 @@ /turf/simulated/floor/plasteel, /area/atmos) "bvS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -34268,10 +32972,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/plasticflaps{ opacity = 1 }, @@ -34289,10 +32989,10 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/machinery/computer/general_air_control/large_tank_control{ frequency = 1441; - input_tag = "mix_in"; + input_tag = "waste_in"; name = "Gas Mix Tank Control"; - output_tag = "mix_out"; - sensors = list("mix_sensor" = "Tank") + output_tag = "waste_out"; + sensors = list("waste_sensor" = "Tank") }, /turf/simulated/floor/plasteel{ dir = 8; @@ -34615,35 +33315,26 @@ /turf/simulated/floor/plating, /area/bridge) "bwo" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" + icon_state = "grimy" }, -/area/hallway/primary/central) +/area/library) "bwp" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/hallway/primary/central) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet, +/area/library) "bwq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, /area/security/nuke_storage) "bwr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Vault"; dir = 4 @@ -34653,26 +33344,27 @@ }, /area/security/nuke_storage) "bws" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/greengrid, -/area/security/nuke_storage) +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/maintenance/starboard2) "bwt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/greengrid, /area/security/nuke_storage) "bwu" = ( -/turf/simulated/floor/greengrid, -/area/security/nuke_storage) +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/engine/engine_smes) "bwv" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/security/nuke_storage) "bwy" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -34685,7 +33377,6 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -34811,11 +33502,11 @@ }, /area/turret_protected/ai) "bwI" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/ai) +/turf/simulated/floor/plasteel, +/area/engine/engineering) "bwJ" = ( /obj/structure/cable{ d1 = 1; @@ -34835,11 +33526,15 @@ }, /area/turret_protected/ai) "bwL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/turret_protected/ai) +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "bwM" = ( /obj/structure/window/reinforced{ dir = 8 @@ -34867,21 +33562,25 @@ /turf/simulated/wall/r_wall, /area/engine/break_room) "bwR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, -/area/engine/break_room) +/obj/effect/decal/cleanable/fungus, +/turf/simulated/wall, +/area/maintenance/starboard2) "bwS" = ( -/obj/machinery/status_display, /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall/r_wall, +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, /area/engine/break_room) "bwT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/engine/break_room) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/library) "bwU" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/turf/simulated/wall/r_wall, +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, /area/engine/break_room) "bwV" = ( /obj/structure/table/reinforced, @@ -34914,7 +33613,6 @@ }, /area/engine/break_room) "bwY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small{ dir = 8 }, @@ -34937,10 +33635,11 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/break_room) "bxa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -34977,29 +33676,26 @@ icon_state = "0-2" }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/atmos) "bxe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellowcorner" + dir = 8; + icon_state = "neutralfull" }, -/area/hallway/primary/port) +/area/hallway/primary/central) "bxf" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -35175,29 +33871,26 @@ req_one_access_txt = "65;12" }, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "bxy" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/machinery/light, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/quartermaster/miningdock) "bxz" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -35213,6 +33906,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -35228,10 +33924,12 @@ dir = 4 }, /obj/machinery/door/airlock/vault{ - icon_state = "door_locked"; locked = 1; req_access_txt = "53" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -35246,6 +33944,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -35260,6 +33961,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/greengrid, /area/security/nuke_storage) "bxE" = ( @@ -35273,7 +33977,10 @@ dir = 10 }, /obj/machinery/nuclearbomb, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/greengrid, /area/security/nuke_storage) "bxF" = ( /obj/structure/cable{ @@ -35307,12 +34014,12 @@ }, /area/security/prisonershuttle) "bxK" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/security/glass{ name = "Labor Camp Processing"; req_access_txt = "63" @@ -35357,6 +34064,8 @@ network = list("Minisat","SS13"); pixel_y = -22 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -35399,20 +34108,6 @@ icon_state = "dark" }, /area/security/main) -"bxW" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/construction/hallway) "bxX" = ( /obj/structure/table/reinforced, /obj/item/folder/blue, @@ -35431,9 +34126,6 @@ }, /area/turret_protected/ai) "bxZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -35442,19 +34134,7 @@ }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) -"bya" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/greengrid, -/area/turret_protected/ai) "byb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -35468,9 +34148,6 @@ /turf/simulated/floor/greengrid, /area/turret_protected/ai) "byc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/ai_slipper, /obj/structure/cable{ d1 = 4; @@ -35486,9 +34163,6 @@ /turf/simulated/floor/greengrid, /area/turret_protected/ai) "byd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -35503,10 +34177,6 @@ /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bye" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -35515,9 +34185,6 @@ /turf/simulated/floor/greengrid, /area/turret_protected/ai) "byf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -35548,11 +34215,9 @@ "byj" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "atmo_tank_outer"; locked = 1; name = "Atmos External Access"; - req_access = null; req_access_txt = "32" }, /turf/simulated/floor/plasteel, @@ -35588,14 +34253,17 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "byo" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/engine/break_room) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/crew_quarters/locker) "byp" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/rglass, @@ -35616,12 +34284,11 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "byr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/wall, -/area/engine/break_room) +/area/engine/engine_smes) "bys" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, -/turf/simulated/floor/plating, +/turf/simulated/floor/plasteel, /area/engine/break_room) "byt" = ( /obj/structure/table/reinforced, @@ -35648,11 +34315,6 @@ icon_state = "redyellowfull" }, /area/engine/break_room) -"byw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/sign/nosmoking_2, -/turf/simulated/wall/r_wall, -/area/engine/break_room) "byx" = ( /obj/structure/cable{ d1 = 1; @@ -35665,12 +34327,9 @@ name = "Atmospherics Access"; req_access_txt = "24" }, -/turf/simulated/floor/plasteel, -/area/engine/break_room) -"byy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/securearea, -/turf/simulated/wall/r_wall, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, /area/engine/break_room) "byz" = ( /obj/machinery/status_display{ @@ -35693,6 +34352,9 @@ name = "Life Support Specialist" }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -35705,7 +34367,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -35721,6 +34385,9 @@ /obj/structure/chair/office/dark{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" @@ -35738,7 +34405,6 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/reinforced, /obj/item/folder/yellow, /obj/item/pen, @@ -35750,26 +34416,30 @@ name = "Atmospherics Desk"; req_access_txt = "24" }, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/atmos) "byF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/hallway/primary/port) "byG" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/visible/cyan{ - dir = 6; - initialize_directions = 6 +/obj/machinery/atmospherics/pipe/manifold/visible/cyan{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -35829,35 +34499,27 @@ icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "byK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/turf/simulated/floor/plating, +/area/maintenance/fore) +"byL" = ( /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"byL" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -35870,28 +34532,24 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/turf/simulated/floor/plating, +/area/maintenance/fore) +"byM" = ( +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/fsmaint) -"byM" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "byN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/airlock/public/glass, @@ -35907,17 +34565,18 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/hallway/primary/central) "byP" = ( +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -35930,7 +34589,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -36088,10 +34746,7 @@ /turf/simulated/wall/r_wall, /area/security/nuke_storage) "bzd" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/greengrid, /area/security/nuke_storage) "bzf" = ( @@ -36157,13 +34812,13 @@ /turf/simulated/floor/plating, /area/security/brig) "bzm" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -36215,8 +34870,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -36263,18 +34917,6 @@ icon_state = "redcorner" }, /area/security/brig) -"bzu" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/construction/hallway) "bzv" = ( /obj/machinery/status_display, /turf/simulated/wall/r_wall, @@ -36288,66 +34930,52 @@ }, /area/turret_protected/ai) "bzx" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/turret_protected/ai) +/area/library) "bzy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bzz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/turret_protected/ai) "bzA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/turret_protected/ai) "bzB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) -"bzC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/chair/office/dark{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/ai) "bzD" = ( /obj/structure/table/reinforced, /obj/item/folder/blue, @@ -36362,27 +34990,23 @@ }, /area/engine/gravitygenerator) "bzF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/engine/gravitygenerator) -"bzG" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/crew_quarters/locker) +"bzG" = ( +/obj/effect/spawner/window/reinforced, /obj/structure/sign/electricshock{ pixel_y = 32 }, /turf/simulated/floor/plating, /area/engine/gravitygenerator) "bzH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/status_display{ pixel_y = 32 }, @@ -36391,6 +35015,7 @@ on = 1 }, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bzI" = ( @@ -36398,9 +35023,6 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -36410,13 +35032,6 @@ /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bzJ" = ( -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/power/terminal{ dir = 4 }, @@ -36482,7 +35097,6 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/engine/break_room) "bzP" = ( @@ -36491,17 +35105,14 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bzQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/wall, -/area/engine/break_room) +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel, +/area/engine/engineering) "bzR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/wall, +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, /area/engine/break_room) "bzS" = ( /obj/machinery/disposal, @@ -36516,11 +35127,6 @@ icon_state = "redyellowfull" }, /area/engine/break_room) -"bzU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/engine/break_room) "bzV" = ( /obj/structure/cable{ d1 = 1; @@ -36529,10 +35135,11 @@ tag = "" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/break_room) "bzW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/engine/break_room) @@ -36560,15 +35167,13 @@ }, /area/atmos) "bAa" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "dark" }, -/area/atmos) +/area/library) "bAb" = ( /obj/structure/table/reinforced, /obj/item/tank/internals/emergency_oxygen, @@ -36581,32 +35186,29 @@ }, /area/atmos) "bAc" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/atmos) "bAd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 4 +/obj/structure/urinal{ + pixel_y = 28 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellowcorner" - }, -/area/hallway/primary/port) +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker/locker_toilet) "bAe" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/visible/cyan, +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -36672,34 +35274,36 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bAm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ dir = 8; - initialize_directions = 11 + icon_state = "neutral" }, -/turf/simulated/wall, -/area/storage/primary) +/area/crew_quarters/fitness) "bAn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/turf/simulated/wall, -/area/storage/primary) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/engine/engineering) "bAo" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, -/area/storage/primary) +/area/maintenance/fore) "bAp" = ( /obj/structure/table/reinforced, /obj/item/aiModule/reset, @@ -36709,16 +35313,16 @@ /turf/simulated/floor/plasteel, /area/storage/tech) "bAq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" + icon_state = "yellowfull" }, -/area/hallway/primary/central) +/area/engine/engine_smes) "bAr" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light/small{ @@ -36862,7 +35466,7 @@ "bAI" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -24 }, /obj/machinery/light/small, /obj/structure/closet/crate, @@ -36878,11 +35482,10 @@ /obj/machinery/ai_status_display{ pixel_y = -32 }, -/obj/item/clothing/accessory/stethoscope, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "vault" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, +/turf/simulated/floor/greengrid, /area/security/nuke_storage) "bAK" = ( /obj/machinery/light/small, @@ -36998,8 +35601,7 @@ /area/security/brig) "bAR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/light/small{ dir = 8 @@ -37011,33 +35613,13 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" }, /area/security/brig) -"bAS" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/security/brig) "bAT" = ( /obj/machinery/light/small{ dir = 4 @@ -37163,40 +35745,20 @@ icon_state = "vault" }, /area/turret_protected/ai) -"bBe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/greengrid, -/area/turret_protected/ai) "bBf" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/turret_protected/ai) "bBg" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "AI-window"; - name = "Bridge Blast Doors"; - opacity = 0 + name = "AI Blast Doors" }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/turret_protected/ai) -"bBh" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/greengrid, -/area/turret_protected/ai) "bBi" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -37210,14 +35772,16 @@ }, /area/engine/gravitygenerator) "bBk" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "freezerfloor" }, -/area/engine/gravitygenerator) +/area/crew_quarters/locker/locker_toilet) "bBl" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -37234,10 +35798,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -37245,66 +35805,40 @@ /area/engine/gravitygenerator) "bBo" = ( /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bBp" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) -"bBq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'RADIOACTIVE AREA'"; - icon_state = "radiation"; - name = "RADIOACTIVE AREA" - }, -/turf/simulated/wall/r_wall, -/area/engine/gravitygenerator) "bBr" = ( /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bBs" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; - id_tag = "atmos_eva_inner"; + id_tag = "atmos_tank_inner"; locked = 1; name = "Atmos External Access"; - req_access = null; req_access_txt = "32" }, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bBt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/camera{ c_tag = "Gravity Generation Access"; dir = 4; @@ -37319,20 +35853,20 @@ /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bBu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/wall, -/area/engine/break_room) +/turf/simulated/floor/plasteel, +/area/crew_quarters/locker/locker_toilet) "bBv" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/engine/break_room) "bBw" = ( @@ -37342,9 +35876,6 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Storage"; @@ -37363,7 +35894,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plating, /area/engine/break_room) "bBy" = ( @@ -37379,9 +35909,6 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ name = "Engineering Storage"; @@ -37390,26 +35917,20 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bBz" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/engine/break_room) "bBA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/break_room) "bBB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/firealarm{ pixel_y = 24 }, @@ -37421,27 +35942,12 @@ /area/engine/break_room) "bBC" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "yellow" }, /area/engine/break_room) -"bBD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellow" - }, -/area/engine/break_room) "bBE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -37452,9 +35958,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/power/apc{ dir = 1; @@ -37477,10 +35980,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" @@ -37499,22 +35998,17 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "caution" }, /area/engine/break_room) "bBI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -37576,13 +36070,19 @@ }, /area/atmos) "bBO" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -37645,9 +36145,17 @@ }, /area/storage/tech) "bBV" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/storage/primary) +/obj/machinery/camera{ + c_tag = "Central Ring Hallway East"; + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "bBW" = ( /obj/structure/cable{ d1 = 1; @@ -37655,9 +36163,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/plasticflaps{ opacity = 1 }, @@ -37752,6 +36257,10 @@ /turf/simulated/wall, /area/storage/primary) "bCf" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -37763,10 +36272,6 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -37795,6 +36300,9 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "bCh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -37812,9 +36320,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -37839,15 +36344,15 @@ }, /area/bridge) "bCi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -37859,16 +36364,16 @@ }, /area/bridge) "bCj" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -37939,8 +36444,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -37963,8 +36467,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ @@ -38061,8 +36564,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/machinery/door/window/brigdoor/southright{ req_access_txt = "30" @@ -38087,8 +36589,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -38207,8 +36708,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/machinery/light{ dir = 1 @@ -38342,16 +36842,14 @@ "bCE" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/camera{ c_tag = "Central Ring Hallway East"; dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -38468,13 +36966,13 @@ }, /area/turret_protected/ai) "bCV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/ai_slipper, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bCW" = ( @@ -38535,6 +37033,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bDa" = ( @@ -38582,9 +37081,6 @@ }, /area/engine/gravitygenerator) "bDe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, @@ -38598,6 +37094,12 @@ "bDf" = ( /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -38605,20 +37107,25 @@ /area/engine/gravitygenerator) "bDg" = ( /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bDh" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bDi" = ( @@ -38633,6 +37140,12 @@ name = "Gravity Generator Foyer"; req_access_txt = "10" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bDj" = ( @@ -38648,8 +37161,13 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bDk" = ( @@ -38660,6 +37178,12 @@ tag = "" }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bDl" = ( @@ -38669,10 +37193,13 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bDm" = ( @@ -38682,29 +37209,13 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, -/area/engine/break_room) -"bDn" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bDo" = ( @@ -38714,10 +37225,13 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bDp" = ( @@ -38732,11 +37246,13 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bDq" = ( @@ -38746,10 +37262,11 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/engine/break_room) "bDr" = ( @@ -38759,15 +37276,18 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ name = "Tech Storage"; req_access_txt = "23" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bDs" = ( @@ -38777,21 +37297,26 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bDt" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -38805,21 +37330,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/engine/break_room) -"bDv" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -38836,9 +37348,11 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -38858,65 +37372,76 @@ icon_state = "2-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bDy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "caution" }, /area/engine/break_room) "bDz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_y = 5 }, -/turf/simulated/wall/r_wall, -/area/atmos) +/obj/item/pen/multi, +/turf/simulated/floor/wood, +/area/medical/psych) "bDA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green, +/obj/item/storage/briefcase, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24 }, -/turf/simulated/wall/r_wall, -/area/atmos) +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/wood, +/area/medical/psych) "bDB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellowcorner" - }, -/area/hallway/primary/port) +/turf/simulated/floor/plating, +/area/crew_quarters/locker) "bDC" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/port) "bDD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/structure/chair/office/light{ + dir = 1 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "yellowcorner" +/obj/effect/landmark/start{ + name = "Psychiatrist" }, -/area/hallway/primary/port) +/turf/simulated/floor/wood, +/area/medical/psych) "bDE" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/status_display{ @@ -38934,16 +37459,16 @@ }, /area/storage/tech) "bDG" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -39133,15 +37658,15 @@ }, /area/bridge) "bDW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ name = "Bridge"; @@ -39172,16 +37697,16 @@ }, /area/bridge) "bDZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -39190,12 +37715,10 @@ /area/bridge) "bEa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -39385,8 +37908,7 @@ "bEp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -39510,7 +38032,6 @@ /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bEF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 8 }, @@ -39526,15 +38047,18 @@ }, /area/engine/gravitygenerator) "bEH" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/structure/sign/poster/random{ + pixel_x = 32 }, -/area/engine/gravitygenerator) +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/turf/simulated/floor/wood, +/area/medical/psych) "bEI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -39547,39 +38071,32 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ name = "Tech Storage"; req_access_txt = "23" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bEK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bEL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; name = "RADIOACTIVE AREA" }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall, /area/engine/gravitygenerator) "bEM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/power/port_gen/pacman, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -39591,42 +38108,16 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bEO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/southeastcorner, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) -"bEP" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "yellow" - }, -/area/engine/break_room) "bEQ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/machinery/camera{ c_tag = "Engineering Storage"; dir = 1; @@ -39643,9 +38134,6 @@ }, /area/engine/break_room) "bES" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "caution" }, @@ -39680,14 +38168,15 @@ /area/engine/break_room) "bEV" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" }, /area/engine/break_room) "bEW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -39701,15 +38190,17 @@ }, /area/engine/break_room) "bEY" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 1; + icon_state = "neutralcorner" }, -/area/engine/break_room) +/area/crew_quarters/sleep) "bEZ" = ( /obj/structure/cable{ d1 = 1; @@ -39717,13 +38208,14 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bFa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/status_display{ pixel_x = 32; pixel_y = 32 @@ -39734,6 +38226,7 @@ }, /area/engine/break_room) "bFb" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -39750,7 +38243,6 @@ }, /area/engine/break_room) "bFd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/closet/emcloset, /obj/effect/decal/warning_stripes/northwest, /obj/machinery/camera{ @@ -39762,9 +38254,6 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bFe" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/machinery/light{ dir = 1; on = 1 @@ -39778,6 +38267,7 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/northeast, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/engine/break_room) "bFg" = ( @@ -39789,12 +38279,18 @@ /turf/simulated/floor/plating, /area/engine/break_room) "bFh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "yellowcorner" + icon_state = "neutralcorner" }, -/area/hallway/primary/port) +/area/crew_quarters/sleep) "bFi" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -39918,11 +38414,11 @@ }, /area/hallway/primary/central) "bFu" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/spawner/window/reinforced, +/obj/structure/cable, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -39975,13 +38471,13 @@ }, /area/bridge) "bFA" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -40111,7 +38607,7 @@ "bFN" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "darkblue" @@ -40373,36 +38869,34 @@ }, /area/turret_protected/ai) "bGr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/engine/gravitygenerator) -"bGs" = ( -/obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/turf/simulated/floor/plating, +/area/maintenance/port) +"bGs" = ( +/obj/effect/spawner/window/reinforced, /obj/structure/sign/electricshock{ pixel_y = -32 }, /turf/simulated/floor/plating, /area/engine/gravitygenerator) "bGt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/light/small, /obj/structure/closet/radiation, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bGu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/status_display{ pixel_y = -32 }, @@ -40413,23 +38907,20 @@ network = list("SS13","Engineering") }, /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bGv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bGw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/machinery/newscaster{ pixel_y = -32 }, @@ -40457,8 +38948,9 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bGz" = ( @@ -40482,7 +38974,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -40517,10 +39008,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/reinforced, /obj/item/folder/yellow, /obj/item/lightreplacer, @@ -40531,6 +39018,9 @@ }, /area/engine/break_room) "bGG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -40543,9 +39033,30 @@ icon_state = "2-4"; tag = "" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/engine/break_room) +"bGH" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -40554,32 +39065,17 @@ icon_state = "neutralfull" }, /area/engine/break_room) -"bGH" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/engine/break_room) "bGI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -40589,62 +39085,77 @@ }, /area/engine/break_room) "bGJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ name = "Engineering"; req_access_txt = "32" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bGK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bGL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bGM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -40657,14 +39168,14 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/effect/landmark{ + name = "lightsout" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/landmark{ - name = "lightsout" + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -40672,6 +39183,9 @@ }, /area/engine/break_room) "bGN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -40689,30 +39203,38 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ name = "Engineering"; req_access_txt = "32" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bGO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -40731,17 +39253,24 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/storage/tech) "bGQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -40759,9 +39288,11 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -40769,7 +39300,6 @@ }, /area/hallway/primary/port) "bGR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 4 }, @@ -40803,7 +39333,7 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -40818,8 +39348,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -40839,25 +39369,23 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "bGW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/rack, /obj/item/circuitboard/mechfab, /obj/item/circuitboard/autolathe{ pixel_x = 3; pixel_y = -3 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/storage/tech) "bGX" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -40905,9 +39433,6 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "bHc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 1; @@ -40915,9 +39440,6 @@ }, /area/storage/primary) "bHd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/effect/landmark/start{ name = "Civilian" }, @@ -40927,41 +39449,41 @@ }, /area/storage/primary) "bHe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" }, /area/storage/primary) "bHf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/storage/primary) +/turf/simulated/floor/plasteel, +/area/maintenance/starboard) "bHg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/central) -"bHh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/turf/simulated/floor/plating, +/area/crew_quarters/sleep) +"bHh" = ( /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -40985,13 +39507,13 @@ /turf/simulated/wall, /area/bridge/meeting_room) "bHl" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -41007,8 +39529,7 @@ "bHm" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -41182,13 +39703,13 @@ }, /area/hallway/primary/central) "bHC" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -41205,7 +39726,7 @@ }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "bHE" = ( /obj/structure/cable{ d1 = 4; @@ -41215,7 +39736,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "bHF" = ( /obj/structure/cable{ d1 = 4; @@ -41225,12 +39746,12 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "bHG" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -41243,7 +39764,7 @@ tag = "" }, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "bHI" = ( /obj/structure/cable{ d1 = 2; @@ -41255,7 +39776,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "bHJ" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -41315,14 +39836,14 @@ }, /area/security/detectives_office) "bHO" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -41453,8 +39974,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -41462,6 +39982,7 @@ }, /area/security/brig) "bHZ" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -41474,7 +39995,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -41486,31 +40006,28 @@ /turf/simulated/floor/plating, /area/security/warden) "bIg" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/structure/chair/office/dark{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/turret_protected/ai) +/area/crew_quarters/fitness) "bIh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bIi" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -41530,9 +40047,6 @@ }, /area/turret_protected/ai) "bIk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -41547,27 +40061,21 @@ }, /area/turret_protected/ai) "bIl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/turret_protected/ai) "bIm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bIn" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/structure/chair/office/dark{ dir = 4 }, @@ -41585,7 +40093,6 @@ }, /area/turret_protected/ai) "bIp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) @@ -41640,9 +40147,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/rack, /obj/item/crowbar, /obj/item/storage/toolbox/mechanical, @@ -41657,9 +40161,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ pixel_y = 24 @@ -41669,17 +40170,14 @@ }, /area/crew_quarters/chief) "bIw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/crew_quarters/chief) "bIx" = ( @@ -41697,9 +40195,6 @@ /obj/structure/disposalpipe/sortjunction{ name = "CE's Junction" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" @@ -41712,16 +40207,16 @@ }, /area/engine/break_room) "bIB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/obj/structure/chair/stool, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "dark" }, -/area/engine/break_room) +/area/crew_quarters/fitness) "bIC" = ( /obj/structure/cable{ d1 = 1; @@ -41729,35 +40224,32 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/break_room) "bID" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bIE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/engine/break_room) +/area/crew_quarters/fitness) "bIF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light{ dir = 4 }, @@ -41767,11 +40259,20 @@ }, /area/engine/break_room) "bIG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/wall, -/area/engine/break_room) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "purplecorner" + }, +/area/hallway/primary/central) "bIH" = ( /obj/structure/cable{ d1 = 1; @@ -41779,9 +40280,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/engine/break_room) @@ -41790,7 +40288,6 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bIJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/rack, /obj/item/circuitboard/camera{ pixel_x = -3; @@ -41812,25 +40309,6 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/engine/break_room) -"bIL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "cautioncorner" - }, -/area/hallway/primary/port) -"bIM" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/port) "bIN" = ( /obj/structure/table/reinforced, /obj/machinery/camera{ @@ -41868,6 +40346,7 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; @@ -41900,6 +40379,12 @@ /obj/item/clothing/gloves/color/fyellow, /obj/item/storage/box/lights/mixed, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/storage/primary) "bIT" = ( @@ -41910,6 +40395,9 @@ }, /area/storage/primary) "bIU" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, @@ -41933,9 +40421,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ name = "Security Checkpoint"; @@ -42009,6 +40494,7 @@ }, /area/hallway/primary/central) "bJe" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light_switch{ pixel_x = 26; @@ -42021,7 +40507,6 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -42153,7 +40638,7 @@ icon_state = "1-4" }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "bJu" = ( /obj/structure/cable{ d1 = 4; @@ -42166,7 +40651,7 @@ req_access_txt = "4" }, /turf/simulated/floor/plasteel, -/area/security/detectives_office) +/area/maintenance/starboard2) "bJv" = ( /obj/structure/cable{ d1 = 4; @@ -42238,12 +40723,12 @@ }, /area/security/detectives_office) "bJz" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -42310,7 +40795,7 @@ dir = 4 }, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -42328,6 +40813,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42341,6 +40829,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42350,9 +40841,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42371,13 +40859,15 @@ }, /area/turret_protected/ai) "bJS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bJT" = ( @@ -42386,6 +40876,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bJU" = ( @@ -42395,10 +40891,15 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bJV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -42409,6 +40910,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bJW" = ( @@ -42417,6 +40924,9 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/greengrid, /area/turret_protected/ai) "bJX" = ( @@ -42427,6 +40937,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42442,6 +40955,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42458,9 +40974,6 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -42478,12 +40991,12 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/break_room) "bKc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 4; @@ -42510,26 +41023,23 @@ }, /area/crew_quarters/chief) "bKe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/crew_quarters/chief) "bKf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, /area/crew_quarters/chief) "bKg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -42542,8 +41052,11 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -42553,9 +41066,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/engine/break_room) @@ -42563,9 +41073,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 4; @@ -42590,79 +41097,52 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ name = "Chief Engineer"; req_access_txt = "56" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/chief) "bKl" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "yellow" }, /area/engine/break_room) -"bKm" = ( +"bKp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/engine/break_room) -"bKn" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/engine/break_room) -"bKo" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -42673,26 +41153,11 @@ icon_state = "neutralfull" }, /area/engine/break_room) -"bKp" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/engine/break_room) "bKq" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -42705,9 +41170,11 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -42724,18 +41191,21 @@ /turf/simulated/wall, /area/security/checkpoint/engineering) "bKt" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/structure/disposalpipe/junction{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 }, -/turf/simulated/floor/plating, -/area/security/checkpoint/engineering) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "purplecorner" + }, +/area/hallway/primary/central) "bKu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/rack, /obj/item/circuitboard/teleporter_hub{ pixel_x = -3; @@ -42753,33 +41223,18 @@ }, /area/storage/tech) "bKv" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plating, -/area/security/checkpoint/engineering) -"bKw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/sign/electricshock, -/turf/simulated/wall/r_wall, -/area/security/checkpoint/engineering) -"bKx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "cautioncorner" + icon_state = "neutralcorner" }, -/area/hallway/primary/port) +/area/crew_quarters/sleep) +"bKw" = ( +/obj/structure/sign/electricshock, +/turf/simulated/wall, +/area/security/checkpoint/engineering) "bKy" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/ai_status_display{ @@ -42818,21 +41273,26 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/break_room) "bKD" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "neutralcorner" }, -/area/storage/primary) +/area/crew_quarters/sleep) "bKE" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -42912,6 +41372,7 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bKL" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/wood, /obj/item/phone, @@ -42923,7 +41384,6 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bKM" = ( @@ -43017,23 +41477,21 @@ }, /area/crew_quarters/captain) "bLa" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -43098,14 +41556,14 @@ }, /area/storage/tools) "bLj" = ( -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, /obj/structure/disposalpipe/trunk{ dir = 4 }, /obj/machinery/disposal, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -43117,16 +41575,16 @@ }, /area/storage/tools) "bLk" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel, /area/storage/tools) "bLl" = ( @@ -43224,7 +41682,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -43343,18 +41801,10 @@ /turf/space, /area/space/nearstation) "bLN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/ai) +/obj/effect/spawner/random_spawners/grille_maybe, +/turf/simulated/floor/plating, +/area/maintenance/port) "bLO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -43364,18 +41814,13 @@ }, /area/turret_protected/ai) "bLP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/atmos{ + name = "Atmospherics Maintenance"; + req_access_txt = "12;24" }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/ai) +/turf/simulated/floor/plasteel, +/area/maintenance/port) "bLQ" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -43404,10 +41849,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -43422,9 +41865,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -43440,9 +41880,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/external{ name = "MiniSat External Access"; @@ -43460,10 +41897,13 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellow" @@ -43476,11 +41916,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/hatch{ name = "MiniSat Transit Tube"; req_one_access_txt = "32;19" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/break_room) "bLZ" = ( @@ -43492,29 +41933,30 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/storage/primary) "bMa" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/airlock/public/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/fore) "bMb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/airlock/public/glass, @@ -43547,7 +41989,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10; initialize_directions = 10 @@ -43571,15 +42012,13 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/break_room) "bMf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small{ dir = 4 }, @@ -43597,10 +42036,7 @@ }, /area/crew_quarters/chief) "bMh" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -43624,6 +42060,7 @@ }, /area/crew_quarters/chief) "bMk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; @@ -43637,7 +42074,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -43692,28 +42128,22 @@ icon_state = "yellow" }, /area/engine/break_room) -"bMs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 7; - icon_state = "yellow" - }, -/area/engine/break_room) "bMt" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 7; icon_state = "yellow" }, /area/engine/break_room) "bMu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 7; icon_state = "yellow" @@ -43786,12 +42216,11 @@ }, /area/storage/tech) "bMD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/structure/sign/poster/random{ + pixel_x = -32 }, -/area/storage/tech) +/turf/simulated/floor/carpet, +/area/medical/psych) "bME" = ( /obj/structure/table/reinforced, /obj/machinery/light{ @@ -43814,12 +42243,11 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bMG" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/electrical, @@ -43839,7 +42267,6 @@ }, /area/storage/primary) "bMJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cautioncorner" @@ -43964,15 +42391,14 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bMS" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/structure/table/wood, /obj/item/storage/fancy/donut_box, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/structure/cable{ d1 = 1; @@ -43980,7 +42406,6 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -44062,6 +42487,7 @@ }, /area/crew_quarters/captain) "bNc" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -44073,7 +42499,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -44162,12 +42587,12 @@ }, /area/storage/tools) "bNk" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -44284,7 +42709,7 @@ "bNy" = ( /obj/effect/decal/warning_stripes/east, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /turf/simulated/floor/plasteel, /area/security/brig) @@ -44296,7 +42721,6 @@ /turf/simulated/floor/plasteel, /area/security/brig) "bNB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/mineral/ore_redemption, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -44309,26 +42733,26 @@ /turf/simulated/floor/plasteel, /area/maintenance/starboard) "bND" = ( -/obj/structure/chair{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/chair{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" }, /area/security/processing) "bNE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/security/processing) "bNF" = ( @@ -44347,6 +42771,11 @@ }, /area/security/processing) "bNH" = ( +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "Brig Equipment Storage"; + sortType = 8 + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -44355,25 +42784,20 @@ }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Brig Equipment Storage"; - sortType = 8 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/security/brig) "bNI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, /area/security/processing) "bNK" = ( @@ -44392,10 +42816,6 @@ /turf/simulated/floor/plating, /area/security/brig) "bNL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 - }, /obj/machinery/camera{ c_tag = "AI Chamber South"; dir = 1; @@ -44414,9 +42834,8 @@ /turf/simulated/wall/r_wall, /area/turret_protected/aisat) "bNO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/turret_protected/aisat) +/turf/simulated/floor/carpet, +/area/medical/psych) "bNP" = ( /obj/machinery/door/firedoor, /obj/machinery/flasher{ @@ -44434,30 +42853,35 @@ name = "MiniSat Chamber Observation"; req_access_txt = "75" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/turret_protected/aisat) "bNQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, -/area/turret_protected/aisat) +/obj/item/twohanded/required/kirbyplants, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/medical/psych) "bNR" = ( /obj/machinery/status_display, /turf/simulated/wall/r_wall, /area/turret_protected/aisat) "bNS" = ( +/obj/structure/disposalpipe/sortjunction{ + name = "Atmospherics Junction"; + sortType = 6 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/sortjunction{ - name = "Atmospherics Junction"; - sortType = 6 - }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 5 }, @@ -44475,18 +42899,20 @@ }, /area/engine/break_room) "bNU" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ name = "Engineering"; req_access_txt = "10" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/break_room) "bNW" = ( @@ -44505,7 +42931,6 @@ }, /area/engine/break_room) "bNY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 8; @@ -44532,6 +42957,12 @@ }, /area/crew_quarters/chief) "bOa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -44544,6 +42975,12 @@ /obj/effect/landmark/start{ name = "Chief Engineer" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -44567,7 +43004,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -44585,7 +43027,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 4 }, @@ -44598,7 +43039,6 @@ /turf/simulated/wall/r_wall, /area/crew_quarters/chief) "bOg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/nosmoking_2, /turf/simulated/wall, /area/engine/break_room) @@ -44608,7 +43048,6 @@ /turf/simulated/floor/plasteel, /area/engine/break_room) "bOi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/sign/securearea, /turf/simulated/wall, /area/engine/break_room) @@ -44642,7 +43081,6 @@ }, /area/security/checkpoint/engineering) "bOn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -44659,25 +43097,24 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/port) "bOp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; initialize_directions = 11 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "yellowcorner" + dir = 8; + icon_state = "neutralfull" }, -/area/hallway/primary/port) +/area/crew_quarters/fitness) "bOq" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/yellow, @@ -44689,7 +43126,6 @@ }, /area/storage/tech) "bOr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /obj/machinery/firealarm{ dir = 1; @@ -44705,8 +43141,9 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/storage/tech) "bOt" = ( @@ -44736,13 +43173,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bOw" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -44772,13 +43208,14 @@ /turf/simulated/floor/plasteel, /area/storage/primary) "bOA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/storage/primary) "bOB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" @@ -44820,6 +43257,7 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bOH" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/command{ name = "Head of Personnel"; req_access = null; @@ -44833,7 +43271,6 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -44846,6 +43283,7 @@ /turf/simulated/floor/carpet, /area/bridge/meeting_room) "bOJ" = ( +/obj/structure/disposalpipe/segment, /obj/structure/table/wood, /obj/item/paper_bin, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -44856,7 +43294,6 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/item/pen, /turf/simulated/floor/carpet, /area/bridge/meeting_room) @@ -44870,6 +43307,10 @@ }, /area/bridge/meeting_room) "bOL" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -44877,10 +43318,6 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -44972,13 +43409,13 @@ }, /area/hallway/primary/central) "bOX" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/structure/chair/comfy/brown, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -45329,15 +43766,10 @@ }, /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "station_ai_outer"; locked = 1; name = "Minisat Access"; - req_access = null; - req_access_txt = "10;13" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + req_one_access_txt = "10;13" }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -45381,19 +43813,14 @@ }, /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "station_ai_inner"; locked = 1; name = "Minisat Access"; - req_access = null; - req_access_txt = "10;13" + req_one_access_txt = "10;13" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -45413,7 +43840,7 @@ tag = "" }, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/machinery/portable_atmospherics/canister/air, /obj/effect/decal/warning_stripes/north, @@ -45435,9 +43862,6 @@ }, /area/turret_protected/aisat) "bPK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -45447,24 +43871,20 @@ frequency = 1379; master_tag = "atmo_tank_airlock"; name = "interior access button"; - pixel_x = -20; + pixel_x = -23; pixel_y = 20; req_access_txt = "32" }, /turf/simulated/floor/plasteel, /area/engine/gravitygenerator) "bPL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/turret_protected/aisat) -"bPM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/aisat) "bPN" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -45586,8 +44006,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance{ name = "Mining Maintenance"; req_access_txt = "48" @@ -45608,9 +44026,6 @@ }, /area/quartermaster/office) "bQc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/window/eastleft{ @@ -45630,6 +44045,12 @@ /obj/item/folder/blue, /obj/item/stamp/ce, /obj/item/paper/tcommskey, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -45645,23 +44066,22 @@ id_tag = "transitlock"; name = "Transit Tube Blast Doors" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/break_room) "bQg" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/maintenance/starboard) @@ -45686,13 +44106,10 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; id_tag = "ceprivacy"; - name = "CE Privacy Shutters"; - opacity = 0 + name = "CE Privacy Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/chief) @@ -45711,6 +44128,7 @@ /obj/machinery/ai_status_display{ pixel_y = 32 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -45782,7 +44200,6 @@ dir = 2; icon_state = "pipe-j2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ dir = 8 @@ -45799,7 +44216,6 @@ }, /area/engine/break_room) "bQq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small{ dir = 1 }, @@ -45861,7 +44277,6 @@ /turf/simulated/floor/plating, /area/security/checkpoint/engineering) "bQw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/camera{ c_tag = "Port Hallway South"; dir = 8 @@ -45872,9 +44287,13 @@ }, /area/hallway/primary/port) "bQx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/storage/tech) +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/bluegrid{ + nitrogen = 500; + oxygen = 0; + temperature = 80 + }, +/area/toxins/xenobiology) "bQy" = ( /obj/structure/table/reinforced, /obj/machinery/kitchen_machine/microwave, @@ -45893,14 +44312,16 @@ }, /area/hallway/primary/starboard) "bQA" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) "bQB" = ( @@ -45918,7 +44339,7 @@ /area/storage/primary) "bQC" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/machinery/teleport/hub, /obj/effect/decal/warning_stripes/southwest, @@ -45967,7 +44388,7 @@ "bQH" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/camera{ c_tag = "Command Meeting Room"; @@ -45981,6 +44402,7 @@ /turf/simulated/wall, /area/blueshield) "bQJ" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -45989,7 +44411,6 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -45997,7 +44418,7 @@ "bQK" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/machinery/porta_turret{ dir = 4 @@ -46054,13 +44475,13 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain) "bQQ" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/structure/table/wood, /obj/machinery/door/window{ base_state = "right"; @@ -46183,12 +44604,12 @@ /turf/simulated/floor/plating, /area/security/detectives_office) "bRc" = ( +/obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/security/detectives_office) "bRd" = ( @@ -46203,11 +44624,11 @@ }, /area/hallway/primary/starboard) "bRe" = ( -/obj/effect/decal/warning_stripes/east, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -46216,11 +44637,11 @@ /turf/simulated/floor/plasteel, /area/security/brig) "bRf" = ( -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/light/small, @@ -46230,14 +44651,14 @@ /turf/simulated/floor/plasteel, /area/security/brig) "bRg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -46256,17 +44677,21 @@ /turf/simulated/floor/plasteel, /area/security/brig) "bRh" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "redcorner" }, /area/security/brig) "bRi" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -46276,10 +44701,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -46358,21 +44779,11 @@ }, /turf/simulated/floor/plating, /area/security/seceqstorage) -"bRq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/chair/stool/bar, -/turf/simulated/floor/plasteel{ - icon_state = "redyellowfull" - }, -/area/crew_quarters/bar/atrium) "bRr" = ( /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -46405,7 +44816,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/camera{ c_tag = "AI Minisatellite West"; dir = 8; @@ -46422,26 +44832,25 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/camera{ c_tag = "AI Minisatellite East"; dir = 4; network = list("Minisat","SS13"); pixel_y = -22 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/construction/hallway) "bRw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/wall/r_wall, -/area/engine/break_room) +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plasteel, +/area/maintenance/starboard) "bRx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, /obj/structure/showcase{ density = 0; @@ -46455,87 +44864,31 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/turret_protected/aisat) -"bRy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/showcase{ - density = 0; - dir = 4; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; - pixel_x = -9; - pixel_y = 2 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/aisat) "bRz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/turret_protected/aisat) -"bRA" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/turret_protected/aisat) "bRB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/ai_slipper, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/turret_protected/aisat) -"bRC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/turret_protected/aisat) "bRD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/turret_protected/aisat) -"bRE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/showcase{ - density = 0; - dir = 8; - icon = 'icons/mob/robots.dmi'; - icon_state = "robot_old"; - name = "Cyborg Statue"; - pixel_x = 9; - pixel_y = 2 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/aisat) "bRF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/turret_protected/aisat) +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/glass/bucket, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "bRG" = ( /obj/structure/window/reinforced{ dir = 1; @@ -46544,31 +44897,11 @@ /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) -"bRH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/aisat) -"bRI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/aisat) "bRJ" = ( /obj/structure/window/reinforced{ dir = 1; layer = 2.9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light/small{ dir = 8 }, @@ -46576,23 +44909,12 @@ icon_state = "dark" }, /area/construction/hallway) -"bRK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/construction/hallway) "bRL" = ( /obj/structure/window/reinforced{ dir = 1; layer = 2.9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -46602,9 +44924,6 @@ dir = 1; layer = 2.9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/sign/vacuum{ pixel_y = 32 }, @@ -46620,10 +44939,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 - }, /obj/structure/transit_tube{ icon_state = "S-NE" }, @@ -46660,7 +44975,6 @@ /turf/space, /area/space/nearstation) "bRS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/small{ dir = 1 }, @@ -46686,7 +45000,8 @@ }, /area/engine/break_room) "bRU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -46738,8 +45053,11 @@ }, /area/crew_quarters/chief) "bRY" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -46752,8 +45070,11 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -46777,14 +45098,17 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ name = "Chief Engineer"; req_access_txt = "56" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -46796,6 +45120,9 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -46810,9 +45137,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -46830,34 +45160,20 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/landmark/start{ name = "Chief Engineer" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/crew_quarters/chief) "bSe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/storage/primary) -"bSf" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor{ - icon_state = "open"; - id_tag = "transitlock"; - name = "Transit Tube Blast Doors" - }, +/obj/structure/closet/firecloset, /turf/simulated/floor/plating, -/area/engine/break_room) +/area/maintenance/starboard) "bSg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, @@ -46869,18 +45185,16 @@ }, /area/hallway/primary/central) "bSh" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/item/radio/beacon, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -46906,9 +45220,6 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/engine/engineering) "bSk" = ( @@ -46918,9 +45229,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 9; @@ -46932,9 +45240,6 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -46946,8 +45251,12 @@ }, /area/security/checkpoint/engineering) "bSm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/door_timer{ + dir = 10; + id = "engcell"; + name = "Engineering Cell Timer"; + pixel_y = 32 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -46961,18 +45270,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" }, /area/security/checkpoint/engineering) "bSo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera{ c_tag = "MiniSat Central"; network = list("SS13","Minisat") @@ -46993,6 +45296,8 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -47005,20 +45310,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "yellowcorner" }, /area/hallway/primary/port) "bSr" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -47026,54 +45323,11 @@ }, /obj/machinery/meter, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plating, /area/turret_protected/aisat) -"bSs" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/port) -"bSt" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellowcorner" - }, -/area/hallway/primary/port) -"bSu" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "yellowcorner" - }, -/area/hallway/primary/port) "bSv" = ( /obj/structure/cable{ d1 = 1; @@ -47086,27 +45340,13 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/hallway/primary/port) -"bSw" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/port) "bSx" = ( /obj/structure/cable{ d1 = 1; @@ -47119,7 +45359,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -47132,10 +45371,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -47155,16 +45390,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellowcorner" }, /area/hallway/primary/port) "bSB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/camera{ c_tag = "Fore Hallway South"; dir = 8 @@ -47291,13 +45522,13 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain) "bSQ" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/structure/chair/comfy/brown{ dir = 1 }, @@ -47330,8 +45561,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -47413,15 +45643,15 @@ /turf/simulated/floor/plasteel, /area/storage/tools) "bTf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -47537,6 +45767,12 @@ /turf/simulated/floor/plating, /area/security/seceqstorage) "bTs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -47548,6 +45784,12 @@ name = "MiniSat Maintenance"; req_access_txt = "75" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -47560,13 +45802,16 @@ icon_state = "2-4"; tag = "" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/turret_protected/aisat) "bTv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -47578,6 +45823,12 @@ icon_state = "1-4"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -47595,42 +45846,17 @@ icon_state = "2-8"; tag = "" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/aisat) -"bTx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/aisat) -"bTy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/ai_slipper, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" + icon_state = "dark" }, /area/turret_protected/aisat) "bTz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -47641,19 +45867,11 @@ name = "MiniSat Maintenance"; req_access_txt = "75" }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/turret_protected/aisat) -"bTA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -47666,16 +45884,9 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/turret_protected/aisat) -"bTC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -47695,30 +45906,38 @@ tag = "" }, /mob/living/simple_animal/bot/secbot/pingsky, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/turret_protected/aisat) "bTE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/turret_protected/aisat) "bTF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -47729,6 +45948,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -47745,6 +45970,12 @@ name = "MiniSat Foyer"; req_access_txt = "75" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -47757,24 +45988,17 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/turret_protected/aisat) -"bTJ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/aisat) "bTK" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -47782,20 +46006,29 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/turret_protected/aisat) "bTL" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -47811,6 +46044,12 @@ name = "MiniSat Teleporter Room"; req_access_txt = "17;75" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -47822,35 +46061,25 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/construction/hallway) "bTO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/construction/hallway) -"bTP" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - on = 1 - }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -47862,6 +46091,10 @@ icon_state = "4-8" }, /obj/item/radio/beacon, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -47873,6 +46106,12 @@ icon_state = "4-8" }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -47884,6 +46123,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -47895,7 +46140,10 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -47906,11 +46154,16 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/transit_tube/station{ dir = 8 }, /obj/structure/transit_tube_pod, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -47922,24 +46175,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/crew_quarters/chief) -"bTW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"bTX" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "bTY" = ( /obj/structure/cable{ d1 = 4; @@ -47947,9 +46185,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -47964,7 +46199,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -47977,9 +46211,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -47999,13 +46232,16 @@ /turf/space, /area/space/nearstation) "bUc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/window/reinforced{ dir = 8 }, /obj/structure/table/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -48014,24 +46250,29 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/break_room) "bUe" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/engine/break_room) "bUf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/machinery/light/small{ dir = 4 @@ -48089,13 +46330,10 @@ "bUm" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; id_tag = "ceprivacy"; - name = "CE Privacy Shutters"; - opacity = 0 + name = "CE Privacy Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/chief) @@ -48141,22 +46379,26 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/engineering{ name = "Tech Storage"; req_access_txt = "23" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/storage/tech) "bUs" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, /turf/simulated/floor/plasteel{ @@ -48171,10 +46413,9 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, -/area/maintenance/fsmaint) +/area/maintenance/fore) "bUu" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -48192,6 +46433,12 @@ icon_state = "2-4"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/engine/engineering) "bUv" = ( @@ -48213,7 +46460,12 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -48232,6 +46484,12 @@ tag = "" }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -48245,6 +46503,12 @@ tag = "" }, /obj/structure/chair/office/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -48271,7 +46535,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/item/book/manual/security_space_law, /obj/item/radio, @@ -48281,7 +46545,6 @@ }, /area/security/checkpoint/engineering) "bUA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8 }, @@ -48301,17 +46564,28 @@ codes_txt = "patrol;next_patrol=engi2"; location = "engi1" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/port) "bUC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=hall4"; location = "engi3" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -48326,37 +46600,20 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, /area/turret_protected/aisat) -"bUE" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/port) -"bUF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/port) "bUG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/port) -"bUH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/port) "bUI" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -48369,19 +46626,20 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) "bUK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=engi1"; location = "hall3" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -48424,8 +46682,7 @@ }, /area/hallway/primary/central) "bUP" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/spawner/window/reinforced/plasma, /obj/machinery/door/poddoor{ icon_state = "open"; id_tag = "transitlock"; @@ -48454,6 +46711,9 @@ icon_state = "pipe-c" }, /obj/item/twohanded/required/kirbyplants, +/obj/machinery/keycard_auth{ + pixel_y = 26 + }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -48499,13 +46759,13 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain) "bUX" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/black, @@ -48614,9 +46874,6 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) @@ -48657,16 +46914,18 @@ }, /area/hallway/primary/starboard) "bVj" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Minisat Teleporter Room"; dir = 4; network = list("Minisat","SS13"); pixel_y = -22 }, +/obj/machinery/turretid/stun{ + control_area = "\improper AI Satellite Antechamber"; + name = "AI Antechamber Turret Control"; + pixel_x = -28; + req_access_txt = "75" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -48716,13 +46975,13 @@ }, /area/hallway/primary/starboard) "bVm" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -48769,8 +47028,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -48834,9 +47092,6 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) @@ -48845,20 +47100,15 @@ pixel_x = -32 }, /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/engine/break_room) "bVz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/wall, -/area/engine/break_room) +/obj/machinery/status_display, +/turf/simulated/wall/r_wall, +/area/security/checkpoint/medical) "bVA" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -48901,9 +47151,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -48936,9 +47183,6 @@ /area/crew_quarters/courtroom) "bVH" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light/small{ dir = 4 }, @@ -48947,15 +47191,10 @@ }, /area/construction/hallway) "bVI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/ai_status_display, /turf/simulated/wall/r_wall, -/area/turret_protected/aisat) +/area/security/checkpoint/medical) "bVJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -48973,20 +47212,14 @@ pixel_x = -9; pixel_y = 2 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/area/turret_protected/aisat) -"bVK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/turret_protected/aisat) "bVL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -48996,31 +47229,20 @@ icon_state = "dark" }, /area/turret_protected/aisat) -"bVM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/turret_protected/aisat) "bVN" = ( /obj/item/twohanded/required/kirbyplants, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/turret_protected/aisat) "bVO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/showcase{ density = 0; dir = 4; @@ -49034,46 +47256,24 @@ icon_state = "dark" }, /area/turret_protected/aisat) -"bVP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/turret_protected/aisat) -"bVQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/turret_protected/aisat) "bVR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/turret_protected/aisat) "bVS" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/turret_protected/aisat) "bVT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/showcase{ density = 0; dir = 8; @@ -49088,23 +47288,19 @@ }, /area/turret_protected/aisat) "bVU" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/turret_protected/aisat) "bVV" = ( /obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light/small{ dir = 8 }, @@ -49117,10 +47313,8 @@ }, /area/construction/hallway) "bVW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -49298,13 +47492,10 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "ceprivacy"; - name = "CE Privacy Shutters"; - opacity = 0 + name = "CE Privacy Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/chief) @@ -49321,13 +47512,10 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "ceprivacy"; - name = "CE Privacy Shutters"; - opacity = 0 + name = "CE Privacy Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/chief) @@ -49337,13 +47525,9 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; +/obj/machinery/door/poddoor/shutters/preopen{ id_tag = "ceprivacy"; - name = "CE Privacy Shutters"; - opacity = 0 + name = "CE Privacy Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/chief) @@ -49376,7 +47560,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -49397,6 +47580,9 @@ pixel_y = -32 }, /obj/machinery/computer/security, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -49429,9 +47615,6 @@ }, /area/security/checkpoint/engineering) "bWz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cautioncorner" @@ -49444,56 +47627,26 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/port) -"bWB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowcorner" - }, -/area/hallway/primary/port) "bWC" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/security/seceqstorage) -"bWD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/port) "bWE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/hallway/primary/port) -"bWF" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/port) "bWG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/light, /turf/simulated/floor/plasteel{ dir = 8; @@ -49501,10 +47654,6 @@ }, /area/hallway/primary/port) "bWH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -49513,16 +47662,13 @@ "bWI" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/machinery/suit_storage_unit/ce, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, /area/crew_quarters/chief) "bWJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; @@ -49534,37 +47680,33 @@ }, /area/hallway/primary/port) "bWK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/engine/engineering) -"bWL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) "bWM" = ( /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, /area/hallway/primary/central) "bWN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "bWO" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -49626,13 +47768,13 @@ }, /area/crew_quarters/heads/hop) "bWW" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/command{ id_tag = "captainofficedoor"; name = "Captain's Office"; @@ -49669,8 +47811,7 @@ icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -49702,7 +47843,7 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -24 }, /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -49729,15 +47870,15 @@ /turf/simulated/floor/plasteel, /area/lawoffice) "bXh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -49774,15 +47915,15 @@ }, /area/hallway/primary/starboard) "bXl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -49838,9 +47979,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ @@ -49905,9 +48043,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -49926,7 +48061,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) @@ -49938,7 +48072,6 @@ }, /area/turret_protected/aisat) "bXI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -49949,6 +48082,8 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -49959,7 +48094,7 @@ /obj/machinery/light, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -50076,7 +48211,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "bXZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/securearea, /turf/simulated/wall, /area/engine/engineering) @@ -50087,12 +48221,10 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) "bYb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; icon_state = "radiation"; @@ -50125,30 +48257,20 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "yellow" }, /area/hallway/primary/port) "bYg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plasteel{ icon_state = "yellowcorner" }, /area/hallway/primary/port) -"bYh" = ( -/turf/simulated/wall, -/area/maintenance/fpmaint2) "bYi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "bYj" = ( /turf/simulated/wall, /area/library) @@ -50163,9 +48285,6 @@ icon_state = "1-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) @@ -50176,9 +48295,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) @@ -50193,10 +48309,9 @@ /turf/simulated/wall, /area/library) "bYo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/machinery/light/small, /obj/effect/decal/warning_stripes/southwest, @@ -50242,13 +48357,13 @@ }, /area/crew_quarters/heads/hop) "bYs" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "bYu" = ( @@ -50279,13 +48394,13 @@ }, /area/crew_quarters/captain/bedroom) "bYz" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -50304,6 +48419,12 @@ "bYB" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -50356,9 +48477,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/lattice/catwalk, /turf/space, /area/space/nearstation) @@ -50428,6 +48546,7 @@ /turf/simulated/floor/plating, /area/magistrateoffice) "bYQ" = ( +/obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters{ density = 0; @@ -50437,7 +48556,6 @@ name = "Magistrate Privacy Shutters"; opacity = 0 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/magistrateoffice) "bYR" = ( @@ -50466,12 +48584,10 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -50519,8 +48635,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -50616,6 +48731,8 @@ name = "Telecommunications"; req_access_txt = "61" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -50726,72 +48843,38 @@ /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/engineering) -"bZu" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"bZv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "bZw" = ( /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/space, /area/space/nearstation) "bZx" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/engineering) "bZy" = ( +/obj/structure/disposalpipe/sortjunction{ + name = "Engineering Junction" + }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/sortjunction{ - name = "Engineering Junction" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/engine/engineering) -"bZz" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/engineering) "bZA" = ( @@ -50801,9 +48884,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -50819,10 +48899,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -50866,17 +48942,6 @@ }, /turf/simulated/floor/greengrid, /area/engine/engineering) -"bZF" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) "bZG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random_spawners/cobweb_left_frequent, @@ -50884,11 +48949,7 @@ dir = 9; icon_state = "neutral" }, -/area/maintenance/fpmaint2) -"bZH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "bZI" = ( /obj/structure/cable{ d2 = 2; @@ -50905,7 +48966,7 @@ name = "3maintenance loot spawner" }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "bZJ" = ( /obj/structure/table/wood, /obj/machinery/computer/library, @@ -50925,13 +48986,20 @@ }, /area/library) "bZL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "bZM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -51003,8 +49071,7 @@ /area/library) "bZT" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/item/radio/intercom{ dir = 8; @@ -51094,7 +49161,7 @@ /obj/machinery/dye_generator, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "barber" @@ -51166,13 +49233,13 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain/bedroom) "can" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -51186,8 +49253,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -51241,8 +49307,7 @@ pixel_x = 28 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -51305,7 +49370,7 @@ /area/crew_quarters/courtroom) "caC" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -51399,8 +49464,7 @@ /area/magistrateoffice) "caN" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -51519,7 +49583,9 @@ }, /area/tcommsat/chamber) "caW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -51530,13 +49596,14 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" }, /area/tcommsat/chamber) "caY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/camera/motion{ c_tag = "MiniSat AI Upload"; network = list("SS13","Minisat"); @@ -51604,11 +49671,9 @@ "cbg" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "engineering_west_outer"; locked = 1; name = "Engineering External Access"; - req_access = null; req_access_txt = "10;13" }, /obj/structure/cable/yellow{ @@ -51651,11 +49716,9 @@ "cbj" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "engineering_west_inner"; locked = 1; name = "Engineering External Access"; - req_access = null; req_access_txt = "10;13" }, /obj/structure/cable/yellow{ @@ -51682,6 +49745,7 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, @@ -51698,13 +49762,11 @@ }, /area/engine/engineering) "cbm" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/engine/engineering) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/starboard) "cbn" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -51721,6 +49783,12 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, @@ -51730,36 +49798,37 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/engineering) "cbr" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "yellowfull" + dir = 1; + icon_state = "whiteblue" }, -/area/engine/engineering) +/area/medical/medbay) "cbs" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/engineering) "cbt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" @@ -51769,9 +49838,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/camera{ c_tag = "Engine Room North"; @@ -51781,9 +49847,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cbv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" @@ -51795,9 +49858,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cbw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" @@ -51809,9 +49869,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cbx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/extinguisher_cabinet{ pixel_x = 28 }, @@ -51832,7 +49889,7 @@ dir = 9; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cbz" = ( /obj/machinery/suit_storage_unit/captain, /obj/machinery/light{ @@ -51843,30 +49900,13 @@ icon_state = "wood" }, /area/crew_quarters/captain/bedroom) -"cbA" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) "cbB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cbC" = ( -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cbD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/maintenance/fpmaint2) +/turf/simulated/wall, +/area/maintenance/port) "cbE" = ( /obj/structure/cable{ d1 = 1; @@ -51883,7 +49923,7 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cbF" = ( /obj/structure/table/wood, /obj/item/folder, @@ -51907,24 +49947,36 @@ }, /area/library) "cbH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "grimy" + dir = 5; + icon_state = "whiteblue" }, -/area/library) +/area/medical/medbay) "cbI" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + initialize_directions = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 8; + icon_state = "cmo" }, -/area/library) +/area/medical/medbay2) "cbJ" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -51947,9 +49999,6 @@ }, /area/library) "cbL" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/structure/chair/office/dark{ dir = 1 }, @@ -51976,9 +50025,6 @@ }, /area/library) "cbO" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/structure/chair/office/dark{ dir = 1 }, @@ -52003,14 +50049,16 @@ /turf/simulated/floor/plating, /area/hallway/primary/central) "cbR" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/engineering) "cbS" = ( @@ -52063,8 +50111,7 @@ "cbV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -52171,15 +50218,15 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain/bedroom) "cci" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/structure/chair/comfy/brown{ dir = 8 }, @@ -52189,15 +50236,15 @@ /turf/simulated/floor/carpet/black, /area/crew_quarters/captain/bedroom) "ccj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, @@ -52206,6 +50253,10 @@ }, /area/crew_quarters/captain/bedroom) "cck" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -52218,10 +50269,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -52408,8 +50455,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -52473,7 +50519,7 @@ "ccC" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/structure/filingcabinet/security, /turf/simulated/floor/plasteel{ @@ -52613,7 +50659,9 @@ }, /area/tcommsat/chamber) "ccX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -52653,6 +50701,7 @@ pixel_x = -32 }, /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) "cdf" = ( @@ -52671,19 +50720,17 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cdh" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/engine/engineering) "cdi" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -52691,19 +50738,14 @@ dir = 8; icon_state = "neutralfull" }, -/area/engine/engineering) +/area/maintenance/electrical) "cdj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/effect/decal/warning_stripes/southwestcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) "cdk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -52713,7 +50755,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cdl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52723,22 +50764,17 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cdm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) "cdn" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52756,11 +50792,6 @@ /turf/simulated/floor/plating, /area/engine/engineering) "cdo" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -52792,9 +50823,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cdq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -52814,45 +50842,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cds" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/maintenance/fpmaint2) -"cdt" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cdu" = ( -/obj/effect/spawner/random_spawners/grille_maybe, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cdv" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) -"cdw" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cdx" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ @@ -52863,18 +50853,17 @@ }, /area/library) "cdy" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "wood" + dir = 8; + icon_state = "neutralfull" }, -/area/library) +/area/maintenance/electrical) "cdz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -52893,7 +50882,6 @@ /turf/simulated/wall, /area/library) "cdC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/morgue, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -52918,8 +50906,7 @@ /area/crew_quarters/heads/hop) "cdG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/structure/cable{ d1 = 1; @@ -53084,20 +51071,20 @@ "cdV" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/crew_quarters/captain/bedroom) "cdW" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -53252,16 +51239,16 @@ }, /area/lawoffice) "cep" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -53444,47 +51431,31 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) "ceM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/tcommsat/chamber) -"ceN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/obj/machinery/porta_turret, -/turf/simulated/floor/bluegrid, -/area/tcommsat/chamber) -"ceP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; - initialize_directions = 11 + icon_state = "neutralfull" }, +/area/maintenance/electrical) +"ceP" = ( /obj/machinery/porta_turret, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) "ceQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 6; + icon_state = "whiteblue" }, -/area/tcommsat/chamber) +/area/medical/medbay) "ceT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -53499,19 +51470,21 @@ /turf/simulated/floor/plating, /area/engine/engineering) "ceV" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "Singularity"; - layer = 2.7; - name = "Singularity Blast Doors"; - opacity = 0 + name = "Singularity Blast Doors" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/engine/engineering) "ceW" = ( /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" @@ -53523,18 +51496,36 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" }, /area/engine/engineering) "ceY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "yellow" }, /area/engine/engineering) "ceZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "yellow" @@ -53553,24 +51544,36 @@ }, /area/engine/engineering) "cfc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/engineering) "cfd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "yellow" }, /area/engine/engineering) "cfe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cff" = ( @@ -53579,9 +51582,6 @@ /turf/simulated/floor/plating, /area/engine/engineering) "cfg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/west, /obj/machinery/door/airlock/engineering/glass{ @@ -53649,7 +51649,7 @@ /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cfl" = ( /obj/structure/cable{ d1 = 1; @@ -53657,7 +51657,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -53665,17 +51664,11 @@ tag = "" }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cfm" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cfn" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cfo" = ( /obj/effect/landmark{ name = "blobstart" @@ -53685,27 +51678,14 @@ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) -"cfp" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cfq" = ( /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -53751,11 +51731,19 @@ }, /area/library) "cfw" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "wood" + dir = 8; + icon_state = "cmo" }, -/area/library) +/area/medical/medbay2) "cfx" = ( /obj/machinery/photocopier, /obj/structure/extinguisher_cabinet{ @@ -53796,7 +51784,6 @@ }, /area/library) "cfB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/small, /obj/structure/closet/radiation, /obj/machinery/firealarm{ @@ -53947,13 +51934,13 @@ }, /area/blueshield) "cfQ" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/command{ id_tag = "captainofficedoor"; @@ -54057,13 +52044,13 @@ }, /area/lawoffice) "cgd" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -54079,7 +52066,7 @@ "cgg" = ( /obj/structure/closet/secure_closet, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/structure/window/reinforced{ dir = 8 @@ -54107,7 +52094,7 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -24 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -54115,6 +52102,10 @@ /turf/simulated/floor/carpet, /area/magistrateoffice) "cgj" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -54127,10 +52118,6 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -54158,8 +52145,7 @@ /area/magistrateoffice) "cgl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/structure/cable{ d1 = 4; @@ -54168,8 +52154,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -54238,6 +52223,11 @@ /area/security/brig) "cgu" = ( /obj/machinery/tcomms/core/station, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) "cgB" = ( @@ -54250,12 +52240,9 @@ /turf/simulated/floor/plating/airless, /area/engine/engineering) "cgC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, @@ -54304,7 +52291,7 @@ }, /area/hallway/primary/central) "cgG" = ( -/obj/effect/spawner/window/reinforced, +/obj/effect/spawner/window/reinforced/plasma, /turf/simulated/floor/plating, /area/engine/engineering) "cgH" = ( @@ -54375,6 +52362,7 @@ }, /area/engine/engineering) "cgP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/engineering) "cgQ" = ( @@ -54382,19 +52370,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/teleporter) -"cgR" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/maintenance/fpmaint2) "cgS" = ( /obj/machinery/photocopier, /obj/machinery/camera{ @@ -54405,27 +52380,6 @@ icon_state = "wood" }, /area/lawoffice) -"cgT" = ( -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cgU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cgV" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) "cgW" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -54445,31 +52399,26 @@ }, /area/library) "cgY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "cgZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "grimy" + dir = 8; + icon_state = "whitepurple" }, -/area/library) +/area/toxins/xenobiology) "cha" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "grimy" + dir = 1; + icon_state = "whiteblue" }, -/area/library) +/area/medical/medbay) "chb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ @@ -54478,10 +52427,7 @@ }, /area/hallway/primary/port) "chc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; @@ -54501,9 +52447,6 @@ "chf" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, -/obj/machinery/keycard_auth{ - pixel_x = -26 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "dark" @@ -54640,22 +52583,25 @@ /turf/simulated/wall/rust, /area/teleporter) "chw" = ( +/obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/space, /area/space/nearstation) "chx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -54666,16 +52612,16 @@ /turf/simulated/floor/plating, /area/teleporter) "chy" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -54696,16 +52642,9 @@ }, /turf/simulated/floor/plasteel, /area/teleporter) -"chB" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "bluecorner" - }, -/area/hallway/primary/central) "chC" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -54727,16 +52666,16 @@ }, /area/crew_quarters/courtroom) "chG" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, -/area/crew_quarters/locker) +/area/maintenance/starboard2) "chH" = ( /obj/structure/cable{ d1 = 1; @@ -54797,10 +52736,6 @@ /obj/structure/table/wood, /obj/item/paper_bin, /obj/item/pen, -/obj/machinery/requests_console{ - name = "Detective Requests Console"; - pixel_y = -30 - }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -54812,13 +52747,13 @@ }, /area/lawoffice) "chO" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -54892,31 +52827,13 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - external_pressure_bound = 101; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/construction/hallway) -"chV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/tcommsat/chamber) "chW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -54928,28 +52845,26 @@ }, /area/tcommsat/chamber) "chX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 - }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/tcommsat/chamber) "cia" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ name = "Engineering"; req_access_txt = "10" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/engineering) "cib" = ( @@ -54964,13 +52879,9 @@ /turf/simulated/floor/plating, /area/engine/engineering) "cic" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "Singularity"; - layer = 2.7; - name = "Singularity Blast Doors"; - opacity = 0 + name = "Singularity Blast Doors" }, /obj/structure/cable/yellow{ d1 = 2; @@ -54982,6 +52893,7 @@ /area/engine/engineering) "cid" = ( /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/engineering) "cie" = ( @@ -55070,63 +52982,35 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cin" = ( /obj/machinery/shieldgen, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cio" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cip" = ( /obj/structure/rack, /obj/item/crowbar, /obj/item/wrench, /obj/item/tank/internals/emergency_oxygen/engi, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "ciq" = ( /obj/effect/spawner/random_spawners/wall_rusted_maybe, /turf/simulated/wall/rust, -/area/maintenance/fpmaint2) -"cir" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cis" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) -"cit" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "ciu" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -55139,47 +53023,37 @@ }, /area/library) "civ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/library) -"ciw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/library) -"cix" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "ciy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "ciz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -55252,6 +53126,10 @@ }, /area/ntrep) "ciH" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -55260,21 +53138,21 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/camera{ c_tag = "NT Representative's Office"; dir = 1 }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/ntrep) "ciI" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -55298,10 +53176,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -55369,6 +53243,10 @@ /turf/simulated/floor/plating, /area/blueshield) "ciO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -55392,15 +53270,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/blueshield) "ciP" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -55409,16 +53287,12 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/camera{ c_tag = "Blueshield's Office"; dir = 1 }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -55456,13 +53330,13 @@ /turf/simulated/wall, /area/crew_quarters/captain/bedroom) "ciU" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Teleporter Maintenance"; @@ -55517,8 +53391,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -55580,8 +53453,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -55628,13 +53500,13 @@ }, /area/crew_quarters/courtroom) "cjk" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Internal Affairs Maintenance"; @@ -55642,11 +53514,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/lawoffice) +/area/maintenance/starboard2) "cjl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/transit_tube{ icon_state = "D-NE" }, @@ -55654,6 +53523,12 @@ icon_state = "D-SE" }, /obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/space, /area/space/nearstation) "cjm" = ( @@ -55663,7 +53538,7 @@ name = "2maintenance loot spawner" }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cjn" = ( /obj/structure/girder, /turf/simulated/floor/plating, @@ -55673,20 +53548,20 @@ /obj/item/book/manual/security_space_law, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cjp" = ( /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cjq" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" }, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cjr" = ( /turf/simulated/wall, /area/security/range) @@ -55715,8 +53590,18 @@ /area/security/range) "cju" = ( /obj/structure/table/reinforced, -/obj/machinery/recharger, +/obj/machinery/recharger{ + pixel_x = -6; + pixel_y = 2 + }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/magnetic_controller{ + autolink = 1; + name = "Firing Range Control Console"; + path = "w;e;e;w;s;n;n;s"; + pixel_x = 7; + pixel_y = 3 + }, /turf/simulated/floor/plasteel, /area/security/range) "cjv" = ( @@ -55748,6 +53633,12 @@ "cjA" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/port) "cjB" = ( @@ -55755,17 +53646,35 @@ /turf/simulated/floor/plating, /area/security/range) "cjD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, -/area/tcommsat/chamber) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, +/area/toxins/xenobiology) "cjF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/tcommsat/chamber) +/turf/simulated/floor/plating, +/area/maintenance/starboard) "cjH" = ( -/obj/effect/decal/warning_stripes/northwestcorner, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/maintenance/electrical) "cjI" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plating/airless, @@ -55784,17 +53693,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/decal/warning_stripes/northeastcorner, +/obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plating/airless, /area/space/nearstation) "cjL" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "Singularity"; - layer = 2.7; - name = "Singularity Blast Doors"; - opacity = 0 + name = "Singularity Blast Doors" }, /obj/structure/cable/yellow{ d1 = 1; @@ -55824,7 +53729,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cjN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -55854,13 +53758,9 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cjP" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "Singularity"; - layer = 2.7; - name = "Singularity Blast Doors"; - opacity = 0 + name = "Singularity Blast Doors" }, /obj/structure/cable/yellow{ d1 = 1; @@ -55911,93 +53811,33 @@ "cjV" = ( /obj/machinery/shieldgen, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cjW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cjX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cjY" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/teleporter) -"cjZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) "cka" = ( /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"ckb" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"ckc" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"ckd" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cke" = ( /obj/structure/cable{ d1 = 1; @@ -56021,11 +53861,8 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "ckf" = ( /obj/structure/cable{ d1 = 4; @@ -56033,29 +53870,21 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ name = "Library Maintenance"; req_access_txt = "12" }, /turf/simulated/floor/plasteel, -/area/library) +/area/maintenance/port) "ckg" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "wood" + dir = 1; + icon_state = "whitebluecorner" }, -/area/library) +/area/medical/medbay) "ckh" = ( /obj/structure/cable{ d1 = 2; @@ -56063,23 +53892,26 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "cki" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; initialize_directions = 11 }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 }, -/area/library) +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/medbay) "ckj" = ( /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -56092,12 +53924,18 @@ }, /area/library) "ckl" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 }, -/area/library) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/medbay) "ckm" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 26 @@ -56129,13 +53967,13 @@ }, /area/crew_quarters/heads/hop) "ckq" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "ckr" = ( @@ -56163,6 +54001,7 @@ /turf/simulated/floor/plating, /area/ntrep) "cku" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -56174,7 +54013,6 @@ name = "NT Representative's Office"; req_access_txt = "73" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -56186,6 +54024,7 @@ }, /area/bridge/meeting_room) "ckw" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -56197,7 +54036,6 @@ name = "Blueshield's Office"; req_access_txt = "67" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -56226,14 +54064,14 @@ /turf/simulated/floor/plasteel, /area/teleporter) "ckB" = ( -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -56303,15 +54141,15 @@ }, /area/hallway/primary/central) "ckI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -56334,8 +54172,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -56395,46 +54232,49 @@ }, /area/crew_quarters/courtroom) "ckR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/effect/landmark{ name = "blobstart" }, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "ckS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "ckT" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "ckU" = ( +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -56446,9 +54286,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -56456,17 +54293,17 @@ dir = 5 }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "ckV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -56477,17 +54314,17 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "ckW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -56495,17 +54332,17 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "ckX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -56516,17 +54353,17 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "ckY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -56535,8 +54372,12 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "ckZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -56552,16 +54393,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cla" = ( /obj/structure/cable{ d1 = 4; @@ -56580,7 +54416,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/security/range) +/area/maintenance/starboard2) "clb" = ( /obj/structure/cable{ d1 = 4; @@ -56634,8 +54470,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, @@ -56703,8 +54538,9 @@ icon_state = "2-8"; tag = "" }, -/obj/item/target/syndicate, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/target_stake, +/obj/item/target/syndicate, /turf/simulated/floor/plasteel, /area/security/range) "clj" = ( @@ -56722,7 +54558,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ name = "Security Checkpoint"; @@ -56750,13 +54585,9 @@ /turf/simulated/wall/r_wall, /area/engine/engineering) "cls" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "Singularity"; - layer = 2.7; - name = "Singularity Blast Doors"; - opacity = 0 + name = "Singularity Blast Doors" }, /obj/machinery/door_control{ id = "Singularity"; @@ -56789,10 +54620,6 @@ /turf/simulated/wall/r_wall/rust, /area/engine/engine_smes) "clx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/machinery/light/small{ dir = 8 }, @@ -56800,7 +54627,7 @@ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cly" = ( /obj/structure/cable{ d1 = 1; @@ -56808,28 +54635,31 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "clz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/turf/simulated/wall, -/area/library) -"clA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 10 }, -/obj/structure/bookcase, /turf/simulated/floor/plasteel{ - icon_state = "wood" + dir = 4; + icon_state = "neutral" }, -/area/library) +/area/maintenance/port) +"clA" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "purplecorner" + }, +/area/hallway/primary/aft) "clB" = ( /obj/structure/cable{ d1 = 1; @@ -56837,10 +54667,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -56881,6 +54709,8 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -56905,7 +54735,6 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -56952,13 +54781,13 @@ }, /area/crew_quarters/heads/hop) "clM" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -56978,8 +54807,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, @@ -56997,13 +54825,13 @@ }, /area/crew_quarters/heads/hop) "clQ" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -57062,13 +54890,13 @@ }, /area/bridge/meeting_room) "clV" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -57100,15 +54928,15 @@ /turf/simulated/floor/plasteel, /area/teleporter) "clZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -57119,16 +54947,16 @@ /turf/simulated/floor/plasteel, /area/teleporter) "cma" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -57138,6 +54966,10 @@ /turf/simulated/floor/plasteel, /area/teleporter) "cmb" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -57149,30 +54981,25 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel, /area/teleporter) "cmc" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/teleporter) @@ -57251,15 +55078,15 @@ }, /area/crew_quarters/courtroom) "cmn" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cmo" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ @@ -57267,46 +55094,38 @@ name = "2maintenance loot spawner" }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cmq" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cmr" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) -"cms" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cmt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/turf/simulated/floor/wood, +/area/medical/psych) "cmv" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cmx" = ( /obj/structure/table/reinforced, /obj/effect/decal/warning_stripes/north, +/obj/machinery/computer/cryopod/robot{ + pixel_y = -32 + }, /turf/simulated/floor/plating, /area/turret_protected/aisat) "cmy" = ( @@ -57321,6 +55140,13 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/window{ + dir = 1; + req_access_txt = "63" + }, /turf/simulated/floor/plasteel, /area/security/range) "cmz" = ( @@ -57363,7 +55189,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -24 }, /obj/item/gun/energy/laser/practice, /obj/item/gun/energy/laser/practice, @@ -57574,20 +55400,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/engine_smes) -"cng" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) "cnh" = ( /obj/structure/cable{ d2 = 4; @@ -57620,6 +55432,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -57643,6 +55456,8 @@ /obj/effect/landmark/start{ name = "Librarian" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/library) "cnn" = ( @@ -57651,7 +55466,6 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -57670,16 +55484,16 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "cnq" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, @@ -57724,8 +55538,7 @@ "cnw" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -57781,8 +55594,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -57795,7 +55607,7 @@ /obj/machinery/light, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/effect/decal/warning_stripes/southwestcorner, /turf/simulated/floor/plasteel, @@ -57822,13 +55634,16 @@ /turf/simulated/floor/plating, /area/teleporter) "cnH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/transit_tube{ icon_state = "E-SW-NW" }, /obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/space, /area/space/nearstation) "cnJ" = ( @@ -57882,9 +55697,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -57896,18 +55708,18 @@ /turf/simulated/wall, /area/crew_quarters/locker) "cnR" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cnS" = ( /obj/structure/plasticflaps{ opacity = 1 @@ -57931,29 +55743,39 @@ req_access_txt = "1" }, /turf/simulated/floor/plasteel, -/area/security/range) +/area/maintenance/starboard2) "cnU" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, /turf/simulated/floor/plating, /area/security/range) "cnV" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/space, -/area/space/nearstation) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/primary/aft) "cnW" = ( /turf/simulated/floor/plasteel{ icon_state = "bot" }, /area/hallway/primary/central) "cnX" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/space, -/area/space/nearstation) +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/medbay) "cnY" = ( /obj/structure/lattice, /obj/structure/window/reinforced, @@ -57988,7 +55810,6 @@ /turf/simulated/floor/plating/airless, /area/space/nearstation) "coc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; @@ -58034,13 +55855,16 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "coi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/transit_tube{ icon_state = "E-W-Pass" }, /obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/space, /area/space/nearstation) "coj" = ( @@ -58053,15 +55877,12 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cok" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/northwestcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/engineering) "col" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -58071,9 +55892,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "com" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/yellow{ d2 = 2; icon_state = "0-2" @@ -58084,22 +55902,7 @@ /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/engine/engineering) -"con" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - id_tag = "engstorage"; - name = "Secure Storage Blast Doors" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/engine/engine_smes) "coo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, @@ -58120,27 +55923,17 @@ /turf/simulated/floor/plasteel, /area/teleporter) "cor" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/shieldgen, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/engine/engine_smes) "cos" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/shieldgen, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/engine_smes) "cot" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 - }, /obj/machinery/field/generator{ anchored = 1 }, @@ -58178,9 +55971,8 @@ }, /area/library) "coy" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/carpet, /area/library) @@ -58189,7 +55981,6 @@ pixel_x = 32 }, /obj/machinery/libraryscanner, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -58287,7 +56078,7 @@ /obj/item/storage/fancy/donut_box, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -58348,13 +56139,13 @@ }, /area/crew_quarters/courtroom) "coQ" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -58392,22 +56183,7 @@ dir = 9; icon_state = "neutral" }, -/area/maintenance/starboard) -"coV" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "coW" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -58426,14 +56202,14 @@ tag = "" }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "coY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "coZ" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -58441,12 +56217,13 @@ icon_state = "0-2" }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cpa" = ( /obj/effect/decal/cleanable/cobweb2, /obj/structure/closet/secure_closet/security, +/obj/item/restraints/handcuffs/pinkcuffs, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cpb" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -58457,21 +56234,24 @@ }, /area/construction/hallway) "cpc" = ( -/obj/structure/window/reinforced{ - dir = 1; - layer = 2.9 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "white" }, -/area/construction/hallway) +/area/medical/medbay3) "cpd" = ( /obj/structure/window/reinforced{ dir = 1; layer = 2.9 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -58481,6 +56261,12 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -58511,7 +56297,7 @@ /turf/simulated/floor/plating, /area/engine/engineering) "cpj" = ( -/obj/effect/spawner/window/reinforced, +/obj/effect/spawner/window/reinforced/plasma, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -58553,13 +56339,9 @@ /turf/simulated/floor/plating, /area/engine/engineering) "cpp" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "Singularity"; - layer = 2.7; - name = "Singularity Blast Doors"; - opacity = 0 + name = "Singularity Blast Doors" }, /obj/structure/cable/yellow{ d1 = 4; @@ -58595,7 +56377,6 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cps" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -58604,6 +56385,12 @@ /obj/effect/landmark/start{ name = "Station Engineer" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, @@ -58617,16 +56404,18 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/engineering) "cpu" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -58637,20 +56426,29 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, /area/engine/engineering) "cpv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; icon_state = "1-8" }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cpw" = ( @@ -58660,11 +56458,23 @@ name = "Secure Storage Blast Doors" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engine_smes) "cpx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engine_smes) "cpy" = ( @@ -58675,27 +56485,32 @@ /area/engine/engine_smes) "cpz" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/engine_smes) "cpA" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/engine_smes) "cpB" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 @@ -58706,9 +56521,6 @@ }, /area/engine/engine_smes) "cpC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -58716,9 +56528,6 @@ }, /area/engine/engine_smes) "cpD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light{ dir = 4 }, @@ -58731,35 +56540,19 @@ }, /area/engine/engine_smes) "cpE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/engine/engine_smes) -"cpF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cpG" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" + icon_state = "whitepurple" }, -/area/maintenance/fpmaint2) +/area/toxins/xenobiology) "cpH" = ( /obj/machinery/newscaster{ pixel_x = -32 @@ -58774,17 +56567,17 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "white" }, -/area/library) +/area/medical/chemistry) "cpK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/structure/table/wood, +/obj/machinery/recharger, /turf/simulated/floor/plasteel{ - icon_state = "wood" + dir = 8; + icon_state = "neutralcorner" }, -/area/library) +/area/medical/medbay3) "cpL" = ( /obj/structure/table/wood, /obj/item/folder, @@ -58802,7 +56595,6 @@ /obj/structure/table/wood, /obj/item/storage/bag/books, /obj/item/taperecorder, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -58835,9 +56627,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/central) "cpP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -58955,16 +56744,15 @@ }, /area/bridge/meeting_room) "cpY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -58972,6 +56760,9 @@ }, /area/bridge/meeting_room) "cqb" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -58979,9 +56770,6 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; @@ -58989,10 +56777,10 @@ }, /area/bridge/meeting_room) "cqc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -59004,13 +56792,13 @@ }, /area/bridge/meeting_room) "cqd" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/disposalpipe/junction{ dir = 4; icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -59020,15 +56808,15 @@ }, /area/bridge/meeting_room) "cqe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = 32 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -59038,6 +56826,9 @@ }, /area/bridge/meeting_room) "cqf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -59047,9 +56838,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -59059,6 +56847,9 @@ }, /area/bridge/meeting_room) "cqg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -59068,9 +56859,6 @@ name = "HIGH VOLTAGE"; pixel_y = 32 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -59080,10 +56868,10 @@ }, /area/bridge/meeting_room) "cqh" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -59093,15 +56881,11 @@ icon_state = "neutralcorner" }, /area/bridge/meeting_room) -"cqi" = ( -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/maintenance/starboard) "cqj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/effect/decal/warning_stripes/northeastcorner, @@ -59114,16 +56898,15 @@ }, /area/bridge/meeting_room) "cqk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/effect/decal/warning_stripes/north, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -59131,10 +56914,10 @@ }, /area/bridge/meeting_room) "cql" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/effect/decal/warning_stripes/north, @@ -59155,10 +56938,10 @@ }, /area/hallway/primary/central) "cqn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -59170,6 +56953,9 @@ }, /area/hallway/primary/central) "cqo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -59179,9 +56965,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -59191,17 +56974,15 @@ }, /area/hallway/primary/central) "cqp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/disposalpipe/junction{ dir = 1; icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -59257,13 +57038,13 @@ }, /area/crew_quarters/courtroom) "cqv" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/structure/extinguisher_cabinet{ pixel_x = -28 }, @@ -59296,9 +57077,8 @@ }, /area/crew_quarters/locker) "cqy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/manifold/hidden/blue{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -59306,7 +57086,7 @@ }, /area/crew_quarters/locker) "cqz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 9 }, /turf/simulated/floor/plasteel{ @@ -59315,9 +57095,8 @@ }, /area/crew_quarters/locker) "cqA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/manifold/hidden/red{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -59325,7 +57104,7 @@ }, /area/crew_quarters/locker) "cqB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 9 }, /obj/item/storage/secure/safe{ @@ -59337,34 +57116,33 @@ }, /area/crew_quarters/locker) "cqC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, /area/maintenance/starboard) "cqD" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; initialize_directions = 11 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cqE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cqF" = ( /obj/structure/cable{ d1 = 1; @@ -59381,7 +57159,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cqG" = ( /obj/structure/cable{ d1 = 4; @@ -59389,27 +57167,15 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) -"cqH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Library" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/library) +/area/maintenance/starboard2) "cqI" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cqJ" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -59418,10 +57184,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -59437,9 +57199,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -59457,9 +57216,6 @@ /turf/simulated/floor/plating/airless, /area/space/nearstation) "cqP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/the_singularitygen/tesla, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -59486,18 +57242,10 @@ /turf/simulated/floor/plating, /area/engine/engineering) "cqV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/southeastcorner, /turf/simulated/floor/plasteel, /area/engine/engineering) "cqW" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 8; @@ -59507,30 +57255,21 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cqX" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/effect/decal/warning_stripes/southwestcorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/engine/engineering) "cqY" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" - }, -/area/engine/engineering) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/maintenance/port) "cqZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/engine/engineering) "cra" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor{ id_tag = "engstorage"; @@ -59540,19 +57279,9 @@ /turf/simulated/floor/plasteel, /area/engine/engine_smes) "crb" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/engine/engine_smes) -"crc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/engine/engineering) "crd" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -59568,10 +57297,10 @@ /turf/simulated/floor/plating, /area/engine/engineering) "cre" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/effect/decal/warning_stripes/northwestcorner, @@ -59600,27 +57329,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/engine_smes) -"cri" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) -"crj" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) "crk" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/camera{ @@ -59675,7 +57383,6 @@ }, /obj/item/clipboard, /obj/item/toy/figure/crew/librarian, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -59711,16 +57418,6 @@ icon_state = "neutralcorner" }, /area/hallway/primary/central) -"crs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Library" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/library) "cru" = ( /obj/structure/cable{ d1 = 1; @@ -59729,8 +57426,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -60046,13 +57742,13 @@ }, /area/bridge/meeting_room) "crQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -60098,8 +57794,7 @@ "crT" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -60107,13 +57802,16 @@ }, /area/hallway/primary/central) "crV" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, +/obj/machinery/atm{ + pixel_x = -32 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -60133,7 +57831,7 @@ }, /area/crew_quarters/locker) "crY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/blue, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ dir = 8; @@ -60141,19 +57839,13 @@ }, /area/crew_quarters/locker) "crZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/red, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/locker) "csa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -60178,20 +57870,17 @@ }, /obj/structure/barricade/wooden, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "csc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, -/area/crew_quarters/locker) +/area/maintenance/starboard2) "csd" = ( /obj/structure/table, /obj/item/storage/box/bodybags, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cse" = ( /obj/structure/cable, /obj/machinery/power/apc{ @@ -60201,7 +57890,7 @@ /obj/structure/table, /obj/item/clothing/under/rank/security, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "csf" = ( /obj/structure/closet/crate, /obj/item/clothing/shoes/jackboots, @@ -60210,12 +57899,12 @@ name = "2maintenance loot spawner" }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "csg" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "csh" = ( /obj/structure/rack, /obj/item/storage/box/flashes, @@ -60224,7 +57913,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "csi" = ( /turf/simulated/wall, /area/crew_quarters/fitness) @@ -60292,11 +57981,14 @@ /turf/simulated/floor/plating, /area/engine/engineering) "csr" = ( +/obj/structure/transit_tube, +/obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/transit_tube, -/obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/space, /area/space/nearstation) "css" = ( @@ -60349,13 +58041,16 @@ /turf/simulated/floor/plating, /area/engine/engine_smes) "csy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/transit_tube{ icon_state = "W-SE" }, /obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/space, /area/space/nearstation) "csz" = ( @@ -60400,33 +58095,16 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/engine/engine_smes) -"csD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) -"csE" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) "csF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/mineral_door/wood, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "csG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/mineral_door/wood, /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -60442,27 +58120,41 @@ name = "Private Study"; req_access_txt = "37" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/library) "csJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall, -/area/library) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/maintenance/port) "csK" = ( /turf/simulated/wall/r_wall, /area/ai_monitored/storage/eva) "csL" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -60490,8 +58182,7 @@ /area/bridge/meeting_room) "csO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/light{ dir = 8 @@ -60561,8 +58252,7 @@ /area/bridge/meeting_room) "csU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/machinery/light{ dir = 4 @@ -60624,10 +58314,7 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; @@ -60636,18 +58323,12 @@ /area/hallway/primary/central) "ctc" = ( /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "ctd" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -60657,28 +58338,22 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /area/hallway/primary/central) -"ctg" = ( -/obj/structure/disposalpipe/segment{ +"cti" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"cti" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -60688,9 +58363,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -60702,37 +58374,30 @@ /turf/simulated/floor/plasteel, /area/bridge/meeting_room) "ctl" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/locker) "ctm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 1; + icon_state = "whitepurplecorner" }, -/area/crew_quarters/locker) +/area/medical/research) "ctn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/chair/stool, /obj/effect/landmark/start{ name = "Civilian" @@ -60743,9 +58408,6 @@ }, /area/crew_quarters/locker) "cto" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table, /obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel{ @@ -60754,44 +58416,38 @@ }, /area/crew_quarters/locker) "ctp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table, /obj/item/camera, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/locker) "ctq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/table, /obj/item/camera_film, /obj/item/camera_film, +/obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/locker) "ctr" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + dir = 1; + icon_state = "whitebluecorner" }, -/area/crew_quarters/locker) +/area/medical/medbay) "cts" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -60811,20 +58467,14 @@ icon_state = "neutralfull" }, /area/crew_quarters/courtroom) -"ctu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "ctv" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "ctw" = ( @@ -60925,7 +58575,6 @@ }, /area/engine/engineering) "ctG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/status_display{ pixel_x = 32 }, @@ -60939,9 +58588,6 @@ }, /area/library) "ctI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/transit_tube{ icon_state = "D-SW" }, @@ -60949,6 +58595,12 @@ dir = 4 }, /obj/structure/lattice/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/space, /area/space/nearstation) "ctJ" = ( @@ -61001,7 +58653,6 @@ /area/library) "ctP" = ( /obj/structure/bookcase, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -61034,20 +58685,8 @@ icon_state = "brokengrille" }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"ctT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "ctU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Library" @@ -61067,13 +58706,16 @@ }, /area/crew_quarters/courtroom) "ctW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ name = "Library" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -61280,7 +58922,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -25 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -61288,8 +58930,12 @@ }, /area/hallway/primary/central) "cuo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -61306,21 +58952,9 @@ icon_state = "dark" }, /area/ai_monitored/storage/eva) -"cuq" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/central) -"cur" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/central) "cus" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -61338,9 +58972,11 @@ /turf/simulated/floor/plating, /area/security/range) "cuu" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -61349,6 +58985,12 @@ /area/hallway/primary/central) "cuv" = ( /obj/item/twohanded/required/kirbyplants, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -61356,6 +58998,12 @@ /area/hallway/primary/central) "cuw" = ( /obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, /area/crew_quarters/locker) "cux" = ( @@ -61365,6 +59013,12 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -61373,6 +59027,12 @@ "cuy" = ( /obj/structure/table, /obj/item/storage/fancy/crayons, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -61382,25 +59042,36 @@ /obj/structure/table, /obj/item/folder, /obj/item/pen, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/locker) "cuA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/table, /obj/item/deck/cards, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/locker) "cuB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -61408,34 +59079,34 @@ /area/crew_quarters/locker) "cuC" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/locker) "cuD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/closet/wardrobe/black, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cuF" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -61443,17 +59114,17 @@ dir = 5 }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cuG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -61462,17 +59133,17 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cuH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -61480,17 +59151,17 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cuI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -61499,7 +59170,7 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/crew_quarters/fitness) +/area/maintenance/starboard2) "cuJ" = ( /obj/structure/cable{ d1 = 1; @@ -61507,22 +59178,21 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/glass{ name = "Cabin" }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker) "cuK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -61535,16 +59205,16 @@ }, /area/crew_quarters/fitness) "cuL" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -61639,10 +59309,9 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cuV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -61704,17 +59373,7 @@ tag = "" }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cvc" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cvd" = ( /obj/structure/cable{ d1 = 4; @@ -61727,7 +59386,7 @@ dir = 1; icon_state = "neutralcorner" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cve" = ( /obj/structure/cable{ d1 = 4; @@ -61743,17 +59402,7 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) -"cvf" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cvg" = ( /obj/structure/cable{ d1 = 1; @@ -61772,10 +59421,9 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cvh" = ( /obj/structure/table/wood, /obj/machinery/ai_status_display{ @@ -61788,50 +59436,54 @@ }, /area/library) "cvi" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/chair/office/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "cvj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/chair/office/dark, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "cvk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "cvl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "white" }, -/area/library) +/area/medical/research) "cvm" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "white" }, -/area/library) +/area/medical/research) "cvn" = ( /obj/structure/table/wood, /obj/item/storage/briefcase, @@ -61844,6 +59496,9 @@ /obj/machinery/newscaster{ pixel_x = -32 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -61852,7 +59507,9 @@ /obj/effect/landmark{ name = "revenantspawn" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -61862,6 +59519,12 @@ /obj/effect/landmark/start{ name = "Librarian" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -61870,9 +59533,8 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -62104,27 +59766,31 @@ }, /area/gateway) "cvT" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/hallway/primary/central) +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/lab) "cvU" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" + icon_state = "white" }, -/area/hallway/primary/central) +/area/medical/chemistry) "cvV" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/glass{ name = "Cabin" }, @@ -62134,9 +59800,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light, /turf/simulated/floor/plasteel{ dir = 8; @@ -62147,12 +59810,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -62165,18 +59825,15 @@ /turf/simulated/floor/plasteel, /area/gateway) "cvZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -62186,35 +59843,16 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/locker) -"cwb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/crew_quarters/locker) "cwc" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -62224,10 +59862,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/effect/landmark{ name = "lightsout" }, @@ -62238,16 +59872,14 @@ /area/crew_quarters/locker) "cwe" = ( /obj/structure/disposalpipe/junction, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/locker) "cwf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/closet/wardrobe/grey, /obj/machinery/ai_status_display{ pixel_x = 32 @@ -62262,69 +59894,62 @@ pixel_y = 8 }, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cwl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/wall, /area/crew_quarters/fitness) -"cwn" = ( +"cwo" = ( /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; + d1 = 4; + d2 = 8; + icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/crew_quarters/fitness) -"cwo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/crew_quarters/fitness) +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull" + }, +/area/medical/medbay) "cwp" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/crew_quarters/fitness) +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/medbay) "cwq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/item/twohanded/required/kirbyplants, +/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "white" }, -/area/crew_quarters/fitness) +/area/medical/research) "cwr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" + icon_state = "whitebluecorner" }, -/area/crew_quarters/fitness) +/area/medical/medbay) "cws" = ( /obj/structure/closet/boxinggloves, /turf/simulated/floor/plasteel{ @@ -62408,10 +60033,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/engine_smes) -"cwC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/maintenance/fpmaint2) "cwD" = ( /obj/structure/cable{ d1 = 1; @@ -62419,9 +60040,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cwE" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -62453,9 +60073,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/wood, /obj/item/paicard, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -62464,7 +60085,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/wood, /obj/item/folder, /obj/item/pen, @@ -62515,7 +60135,7 @@ "cwM" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/structure/filingcabinet, /turf/simulated/floor/plasteel{ @@ -62529,7 +60149,6 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -62611,8 +60230,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 + dir = 10 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -62719,9 +60337,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -62841,14 +60456,11 @@ }, /area/crew_quarters/locker) "cxq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, +/obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "white" }, -/area/crew_quarters/locker) +/area/medical/research) "cxr" = ( /obj/structure/table, /obj/item/storage/toolbox/emergency, @@ -62860,6 +60472,7 @@ "cxs" = ( /obj/structure/table, /obj/item/storage/toolbox/mechanical, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -62877,46 +60490,52 @@ }, /area/crew_quarters/locker) "cxu" = ( +/obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/crew_quarters/locker) +/turf/simulated/floor/plasteel, +/area/medical/research) "cxv" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/locker) "cxw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/closet/wardrobe/green, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cxx" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8; initialize_directions = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/fitness) "cxy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -62924,18 +60543,13 @@ icon_state = "neutral" }, /area/crew_quarters/fitness) -"cxz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/fitness) "cxA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -62944,7 +60558,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -62954,18 +60571,29 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + initialize_directions = 10 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/fitness) "cxD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 }, -/area/crew_quarters/fitness) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research) "cxE" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/effect/decal/warning_stripes/yellow, @@ -63026,9 +60654,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/engine/engine_smes) "cxL" = ( @@ -63040,18 +60665,12 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cxM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/engine/engine_smes) +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel, +/area/medical/research) "cxN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, @@ -63072,7 +60691,7 @@ "cxP" = ( /obj/effect/spawner/random_spawners/wall_rusted_maybe, /turf/simulated/wall, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cxQ" = ( /obj/structure/cable{ d1 = 4; @@ -63088,7 +60707,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/item/clothing/shoes/magboots{ pixel_x = 4; @@ -63104,7 +60723,7 @@ /obj/item/flashlight, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cxT" = ( /obj/structure/table/reinforced, /obj/structure/sign/nosmoking_2{ @@ -63112,16 +60731,15 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) -"cxU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/rust, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cxV" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -63130,25 +60748,35 @@ /obj/structure/chair/office/dark{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "cxX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/wood, /obj/item/storage/pill_bottle/dice, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "cxY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/wood, /obj/item/deck/cards, /obj/item/deck/cards{ pixel_y = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -63157,12 +60785,18 @@ /obj/structure/chair/office/dark{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library) "cya" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -63177,9 +60811,12 @@ }, /area/library) "cyc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/library) +/obj/effect/decal/warning_stripes/south, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research) "cyd" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -63325,8 +60962,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -63419,10 +61055,7 @@ }, /area/crew_quarters/locker/locker_toilet) "cyC" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light/small{ dir = 1 }, @@ -63431,9 +61064,6 @@ }, /area/crew_quarters/locker/locker_toilet) "cyD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/shower{ dir = 8 }, @@ -63442,32 +61072,28 @@ }, /area/crew_quarters/locker/locker_toilet) "cyE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall, -/area/crew_quarters/locker/locker_toilet) +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel, +/area/medical/research) "cyF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cyG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker/locker_toilet) +/obj/effect/decal/warning_stripes/yellow/hollow, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research) "cyH" = ( /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -63491,9 +61117,6 @@ /turf/simulated/floor/plasteel, /area/gateway) "cyJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/urinal{ pixel_y = 28 }, @@ -63511,9 +61134,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/closet/wardrobe/white, /turf/simulated/floor/plasteel{ dir = 8; @@ -63527,9 +61147,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -63542,9 +61159,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ dir = 8; @@ -63558,9 +61172,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table, /obj/item/folder, /obj/item/pen, @@ -63576,11 +61187,11 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table, /obj/item/paicard, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -63593,9 +61204,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table, /turf/simulated/floor/plasteel{ dir = 8; @@ -63615,10 +61223,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair/stool, /obj/effect/landmark/start{ name = "Civilian" @@ -63629,16 +61233,15 @@ }, /area/crew_quarters/locker) "cyR" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -63649,10 +61252,6 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -63773,13 +61372,13 @@ }, /area/crew_quarters/fitness) "czc" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -63788,14 +61387,18 @@ }, /area/crew_quarters/fitness) "czd" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id_tag = "rdprivacy"; + name = "Research Director Office Shutters" }, -/area/crew_quarters/fitness) +/turf/simulated/floor/plating, +/area/crew_quarters/hor) "cze" = ( /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -63812,13 +61415,13 @@ /area/crew_quarters/fitness) "czg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/fitness) "czh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair{ dir = 4 }, @@ -63883,7 +61486,7 @@ /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "czo" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ @@ -63893,7 +61496,7 @@ /obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "czp" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -63943,6 +61546,12 @@ req_access_txt = "32" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engine_smes) "czt" = ( @@ -63960,10 +61569,16 @@ dir = 1; icon_state = "neutralcorner" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "czu" = ( /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -63974,7 +61589,7 @@ dir = 1; icon_state = "yellow" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "czw" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -63991,12 +61606,11 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "czy" = ( /obj/structure/table/wood, /obj/machinery/status_display{ @@ -64008,22 +61622,7 @@ icon_state = "dark" }, /area/library) -"czz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/chair/office/dark{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/library) "czA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/chair/office/dark{ dir = 1 }, @@ -64032,55 +61631,29 @@ }, /area/library) "czB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "whitebluefull" }, -/area/library) +/area/medical/medbay) "czC" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/library) -"czD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"czE" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) "czF" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "czG" = ( /obj/machinery/space_heater, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "czH" = ( /obj/machinery/light/small{ dir = 8 @@ -64284,9 +61857,6 @@ }, /area/assembly/showroom) "czU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/urinal{ pixel_y = 28 }, @@ -64373,6 +61943,12 @@ name = "Civilian" }, /obj/item/bikehorn/rubberducky, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, @@ -64381,13 +61957,25 @@ /obj/machinery/door/airlock{ name = "Unisex Showers" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cAf" = ( /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cAg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cAh" = ( @@ -64397,10 +61985,21 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cAi" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cAj" = ( @@ -64430,14 +62029,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/locker) "cAm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/closet/wardrobe/mixed, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -64500,7 +62097,6 @@ }, /area/crew_quarters/fitness) "cAv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair{ dir = 4 }, @@ -64537,24 +62133,18 @@ /turf/simulated/floor/plating, /area/crew_quarters/fitness) "cAA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/power/port_gen/pacman, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/engine_smes) "cAB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/engine/engineering) "cAC" = ( /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 7; icon_state = "yellow" @@ -64568,6 +62158,12 @@ pixel_x = -32 }, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cAE" = ( @@ -64577,17 +62173,26 @@ icon_state = "1-2" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cAF" = ( /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cAG" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/landmark{ name = "lightsout" }, @@ -64600,7 +62205,7 @@ /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cAI" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, @@ -64610,30 +62215,19 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/engine/engine_smes) "cAJ" = ( /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cAK" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" +/obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/engine/engine_smes) +/turf/simulated/floor/plasteel, +/area/medical/research) "cAL" = ( /obj/structure/cable{ d1 = 4; @@ -64641,9 +62235,7 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, @@ -64667,10 +62259,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/engine/engineering) @@ -64680,17 +62268,10 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/engine/engine_smes) "cAP" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 @@ -64698,11 +62279,8 @@ /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cAQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/landmark{ name = "blobstart" }, @@ -64710,7 +62288,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cAR" = ( /obj/structure/cable{ d2 = 8; @@ -64737,17 +62315,13 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cAT" = ( /obj/structure/table/wood, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel{ @@ -64755,9 +62329,6 @@ }, /area/library) "cAU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ dir = 1; @@ -64768,9 +62339,6 @@ }, /area/library) "cAV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/status_display{ pixel_y = -32 }, @@ -64787,7 +62355,6 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -64797,9 +62364,6 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/filingcabinet, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -64809,9 +62373,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -64820,16 +62381,6 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/medical/research) -"cBa" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) "cBb" = ( /obj/effect/landmark{ name = "blobstart" @@ -64839,14 +62390,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fpmaint2) -"cBc" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cBd" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -64857,7 +62401,7 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cBe" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/glass/fifty{ @@ -64894,9 +62438,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ @@ -65112,25 +62653,24 @@ /turf/simulated/floor/plasteel, /area/gateway) "cBE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/plating, /area/crew_quarters/locker/locker_toilet) "cBF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "freezerfloor" }, /area/crew_quarters/locker/locker_toilet) "cBG" = ( +/obj/effect/decal/warning_stripes/south, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/wall, -/area/crew_quarters/locker/locker_toilet) +/turf/simulated/floor/plasteel, +/area/medical/research) "cBI" = ( /obj/structure/cable{ d1 = 2; @@ -65139,9 +62679,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cBJ" = ( @@ -65156,9 +62694,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) @@ -65169,9 +62704,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cBL" = ( @@ -65181,7 +62713,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cBM" = ( @@ -65191,9 +62725,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) @@ -65204,9 +62735,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/airlock{ name = "Unisex Restrooms" }, @@ -65218,27 +62746,18 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cBP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/crew_quarters/locker) "cBQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light, /obj/machinery/status_display{ pixel_y = -32 @@ -65248,9 +62767,6 @@ }, /area/crew_quarters/locker) "cBR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -65262,10 +62778,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -65275,6 +62787,8 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -65358,14 +62872,22 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engine_smes) "cCe" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/northwestcorner, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "cCf" = ( @@ -65403,7 +62925,7 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cCj" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ id_tag = "engineering_east_airlock"; @@ -65428,11 +62950,9 @@ "cCk" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "engineering_east_outer"; locked = 1; name = "Engineering External Access"; - req_access = null; req_access_txt = "10;13" }, /obj/structure/cable/yellow{ @@ -65446,11 +62966,9 @@ "cCl" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "engineering_east_inner"; locked = 1; name = "Engineering External Access"; - req_access = null; req_access_txt = "10;13" }, /obj/structure/cable/yellow{ @@ -65473,74 +62991,66 @@ }, /area/engine/engineering) "cCn" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - icon_state = "yellowfull" +/obj/effect/decal/warning_stripes/south, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 }, -/area/engine/engineering) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plasteel, +/area/medical/research) "cCo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/engine/engineering) "cCp" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, /area/engine/engineering) "cCq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cCr" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, /turf/simulated/floor/plating, /area/engine/engine_smes) "cCs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cCt" = ( /turf/simulated/floor/plasteel{ dir = 7; @@ -65548,9 +63058,8 @@ }, /area/engine/engine_smes) "cCu" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 7; @@ -65563,7 +63072,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -65580,33 +63088,32 @@ dir = 1; icon_state = "neutralcorner" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cCx" = ( /turf/simulated/wall/rust, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cCy" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cCz" = ( /turf/simulated/floor/plasteel{ dir = 7; icon_state = "yellow" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cCA" = ( /turf/simulated/floor/plasteel{ icon_state = "caution" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cCB" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cCC" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -65731,19 +63238,6 @@ /obj/item/folder/red, /turf/simulated/floor/carpet, /area/assembly/showroom) -"cCU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/crew_quarters/locker/locker_toilet) "cCV" = ( /obj/structure/table, /obj/machinery/recharger, @@ -65765,6 +63259,12 @@ "cCY" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -65817,6 +63317,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) "cDh" = ( @@ -65864,19 +63365,19 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/crew_quarters/locker) "cDo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/crew_quarters/locker) "cDp" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -65970,6 +63471,9 @@ icon_state = "4-8" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "yellowfull" }, @@ -65984,7 +63488,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/turf/simulated/wall/r_wall, +/turf/simulated/wall, /area/engine/engineering) "cDB" = ( /obj/structure/rack, @@ -66011,9 +63515,6 @@ /turf/simulated/floor/plasteel, /area/engine/engine_smes) "cDD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/window/reinforced{ dir = 8 }, @@ -66036,11 +63537,13 @@ /area/engine/engineering) "cDF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/engine/engineering) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/medical/research) "cDG" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -66057,31 +63560,24 @@ /turf/simulated/floor/plating, /area/engine/engineering) "cDH" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/engine/engineering) "cDI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/south, +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/assembly/chargebay) "cDJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, @@ -66117,7 +63613,7 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cDO" = ( /obj/machinery/ai_status_display{ pixel_y = -32 @@ -66130,41 +63626,40 @@ /obj/structure/rack, /obj/machinery/light/small, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cDQ" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cDR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cDS" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cDT" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cDU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66174,7 +63669,7 @@ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cDV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66186,7 +63681,7 @@ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cDW" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; @@ -66194,33 +63689,31 @@ name = "Library Junction"; sortType = 17 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cDX" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cDY" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/girder, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cDZ" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cEa" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -66232,7 +63725,7 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cEb" = ( /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ @@ -66289,7 +63782,6 @@ /turf/simulated/floor/plating, /area/assembly/showroom) "cEj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sink{ dir = 8; pixel_x = -12; @@ -66322,12 +63814,19 @@ /turf/simulated/floor/plasteel, /area/gateway) "cEm" = ( -/obj/structure/rack, -/obj/effect/decal/cleanable/cobweb, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/obj/machinery/door_control{ + id = "psychoffice"; + name = "Privacy Shutters Control"; + pixel_x = -25 + }, +/obj/structure/table/wood, +/obj/machinery/computer/med_data/laptop, +/obj/machinery/alarm{ + pixel_y = 24 + }, +/turf/simulated/floor/wood, +/area/medical/psych) "cEn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/vending/cigarette, /turf/simulated/floor/plasteel, /area/crew_quarters/locker/locker_toilet) @@ -66421,9 +63920,6 @@ icon_state = "dark" }, /area/crew_quarters/fitness) -"cEz" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/fpmaint2) "cEA" = ( /turf/simulated/wall/r_wall/rust, /area/engine/engineering) @@ -66437,9 +63933,15 @@ /turf/simulated/floor/plasteel, /area/engine/engineering) "cEC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/engine/engineering) +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull" + }, +/area/medical/medbay) "cED" = ( /obj/structure/reagent_dispensers/fueltank, /obj/machinery/ai_status_display{ @@ -66449,52 +63951,21 @@ /turf/simulated/floor/plasteel, /area/engine/engine_smes) "cEE" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cEF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/grille{ - density = 0; - icon_state = "brokengrille" - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cEG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cEH" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cEI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) -"cEJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cEK" = ( /obj/structure/cable{ d1 = 4; @@ -66535,7 +64006,7 @@ /obj/structure/table/reinforced, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cEP" = ( /obj/effect/decal/warning_stripes/south, /obj/machinery/door/poddoor/shutters{ @@ -66662,10 +64133,6 @@ /area/crew_quarters/locker/locker_toilet) "cFc" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/camera{ - c_tag = "Central Ring Hallway East"; - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ @@ -66673,16 +64140,17 @@ }, /area/hallway/primary/central) "cFd" = ( -/obj/structure/rack, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" - }, -/area/maintenance/starboard) +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/medical/psych) "cFe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/crew_quarters/locker/locker_toilet) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull" + }, +/area/medical/medbay) "cFf" = ( /obj/effect/decal/warning_stripes/northeastcorner, /turf/simulated/floor/plasteel{ @@ -66731,7 +64199,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -66744,23 +64211,21 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /area/crew_quarters/sleep) "cFo" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -66781,9 +64246,7 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -66802,9 +64265,6 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -66817,29 +64277,11 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /area/crew_quarters/sleep) -"cFt" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutralcorner" - }, -/area/crew_quarters/sleep) "cFu" = ( /obj/structure/cable{ d1 = 4; @@ -66847,9 +64289,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Dorm Hallway Starboard" }, @@ -66865,9 +64304,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -66880,9 +64316,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/glass{ name = "Cabin" }, @@ -66895,15 +64328,13 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cFy" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -66916,12 +64347,8 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -66936,27 +64363,29 @@ }, /area/crew_quarters/fitness) "cFA" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "whitebluefull" }, -/area/crew_quarters/fitness) +/area/medical/medbay) "cFB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/window/reinforced{ +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "whitebluefull" }, -/area/crew_quarters/fitness) +/area/medical/medbay) "cFC" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -66966,7 +64395,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutralcorner" @@ -67014,10 +64442,8 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cFJ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /obj/machinery/status_display{ layer = 4; @@ -67039,15 +64465,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ name = "Library Maintenance"; req_access_txt = "12" }, /turf/simulated/floor/plasteel, -/area/library) +/area/maintenance/port) "cFN" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ id_tag = "sw_maint_airlock"; @@ -67061,23 +64484,21 @@ id_tag = "sw_maint_sensor"; pixel_y = 33 }, +/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; frequency = 1379; id_tag = "sw_maint_pump" }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cFO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cFP" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -67087,62 +64508,70 @@ pixel_x = -24; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10; - initialize_directions = 10 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cFQ" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cFR" = ( /obj/structure/grille{ density = 0; icon_state = "brokengrille" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cFS" = ( +/obj/structure/girder, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/structure/girder, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cFT" = ( +/obj/structure/closet/crate, +/obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/closet/crate, -/obj/effect/spawner/lootdrop/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cFU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cFV" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cFW" = ( /obj/structure/cable{ d1 = 2; @@ -67153,25 +64582,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) -"cFX" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cFY" = ( /obj/structure/cable{ d1 = 4; @@ -67179,43 +64597,15 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cFZ" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) -"cGa" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGb" = ( /obj/structure/table/reinforced, /obj/item/stack/rods{ @@ -67233,16 +64623,18 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGd" = ( /obj/structure/cable{ d1 = 4; @@ -67256,72 +64648,87 @@ icon_state = "2-4"; tag = "" }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -67334,50 +64741,59 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -67389,53 +64805,60 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGl" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/light/small{ + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGn" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -67447,14 +64870,13 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGo" = ( /obj/structure/cable{ d1 = 4; @@ -67462,12 +64884,15 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGp" = ( /obj/structure/cable{ d1 = 4; @@ -67478,8 +64903,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGq" = ( /obj/structure/cable{ d1 = 4; @@ -67487,14 +64915,17 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/landmark{ name = "blobstart" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGr" = ( /obj/structure/cable{ d1 = 4; @@ -67502,9 +64933,12 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGs" = ( /obj/structure/cable{ d1 = 4; @@ -67512,16 +64946,16 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGt" = ( /obj/structure/cable{ d1 = 4; @@ -67529,14 +64963,21 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGu" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -67549,59 +64990,59 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGw" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "sw_maint_outer"; locked = 1; - name = "West Maintenance External Access"; - req_access = null + name = "West Maintenance External Access" }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cGx" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; initialize_directions = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -67714,57 +65155,69 @@ }, /area/hallway/primary/central) "cGE" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/disposalpipe/sortjunction{ dir = 1; name = "Medbay Junction"; sortType = 13 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/hallway/primary/central) -"cGF" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) +"cGF" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plasteel, -/area/maintenance/starboard) -"cGG" = ( /obj/structure/cable{ - d1 = 2; + d1 = 4; d2 = 8; - icon_state = "2-8"; + icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/medical{ + name = "Psych Office"; + req_access_txt = "64" + }, +/turf/simulated/floor/wood, +/area/medical/psych) +"cGG" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/turf/simulated/floor/wood, +/area/medical/psych) "cGH" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67772,8 +65225,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/wood, +/area/medical/psych) "cGI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67781,9 +65248,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/girder, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/machinery/door/airlock/maintenance{ + name = "Psych Office Maintenance"; + req_access = "64" + }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/medical/psych) "cGJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67791,7 +65270,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cGK" = ( @@ -67811,18 +65298,21 @@ }, /area/hallway/primary/central) "cGM" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -67833,6 +65323,9 @@ /obj/effect/landmark{ name = "blobstart" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -67843,6 +65336,9 @@ dir = 10 }, /obj/structure/table, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cGP" = ( @@ -67857,16 +65353,17 @@ }, /area/crew_quarters/sleep) "cGQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, /area/crew_quarters/sleep) "cGR" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -67875,6 +65372,12 @@ /area/crew_quarters/sleep) "cGS" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -67882,19 +65385,23 @@ /area/crew_quarters/sleep) "cGT" = ( /obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 }, -/area/crew_quarters/sleep) -"cGU" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/sleep) "cGV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -67907,6 +65414,12 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -67921,6 +65434,12 @@ dir = 4; pixel_y = -22 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -67945,7 +65464,6 @@ }, /area/crew_quarters/fitness) "cHa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -67968,39 +65486,15 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/fitness) "cHe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/portable_atmospherics/canister/air, /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 }, -/obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) -"cHf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cHg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cHh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cHi" = ( /obj/structure/cable{ d1 = 1; @@ -68008,29 +65502,26 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/engineering{ name = "Electrical Maintenance"; req_access_txt = "11" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/maintenance/electrical) +/area/maintenance/port) "cHj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cHk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light/small, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cHl" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -68042,41 +65533,15 @@ icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) -"cHm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) -"cHn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cHo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; @@ -68085,18 +65550,15 @@ /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cHp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/rack, /obj/item/clothing/gloves/color/fyellow, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cHq" = ( /obj/structure/cable{ d1 = 1; @@ -68104,25 +65566,18 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cHr" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cHs" = ( /obj/structure/cable{ d1 = 1; @@ -68130,14 +65585,11 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cHt" = ( /obj/structure/cable/yellow{ d1 = 2; @@ -68152,30 +65604,19 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/vending/artvend, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) -"cHv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/maintenance/fpmaint2) +/area/maintenance/starboard2) "cHw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cHx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cHy" = ( /obj/structure/cable{ d1 = 1; @@ -68183,34 +65624,23 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fpmaint2) -"cHz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cHA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/wall, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cHB" = ( /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -68247,7 +65677,7 @@ }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralcorner" + icon_state = "purplecorner" }, /area/hallway/primary/central) "cHF" = ( @@ -68263,7 +65693,7 @@ }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralcorner" + icon_state = "purplecorner" }, /area/hallway/primary/central) "cHG" = ( @@ -68280,7 +65710,7 @@ }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralcorner" + icon_state = "purplecorner" }, /area/hallway/primary/central) "cHH" = ( @@ -68300,7 +65730,7 @@ }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralcorner" + icon_state = "purplecorner" }, /area/hallway/primary/central) "cHI" = ( @@ -68308,22 +65738,21 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralcorner" + icon_state = "purplecorner" }, /area/hallway/primary/central) "cHJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -68334,12 +65763,12 @@ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -68408,98 +65837,74 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/primary/central) "cHR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/maintenance/starboard) -"cHS" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/spawner/window/reinforced, +/obj/machinery/door/poddoor/shutters{ + density = 0; + dir = 8; + icon_state = "open"; + id_tag = "psychoffice"; + name = "Privacy Shutters"; + opacity = 0 }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/medical/psych) +"cHS" = ( +/turf/simulated/floor/wood, +/area/medical/psych) "cHT" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" +/obj/structure/closet/secure_closet/psychiatrist, +/obj/item/clipboard{ + pixel_x = -5 }, +/turf/simulated/floor/wood, +/area/medical/psych) +"cHV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralfull" + icon_state = "whitebluecorner" }, -/area/maintenance/starboard) -"cHU" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/landmark{ - name = "blobstart" - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"cHV" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/medical/medbay) "cHW" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutral" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, /area/maintenance/starboard) "cHX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" }, -/turf/simulated/wall/r_wall, -/area/medical/medbay2) +/area/medical/research) "cHY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 +/obj/effect/decal/warning_stripes/yellow, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + icon_state = "white" }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/medical/research) "cHZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/iv_drip, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "cIa" = ( @@ -68513,18 +65918,12 @@ }, /area/crew_quarters/sleep) "cIc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/crew_quarters/sleep) "cId" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -68535,9 +65934,6 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -68546,8 +65942,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -68558,7 +65954,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/light, /obj/machinery/firealarm{ dir = 1; @@ -68570,13 +65965,10 @@ }, /area/crew_quarters/sleep) "cIi" = ( -/obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/structure/cable, /obj/machinery/power/apc{ name = "south bump"; pixel_y = -24 @@ -68594,9 +65986,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -68605,9 +65994,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -68616,9 +66002,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -68628,9 +66011,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/airlock/glass{ name = "Cabin" }, @@ -68640,66 +66020,69 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/crew_quarters/fitness) "cIo" = ( +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/fitness) "cIp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/fitness) -"cIq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/crew_quarters/fitness) -"cIr" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular, -/turf/simulated/floor/plasteel, -/area/crew_quarters/fitness) -"cIs" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/assembly/chargebay) +"cIq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/assembly/chargebay) +"cIr" = ( +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/regular, +/turf/simulated/floor/plasteel, +/area/crew_quarters/fitness) +"cIs" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -68715,26 +66098,23 @@ "cIu" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "sw_maint_inner"; locked = 1; name = "West Maintenance External Access"; - req_access = null; req_access_txt = "10;13" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cIv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/girder, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cIw" = ( /turf/simulated/wall/rust, /area/maintenance/electrical) @@ -68746,20 +66126,26 @@ /turf/simulated/wall, /area/maintenance/electrical) "cIz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cIA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/wall, @@ -68777,21 +66163,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/maintenance/electrical) -"cIE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cIF" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) "cIG" = ( /obj/structure/cable{ d1 = 1; @@ -68799,14 +66170,13 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cIH" = ( /turf/simulated/wall/r_wall, /area/toxins/xenobiology) @@ -68867,22 +66237,15 @@ }, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cIR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cIS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cIT" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel{ @@ -68906,8 +66269,8 @@ /turf/simulated/floor/plating, /area/medical/research) "cIX" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/disposalpipe/segment, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/medical/research) "cIY" = ( @@ -68943,9 +66306,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ dir = 8; @@ -69015,8 +66375,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/crew_quarters/locker/locker_toilet) +/area/maintenance/starboard) "cJm" = ( /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -69027,7 +66388,7 @@ dir = 8; icon_state = "neutral" }, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cJo" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -69039,12 +66400,16 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "cJq" = ( -/turf/simulated/wall/r_wall, -/area/medical/medbay2) +/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plasteel, +/area/assembly/chargebay) "cJr" = ( /obj/machinery/vending/medical, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" + icon_state = "whitebluefull" }, /area/medical/medbay2) "cJs" = ( @@ -69053,7 +66418,7 @@ }, /obj/structure/closet/secure_closet/medical3, /turf/simulated/floor/plasteel{ - icon_state = "neutral" + icon_state = "whitebluefull" }, /area/medical/medbay2) "cJt" = ( @@ -69063,17 +66428,16 @@ }, /obj/structure/closet/secure_closet/medical3, /turf/simulated/floor/plasteel{ - icon_state = "neutral" + icon_state = "whitebluefull" }, /area/medical/medbay2) "cJu" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, -/obj/structure/closet/wardrobe/medical_white, -/obj/item/storage/backpack/satchel_med, +/obj/structure/closet/radiation, /turf/simulated/floor/plasteel{ - icon_state = "neutral" + icon_state = "whitebluefull" }, /area/medical/medbay2) "cJv" = ( @@ -69081,16 +66445,13 @@ /obj/machinery/disposal, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" + icon_state = "whitebluefull" }, /area/medical/medbay2) "cJw" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -69101,6 +66462,7 @@ dir = 4; initialize_directions = 11 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "cJy" = ( @@ -69140,9 +66502,8 @@ }, /area/crew_quarters/fitness) "cJD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -69204,12 +66565,12 @@ "cJK" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cJL" = ( /obj/machinery/shieldgen, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cJM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/atmos{ @@ -69218,14 +66579,6 @@ }, /turf/simulated/floor/plasteel, /area/maintenance/electrical) -"cJN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) "cJO" = ( /obj/machinery/light/small{ dir = 4 @@ -69234,22 +66587,11 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cJP" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) -"cJQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cJR" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, /turf/simulated/floor/plasteel, @@ -69267,7 +66609,7 @@ "cJU" = ( /obj/structure/table/reinforced, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -69292,16 +66634,18 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cJY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/twohanded/required/kirbyplants, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/maintenance/electrical) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/hallway/primary/aft) "cJZ" = ( /obj/machinery/light/small{ dir = 1 @@ -69330,67 +66674,37 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cKd" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cKe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cKf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cKg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/rack, /obj/item/book/manual/engineering_guide, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) -"cKh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cKi" = ( /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cKj" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -69413,7 +66727,9 @@ tag = "" }, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cKl" = ( /obj/structure/window/reinforced, @@ -69434,7 +66750,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cKn" = ( /mob/living/simple_animal/slime, @@ -69444,13 +66762,7 @@ /turf/simulated/floor/greengrid, /area/toxins/xenobiology) "cKp" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - external_pressure_bound = 140; - external_pressure_bound_default = 140; - on = 1; - pressure_checks = 0; - pressure_checks_default = 0 - }, +/obj/machinery/atmospherics/unary/vent_pump/siphon/on, /turf/simulated/floor/bluegrid{ nitrogen = 500; oxygen = 0; @@ -69468,21 +66780,33 @@ /turf/simulated/wall/r_wall, /area/medical/research) "cKs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, -/area/medical/research) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/engine, +/area/toxins/explab) "cKt" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cKu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/medical/research) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/engine, +/area/toxins/explab) "cKv" = ( -/turf/simulated/wall/r_wall, -/area/security/checkpoint/science) +/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id_tag = "rdprivacy"; + name = "Research Director Office Shutters" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/hor) "cKw" = ( /obj/structure/table, /obj/item/paper_bin, @@ -69595,23 +66919,8 @@ /obj/structure/sign/science, /turf/simulated/wall, /area/medical/research) -"cKJ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/aft) -"cKK" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/aft) "cKL" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -69657,10 +66966,10 @@ }, /area/medical/medbay) "cKR" = ( -/obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ dir = 1 }, +/obj/machinery/vending/medical, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -69720,23 +67029,25 @@ /turf/simulated/wall, /area/medical/medbay) "cKZ" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plasteel, -/area/maintenance/starboard) -"cLa" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"cLb" = ( -/obj/structure/closet/firecloset, -/turf/simulated/floor/plating, -/area/maintenance/starboard) -"cLc" = ( -/turf/simulated/floor/plasteel{ - icon_state = "neutral" +/obj/structure/chair/comfy/lime{ + dir = 4 }, -/area/maintenance/starboard) +/turf/simulated/floor/carpet, +/area/medical/psych) +"cLa" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/carpet, +/area/medical/psych) +"cLb" = ( +/obj/structure/bed/psych, +/turf/simulated/floor/carpet, +/area/medical/psych) +"cLc" = ( +/turf/simulated/wall, +/area/medical/psych) "cLd" = ( /obj/structure/cable{ d2 = 4; @@ -69753,8 +67064,7 @@ network = list("SS13","Medical") }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" + icon_state = "whitebluefull" }, /area/medical/medbay2) "cLe" = ( @@ -69770,9 +67080,6 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -69785,45 +67092,35 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" }, /area/medical/medbay2) "cLg" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" - }, -/area/medical/medbay2) -"cLh" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/turf/simulated/floor/plasteel{ + icon_state = "whitebluefull" + }, +/area/medical/medbay2) +"cLh" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" }, /obj/machinery/door/airlock/maintenance{ name = "Medbay Maintenance"; @@ -69832,6 +67129,10 @@ /turf/simulated/floor/plasteel, /area/medical/medbay2) "cLi" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -69843,31 +67144,9 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/maintenance/starboard) -"cLj" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "cLk" = ( /obj/structure/cable{ d1 = 4; @@ -69879,6 +67158,9 @@ dir = 5 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cLl" = ( @@ -69894,18 +67176,21 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "cLm" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -69914,13 +67199,17 @@ dir = 4 }, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "cLn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + initialize_directions = 10 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cLo" = ( @@ -69978,11 +67267,12 @@ }, /area/crew_quarters/fitness) "cLv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/area/crew_quarters/fitness) +/turf/simulated/floor/plasteel, +/area/assembly/chargebay) "cLw" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -70005,19 +67295,23 @@ pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/structure/closet/secure_closet/scientist, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "cLz" = ( /obj/effect/spawner/random_spawners/wall_rusted_probably, /turf/simulated/wall, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cLA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cLB" = ( /obj/structure/cable{ d1 = 1; @@ -70038,7 +67332,7 @@ /obj/machinery/light/small, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cLD" = ( /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/plasteel{ @@ -70086,21 +67380,21 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cLL" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 }, +/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/maintenance/electrical) +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutral" + }, +/area/maintenance/starboard) "cLM" = ( /obj/structure/cable{ d1 = 4; @@ -70141,19 +67435,20 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cLQ" = ( /obj/effect/decal/warning_stripes/northeast, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 9; level = 2 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cLR" = ( /obj/structure/disposalpipe/trunk, @@ -70200,15 +67495,15 @@ "cLV" = ( /obj/structure/closet/wardrobe/white, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/medical/research) -"cLW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + dir = 8; + icon_state = "whitepurplefull" }, /area/medical/research) +"cLW" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plasteel, +/area/maintenance/starboard) "cLX" = ( /obj/structure/cable{ d1 = 1; @@ -70222,12 +67517,9 @@ }, /area/medical/research) "cLY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" - }, +/turf/simulated/floor/plating, /area/medical/research) "cLZ" = ( /turf/simulated/wall, @@ -70299,8 +67591,14 @@ /area/medical/research) "cMf" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "whitepurplefull" }, /area/medical/research) "cMg" = ( @@ -70312,14 +67610,6 @@ icon_state = "white" }, /area/medical/research) -"cMh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "purplefull" - }, -/area/medical/research) "cMi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -70334,7 +67624,7 @@ }, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/medical/research) "cMk" = ( @@ -70347,8 +67637,16 @@ }, /area/medical/research) "cMl" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/medical/research) "cMm" = ( @@ -70383,13 +67681,13 @@ "cMr" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "whiteblue" }, /area/medical/medbay) "cMs" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + icon_state = "whiteblue" }, /area/medical/medbay) "cMt" = ( @@ -70400,13 +67698,7 @@ }, /area/medical/medbay) "cMu" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/machinery/door_control{ - id = "medbayfoyer"; - name = "Medbay Front Doors"; - pixel_x = -25; - pixel_y = 25 - }, +/obj/machinery/vending/medical, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" @@ -70438,13 +67730,12 @@ /turf/simulated/wall, /area/medical/medbay2) "cMA" = ( -/obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ dir = 8 }, +/obj/structure/closet/radiation, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" + icon_state = "whitebluefull" }, /area/medical/medbay2) "cMB" = ( @@ -70467,13 +67758,12 @@ /area/medical/medbay2) "cMD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "cmo" + icon_state = "white" }, -/area/medical/medbay2) +/area/toxins/mixing) "cME" = ( /obj/structure/cable{ d1 = 2; @@ -70485,65 +67775,35 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "cMF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/plasticflaps, /turf/simulated/floor/plasteel, /area/medical/medbay2) "cMG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" + icon_state = "whitebluefull" }, /area/medical/medbay2) "cMH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/starboard) "cMI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "cMJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/space_heater, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, /area/maintenance/starboard) -"cMK" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" - }, -/area/maintenance/starboard) "cML" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, @@ -70589,7 +67849,6 @@ }, /area/crew_quarters/fitness) "cMR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair{ dir = 4 }, @@ -70598,24 +67857,15 @@ }, /area/crew_quarters/fitness) "cMS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 3; name = "3maintenance loot spawner" }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cMT" = ( -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cMU" = ( /obj/machinery/atmospherics/binary/valve, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -23 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/maintenance/electrical) @@ -70652,21 +67902,8 @@ /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cNa" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /turf/simulated/floor/plating, /area/maintenance/electrical) -"cNb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/maintenance/electrical) "cNc" = ( /obj/structure/cable{ d1 = 1; @@ -70674,39 +67911,25 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/maintenance/electrical) -"cNd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/maintenance/electrical) "cNe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/maintenance/electrical) "cNf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/maintenance/electrical) +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/mixing) "cNg" = ( /obj/structure/cable{ d1 = 1; @@ -70714,20 +67937,18 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cNh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cNi" = ( /obj/effect/decal/cleanable/blood/xeno, /turf/simulated/floor/plasteel{ @@ -70766,7 +67987,9 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cNm" = ( /obj/structure/cable{ @@ -70776,7 +67999,9 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cNn" = ( /obj/structure/cable/yellow{ @@ -70810,7 +68035,9 @@ req_access_txt = "47" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cNp" = ( /obj/effect/spawner/window/reinforced, @@ -70833,12 +68060,9 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "xeno4"; - name = "Creature Cell #4"; - opacity = 0 + name = "Creature Cell #4" }, /obj/machinery/door/window/brigdoor{ dir = 1; @@ -70850,12 +68074,12 @@ }, /area/toxins/xenobiology) "cNr" = ( +/obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/toxins/xenobiology) "cNs" = ( @@ -70871,12 +68095,9 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "xeno5"; - name = "Creature Cell #5"; - opacity = 0 + name = "Creature Cell #5" }, /obj/machinery/door/window/brigdoor{ dir = 1; @@ -70900,12 +68121,9 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "xeno6"; - name = "Creature Cell #6"; - opacity = 0 + name = "Creature Cell #6" }, /obj/machinery/door/window/brigdoor{ dir = 1; @@ -70967,11 +68185,13 @@ tag = "" }, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/medical/research) "cNy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -70986,9 +68206,6 @@ /turf/simulated/floor/plating, /area/security/checkpoint/science) "cNA" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/machinery/light_switch{ pixel_x = -24; pixel_y = 24 @@ -70999,10 +68216,8 @@ }, /area/security/checkpoint/science) "cNB" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel, /area/security/checkpoint/science) "cNC" = ( /obj/machinery/computer/secure_data, @@ -71023,9 +68238,14 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "whitepurple" }, /area/medical/research) "cNF" = ( @@ -71034,29 +68254,39 @@ icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "whitepurple" }, /area/medical/research) "cNG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "whitepurple" }, /area/medical/research) "cNH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "whitepurple" }, /area/medical/research) "cNI" = ( @@ -71064,8 +68294,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "whitepurple" }, /area/medical/research) "cNJ" = ( @@ -71073,33 +68306,45 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "whitepurple" }, /area/medical/research) "cNK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "whitepurplefull" }, /area/medical/research) "cNL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" }, /area/medical/research) "cNM" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/research) "cNN" = ( @@ -71107,16 +68352,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralcorner" + icon_state = "purplecorner" }, /area/hallway/primary/aft) "cNO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -71124,23 +68370,34 @@ /area/hallway/primary/aft) "cNP" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, /area/hallway/primary/aft) "cNQ" = ( +/obj/machinery/door/firedoor, +/obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/medbay) "cNR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" @@ -71150,6 +68407,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -71158,58 +68418,81 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" + dir = 9; + icon_state = "whiteblue" }, /area/medical/medbay) "cNU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" - }, -/area/medical/medbay) -"cNV" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" + icon_state = "white" + }, +/area/medical/medbay) +"cNV" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" }, /area/medical/medbay) "cNW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" }, /area/medical/medbay) "cNX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ id_tag = "medbayfoyer"; name = "Medbay Entrance"; req_access_txt = "5" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" }, /area/medical/medbay) "cNY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + initialize_directions = 10 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 10 }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + icon_state = "white" }, /area/medical/medbay) "cNZ" = ( @@ -71230,15 +68513,6 @@ /obj/structure/table/reinforced, /obj/item/book/manual/security_space_law, /obj/item/radio, -/obj/machinery/status_display{ - pixel_y = 32 - }, -/obj/machinery/door_control{ - id = "medbayfoyer"; - name = "Medbay Front Doors"; - pixel_x = -25; - pixel_y = 25 - }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" @@ -71265,9 +68539,6 @@ pixel_x = 24 }, /obj/structure/closet/secure_closet/security/med, -/obj/machinery/ai_status_display{ - pixel_y = 32 - }, /obj/structure/extinguisher_cabinet{ pixel_x = 28; pixel_y = 30 @@ -71287,34 +68558,27 @@ pixel_y = 5 }, /obj/item/storage/box/masks, +/obj/item/storage/box/beakers, +/obj/item/storage/box/gloves{ + pixel_x = 5; + pixel_y = 5 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" }, /area/medical/medbay) "cOe" = ( -/obj/structure/table, /obj/item/radio/intercom{ dir = 1; pixel_y = 25 }, -/obj/item/storage/box/gloves{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/storage/box/beakers, +/obj/structure/closet/secure_closet/medical1, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" }, /area/medical/medbay) -"cOf" = ( -/obj/structure/closet/walllocker/emerglocker/north, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitebluecorner" - }, -/area/medical/medbay) "cOg" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -71334,22 +68598,29 @@ pixel_x = -3; pixel_y = -3 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" + icon_state = "whitebluefull" }, /area/medical/medbay2) "cOi" = ( /obj/effect/landmark/start{ name = "Medical Doctor" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" }, /area/medical/medbay2) "cOj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" @@ -71377,15 +68648,20 @@ pixel_x = -3; pixel_y = -3 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" + icon_state = "whitebluefull" }, /area/medical/medbay2) "cOl" = ( +/obj/effect/decal/warning_stripes/north, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/medical/medbay) +/turf/simulated/floor/plasteel, +/area/medical/research) "cOm" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -71396,9 +68672,6 @@ /turf/space, /area/space/nearstation) "cOn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/maintenance/starboard) @@ -71409,7 +68682,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "cOp" = ( @@ -71516,6 +68788,9 @@ /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cOD" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -71530,6 +68805,12 @@ }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -71585,7 +68866,9 @@ pixel_x = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cOM" = ( /obj/structure/cable{ @@ -71594,24 +68877,27 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cON" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" }, -/turf/simulated/floor/plasteel, /area/toxins/xenobiology) "cOO" = ( /obj/structure/table/reinforced, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cOP" = ( /obj/structure/sign/science{ @@ -71626,11 +68912,13 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cOR" = ( /obj/structure/table/reinforced, @@ -71647,26 +68935,22 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cOS" = ( /obj/machinery/monkey_recycler, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cOT" = ( /obj/structure/sign/electricshock, /turf/simulated/wall, /area/toxins/xenobiology) -"cOU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 - }, -/obj/item/twohanded/required/kirbyplants, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/toxins/xenobiology) "cOV" = ( /obj/machinery/atmospherics/unary/thermomachine/freezer/on/server{ dir = 1 @@ -71676,7 +68960,10 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cOW" = ( /obj/structure/sign/science{ @@ -71692,7 +68979,10 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cOY" = ( /obj/structure/sign/biohazard, @@ -71701,7 +68991,10 @@ "cOZ" = ( /obj/machinery/chem_master, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cPa" = ( /obj/machinery/chem_dispenser, @@ -71715,7 +69008,10 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cPb" = ( /obj/structure/table/reinforced, @@ -71723,7 +69019,10 @@ /obj/item/storage/box/syringes, /obj/item/extinguisher/mini, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cPc" = ( /obj/structure/cable{ @@ -71732,20 +69031,11 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/toxins/xenobiology) -"cPd" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "whitepurple" }, -/obj/effect/decal/warning_stripes/east, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, /area/toxins/xenobiology) "cPe" = ( /obj/structure/chair/office/light{ @@ -71756,23 +69046,22 @@ /turf/simulated/floor/plasteel, /area/toxins/xenobiology) "cPf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" - }, -/area/medical/research) +/turf/simulated/floor/engine, +/area/toxins/explab) "cPg" = ( /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -71788,7 +69077,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -71807,7 +69098,10 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -71827,10 +69121,13 @@ icon_state = "2-8"; tag = "" }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plasteel, /area/security/checkpoint/science) "cPl" = ( /obj/structure/cable{ @@ -71871,103 +69168,70 @@ /area/medical/research) "cPo" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research) -"cPp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + icon_state = "whitepurplefull" }, /area/medical/research) "cPq" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "whitepurplecorner" + icon_state = "whitepurple" }, /area/medical/research) "cPr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "whitepurplecorner" + icon_state = "whitepurple" }, /area/medical/research) "cPs" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "whitepurplecorner" + icon_state = "whitepurple" }, /area/medical/research) "cPt" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "whitepurplecorner" + icon_state = "whitepurple" }, /area/medical/research) "cPu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "whitepurplefull" }, /area/medical/research) "cPv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ + dir = 8; icon_state = "whitepurplecorner" }, /area/medical/research) "cPw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/medical/research) -"cPx" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralcorner" - }, -/area/hallway/primary/aft) "cPy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -71979,10 +69243,6 @@ name = "Chemistry Junction"; sortType = 13 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, @@ -71991,56 +69251,31 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/medical/medbay) -"cPB" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" - }, -/area/medical/medbay) "cPC" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" - }, -/area/medical/medbay) +/turf/simulated/wall/r_wall, +/area/maintenance/starboardsolar) "cPD" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" + dir = 10; + icon_state = "whiteblue" }, /area/medical/medbay) "cPE" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" + icon_state = "white" }, /area/medical/medbay) "cPF" = ( @@ -72048,33 +69283,16 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" - }, -/area/medical/medbay) -"cPG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" + icon_state = "whiteblue" }, /area/medical/medbay) "cPH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/landmark{ name = "lightsout" }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" + icon_state = "whiteblue" }, /area/medical/medbay) "cPI" = ( @@ -72082,25 +69300,17 @@ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" + icon_state = "white" }, /area/medical/medbay) "cPJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -72123,9 +69333,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitebluecorner" @@ -72136,24 +69343,12 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) -"cPN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitebluecorner" - }, -/area/medical/medbay) "cPO" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -72170,24 +69365,22 @@ tag = "" }, /obj/machinery/computer/secure_data, +/obj/machinery/door_control{ + id = "medbayfoyer"; + layer = 3.3; + name = "Medbay Foyer Doors"; + normaldoorcontrol = 1; + pixel_x = -25 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" }, /area/security/checkpoint/medical) "cPQ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/turf/simulated/floor/plasteel, /area/security/checkpoint/medical) "cPR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -72195,25 +69388,15 @@ /area/security/checkpoint/medical) "cPS" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/turf/simulated/floor/plating, +/area/maintenance/starboardsolar) +"cPT" = ( +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/turf/simulated/floor/plating, -/area/security/checkpoint/medical) -"cPT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" - }, -/area/medical/medbay) +/turf/simulated/floor/plasteel, +/area/medical/research) "cPU" = ( /obj/structure/table/glass, /obj/item/storage/firstaid/brute{ @@ -72230,20 +69413,16 @@ pixel_y = -3 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" + icon_state = "whitebluefull" }, /area/medical/medbay2) "cPV" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "cmo" - }, -/area/medical/medbay2) +/turf/simulated/floor/plasteel, +/area/medical/research) "cPW" = ( /obj/structure/table/glass, /obj/machinery/requests_console{ @@ -72266,8 +69445,7 @@ pixel_y = -3 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" + icon_state = "whitebluefull" }, /area/medical/medbay2) "cPX" = ( @@ -72292,9 +69470,14 @@ /turf/space, /area/space/nearstation) "cPZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/medical/medbay3) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/greengrid, +/area/medical/research) "cQa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ @@ -72302,28 +69485,27 @@ req_access_txt = "5" }, /turf/simulated/floor/plasteel, -/area/medical/medbay3) +/area/maintenance/starboard) "cQb" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ id_tag = "medbayfoyer"; name = "Medbay Entrance"; req_access_txt = "5" }, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, /area/medical/medbay) "cQc" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /obj/structure/toilet{ dir = 4 @@ -72347,6 +69529,7 @@ lootcount = 3; name = "3maintenance loot spawner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "cQe" = ( @@ -72434,7 +69617,6 @@ }, /area/crew_quarters/fitness) "cQo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair{ dir = 4 }, @@ -72473,30 +69655,19 @@ }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) -"cQt" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cQu" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cQv" = ( /obj/machinery/space_heater, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cQw" = ( /obj/structure/cable{ d1 = 4; @@ -72515,15 +69686,20 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ name = "Security Checkpoint"; req_access_txt = "1" }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "redfull" + }, /area/security/checkpoint/science) "cQx" = ( /obj/machinery/meter, @@ -72564,6 +69740,8 @@ "cQB" = ( /obj/structure/cable, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/electrical) "cQC" = ( @@ -72609,7 +69787,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cQG" = ( /obj/structure/cable{ @@ -72624,14 +69804,15 @@ req_access_txt = "47" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cQH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "white" }, -/turf/simulated/floor/plasteel, /area/toxins/xenobiology) "cQI" = ( /obj/structure/disposalpipe/trunk{ @@ -72642,7 +69823,9 @@ dir = 8 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cQJ" = ( /obj/structure/table/reinforced, @@ -72682,7 +69865,16 @@ tag = "" }, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cQL" = ( /obj/structure/table/reinforced, @@ -72695,14 +69887,8 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/toxins/xenobiology) -"cQM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - icon_state = "whitehall" + icon_state = "white" }, /area/toxins/xenobiology) "cQN" = ( @@ -72712,11 +69898,10 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ - icon_state = "whitehall" + dir = 1; + icon_state = "whitepurple" }, /area/toxins/xenobiology) "cQO" = ( @@ -72725,19 +69910,15 @@ dir = 1; on = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - icon_state = "whitehall" + dir = 1; + icon_state = "whitepurple" }, /area/toxins/xenobiology) "cQP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /turf/simulated/floor/plasteel{ - icon_state = "whitehall" + dir = 1; + icon_state = "whitepurple" }, /area/toxins/xenobiology) "cQQ" = ( @@ -72750,15 +69931,14 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/toxins/xenobiology) -"cQR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/xenobiology) "cQS" = ( @@ -72768,23 +69948,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/toxins/xenobiology) -"cQT" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - layer = 2.4; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/xenobiology) "cQU" = ( @@ -72798,44 +69963,34 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/decal/warning_stripes/east, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "whitepurple" + }, +/area/toxins/xenobiology) +"cQX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/toxins/xenobiology) -"cQW" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" - }, -/area/medical/research) -"cQX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" + icon_state = "neutralfull" }, /area/medical/research) "cQY" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" }, -/turf/simulated/floor/plating, -/area/security/checkpoint/science) +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/maintenance/port) "cQZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -72848,10 +70003,10 @@ icon_state = "1-2"; tag = "" }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, +/turf/simulated/floor/plasteel, /area/security/checkpoint/science) "cRb" = ( /obj/machinery/computer/mecha, @@ -72874,18 +70029,25 @@ /area/medical/research) "cRe" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/medical/research) "cRf" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "purplefull" +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4"; + tag = "" }, -/area/medical/research) +/obj/item/radio/intercom{ + pixel_y = 28 + }, +/obj/effect/decal/warning_stripes/northwest, +/turf/simulated/floor/plating, +/area/maintenance/starboardsolar) "cRg" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -72896,16 +70058,15 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "bluecorner" }, /area/hallway/primary/aft) "cRi" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/medical/medbay) "cRj" = ( @@ -72932,7 +70093,8 @@ icon_state = "pipe-c" }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + dir = 1; + icon_state = "whiteblue" }, /area/medical/medbay) "cRm" = ( @@ -72942,14 +70104,22 @@ }, /area/medical/medbay) "cRn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door_control{ + id = "medbayfoyer"; + layer = 3.3; + name = "Medbay Foyer Doors"; + normaldoorcontrol = 1; + pixel_x = -25 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" }, /area/medical/medbay) "cRo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -72997,10 +70167,7 @@ /obj/structure/chair/office/dark{ dir = 8 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/turf/simulated/floor/plasteel, /area/security/checkpoint/medical) "cRr" = ( /obj/structure/cable{ @@ -73031,8 +70198,7 @@ req_access_txt = "1" }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "red" + icon_state = "redfull" }, /area/security/checkpoint/medical) "cRt" = ( @@ -73047,8 +70213,7 @@ pixel_x = -32 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "neutral" + icon_state = "whitebluefull" }, /area/medical/medbay2) "cRu" = ( @@ -73058,6 +70223,8 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -73077,15 +70244,13 @@ /obj/item/clothing/glasses/hud/health, /obj/item/reagent_containers/spray/cleaner, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutral" + icon_state = "whitebluefull" }, /area/medical/medbay2) "cRx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance{ name = "Medbay Toilet" @@ -73103,11 +70268,15 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "cRz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/girder, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "cRA" = ( @@ -73126,6 +70295,7 @@ }, /area/crew_quarters/fitness) "cRB" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -73137,7 +70307,6 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -73146,17 +70315,22 @@ }, /area/crew_quarters/fitness) "cRC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" }, -/area/crew_quarters/fitness) +/obj/machinery/power/smes, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/decal/warning_stripes/north, +/turf/simulated/floor/plating, +/area/maintenance/starboardsolar) "cRD" = ( /obj/structure/rack, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cRE" = ( /obj/machinery/light/small{ dir = 8 @@ -73190,6 +70364,8 @@ /area/maintenance/electrical) "cRJ" = ( /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/electrical) "cRK" = ( @@ -73213,7 +70389,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark{ name = "blobstart" }, @@ -73221,7 +70396,7 @@ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cRO" = ( /obj/structure/cable{ d1 = 1; @@ -73230,7 +70405,9 @@ }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/atmospherics/pipe/simple/hidden/universal, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cRP" = ( /obj/structure/cable{ @@ -73244,19 +70421,16 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; - id_tag = "xenosecure"; - name = "Secure Creature Cell"; - opacity = 0 - }, /obj/machinery/door/window/brigdoor{ dir = 8; id = null; name = "Creature Pen"; req_access_txt = "47" }, +/obj/machinery/door/poddoor/preopen{ + id_tag = "xenosecure"; + name = "Secure Creature Cell" + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -73271,7 +70445,9 @@ req_access_txt = "55" }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cRR" = ( /obj/structure/cable{ @@ -73281,7 +70457,9 @@ tag = "" }, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cRS" = ( /obj/structure/cable{ @@ -73290,44 +70468,15 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark/start{ name = "Scientist" }, -/turf/simulated/floor/plasteel, -/area/toxins/xenobiology) -"cRT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 5 }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/toxins/xenobiology) -"cRU" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/effect/decal/warning_stripes/west, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/toxins/xenobiology) -"cRV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/toxins/xenobiology) -"cRW" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73339,19 +70488,15 @@ icon_state = "4-8"; tag = "" }, -/turf/simulated/floor/plasteel{ - icon_state = "purplefull" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/toxins/xenobiology) -"cRY" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 8; + icon_state = "whitepurplefull" }, /area/toxins/xenobiology) "cRZ" = ( @@ -73380,41 +70525,32 @@ /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" - }, -/area/toxins/xenobiology) -"cSa" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 8; + icon_state = "whitepurplefull" }, /area/toxins/xenobiology) "cSb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/toxins/xenobiology) -"cSc" = ( -/obj/machinery/hologram/holopad, -/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/xenobiology) +"cSc" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplefull" + }, +/area/toxins/xenobiology) "cSd" = ( /obj/structure/cable{ d1 = 4; @@ -73422,9 +70558,14 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/xenobiology) "cSe" = ( @@ -73442,13 +70583,15 @@ /obj/effect/landmark/start{ name = "Scientist" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/area/toxins/xenobiology) -"cSf" = ( /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + dir = 8; + icon_state = "whitepurplefull" }, /area/toxins/xenobiology) "cSg" = ( @@ -73463,7 +70606,7 @@ /obj/machinery/status_display{ pixel_x = 32 }, -/turf/simulated/floor/greengrid, +/turf/simulated/floor/plasteel, /area/toxins/xenobiology) "cSi" = ( /obj/machinery/light/small{ @@ -73478,9 +70621,6 @@ }, /area/toxins/xenobiology) "cSj" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -73494,7 +70634,6 @@ dir = 10; id = "scicell"; name = "Science Cell Timer"; - pixel_x = -32; pixel_y = -32 }, /turf/simulated/floor/plasteel{ @@ -73543,15 +70682,8 @@ /area/medical/research) "cSn" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/medical/research) -"cSo" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -73621,13 +70753,6 @@ icon_state = "whitepurplecorner" }, /area/medical/research) -"cSw" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" - }, -/area/hallway/primary/aft) "cSx" = ( /obj/structure/table, /obj/item/paper_bin, @@ -73692,7 +70817,6 @@ }, /area/medical/medbay) "cSE" = ( -/obj/structure/bed/roller, /obj/machinery/light, /obj/structure/sign/chemistry{ pixel_y = -32 @@ -73702,6 +70826,7 @@ dir = 1; network = list("Medical","SS13") }, +/obj/structure/bed/roller, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -73721,6 +70846,8 @@ /area/medical/medbay) "cSH" = ( /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -73732,6 +70859,9 @@ icon_state = "1-8" }, /obj/machinery/computer/crew, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -73744,18 +70874,18 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/turf/simulated/floor/plasteel, /area/security/checkpoint/medical) "cSK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -73763,32 +70893,44 @@ }, /area/security/checkpoint/medical) "cSL" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plating, -/area/security/checkpoint/medical) +/area/maintenance/starboard) "cSM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" }, -/area/medical/medbay) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/plating, +/area/maintenance/starboardsolar) "cSN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitebluecorner" - }, -/area/medical/medbay) +/obj/structure/lattice/catwalk, +/turf/space, +/area/maintenance/starboardsolar) "cSO" = ( /obj/structure/sign/greencross, /turf/simulated/wall, @@ -73810,6 +70952,8 @@ name = "Medical Supplies"; req_access_txt = "5" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -73828,9 +70972,8 @@ }, /area/medical/medbay3) "cSS" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -73856,7 +70999,6 @@ }, /area/medical/medbay3) "cSU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Medbay Toilet"; req_access_txt = "5" @@ -73932,16 +71074,14 @@ }, /area/maintenance/starboard) "cTe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/crew_quarters/fitness) "cTf" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -73950,7 +71090,7 @@ "cTg" = ( /obj/effect/spawner/random_spawners/wall_rusted_probably, /turf/simulated/wall/rust, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cTh" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 @@ -73962,7 +71102,7 @@ /obj/structure/reagent_dispensers/fueltank, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cTj" = ( /obj/structure/closet/secure_closet/engineering_welding, /turf/simulated/floor/plating, @@ -74004,7 +71144,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light/small{ dir = 8 }, @@ -74012,7 +71151,7 @@ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cTp" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -74025,6 +71164,9 @@ }, /area/toxins/xenobiology) "cTq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d1 = 1; @@ -74033,9 +71175,6 @@ tag = "" }, /obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, /area/toxins/xenobiology) "cTr" = ( @@ -74045,11 +71184,11 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cTs" = ( /obj/structure/cable{ @@ -74064,7 +71203,9 @@ req_access_txt = "47" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cTt" = ( /obj/structure/cable{ @@ -74090,7 +71231,9 @@ tag = "" }, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cTu" = ( /obj/structure/cable{ @@ -74099,9 +71242,16 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cTv" = ( /obj/structure/cable{ @@ -74124,7 +71274,9 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cTw" = ( /obj/machinery/door/firedoor, @@ -74136,33 +71288,26 @@ }, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/toxins/xenobiology) -"cTx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitehall" + icon_state = "white" }, /area/toxins/xenobiology) "cTy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitehall" + icon_state = "whitepurple" }, /area/toxins/xenobiology) "cTz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitehall" + icon_state = "whitepurple" }, /area/toxins/xenobiology) "cTA" = ( @@ -74172,28 +71317,27 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitehall" + icon_state = "whitepurple" }, /area/toxins/xenobiology) "cTB" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Research Division Access"; req_access_txt = "47" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/medical/research) "cTC" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Research Division Access"; @@ -74203,12 +71347,11 @@ /turf/simulated/floor/plasteel, /area/medical/research) "cTD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/xenobiology) "cTE" = ( @@ -74218,12 +71361,18 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/hologram/holopad, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/toxins/xenobiology) "cTF" = ( @@ -74235,16 +71384,15 @@ req_access_txt = "7" }, /obj/machinery/door/window/northleft, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "researchdesk1"; - name = "Research Desk Shutters"; - opacity = 0 + name = "Research Desk Shutters" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/lab) "cTG" = ( /obj/structure/table/reinforced, @@ -74257,7 +71405,9 @@ dir = 8 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cTH" = ( /obj/structure/table/reinforced, @@ -74270,13 +71420,17 @@ dir = 8 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cTI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -74311,7 +71465,7 @@ dir = 2; id = "scicell"; name = "Science Cell"; - req_access_txt = "150" + req_access_txt = "1" }, /turf/simulated/floor/plasteel{ icon_state = "redfull" @@ -74331,12 +71485,15 @@ name = "Slime Processor" }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cTN" = ( -/obj/structure/sign/science, -/turf/simulated/wall/r_wall, -/area/medical/research) +/obj/structure/lattice/catwalk, +/turf/space, +/area/maintenance/starboardsolar) "cTO" = ( /obj/structure/chair/office/light{ dir = 4 @@ -74345,49 +71502,48 @@ /turf/simulated/floor/plasteel, /area/toxins/xenobiology) "cTP" = ( -/obj/structure/sign/securearea, -/turf/simulated/wall/r_wall, -/area/medical/research) +/obj/machinery/door/poddoor/shutters/preopen{ + id_tag = "robodesk"; + name = "Robotics Desk Shutters" + }, +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/assembly/robotics) "cTQ" = ( /obj/structure/sign/science, /turf/simulated/wall, /area/toxins/lab) "cTR" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall, /area/toxins/lab) "cTS" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/disposalpipe/segment, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/effect/spawner/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "researchdesk1"; - name = "Research Desk Shutters"; - opacity = 0 + name = "Research Desk Shutters" }, /turf/simulated/floor/plating, /area/toxins/lab) "cTT" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "researchdesk1"; - name = "Research Desk Shutters"; - opacity = 0 + name = "Research Desk Shutters" }, /turf/simulated/floor/plating, /area/toxins/lab) "cTU" = ( /obj/structure/closet/emcloset, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "cTV" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8 }, @@ -74396,12 +71552,11 @@ }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralcorner" + icon_state = "purplecorner" }, /area/hallway/primary/aft) "cTW" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ pixel_x = 28 }, @@ -74414,13 +71569,10 @@ /area/medical/medbay) "cTY" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "chemdesk1"; - name = "Research Desk Shutters"; - opacity = 0 + name = "Chemistry Desk Shutters" }, /turf/simulated/floor/plating, /area/medical/medbay) @@ -74440,29 +71592,21 @@ name = "Chemistry Desk"; req_access_txt = "5; 33" }, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "chemdesk1"; - name = "Research Desk Shutters"; - opacity = 0 + name = "Chemistry Desk Shutters" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/medbay) "cUb" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/disposalpipe/segment, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/effect/spawner/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "chemdesk1"; - name = "Research Desk Shutters"; - opacity = 0 + name = "Chemistry Desk Shutters" }, /turf/simulated/floor/plating, /area/medical/medbay) @@ -74493,10 +71637,9 @@ }, /area/medical/medbay) "cUe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/machinery/light{ dir = 8 @@ -74507,7 +71650,6 @@ }, /area/medical/medbay) "cUf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/camera{ c_tag = "Medbay Entrance Hall"; dir = 8; @@ -74519,10 +71661,6 @@ }, /area/medical/medbay) "cUg" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -74541,7 +71679,6 @@ dir = 10; id = "medcell"; name = "Medical Cell Timer"; - pixel_x = -32; pixel_y = -32 }, /turf/simulated/floor/plasteel{ @@ -74556,14 +71693,13 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -74583,22 +71719,26 @@ }, /area/security/checkpoint/medical) "cUj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" }, /area/medical/medbay) "cUk" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + icon_state = "white" }, /area/medical/medbay) "cUl" = ( @@ -74610,8 +71750,8 @@ }, /area/medical/medbay3) "cUm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/table/wood, +/obj/structure/closet/wardrobe/medical_white, +/obj/item/storage/backpack/satchel_med, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutralcorner" @@ -74634,7 +71774,6 @@ }, /area/medical/medbay3) "cUp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -74667,12 +71806,22 @@ pixel_x = -5; pixel_y = 3 }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/defibrillator_mount/loaded{ + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "whitebluecorner" + icon_state = "whiteblue" }, /area/medical/medbay3) "cUu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -74689,25 +71838,22 @@ dir = 8; initialize_directions = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cUv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -74719,15 +71865,15 @@ }, /area/maintenance/starboard) "cUw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -74738,15 +71884,15 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "cUx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -74757,15 +71903,15 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "cUy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -74778,34 +71924,33 @@ }, /area/maintenance/starboard) "cUA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plating, /area/maintenance/starboard) "cUB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -74815,15 +71960,15 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "cUC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -74837,15 +71982,15 @@ }, /area/maintenance/starboard) "cUD" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -74854,17 +71999,17 @@ }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, -/area/crew_quarters/fitness) +/area/maintenance/starboard) "cUE" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -74877,15 +72022,15 @@ }, /area/crew_quarters/fitness) "cUF" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ @@ -74962,7 +72107,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 9 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -74970,13 +72115,10 @@ }, /area/crew_quarters/fitness) "cUM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /turf/simulated/floor/plasteel{ - icon_state = "neutralcorner" + icon_state = "neutral" }, -/area/crew_quarters/fitness) +/area/maintenance/starboard) "cUN" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -74995,11 +72137,11 @@ /obj/structure/mopbucket, /obj/item/mop, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cUQ" = ( /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cUR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/securearea, @@ -75011,6 +72153,8 @@ req_access_txt = "11" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/maintenance/electrical) "cUT" = ( @@ -75042,7 +72186,16 @@ tag = "" }, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cUV" = ( /obj/machinery/disposal, @@ -75054,65 +72207,59 @@ layer = 2.9 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cUW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cUX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cUY" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/medical/research) "cUZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/light/small{ dir = 1 }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/medical/research) -"cVa" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/toxins/xenobiology) "cVb" = ( /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cVc" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/medical/research) "cVd" = ( /obj/structure/closet/firecloset, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "cVe" = ( /obj/structure/disposalpipe/trunk{ @@ -75120,12 +72267,14 @@ }, /obj/machinery/disposal, /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, /area/toxins/lab) "cVf" = ( /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/xenobiology) "cVg" = ( @@ -75135,12 +72284,14 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/start{ name = "Scientist" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 8; + icon_state = "whitepurplefull" }, /area/toxins/xenobiology) "cVh" = ( @@ -75224,7 +72375,10 @@ pixel_x = -26 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cVn" = ( /obj/structure/cable{ @@ -75262,26 +72416,25 @@ name = "Security Checkpoint"; req_access_txt = "1" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "redfull" + }, /area/security/checkpoint/science) "cVq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "cVr" = ( /obj/structure/sign/nosmoking_2, -/turf/simulated/wall/r_wall, +/turf/simulated/wall, /area/toxins/lab) "cVs" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/medical/research) "cVt" = ( @@ -75309,6 +72462,7 @@ }, /area/toxins/lab) "cVv" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -75349,52 +72503,25 @@ /area/toxins/lab) "cVz" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - density = 0; - icon_state = "shutter0"; +/obj/machinery/door/poddoor/shutters/preopen{ id_tag = "researchdesk2"; - name = "Research Desk Shutters"; - opacity = 0 + name = "Research Desk Shutters" }, /turf/simulated/floor/plating, /area/toxins/lab) "cVA" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purplecorner" }, /area/hallway/primary/aft) -"cVB" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/aft) -"cVC" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "orangecorner" - }, -/area/hallway/primary/aft) "cVD" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 8; - icon_state = "shutter0"; id_tag = "chemdesk2"; - name = "Chemistry Desk Shutters"; - opacity = 0 + name = "Chemistry Desk Shutters" }, /turf/simulated/floor/plating, /area/medical/chemistry) @@ -75415,8 +72542,8 @@ pixel_y = -3 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitegreencorner" + dir = 9; + icon_state = "whiteyellow" }, /area/medical/chemistry) "cVF" = ( @@ -75425,7 +72552,7 @@ /obj/item/toy/figure/crew/chemist, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "whitegreencorner" + icon_state = "whiteyellow" }, /area/medical/chemistry) "cVG" = ( @@ -75446,20 +72573,15 @@ /obj/effect/landmark/start{ name = "Chemist" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "cVI" = ( /obj/structure/disposalpipe/segment, /obj/machinery/chem_dispenser, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "cVJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera{ c_tag = "Research Hallway North"; dir = 8; @@ -75473,14 +72595,20 @@ "cVK" = ( /obj/structure/closet/wardrobe/chemistry_white, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/structure/reagent_dispensers/fueltank/chem{ + pixel_x = 32 }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "cVL" = ( -/obj/machinery/ai_status_display, -/turf/simulated/wall/r_wall, -/area/medical/chemistry) +/obj/structure/cable, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -24 + }, +/obj/effect/decal/warning_stripes/southwest, +/turf/simulated/floor/plating, +/area/maintenance/starboardsolar) "cVM" = ( /obj/machinery/computer/med_data, /turf/simulated/floor/plasteel{ @@ -75501,6 +72629,14 @@ /obj/structure/chair/office/light{ dir = 1 }, +/obj/machinery/door_control{ + id = "medbayfoyer"; + layer = 3.3; + name = "Medbay Foyer Doors"; + normaldoorcontrol = 1; + pixel_x = 28; + pixel_y = 27 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -75508,12 +72644,6 @@ /area/medical/medbay) "cVP" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/machinery/door_control{ - id = "medbayfoyer"; - name = "Medbay Front Doors"; - pixel_x = 25; - pixel_y = 25 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -75542,8 +72672,10 @@ dir = 2; id = "medcell"; name = "Medical Cell"; - req_access_txt = "150" + req_access_txt = "1" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -75563,6 +72695,8 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" @@ -75575,6 +72709,11 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -75587,15 +72726,15 @@ /area/medical/medbay3) "cVV" = ( /obj/item/twohanded/required/kirbyplants, +/obj/machinery/defibrillator_mount/loaded{ + pixel_y = 30 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitebluecorner" + dir = 5; + icon_state = "whiteblue" }, /area/medical/medbay3) "cVW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/machinery/newscaster{ pixel_x = -32 }, @@ -75604,33 +72743,21 @@ icon_state = "neutralcorner" }, /area/medical/medbay3) -"cVX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "redbluefull" - }, -/area/medical/medbay3) "cVY" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, /area/medical/medbay3) -"cVZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "redbluefull" - }, -/area/medical/medbay3) "cWa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/obj/item/twohanded/required/kirbyplants, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "purplefull" + }, +/area/assembly/robotics) "cWb" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -75638,7 +72765,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "cWc" = ( @@ -75700,33 +72827,23 @@ /obj/item/bikehorn/rubberducky, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cWl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cWm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cWn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cWo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/landmark{ name = "blobstart" }, @@ -75734,54 +72851,64 @@ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cWp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cWq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cWr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cWs" = ( /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/power/apc{ dir = 1; name = "north bump"; pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cWt" = ( /obj/structure/cable{ d1 = 4; @@ -75789,6 +72916,9 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -75796,12 +72926,12 @@ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cWu" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/machinery/camera{ c_tag = "Research Security Checkpoint"; @@ -75823,6 +72953,9 @@ icon_state = "2-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -75830,13 +72963,16 @@ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cWw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cWx" = ( /obj/structure/cable{ d1 = 1; @@ -75844,13 +72980,15 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cWy" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -75858,7 +72996,6 @@ }, /area/toxins/xenobiology) "cWz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -75867,11 +73004,10 @@ }, /area/medical/research) "cWA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cWB" = ( /obj/structure/cable{ @@ -75880,25 +73016,27 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cWC" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "cWD" = ( +/obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/toxins/xenobiology) "cWE" = ( @@ -75912,12 +73050,9 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "xeno1"; - name = "Creature Cell #1"; - opacity = 0 + name = "Creature Cell #1" }, /obj/machinery/door/window/brigdoor{ dir = 2; @@ -75939,12 +73074,9 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "xeno2"; - name = "Creature Cell #4"; - opacity = 0 + name = "Creature Cell #2" }, /obj/machinery/door/window/brigdoor{ dir = 2; @@ -75966,12 +73098,9 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "xeno3"; - name = "Creature Cell #3"; - opacity = 0 + name = "Creature Cell #3" }, /obj/machinery/door/window/brigdoor{ dir = 2; @@ -75984,16 +73113,13 @@ /area/toxins/xenobiology) "cWH" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/medical/research) "cWI" = ( /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "whitepurple" + dir = 8; + icon_state = "whitepurplefull" }, /area/toxins/xenobiology) "cWJ" = ( @@ -76008,11 +73134,10 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/xenobiology) "cWK" = ( @@ -76022,11 +73147,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/xenobiology) "cWL" = ( @@ -76049,7 +73171,7 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/item/stock_parts/matter_bin{ pixel_x = 3; @@ -76058,7 +73180,10 @@ /obj/item/stock_parts/matter_bin, /obj/item/stock_parts/micro_laser, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, /area/toxins/lab) "cWN" = ( /obj/structure/chair{ @@ -76117,16 +73242,23 @@ pixel_x = -26 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cWU" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cWV" = ( /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cWW" = ( /obj/structure/filingcabinet/chestdrawer, @@ -76134,30 +73266,16 @@ pixel_y = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/toxins/xenobiology) -"cWX" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "whitepurple" }, -/area/toxins/lab) +/area/toxins/xenobiology) "cWY" = ( /obj/effect/landmark/start{ name = "Scientist" }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/toxins/lab) -"cWZ" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "white" }, /area/toxins/lab) "cXa" = ( @@ -76170,7 +73288,9 @@ pixel_y = -29 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurple" + }, /area/toxins/xenobiology) "cXb" = ( /obj/structure/closet/emcloset, @@ -76180,21 +73300,26 @@ pixel_y = -29 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "cXc" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/southwest, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/medical/research) "cXd" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/camera{ c_tag = "Central Hallway South"; dir = 8 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "orangecorner" }, @@ -76209,7 +73334,7 @@ }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "whitegreen" + icon_state = "whiteyellow" }, /area/medical/chemistry) "cXg" = ( @@ -76219,9 +73344,7 @@ /area/medical/chemistry) "cXh" = ( /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "cXi" = ( /obj/structure/disposalpipe/trunk{ @@ -76229,9 +73352,7 @@ }, /obj/machinery/disposal, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "cXj" = ( /obj/structure/window/reinforced, @@ -76241,9 +73362,7 @@ pixel_x = 24 }, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "cXk" = ( /obj/structure/cable{ @@ -76252,6 +73371,12 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76259,9 +73384,14 @@ "cXl" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitebluecorner" + icon_state = "whitebluefull" }, /area/medical/medbay3) "cXm" = ( @@ -76276,8 +73406,8 @@ }, /area/medical/medbay) "cXn" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -76287,29 +73417,34 @@ /obj/effect/landmark/start{ name = "Medical Doctor" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) "cXp" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" }, /area/medical/medbay) "cXq" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/area/medical/medbay3) -"cXr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/medbay3) +"cXr" = ( /obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Medbay Reception"; @@ -76362,6 +73497,8 @@ icon_state = "2-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -76384,17 +73521,6 @@ }, /turf/simulated/floor/plating, /area/security/checkpoint/medical) -"cXx" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" - }, -/area/medical/medbay) "cXy" = ( /obj/structure/cable{ d1 = 1; @@ -76407,6 +73533,8 @@ d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -76423,8 +73551,14 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + icon_state = "white" }, /area/medical/medbay3) "cXA" = ( @@ -76456,7 +73590,7 @@ }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "whitebluecorner" + icon_state = "whiteblue" }, /area/medical/medbay3) "cXC" = ( @@ -76467,33 +73601,19 @@ }, /area/medical/medbay3) "cXD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/closet/crate, /obj/item/retractor, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/starboard) -"cXE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "redbluefull" - }, -/area/medical/medbay3) "cXF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/hologram/holopad, /obj/structure/disposalpipe/segment, +/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, /area/medical/medbay3) "cXG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, @@ -76514,14 +73634,6 @@ "cXJ" = ( /turf/simulated/wall, /area/medical/surgery1) -"cXK" = ( -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" - }, -/area/medical/medbay3) "cXL" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, @@ -76570,7 +73682,7 @@ /obj/structure/reagent_dispensers/watertank, /obj/machinery/light/small, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cXS" = ( /obj/structure/cable{ d1 = 4; @@ -76578,47 +73690,28 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cXT" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cXU" = ( /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) -"cXV" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) -"cXW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cXX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/closet/emcloset, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cXY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; @@ -76627,31 +73720,11 @@ /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) -"cXZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) -"cYa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cYb" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cYc" = ( /obj/structure/cable{ d1 = 4; @@ -76659,13 +73732,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cYd" = ( /obj/structure/cable{ d1 = 4; @@ -76673,13 +73742,10 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cYe" = ( /obj/structure/cable{ d1 = 4; @@ -76687,11 +73753,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cYf" = ( /obj/structure/cable{ d1 = 1; @@ -76704,29 +73767,22 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cYg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cYh" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/closet/wardrobe/yellow, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -76742,26 +73798,21 @@ }, /area/toxins/xenobiology) "cYj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/light/small, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/medical/research) "cYk" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/medical/research) "cYl" = ( /obj/structure/closet/l3closet/scientist, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "cYm" = ( /obj/structure/table/reinforced, @@ -76776,7 +73827,10 @@ /obj/item/stock_parts/manipulator, /obj/item/stock_parts/manipulator, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, /area/toxins/lab) "cYn" = ( /obj/machinery/computer/rdconsole/core, @@ -76784,7 +73838,6 @@ /turf/simulated/floor/plasteel, /area/toxins/lab) "cYo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ pixel_x = 28 }, @@ -76819,7 +73872,6 @@ /turf/simulated/floor/plasteel, /area/toxins/lab) "cYs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/south, /obj/effect/decal/warning_stripes/north, @@ -76832,12 +73884,13 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/south, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/medical/research) "cYu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/south, /obj/effect/decal/warning_stripes/north, @@ -76854,25 +73907,15 @@ }, /obj/item/storage/box/gloves, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/medical/research) -"cYw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralfull" + icon_state = "whitepurplefull" }, -/area/toxins/lab) -"cYx" = ( -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "whitepurple" - }, -/area/toxins/lab) +/area/medical/research) "cYy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/lab) "cYz" = ( @@ -76881,27 +73924,33 @@ /obj/item/wrench, /obj/item/clothing/mask/gas, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplefull" + }, /area/medical/research) "cYA" = ( /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplefull" + }, /area/medical/research) "cYB" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Research Division Access"; req_access_txt = "47" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/medical/research) "cYC" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "orangecorner" }, @@ -76912,28 +73961,40 @@ /obj/item/clothing/glasses/science, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitegreencorner" + dir = 10; + icon_state = "whiteyellow" }, /area/medical/chemistry) "cYE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "whitegreencorner" + icon_state = "whiteyellowcorner" }, /area/medical/chemistry) "cYF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "whitegreen" + icon_state = "white" }, /area/medical/chemistry) "cYG" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitegreen" + icon_state = "white" }, /area/medical/chemistry) "cYH" = ( @@ -76941,9 +74002,12 @@ /obj/machinery/reagentgrinder, /obj/item/reagent_containers/glass/beaker/large, /obj/item/reagent_containers/glass/beaker/large, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "whitegreencorner" + icon_state = "whiteyellow" }, /area/medical/chemistry) "cYI" = ( @@ -76965,15 +74029,10 @@ icon_state = "whitebluecorner" }, /area/medical/medbay) -"cYK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" - }, -/area/medical/medbay) "cYL" = ( /obj/structure/chair/office/light, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -76986,20 +74045,17 @@ }, /area/medical/medbay) "cYN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, +/obj/structure/closet/wardrobe/coroner, +/obj/item/reagent_containers/glass/bottle/reagent/formaldehyde, +/obj/item/reagent_containers/dropper, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" + icon_state = "dark" }, -/area/medical/medbay) +/area/medical/morgue) "cYO" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -77031,6 +74087,8 @@ icon_state = "2-4"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -77061,14 +74119,14 @@ /turf/simulated/floor/plating, /area/security/checkpoint/medical) "cYU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay) +/obj/structure/lattice/catwalk, +/turf/space, +/area/maintenance/starboardsolar) "cYV" = ( /obj/structure/cable{ d1 = 1; @@ -77077,7 +74135,7 @@ tag = "" }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + icon_state = "white" }, /area/medical/medbay3) "cYW" = ( @@ -77085,27 +74143,32 @@ pixel_x = 26 }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" + dir = 4; + icon_state = "whiteblue" }, /area/medical/medbay3) "cYX" = ( /obj/structure/table/wood, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/medical/medbay3) "cYY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, /area/medical/medbay3) "cYZ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" @@ -77121,6 +74184,9 @@ dir = 8; network = list("SS13","Medical") }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -77131,7 +74197,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel{ @@ -77140,7 +74206,6 @@ }, /area/medical/surgery) "cZc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /obj/item/clothing/accessory/stethoscope, @@ -77150,6 +74215,7 @@ }, /area/maintenance/starboard) "cZd" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -77160,7 +74226,7 @@ /obj/structure/sign/examroom{ pixel_x = 32 }, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "cZe" = ( @@ -77235,19 +74301,15 @@ }, /obj/structure/barricade/wooden, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cZl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Gambling Den" }, /obj/structure/barricade/wooden, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cZm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, @@ -77255,30 +74317,18 @@ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cZn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/rack, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"cZo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "cZp" = ( /obj/machinery/sleeper{ dir = 4 }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" + icon_state = "whiteblue" }, /area/medical/medbay3) "cZq" = ( @@ -77291,7 +74341,6 @@ /area/maintenance/electrical) "cZr" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Research Division Access"; @@ -77317,15 +74366,15 @@ /obj/item/stack/sheet/glass, /obj/item/stack/sheet/glass, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, /area/toxins/lab) "cZt" = ( /turf/simulated/wall, /area/medical/research) "cZu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/east, @@ -77335,9 +74384,6 @@ }, /area/medical/research) "cZv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/folder, /obj/item/pen, @@ -77347,12 +74393,16 @@ req_access_txt = "7" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/lab) "cZw" = ( /obj/machinery/constructable_frame/machine_frame, /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "cZx" = ( /obj/structure/sign/securearea, @@ -77365,23 +74415,16 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/medical/research) -"cZz" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/toxins/lab) "cZA" = ( /obj/structure/cable{ d1 = 4; @@ -77390,8 +74433,7 @@ tag = "" }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/lab) "cZB" = ( @@ -77404,9 +74446,9 @@ /obj/machinery/hologram/holopad{ pixel_x = -16 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/lab) "cZC" = ( @@ -77444,7 +74486,7 @@ }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "whitegreencorner" + icon_state = "whiteyellow" }, /area/medical/chemistry) "cZE" = ( @@ -77459,14 +74501,12 @@ d2 = 2; icon_state = "0-2" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "cZF" = ( /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitegreencorner" + dir = 1; + icon_state = "whiteyellow" }, /area/medical/chemistry) "cZG" = ( @@ -77477,13 +74517,30 @@ network = list("Research","SS13") }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "cZH" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/medical/medbay) +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/research) "cZI" = ( /obj/structure/table/reinforced, /obj/item/folder/white, @@ -77493,12 +74550,13 @@ req_access_txt = "5" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) "cZJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ pixel_x = -28 }, @@ -77524,9 +74582,10 @@ name = "Security Checkpoint"; req_access_txt = "1" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "red" + icon_state = "redfull" }, /area/security/checkpoint/medical) "cZL" = ( @@ -77534,7 +74593,6 @@ /turf/simulated/floor/plating, /area/security/checkpoint/medical) "cZM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -77545,6 +74603,8 @@ "cZN" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -77557,36 +74617,40 @@ tag = "" }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" + icon_state = "whiteblue" }, /area/medical/medbay3) -"cZP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay) "cZQ" = ( /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, /area/medical/medbay3) "cZR" = ( -/turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/area/medical/medbay3) +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/hallway/primary/aft) "cZS" = ( /obj/machinery/sleeper, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" + dir = 6; + icon_state = "whiteblue" }, /area/medical/medbay3) "cZT" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -77604,14 +74668,13 @@ initialize_directions = 11 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, /area/maintenance/starboard) "cZU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ dir = 8; @@ -77619,8 +74682,9 @@ }, /area/medical/medbay3) "cZV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -77645,14 +74709,11 @@ icon_state = "whitebluecorner" }, /area/medical/surgery) -"cZZ" = ( -/turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" - }, -/area/medical/medbay3) "daa" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 1; + icon_state = "whiteblue" }, /area/medical/medbay3) "dab" = ( @@ -77731,9 +74792,17 @@ }, /area/maintenance/gambling_den) "dak" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/obj/machinery/power/solar{ + name = "Aft Starboard Solar Panel" + }, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/plasteel/airless{ + icon_state = "solarpanel" + }, +/area/maintenance/starboardsolar) "dal" = ( /obj/structure/cable{ d1 = 1; @@ -77744,28 +74813,20 @@ /turf/simulated/floor/plating, /area/maintenance/gambling_den) "dam" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/door/window/westleft{ + name = "Robotics Desk"; + req_access_txt = "29" }, -/area/maintenance/gambling_den) +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/assembly/robotics) "dan" = ( /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/gambling_den) -"dao" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) "dap" = ( /obj/structure/cable{ d1 = 4; @@ -77773,13 +74834,16 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "daq" = ( /obj/structure/cable{ d1 = 4; @@ -77787,14 +74851,17 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dar" = ( /obj/structure/cable{ d1 = 4; @@ -77802,11 +74869,14 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "das" = ( /obj/structure/cable{ d1 = 2; @@ -77814,12 +74884,17 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dat" = ( /obj/machinery/chem_heater, /obj/effect/decal/warning_stripes/southwest, @@ -77828,9 +74903,7 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "dau" = ( /turf/simulated/floor/plasteel{ @@ -77839,18 +74912,12 @@ }, /area/medical/research) "dav" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + icon_state = "white" }, -/area/medical/research) +/area/assembly/robotics) "daw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -77862,39 +74929,56 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/chemistry) "day" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plasteel{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; - icon_state = "whitepurplecorner" + initialize_directions = 11 }, -/area/medical/research) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/medical/morgue) "daz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4"; + tag = "" }, -/area/medical/research) +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4"; + tag = "" + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/maintenance/starboardsolar) "daA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research) "daB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_x = 32; pixel_y = 32 @@ -77905,73 +74989,81 @@ }, /area/medical/research) "daC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4"; + tag = "" }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4"; + tag = "" }, -/area/medical/research) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/maintenance/starboardsolar) "daD" = ( /turf/simulated/wall/rust, /area/toxins/xenobiology) "daE" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" - }, -/area/medical/research) -"daF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/medical/research) -"daG" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" }, /area/medical/research) +"daF" = ( +/obj/machinery/light{ + dir = 1; + on = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, +/area/medical/research) +"daG" = ( +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/maintenance/starboardsolar) "daH" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ name = "Research and Development"; req_access_txt = "47" }, -/turf/simulated/floor/plasteel, -/area/toxins/lab) -"daI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/lab) +"daI" = ( /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" }, /area/toxins/lab) "daJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "white" }, /area/toxins/lab) "daK" = ( @@ -77979,8 +75071,7 @@ /obj/item/clipboard, /obj/item/toy/figure/crew/scientist, /turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/lab) "daL" = ( @@ -78000,9 +75091,9 @@ /obj/item/disk/tech_disk{ pixel_y = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/lab) "daM" = ( @@ -78015,6 +75106,7 @@ /obj/structure/table/reinforced, /obj/item/paper_bin, /turf/simulated/floor/plasteel{ + dir = 8; icon_state = "purplefull" }, /area/hallway/primary/aft) @@ -78022,7 +75114,6 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/sign/chemistry{ pixel_x = 32; pixel_y = 32 @@ -78042,17 +75133,14 @@ }, /area/hallway/primary/aft) "daQ" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/effect/spawner/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ dir = 8; - icon_state = "shutter0"; id_tag = "chemdesk2"; - name = "Chemistry Desk Shutters"; - opacity = 0 + name = "Chemistry Desk Shutters" }, /turf/simulated/floor/plating, /area/medical/chemistry) @@ -78068,18 +75156,30 @@ /turf/simulated/floor/plating, /area/medical/surgery) "daT" = ( -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "whitegreen" +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8"; + tag = "" }, -/area/medical/chemistry) +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk, +/turf/space, +/area/maintenance/starboardsolar) "daU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "whitegreen" + icon_state = "white" }, /area/medical/chemistry) "daV" = ( @@ -78089,92 +75189,83 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/chemistry) "daW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - icon_state = "whitegreencorner" + dir = 4; + icon_state = "whiteyellow" }, /area/medical/chemistry) "daX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/folder/white, /obj/machinery/door/firedoor, /obj/item/pen, +/obj/machinery/door/window/westleft{ + dir = 4; + name = "Chemistry Desk"; + req_access_txt = "5; 33" + }, /obj/machinery/door/window/westleft{ name = "Chemistry Desk"; req_access_txt = "5; 33" }, -/obj/machinery/door/window/eastleft, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/chemistry) "daY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; - icon_state = "whitegreencorner" + icon_state = "whiteyellowcorner" }, /area/medical/medbay) "daZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" }, /area/medical/medbay) "dba" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/area/medical/medbay) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "cmo" + }, +/area/medical/cmo) "dbb" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, /area/medical/medbay) "dbc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/power/solar{ + name = "Aft Starboard Solar Panel" }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitebluecorner" +/obj/structure/cable, +/turf/simulated/floor/plasteel/airless{ + icon_state = "solarpanel" }, -/area/medical/medbay) +/area/maintenance/starboardsolar) "dbd" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/chem_dispenser, /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "dbf" = ( /obj/structure/cable{ @@ -78183,77 +75274,67 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitebluecorner" - }, -/area/medical/medbay) -"dbg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" }, /area/medical/medbay) +"dbg" = ( +/obj/machinery/ai_status_display, +/turf/simulated/wall, +/area/assembly/robotics) "dbh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" + icon_state = "white" }, -/area/medical/medbay) +/area/toxins/mixing) "dbi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) "dbj" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "whitepurple" }, -/area/medical/medbay) +/area/medical/research) "dbk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" }, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" - }, -/area/medical/medbay) +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plasteel, +/area/maintenance/apmaint) "dbl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" }, /area/medical/medbay) "dbm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitebluecorner" - }, -/area/medical/medbay) +/obj/structure/cable, +/obj/structure/lattice/catwalk, +/turf/space, +/area/maintenance/starboardsolar) "dbn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/vending/medical, /turf/simulated/floor/plasteel{ dir = 4; @@ -78261,19 +75342,18 @@ }, /area/medical/medbay) "dbo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/medical/medbay) -"dbp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/structure/grille{ + density = 0; + icon_state = "brokengrille" }, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/apmaint) +"dbp" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/apmaint) "dbq" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -78285,7 +75365,7 @@ pixel_x = 32 }, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -78294,7 +75374,7 @@ "dbr" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, -/area/medical/surgery1) +/area/medical/surgery) "dbs" = ( /obj/structure/sign/examroom, /turf/simulated/wall, @@ -78309,16 +75389,14 @@ /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" + icon_state = "whitebluefull" }, /area/medical/medbay3) "dbu" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whiteblue" + icon_state = "whitebluefull" }, /area/medical/medbay3) "dbv" = ( @@ -78329,12 +75407,9 @@ /turf/simulated/floor/plating, /area/medical/medbay3) "dbw" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/medical/medbay3) +/turf/simulated/wall/r_wall, +/area/maintenance/apmaint) "dbx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small{ dir = 8 }, @@ -78364,19 +75439,33 @@ /turf/simulated/floor/plating, /area/medical/surgery) "dbB" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/maintenance/apmaint) "dbC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/maintenance/gambling_den) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/apmaint) "dbD" = ( /obj/structure/cable{ d1 = 1; @@ -78389,9 +75478,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/gambling_den) "dbE" = ( @@ -78401,14 +75487,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/maintenance/gambling_den) "dbF" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ id_tag = null; @@ -78416,7 +75500,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -78429,19 +75512,33 @@ }, /area/maintenance/gambling_den) "dbH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/area/maintenance/gambling_den) -"dbI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 5 }, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "white" }, -/area/maintenance/gambling_den) +/area/medical/medbay) +"dbI" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/maintenance/apmaint) "dbJ" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/sign/poster/contraband/random{ @@ -78461,16 +75558,6 @@ "dbM" = ( /turf/simulated/wall/rust, /area/medical/research) -"dbN" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) "dbO" = ( /obj/machinery/light{ dir = 8 @@ -78481,18 +75568,23 @@ }, /area/medical/research) "dbP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research) "dbQ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/medical/research) "dbR" = ( @@ -78500,6 +75592,12 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78509,15 +75607,8 @@ dir = 4 }, /obj/item/radio/beacon, -/turf/simulated/floor/plasteel{ - icon_state = "purplefull" - }, -/area/medical/research) -"dbT" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78531,23 +75622,28 @@ /obj/machinery/door/window/eastleft, /obj/item/folder, /obj/item/pen, -/obj/machinery/door/poddoor/shutters{ - density = 0; - icon_state = "shutter0"; +/obj/machinery/door/poddoor/shutters/preopen{ id_tag = "researchdesk2"; - name = "Research Desk Shutters"; - opacity = 0 + name = "Research Desk Shutters" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "purplefull" + }, /area/toxins/lab) "dbV" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/medical/research) "dbW" = ( @@ -78555,9 +75651,10 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/medical/research) "dbX" = ( @@ -78565,12 +75662,23 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/medical/research) "dbY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -78585,9 +75693,17 @@ /obj/item/reagent_containers/glass/beaker/sulphuric, /obj/item/reagent_containers/dropper, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dca" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -78600,13 +75716,17 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/landmark/start{ name = "Scientist" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "white" }, /area/toxins/lab) "dcc" = ( @@ -78626,10 +75746,13 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dce" = ( /turf/simulated/floor/plasteel{ + dir = 8; icon_state = "purplefull" }, /area/hallway/primary/aft) @@ -78644,9 +75767,7 @@ }, /obj/machinery/disposal, /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "dch" = ( /obj/structure/chair/office/light{ @@ -78655,14 +75776,9 @@ /obj/effect/landmark/start{ name = "Chemist" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "dci" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -78671,29 +75787,33 @@ }, /area/medical/medbay) "dcj" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 8; + icon_state = "neutralfull" }, -/area/medical/chemistry) +/area/hallway/primary/aft) "dck" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "whitegreencorner" + dir = 4; + icon_state = "whiteyellow" }, /area/medical/chemistry) "dcl" = ( /obj/structure/table/reinforced, /obj/item/folder/white, /obj/item/pen, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 8; - icon_state = "shutter0"; id_tag = "chemdesk2"; - name = "Chemistry Desk Shutters"; - opacity = 0 + name = "Chemistry Desk Shutters" }, /obj/machinery/door/window/westleft, /obj/machinery/door/window/eastleft{ @@ -78701,9 +75821,7 @@ req_access_txt = "5; 33" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "dcm" = ( /obj/structure/cable{ @@ -78712,9 +75830,15 @@ icon_state = "2-4"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "whitegreen" + icon_state = "whiteyellow" }, /area/medical/medbay) "dcn" = ( @@ -78724,9 +75848,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + icon_state = "white" }, /area/medical/medbay) "dco" = ( @@ -78736,11 +75863,14 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) "dcr" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -78753,19 +75883,18 @@ icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, /area/medical/medbay) "dcs" = ( /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "dct" = ( /obj/structure/cable{ @@ -78779,20 +75908,8 @@ d2 = 8; icon_state = "1-8" }, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" - }, -/area/medical/medbay) -"dcu" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78810,6 +75927,13 @@ icon_state = "2-4"; tag = "" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -78826,6 +75950,12 @@ d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -78837,68 +75967,82 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" - }, -/area/medical/medbay) -"dcy" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-y" - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) -"dcz" = ( +"dcy" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-y" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/medbay) +"dcz" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whiteblue" }, /area/medical/medbay) "dcA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 8; + icon_state = "neutral" }, -/area/medical/medbay) +/area/maintenance/apmaint) "dcB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "dcC" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -78910,11 +76054,14 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -78922,19 +76069,19 @@ }, /area/maintenance/starboard) "dcD" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/medical/glass{ id_tag = ""; name = "Staff Room"; req_access_txt = "5" }, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/medical/medbay3) "dcE" = ( /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" + icon_state = "white" }, /area/medical/medbay3) "dcF" = ( @@ -78948,7 +76095,6 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance{ - icon_state = "door_locked"; locked = 1; name = "Maintenance Access" }, @@ -79019,17 +76165,16 @@ /turf/simulated/floor/plating, /area/maintenance/gambling_den) "dcN" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/maintenance/gambling_den) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/maintenance/apmaint) "dcO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/chair/stool, /turf/simulated/floor/plating, /area/maintenance/gambling_den) @@ -79040,25 +76185,17 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/maintenance/gambling_den) "dcQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - icon_state = "wood" + dir = 4; + icon_state = "neutral" }, -/area/maintenance/gambling_den) +/area/maintenance/apmaint) "dcR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/chair/wood, /turf/simulated/floor/wood{ broken = 1; @@ -79067,13 +76204,17 @@ /area/maintenance/gambling_den) "dcS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 9 }, -/obj/structure/chair/wood, -/turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/primary/aft) "dcT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/chair/wood, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -79086,27 +76227,22 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/wood/poker, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/maintenance/gambling_den) "dcV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/table/wood/poker, -/turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/primary/aft) "dcW" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 @@ -79126,20 +76262,27 @@ /obj/structure/table/reinforced, /obj/machinery/cell_charger, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dda" = ( /obj/structure/table, /obj/item/flashlight/lamp, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "ddb" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, /obj/item/flashlight, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "ddc" = ( /obj/item/twohanded/required/kirbyplants, @@ -79149,16 +76292,16 @@ /turf/simulated/floor/plating, /area/medical/research) "ddd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/structure/chair{ + dir = 8 }, -/area/maintenance/gambling_den) +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/hallway/primary/aft) "dde" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/east, @@ -79174,35 +76317,24 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "ddg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "ddh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 - }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "ddi" = ( /turf/simulated/wall/r_wall, /area/toxins/explab) "ddj" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -79210,15 +76342,15 @@ /obj/machinery/cell_charger, /obj/machinery/light, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/lab) "ddk" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel{ @@ -79259,7 +76391,10 @@ "ddo" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "ddp" = ( /obj/machinery/atmospherics/unary/portables_connector, @@ -79271,7 +76406,10 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "ddq" = ( /obj/machinery/atmospherics/unary/portables_connector, @@ -79279,7 +76417,10 @@ pixel_y = 24 }, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "ddr" = ( /obj/machinery/camera{ @@ -79301,103 +76442,97 @@ /turf/simulated/wall, /area/toxins/explab) "ddt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/medical/research) -"ddu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/apmaint) +"ddu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple" + dir = 8; + icon_state = "whitepurplecorner" }, /area/medical/research) "ddv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + dir = 8; + icon_state = "neutral" }, -/area/medical/research) +/area/maintenance/apmaint) "ddw" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple" + dir = 8; + icon_state = "whitepurplecorner" }, /area/medical/research) "ddx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/apmaint) +"ddy" = ( +/turf/simulated/wall, +/area/maintenance/apmaint) +"ddz" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" + icon_state = "wood" }, -/area/medical/research) -"ddy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/medical/research) -"ddz" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/medical/research) +/area/library/abandoned) "ddA" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/medical/research) "ddB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "wood" }, -/area/medical/research) +/area/library/abandoned) "ddC" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/toxins/lab) "ddD" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/lab) "ddE" = ( /obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/status_display{ pixel_y = -32 }, @@ -79406,7 +76541,10 @@ /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/lab) "ddF" = ( /obj/structure/table/reinforced, @@ -79419,7 +76557,9 @@ /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/dropper, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/toxins/lab) "ddG" = ( /obj/structure/cable{ @@ -79428,11 +76568,11 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "whitepurple" }, /area/toxins/lab) "ddH" = ( @@ -79453,7 +76593,9 @@ pixel_y = -26 }, /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/toxins/lab) "ddI" = ( /obj/structure/table/reinforced, @@ -79461,11 +76603,14 @@ /obj/item/disk/tech_disk, /obj/item/assembly/timer, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "ddJ" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ + dir = 8; icon_state = "purplefull" }, /area/hallway/primary/aft) @@ -79476,7 +76621,18 @@ }, /area/hallway/primary/aft) "ddL" = ( -/obj/machinery/smartfridge/secure/chemistry, +/obj/machinery/smartfridge/medbay, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/window/westleft{ + dir = 4; + name = "Chemistry Desk"; + req_access_txt = "5; 33" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -79490,14 +76646,17 @@ }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) "ddN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/reagent_dispensers/fueltank/chem{ pixel_y = -32 }, @@ -79509,21 +76668,19 @@ name = "Chemistry Cleaner" }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitegreencorner" + icon_state = "whiteyellow" }, /area/medical/chemistry) "ddO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "whitegreencorner" + icon_state = "whiteyellow" }, /area/medical/chemistry) "ddP" = ( @@ -79532,9 +76689,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; @@ -79548,7 +76702,7 @@ tag = "" }, /turf/simulated/floor/plasteel{ - icon_state = "whitegreencorner" + icon_state = "whiteyellow" }, /area/medical/chemistry) "ddQ" = ( @@ -79558,22 +76712,18 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_x = 4; pixel_y = -22 }, /turf/simulated/floor/plasteel{ - icon_state = "whitegreencorner" + dir = 6; + icon_state = "whiteyellow" }, /area/medical/chemistry) "ddR" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plating, /area/medical/surgery) @@ -79583,24 +76733,14 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "whitegreencorner" - }, -/area/medical/medbay) -"ddT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" + icon_state = "whiteyellowcorner" }, /area/medical/medbay) "ddU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -79628,40 +76768,55 @@ pixel_x = 28 }, /turf/simulated/floor/plasteel{ - icon_state = "whitegreencorner" + dir = 4; + icon_state = "whiteyellow" }, /area/medical/chemistry) "ddW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" - }, -/area/medical/medbay) -"ddX" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutral" }, +/area/maintenance/apmaint) +"ddX" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, /area/medical/medbay) "ddY" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" }, -/area/medical/medbay) +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/chapel/office) "ddZ" = ( /obj/machinery/chem_master, /obj/structure/extinguisher_cabinet{ @@ -79672,14 +76827,9 @@ pixel_y = -32 }, /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "dea" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -79691,14 +76841,15 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 4; + icon_state = "whitebluecorner" }, /area/medical/medbay) "dec" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -79709,11 +76860,14 @@ name = "Medbay Maintenance"; req_access_txt = "5" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel, -/area/medical/medbay) +/area/maintenance/starboard) "ded" = ( /obj/structure/cable{ d1 = 1; @@ -79721,31 +76875,37 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, /area/medical/medbay) "deh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, /area/medical/medbay) "dej" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" }, -/turf/simulated/wall, -/area/medical/medbay) -"dek" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/virology) +"dek" = ( /obj/structure/rack, /obj/item/roller, /obj/item/reagent_containers/iv_bag, @@ -79761,10 +76921,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/starboard) "dem" = ( @@ -79772,10 +76930,6 @@ icon_state = "whitebluefull" }, /area/medical/surgery) -"den" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/maintenance/fpmaint2) "deo" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -79790,7 +76944,6 @@ /area/medical/surgery) "deq" = ( /obj/machinery/door/airlock/maintenance{ - icon_state = "door_locked"; locked = 1; name = "Maintenance Access" }, @@ -79818,7 +76971,6 @@ /turf/simulated/wall, /area/medical/medbay3) "det" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/space_heater, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -79837,10 +76989,8 @@ /turf/simulated/floor/plasteel, /area/maintenance/starboard) "dew" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /obj/effect/landmark{ name = "xeno_spawn"; @@ -79869,9 +77019,14 @@ }, /area/maintenance/starboard) "dez" = ( +/obj/structure/bookcase, +/obj/effect/decal/cleanable/cobweb, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "wood" + }, +/area/library/abandoned) "deA" = ( /obj/structure/cable{ d1 = 2; @@ -79976,14 +77131,23 @@ /turf/simulated/floor/plating, /area/maintenance/gambling_den) "deF" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/table/wood/poker, -/turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutral" + }, +/area/maintenance/apmaint) "deG" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -80006,7 +77170,10 @@ pixel_y = 32 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "deL" = ( /obj/structure/chair/office/light{ @@ -80019,7 +77186,9 @@ /obj/item/paper_bin, /obj/item/pen, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "deN" = ( /obj/structure/cable{ @@ -80027,11 +77196,14 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 5 }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "deO" = ( /obj/structure/cable{ d1 = 4; @@ -80039,12 +77211,15 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "deP" = ( /obj/structure/cable{ d1 = 2; @@ -80052,13 +77227,18 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "deQ" = ( /obj/structure/table/reinforced, /obj/item/wrench, @@ -80068,15 +77248,17 @@ pixel_x = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "deR" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/explab) "deS" = ( @@ -80084,8 +77266,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/explab) "deT" = ( @@ -80093,47 +77274,52 @@ dir = 9 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/explab) "deU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood{ + broken = 1; + icon_state = "wood-broken" + }, +/area/library/abandoned) +"deV" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreen" + }, +/area/medical/virology) +"deW" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" + dir = 8; + icon_state = "neutral" }, -/area/toxins/explab) -"deV" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/toxins/explab) -"deW" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/toxins/explab) +/area/maintenance/apmaint) "deX" = ( /obj/structure/closet/l3closet/scientist, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "deY" = ( -/obj/effect/spawner/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/medical/research) +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutral" + }, +/area/maintenance/apmaint) "deZ" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 @@ -80143,10 +77329,21 @@ /turf/simulated/floor/plasteel, /area/maintenance/electrical) "dfa" = ( -/obj/effect/spawner/window/reinforced, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/medical/research) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/chapel/office) "dfb" = ( /obj/structure/sign/nosmoking_2, /turf/simulated/wall, @@ -80183,13 +77380,10 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "rdprivacy"; - name = "Research Director Office Shutters"; - opacity = 0 + name = "Research Director Office Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/hor) @@ -80203,13 +77397,10 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "rdprivacy"; - name = "Research Director Office Shutters"; - opacity = 0 + name = "Research Director Office Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/hor) @@ -80225,13 +77416,10 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "rdprivacy"; - name = "Research Director Office Shutters"; - opacity = 0 + name = "Research Director Office Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/hor) @@ -80247,25 +77435,14 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "rdprivacy"; - name = "Research Director Office Shutters"; - opacity = 0 + name = "Research Director Office Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/hor) -"dfl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/medical/research) "dfm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/extinguisher_cabinet{ pixel_x = 28 }, @@ -80274,8 +77451,20 @@ }, /area/medical/research) "dfn" = ( -/turf/simulated/wall, -/area/assembly/chargebay) +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) "dfo" = ( /turf/simulated/wall/r_wall, /area/assembly/chargebay) @@ -80292,14 +77481,9 @@ pixel_y = -30 }, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/chemistry) "dfr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/ai_status_display{ pixel_y = -32 @@ -80322,11 +77506,12 @@ name = "Mech Bay"; req_access_txt = "29" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) "dft" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -80347,9 +77532,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ id_tag = null; @@ -80377,6 +77559,8 @@ "dfB" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -80407,36 +77591,40 @@ }, /area/medical/medbay) "dfE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/status_display{ pixel_y = -32 }, /obj/machinery/light, /turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 8; + icon_state = "whitebluecorner" }, /area/medical/medbay) "dfF" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Patient Room"; req_access_txt = "5" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" }, /area/medical/medbay) "dfG" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/medical/medbay) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralfull" + }, +/area/hallway/secondary/exit) "dfH" = ( /obj/structure/cable{ d1 = 1; @@ -80445,6 +77633,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -80463,10 +77652,9 @@ /area/maintenance/starboard) "dfL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/maintenance/gambling_den) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/apmaint) "dfM" = ( /obj/structure/cable{ d1 = 1; @@ -80505,7 +77693,6 @@ /turf/simulated/floor/plating, /area/maintenance/gambling_den) "dfP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair/wood{ dir = 8 }, @@ -80515,14 +77702,13 @@ }, /area/maintenance/gambling_den) "dfQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/l3closet/virology, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ - icon_state = "dark" + dir = 5; + icon_state = "whitegreencorner" }, -/area/maintenance/gambling_den) +/area/medical/virology) "dfR" = ( /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, @@ -80531,23 +77717,10 @@ /obj/machinery/constructable_frame/machine_frame, /obj/item/stack/cable_coil/random, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, -/area/medical/research) -"dfT" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "white" }, -/area/maintenance/gambling_den) +/area/medical/research) "dfU" = ( /obj/structure/cable{ d1 = 4; @@ -80555,10 +77728,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -80580,11 +77749,6 @@ /obj/item/multitool, /turf/simulated/floor/plating, /area/medical/research) -"dfY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) "dfZ" = ( /obj/structure/cable{ d1 = 1; @@ -80592,30 +77756,28 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dga" = ( /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/toxins/explab) -"dgb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" }, /area/toxins/explab) -"dgc" = ( +"dgb" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/explab) -"dgd" = ( +"dgc" = ( /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/toxins/explab) "dge" = ( @@ -80630,15 +77792,14 @@ }, /area/toxins/explab) "dgf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "whitepurplefull" }, /area/toxins/explab) "dgg" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/explab) "dgh" = ( @@ -80648,21 +77809,30 @@ }, /obj/structure/closet/bombcloset, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "dgi" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/radiation, /obj/item/clothing/head/radiation, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "dgj" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "dgk" = ( /obj/machinery/firealarm{ @@ -80670,35 +77840,39 @@ pixel_x = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple" + }, /area/toxins/explab) "dgl" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -26 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dgm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + tag = "" }, -/obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, -/area/medical/research) -"dgn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/turf/simulated/floor/plasteel{ dir = 8; - initialize_directions = 11 + icon_state = "neutral" }, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, -/area/medical/research) +/area/maintenance/apmaint) +"dgn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/maintenance/apmaint) "dgo" = ( /obj/structure/cable{ d1 = 1; @@ -80730,6 +77904,7 @@ /turf/simulated/floor/plasteel, /area/toxins/misc_lab) "dgq" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -80742,7 +77917,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, /area/toxins/misc_lab) @@ -80758,11 +77932,11 @@ req_access_txt = "47" }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dgs" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/structure/table/reinforced, /obj/item/paicard, @@ -80770,7 +77944,9 @@ pixel_y = 30 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/crew_quarters/hor) "dgt" = ( /obj/structure/cable{ @@ -80782,37 +77958,16 @@ /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/crew_quarters/hor) -"dgu" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id_tag = "rdprivacy"; - name = "Research Director Office Shutters"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/crew_quarters/hor) "dgv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, /area/medical/research) "dgw" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/machinery/firealarm{ dir = 4; @@ -80824,7 +77979,6 @@ }, /area/hallway/primary/aft) "dgx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -80833,36 +77987,28 @@ }, /area/medical/medbay) "dgy" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay) -"dgz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" - }, -/area/medical/medbay) -"dgA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) +"dgA" = ( +/obj/machinery/door/airlock/maintenance, +/obj/structure/barricade/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/library/abandoned) "dgB" = ( /obj/structure/cable{ d1 = 1; @@ -80872,13 +78018,14 @@ }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) "dgC" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8 }, @@ -80891,7 +78038,6 @@ /turf/simulated/wall/r_wall, /area/medical/paramedic) "dgE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Chemistry Maintenance"; req_access_txt = "5; 33" @@ -80902,13 +78048,15 @@ d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/maintenance/aft) "dgF" = ( /obj/machinery/computer/crew, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" + dir = 9; + icon_state = "whiteblue" }, /area/medical/paramedic) "dgG" = ( @@ -80935,8 +78083,8 @@ pixel_y = 30 }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitebluecorner" + dir = 5; + icon_state = "whiteblue" }, /area/medical/paramedic) "dgI" = ( @@ -80960,6 +78108,7 @@ /obj/structure/sign/nosmoking_2{ pixel_y = 32 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -80967,7 +78116,7 @@ /area/medical/genetics_cloning) "dgK" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/machinery/dna_scannernew, /turf/simulated/floor/plasteel{ @@ -80983,9 +78132,6 @@ }, /area/medical/genetics_cloning) "dgM" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -80999,6 +78145,7 @@ }, /obj/item/storage/box/bodybags, /obj/item/pen, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -81023,37 +78170,34 @@ }, /area/medical/genetics_cloning) "dgP" = ( +/obj/structure/girder, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" - }, -/area/medical/medbay) +/turf/simulated/floor/plating, +/area/maintenance/apmaint) "dgQ" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) "dgR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" + dir = 1; + icon_state = "neutral" }, -/area/medical/medbay) +/area/maintenance/apmaint) "dgS" = ( /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ @@ -81061,12 +78205,13 @@ }, /area/medical/medbay) "dgT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft) "dgU" = ( @@ -81092,9 +78237,8 @@ }, /area/medical/medbay) "dgW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -81108,11 +78252,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81172,7 +78313,6 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "dhh" = ( @@ -81182,6 +78322,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -81244,7 +78385,6 @@ }, /area/hallway/secondary/construction) "dhq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plasteel{ @@ -81258,10 +78398,8 @@ /turf/simulated/floor/plasteel, /area/maintenance/starboard) "dhs" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -81296,12 +78434,14 @@ }, /area/maintenance/gambling_den) "dhx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/chair/wood{ - dir = 8 +/obj/effect/landmark{ + name = "blobstart" }, -/turf/simulated/floor/plating, -/area/maintenance/gambling_den) +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" + }, +/area/maintenance/apmaint) "dhy" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil/random, @@ -81310,7 +78450,9 @@ dir = 0; pixel_x = -28 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dhz" = ( /obj/structure/girder, @@ -81325,7 +78467,7 @@ /obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dhA" = ( /obj/structure/cable{ d1 = 4; @@ -81333,21 +78475,26 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance{ name = "Experimentor Maintenance"; req_access_txt = "47" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/toxins/explab) +/area/maintenance/port) "dhB" = ( /obj/machinery/constructable_frame/machine_frame, /obj/item/stack/cable_coil/random, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dhC" = ( /obj/structure/cable{ @@ -81361,9 +78508,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -81389,16 +78533,18 @@ tag = "" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/research) "dhG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dhH" = ( /obj/structure/cable{ d1 = 1; @@ -81411,16 +78557,20 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dhI" = ( /obj/structure/cable{ d1 = 4; @@ -81428,10 +78578,13 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/research) "dhJ" = ( @@ -81445,50 +78598,54 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/explab) "dhL" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/toxins/explab) -"dhM" = ( /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" + icon_state = "white" + }, +/area/toxins/explab) +"dhM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" }, /area/toxins/explab) "dhN" = ( @@ -81501,7 +78658,6 @@ /turf/simulated/floor/plasteel, /area/crew_quarters/hor) "dhO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/crew_quarters/hor) @@ -81510,37 +78666,43 @@ /obj/item/paper_bin, /obj/item/pen, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/crew_quarters/hor) "dhQ" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/explab) "dhR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ +/obj/structure/table/reinforced, +/obj/item/taperecorder, +/obj/item/stack/sheet/mineral/plasma, +/obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/table/reinforced, -/obj/item/taperecorder, -/obj/item/stack/sheet/mineral/plasma, -/obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/explab) "dhS" = ( @@ -81559,58 +78721,80 @@ name = "Xenobiology Lab"; req_access_txt = "47" }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "dhT" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/hologram/holopad, /obj/structure/chair/office/light, /obj/effect/landmark/start{ name = "Scientist" }, /obj/effect/decal/warning_stripes/north, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/explab) "dhU" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/table/reinforced, /obj/item/clipboard, /obj/item/folder/white, /obj/item/pen, /obj/effect/decal/warning_stripes/northeast, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/explab) "dhV" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "dhW" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dhX" = ( /obj/machinery/door/firedoor, @@ -81618,31 +78802,41 @@ name = "Research Division"; req_access_txt = "47" }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dhY" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/medical/research) "dhZ" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/landmark{ name = "lightsout" }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/research) "dia" = ( @@ -81650,9 +78844,6 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/toxins/misc_lab) @@ -81660,7 +78851,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/medical/research) @@ -81668,26 +78858,20 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/toxins/misc_lab) "did" = ( +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -81697,7 +78881,9 @@ /obj/item/aicard, /obj/item/circuitboard/aicore, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/crew_quarters/hor) "dif" = ( /obj/structure/cable{ @@ -81721,23 +78907,15 @@ d2 = 2; icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; +/obj/machinery/door/poddoor/shutters/preopen{ id_tag = "rdprivacy"; - name = "Research Director Office Shutters"; - opacity = 0 + name = "Research Director Office Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/hor) "dih" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -81750,6 +78928,8 @@ name = "Robotics Junction"; sortType = 13 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81759,27 +78939,21 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, /area/medical/research) "dik" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutral" }, -/turf/simulated/floor/plating, -/area/assembly/chargebay) +/area/maintenance/apmaint) "dil" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "whitebluecorner" }, /area/medical/medbay) "dim" = ( @@ -81793,13 +78967,15 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) "din" = ( /obj/structure/cable{ @@ -81867,7 +79043,9 @@ pixel_x = 32 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) "diu" = ( /obj/structure/disposalpipe/segment, @@ -81875,72 +79053,50 @@ c_tag = "Brig Security Equipment Lockers"; dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/hallway/primary/aft) -"div" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/recharge_station, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/assembly/chargebay) "diw" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, /area/hallway/primary/aft) "dix" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ name = "Paramedic Office"; req_access_txt = "66" }, +/turf/simulated/floor/plasteel, +/area/medical/paramedic) +"diy" = ( +/obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, -/area/hallway/primary/aft) -"diy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + icon_state = "white" }, /area/medical/paramedic) "diz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "whitebluecorner" + icon_state = "whiteblue" }, /area/medical/paramedic) "diA" = ( @@ -81956,6 +79112,7 @@ }, /area/medical/genetics_cloning) "diB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitebluecorner" @@ -81967,18 +79124,25 @@ }, /area/medical/genetics_cloning) "diD" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/area/medical/genetics_cloning) -"diE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/turf/simulated/floor/plasteel{ + dir = 0; + icon_state = "blue" + }, +/area/maintenance/apmaint) +"diE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -81989,9 +79153,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -82011,9 +79172,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ id_tag = null; @@ -82026,6 +79184,7 @@ }, /area/medical/genetics_cloning) "diI" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -82038,12 +79197,10 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + icon_state = "white" }, /area/medical/medbay) "diJ" = ( @@ -82053,10 +79210,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" @@ -82083,7 +79236,6 @@ }, /area/medical/medbay) "diM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ pixel_x = 28 }, @@ -82124,7 +79276,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -82209,7 +79360,6 @@ }, /area/maintenance/gambling_den) "dja" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair/wood{ dir = 8 }, @@ -82233,12 +79383,15 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/research) "djd" = ( @@ -82248,9 +79401,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/girder, /obj/structure/grille, /obj/machinery/door/poddoor{ @@ -82262,8 +79412,14 @@ }, /obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dje" = ( /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, @@ -82275,11 +79431,17 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "djg" = ( /obj/structure/cable{ @@ -82288,23 +79450,23 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/southeast, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel, /area/medical/research) "djh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 9 }, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/medical/research) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/apmaint) "dji" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden, /obj/effect/decal/warning_stripes/east, @@ -82318,15 +79480,17 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "djk" = ( /obj/structure/cable{ d1 = 1; @@ -82339,21 +79503,21 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "djl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/toxins/explab) +/obj/effect/decal/warning_stripes/southeast, +/turf/simulated/floor/plasteel, +/area/maintenance/apmaint) "djm" = ( /obj/structure/cable{ d1 = 4; @@ -82361,158 +79525,147 @@ icon_state = "4-8"; tag = "" }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "djn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/structure/table, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/ointment, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "djo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "djp" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/crew_quarters/hor) "djq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/crew_quarters/hor) "djr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/crew_quarters/hor) "djs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/white, /obj/item/clothing/gloves/color/white, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "djt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/book/manual/experimentor, /obj/item/healthanalyzer, /obj/effect/decal/warning_stripes/northwestcorner, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurple" + }, /area/toxins/explab) "dju" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/computer/rdconsole/experiment, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "djv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/sign/securearea, /turf/simulated/wall, /area/toxins/explab) "djw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/effect/decal/warning_stripes/northeastcorner, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "djx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/machinery/light, /obj/item/paper_bin, /obj/item/pen, /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "djy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "djz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light/small, /obj/structure/closet/firecloset, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "djA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutral" }, -/turf/simulated/wall/r_wall, -/area/medical/research) +/area/maintenance/apmaint) "djB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, -/area/medical/research) -"djC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/chapel/main) +"djC" = ( /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/medical/research) "djD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/medical/research) "djE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/machinery/light_switch{ pixel_x = -26; @@ -82534,13 +79687,13 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/toxins/misc_lab) "djG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -82553,15 +79706,15 @@ icon_state = "1-4"; tag = "90Curve" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" }, /area/crew_quarters/hor) "djH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -82574,52 +79727,56 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" }, /area/crew_quarters/hor) "djI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" }, /area/crew_quarters/hor) "djJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/toxins/misc_lab) "djK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -82631,95 +79788,60 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Research Director's Office"; req_access = null; req_access_txt = "30" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/crew_quarters/hor) "djL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" }, /area/medical/research) "djM" = ( +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-j2" + }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-j2" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "purplefull" - }, -/area/medical/research) -"djN" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; initialize_directions = 11 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/medical/research) -"djO" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Cyborg" - }, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/assembly/chargebay) -"djP" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, -/obj/effect/decal/warning_stripes/yellow/hollow, -/obj/effect/landmark/start{ - name = "Cyborg" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/assembly/chargebay) "djQ" = ( /turf/simulated/floor/bluegrid, /area/assembly/chargebay) @@ -82728,7 +79850,7 @@ dir = 8 }, /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plating, +/turf/simulated/floor/bluegrid, /area/assembly/chargebay) "djS" = ( /obj/effect/decal/warning_stripes/east, @@ -82737,21 +79859,11 @@ "djT" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/assembly/chargebay) -"djU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" + icon_state = "white" }, -/area/hallway/primary/aft) +/area/assembly/chargebay) "djV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -82763,18 +79875,28 @@ req_access_txt = "66" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/aft) "djW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel, /area/maintenance/aft) "djX" = ( @@ -82787,19 +79909,24 @@ }, /area/medical/genetics_cloning) "djY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" }, /area/medical/genetics_cloning) "djZ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/area/medical/genetics_cloning) +/turf/simulated/floor/plating, +/area/maintenance/apmaint) "dka" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -82809,15 +79936,9 @@ }, /area/medical/genetics_cloning) "dkb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/genetics_cloning) -"dkc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1; initialize_directions = 11 @@ -82826,10 +79947,22 @@ icon_state = "white" }, /area/medical/genetics_cloning) +"dkc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/medical/genetics_cloning) "dkd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -82844,9 +79977,11 @@ }, /area/medical/medbay) "dkf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -82854,33 +79989,42 @@ }, /area/medical/medbay) "dkg" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) "dkh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, -/area/medical/medbay) +/turf/simulated/floor/plasteel, +/area/maintenance/apmaint) "dki" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Medbay Cloning"; req_access_txt = "5" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -82929,9 +80073,9 @@ /turf/simulated/floor/plating, /area/hallway/secondary/construction) "dko" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/obj/effect/decal/warning_stripes/west, +/turf/simulated/floor/plasteel, +/area/maintenance/apmaint) "dkp" = ( /obj/structure/table, /obj/item/folder/white, @@ -82940,12 +80084,14 @@ /turf/simulated/floor/plating, /area/medical/research) "dkq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "wood" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 }, -/area/maintenance/gambling_den) +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "dkr" = ( /obj/structure/chair/wood{ dir = 4 @@ -82976,12 +80122,8 @@ /turf/simulated/floor/plating, /area/maintenance/gambling_den) "dku" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood{ - broken = 1; - icon_state = "wood-broken" - }, -/area/maintenance/gambling_den) +/turf/simulated/wall/rust, +/area/maintenance/apmaint) "dkv" = ( /obj/structure/table/wood, /obj/machinery/light{ @@ -82995,29 +80137,33 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/item/stock_parts/matter_bin, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dkx" = ( /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/disposal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/explab) "dky" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light/small, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dkz" = ( /obj/effect/decal/cleanable/dirt, @@ -83040,12 +80186,15 @@ pixel_y = -24 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dkC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall/r_wall, -/area/toxins/explab) +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/suit/fire/firefighter, +/turf/simulated/floor/plating, +/area/maintenance/apmaint) "dkD" = ( /obj/machinery/door/firedoor, /obj/machinery/door_control{ @@ -83053,16 +80202,13 @@ name = "Experimentor Control"; pixel_x = -26 }, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "experimentor"; - name = "Experimentor Blast Door"; - opacity = 0 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" + name = "Experimentor Blast Door" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/engine, /area/toxins/explab) "dkE" = ( /obj/structure/sign/securearea, @@ -83072,27 +80218,12 @@ /obj/machinery/status_display, /turf/simulated/wall/r_wall, /area/toxins/explab) -"dkG" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; - id_tag = "experimentor"; - name = "Experimentor Blast Door"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/toxins/explab) "dkH" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "pdoor0"; +/obj/machinery/door/poddoor/preopen{ id_tag = "experimentor"; - name = "Experimentor Blast Door"; - opacity = 0 + name = "Experimentor Blast Door" }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/toxins/explab) "dkI" = ( @@ -83107,15 +80238,15 @@ /turf/simulated/floor/plating, /area/toxins/mixing) "dkL" = ( +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -83123,19 +80254,15 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, /area/crew_quarters/hor) "dkM" = ( /obj/structure/sign/biohazard, /turf/simulated/wall/r_wall, /area/toxins/mixing) -"dkN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/toxins/misc_lab) "dkO" = ( /obj/structure/cable{ d1 = 1; @@ -83143,36 +80270,43 @@ icon_state = "1-2"; tag = "" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/toxins/misc_lab) "dkP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/window/reinforced{ dir = 1 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/toxins/misc_lab) "dkQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, /area/crew_quarters/hor) "dkR" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/crew_quarters/hor) "dkS" = ( @@ -83182,21 +80316,32 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/chair/office/light, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/crew_quarters/hor) "dkT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair/office/light, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/crew_quarters/hor) "dkU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -83208,22 +80353,23 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Research Director's Office"; req_access = null; req_access_txt = "30" }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/crew_quarters/hor) "dkV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8 }, @@ -83233,35 +80379,44 @@ }, /area/medical/research) "dkW" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research) "dkX" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, /area/medical/research) "dkY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 + dir = 6 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitebluecorner" + dir = 8; + icon_state = "whiteblue" }, /area/medical/paramedic) "dkZ" = ( @@ -83281,46 +80436,45 @@ }, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "whitebluecorner" + icon_state = "whiteblue" }, /area/medical/paramedic) "dla" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel, /area/assembly/chargebay) "dlb" = ( /obj/machinery/hologram/holopad, /obj/effect/landmark/start{ name = "Roboticist" }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/turf/simulated/floor/plasteel, /area/assembly/chargebay) "dlc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay) +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/maintenance/apmaint) "dld" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "whitebluecorner" }, /area/medical/medbay) "dle" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -83331,7 +80485,7 @@ name = "Paramedic" }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + icon_state = "white" }, /area/medical/paramedic) "dlg" = ( @@ -83347,9 +80501,6 @@ }, /area/medical/genetics_cloning) "dlh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light, /obj/machinery/camera{ c_tag = "Medbay West Hallway"; @@ -83384,7 +80535,6 @@ }, /area/medical/medbay) "dll" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -83400,42 +80550,20 @@ icon_state = "whitepurplecorner" }, /area/medical/genetics_cloning) -"dln" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/medical/medbay) -"dlo" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" - }, -/area/medical/medbay) "dlp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/door_control{ - id = "medbayfoyer"; - name = "Medbay Front Doors"; - normaldoorcontrol = 1; - pixel_x = 25 +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitebluecorner" - }, -/area/medical/medbay) +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "dlq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -83473,7 +80601,9 @@ /turf/simulated/floor/plasteel, /area/engine/engine_smes) "dlu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -83493,6 +80623,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "dly" = ( @@ -83511,8 +80644,14 @@ /turf/simulated/wall, /area/medical/surgery) "dlA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + initialize_directions = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "redbluefull" }, @@ -83531,20 +80670,20 @@ }, /area/crew_quarters/fitness) "dlD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4; - icon_state = "whitebluecorner" + initialize_directions = 11 }, -/area/medical/medbay) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel, +/area/hallway/secondary/exit) "dlE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitebluecorner" @@ -83558,7 +80697,6 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "dlG" = ( @@ -83587,11 +80725,9 @@ }, /area/maintenance/gambling_den) "dlJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/maintenance/gambling_den) +/obj/effect/decal/cleanable/fungus, +/turf/simulated/wall, +/area/maintenance/apmaint) "dlK" = ( /obj/structure/table/wood, /turf/simulated/floor/plating, @@ -83599,35 +80735,29 @@ "dlL" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/barricade/wooden, -/turf/simulated/floor/plasteel, -/area/medical/research) -"dlM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"dlN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "dark" + icon_state = "white" }, -/area/toxins/explab) +/area/medical/research) +"dlM" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/maintenance/port) "dlO" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/engine, /area/toxins/explab) "dlP" = ( -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/toxins/explab) -"dlQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +/turf/simulated/floor/engine, /area/toxins/explab) "dlR" = ( /obj/machinery/door/firedoor, @@ -83635,7 +80765,11 @@ name = "Toxin Mixing"; req_access_txt = "47" }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dlS" = ( /turf/simulated/floor/plasteel{ @@ -83644,6 +80778,8 @@ }, /area/toxins/mixing) "dlT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurple" @@ -83665,7 +80801,13 @@ }, /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, /area/crew_quarters/hor) "dlW" = ( /obj/machinery/hologram/holopad, @@ -83675,8 +80817,7 @@ icon_state = "4-8" }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitegreen" + icon_state = "white" }, /area/medical/chemistry) "dlX" = ( @@ -83687,7 +80828,7 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/toxins/misc_lab) "dlY" = ( /obj/machinery/firealarm{ @@ -83696,7 +80837,10 @@ }, /obj/structure/closet/bombcloset, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dlZ" = ( /obj/structure/closet/bombcloset, @@ -83705,7 +80849,10 @@ pixel_y = 26 }, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dma" = ( /obj/structure/cable{ @@ -83715,8 +80862,7 @@ tag = "" }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" + icon_state = "white" }, /area/crew_quarters/hor) "dmb" = ( @@ -83731,7 +80877,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/reinforced, /obj/machinery/door_control{ id = "rdprivacy"; @@ -83739,51 +80884,35 @@ pixel_x = -6; pixel_y = -2 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/crew_quarters/hor) "dmc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/reinforced, /obj/item/folder/white, /obj/item/stamp/rd, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" + icon_state = "white" }, /area/crew_quarters/hor) "dmd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/toxins/misc_lab) -"dme" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "purplefull" - }, -/area/medical/research) "dmf" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) "dmg" = ( /turf/simulated/floor/greengrid, /area/assembly/chargebay) "dmh" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/radio/intercom{ dir = 4; pixel_x = 28 @@ -83806,67 +80935,62 @@ }, /area/medical/medbay) "dmk" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" + dir = 4; + icon_state = "whiteblue" }, /area/medical/paramedic) "dml" = ( -/turf/simulated/wall/r_wall, -/area/medical/genetics) -"dmm" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/medical/genetics) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/chapel/office) "dmn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/maintenance/aft) -"dmo" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/medical/genetics) "dmp" = ( /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/power/apc{ dir = 8; name = "west bump"; pixel_x = -24 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitebluecorner" }, /area/medical/medbay) "dmq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/wall/r_wall, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dmr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -83883,7 +81007,6 @@ /turf/simulated/floor/plating, /area/medical/cmo) "dmv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 8 }, @@ -83912,7 +81035,7 @@ /obj/structure/girder, /obj/effect/decal/cleanable/fungus, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dmz" = ( /obj/structure/sign/nosmoking_2{ pixel_y = 32 @@ -83924,9 +81047,9 @@ }, /area/medical/surgeryobs) "dmA" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -83938,7 +81061,7 @@ }, /area/medical/surgeryobs) "dmC" = ( -/obj/item/twohanded/required/kirbyplants, +/obj/machinery/vending/medical, /obj/machinery/light{ dir = 1; on = 1 @@ -83955,20 +81078,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, /area/maintenance/starboard) -"dmE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/construction) "dmF" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, @@ -83987,10 +81102,8 @@ /turf/simulated/floor/plating, /area/hallway/secondary/construction) "dmI" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plating, /area/hallway/secondary/construction) @@ -84070,7 +81183,6 @@ /turf/simulated/floor/plating, /area/maintenance/gambling_den) "dmQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -84082,7 +81194,9 @@ pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dmS" = ( /obj/machinery/light/small{ @@ -84106,7 +81220,9 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dmW" = ( /obj/structure/rack, @@ -84114,7 +81230,9 @@ /obj/item/storage/belt/utility, /obj/item/reagent_containers/glass/beaker/large, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dmX" = ( /obj/machinery/light/small{ @@ -84122,23 +81240,26 @@ }, /obj/machinery/mecha_part_fabricator, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dmY" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/metal, /obj/item/stack/sheet/glass, /obj/item/flash, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dmZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dna" = ( /obj/structure/cable{ d1 = 1; @@ -84146,97 +81267,75 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) -"dnb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/toxins/explab) +/area/maintenance/port) "dnc" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/engine, /area/toxins/explab) "dnd" = ( /mob/living/simple_animal/pet/dog/pug, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, +/turf/simulated/floor/engine, /area/toxins/explab) "dne" = ( /obj/effect/landmark{ name = "revenantspawn" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, +/turf/simulated/floor/engine, /area/toxins/explab) "dnf" = ( /obj/machinery/r_n_d/experimentor, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, +/turf/simulated/floor/engine, /area/toxins/explab) "dng" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, +/turf/simulated/floor/engine, /area/toxins/explab) "dnh" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, +/turf/simulated/floor/engine, /area/toxins/explab) "dni" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/toxins/misc_lab) "dnj" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/mixing) "dnk" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, /area/crew_quarters/hor) "dnl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 8 }, @@ -84244,14 +81343,13 @@ pixel_x = -32 }, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/toxins/misc_lab) "dnm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/toxins/misc_lab) "dnn" = ( /obj/machinery/ai_status_display{ @@ -84259,16 +81357,9 @@ }, /obj/machinery/computer/card/minor/rd, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/crew_quarters/hor) -"dno" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" + dir = 4; + icon_state = "whitepurple" }, /area/crew_quarters/hor) "dnp" = ( @@ -84283,10 +81374,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/computer/aifixer, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -84299,7 +81388,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair/office/light{ dir = 1; pixel_y = 3 @@ -84308,16 +81396,23 @@ name = "Research Director" }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/crew_quarters/hor) "dnr" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/closet/secure_closet/scientist, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dns" = ( /obj/effect/spawner/window/reinforced, @@ -84325,43 +81420,12 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/door/poddoor/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; +/obj/machinery/door/poddoor/shutters/preopen{ id_tag = "rdprivacy"; - name = "Research Director Office Shutters"; - opacity = 0 + name = "Research Director Office Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/hor) -"dnt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/medical/research) -"dnv" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" - }, -/area/medical/research) -"dnw" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/assembly/chargebay) "dnx" = ( /obj/structure/cable{ d1 = 1; @@ -84374,14 +81438,13 @@ /area/assembly/chargebay) "dny" = ( /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/turf/simulated/floor/plasteel, /area/assembly/chargebay) "dnz" = ( /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) "dnA" = ( /obj/machinery/computer/mech_bay_power_console, @@ -84400,25 +81463,21 @@ }, /obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) "dnC" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dnD" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dnE" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "purplecorner" }, @@ -84429,7 +81488,15 @@ name = "Mech Bay"; req_access_txt = "29" }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) "dnG" = ( /obj/structure/extinguisher_cabinet{ @@ -84466,13 +81533,12 @@ network = list("Medical","SS13") }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" + icon_state = "white" }, /area/medical/paramedic) "dnK" = ( /obj/machinery/status_display, -/turf/simulated/wall/r_wall, +/turf/simulated/wall, /area/medical/genetics) "dnL" = ( /obj/structure/table/reinforced, @@ -84490,20 +81556,9 @@ }, /area/medical/genetics) "dnM" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/medical/glass{ id_tag = "GeneticsDoor"; name = "Genetics"; @@ -84520,9 +81575,7 @@ }, /obj/machinery/computer/scan_consolenew, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/genetics) "dnO" = ( /obj/item/twohanded/required/kirbyplants, @@ -84531,20 +81584,7 @@ icon_state = "whiteblue" }, /area/medical/genetics) -"dnP" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/genetics) "dnQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sink{ dir = 4; pixel_x = 12 @@ -84565,15 +81605,7 @@ dir = 8 }, /mob/living/carbon/human/monkey, -/turf/simulated/floor/plasteel, -/area/medical/genetics) -"dnS" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/grass, /area/medical/genetics) "dnT" = ( /obj/effect/spawner/window/reinforced, @@ -84588,7 +81620,9 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/medical/cmo) "dnV" = ( /obj/structure/table/glass, @@ -84626,7 +81660,9 @@ pixel_y = 28 }, /obj/item/clothing/glasses/hud/health, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/medical/cmo) "dnZ" = ( /obj/structure/cable{ @@ -84641,32 +81677,9 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" - }, -/area/medical/medbay) -"doa" = ( -/obj/machinery/dna_scannernew, -/obj/machinery/firealarm{ - pixel_y = 24 - }, -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/genetics) -"dob" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; @@ -84676,6 +81689,14 @@ icon_state = "white" }, /area/medical/medbay) +"doa" = ( +/obj/machinery/dna_scannernew, +/obj/machinery/firealarm{ + pixel_y = 24 + }, +/obj/effect/decal/warning_stripes/southeast, +/turf/simulated/floor/plasteel, +/area/medical/genetics) "doe" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -84732,6 +81753,7 @@ }, /area/medical/surgeryobs) "doi" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; initialize_directions = 11 @@ -84744,7 +81766,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -84789,7 +81810,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -84810,7 +81836,6 @@ }, /area/hallway/secondary/construction) "doq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; @@ -84818,10 +81843,8 @@ }, /area/maintenance/starboard) "dor" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /obj/effect/landmark{ name = "xeno_spawn"; @@ -84852,22 +81875,18 @@ /obj/structure/computerframe, /obj/effect/decal/warning_stripes/southwest, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/medical/research) -"dow" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ - icon_state = "wood" + icon_state = "white" }, -/area/maintenance/gambling_den) +/area/medical/research) "dox" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/glass, /obj/item/stock_parts/micro_laser, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "doy" = ( /obj/machinery/light_switch{ @@ -84875,13 +81894,23 @@ pixel_y = 24 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) "doz" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, /obj/item/pen, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "doA" = ( /obj/structure/cable{ @@ -84890,7 +81919,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark{ name = "blobstart" }, @@ -84898,31 +81926,30 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "doB" = ( /obj/machinery/light, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, +/turf/simulated/floor/engine, /area/toxins/explab) "doC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitegreen" + icon_state = "white" }, /area/medical/chemistry) "doD" = ( /obj/machinery/light, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, +/turf/simulated/floor/engine, /area/toxins/explab) "doE" = ( /obj/structure/cable{ @@ -84947,23 +81974,6 @@ icon_state = "whitebluecorner" }, /area/medical/genetics_cloning) -"doG" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "purplefull" - }, -/area/toxins/mixing) -"doH" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/toxins/mixing) "doI" = ( /obj/item/radio/intercom{ dir = 4; @@ -84972,7 +81982,14 @@ pixel_y = 22 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/closet/secure_closet/scientist, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "doJ" = ( /obj/structure/table/reinforced, @@ -84987,7 +82004,10 @@ /obj/item/clipboard, /obj/item/toy/figure/crew/rd, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/crew_quarters/hor) "doK" = ( /obj/structure/cable{ @@ -84998,7 +82018,9 @@ }, /obj/machinery/computer/mecha, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/crew_quarters/hor) "doL" = ( /obj/structure/cable{ @@ -85025,12 +82047,12 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, /area/crew_quarters/hor) "doN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, @@ -85040,20 +82062,11 @@ dir = 8 }, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, -/area/toxins/mixing) -"doP" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + dir = 4; + icon_state = "whitepurplecorner" }, -/area/medical/research) +/area/toxins/mixing) "doQ" = ( /obj/machinery/light/small, /obj/machinery/camera{ @@ -85072,12 +82085,16 @@ }, /obj/effect/decal/warning_stripes/east, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) "doS" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "doT" = ( @@ -85085,15 +82102,16 @@ pixel_x = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) "doU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/recharge_station, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) "doV" = ( /obj/structure/cable{ @@ -85102,9 +82120,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/landmark/start{ name = "Cyborg" }, @@ -85112,40 +82127,29 @@ /turf/simulated/floor/plasteel, /area/assembly/chargebay) "doW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /obj/effect/landmark/start{ name = "Cyborg" }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/turf/simulated/floor/plasteel, /area/assembly/chargebay) "doX" = ( /obj/machinery/mech_bay_recharge_port{ dir = 8 }, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plating, +/turf/simulated/floor/greengrid, /area/assembly/chargebay) "doY" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, /area/hallway/primary/aft) "doZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -85157,10 +82161,6 @@ name = "Genetics Junction"; sortType = 13 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "purplecorner" }, @@ -85171,7 +82171,9 @@ pixel_y = -22 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) "dpc" = ( /obj/machinery/door/firedoor, @@ -85180,14 +82182,16 @@ req_access_txt = "29" }, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) "dpd" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -85195,19 +82199,18 @@ }, /area/medical/genetics) "dpe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -85219,7 +82222,7 @@ }, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ - icon_state = "whiteblue" + icon_state = "white" }, /area/medical/paramedic) "dpg" = ( @@ -85229,19 +82232,11 @@ pixel_x = 24 }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" + dir = 6; + icon_state = "whiteblue" }, /area/medical/paramedic) -"dph" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/medical/genetics) "dpi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/machinery/camera{ c_tag = "Medbay Genetics"; @@ -85254,9 +82249,6 @@ }, /area/medical/genetics) "dpj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/chair/office/light{ dir = 8 }, @@ -85269,43 +82261,25 @@ }, /area/medical/genetics) "dpk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whiteblue" }, /area/medical/genetics) "dpl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitepurplecorner" }, /area/medical/genetics) "dpm" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/genetics) "dpn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -85318,33 +82292,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/grass, /area/medical/genetics) -"dpp" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/medical/genetics) -"dpq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/medical/medbay) "dpr" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -85357,9 +82308,13 @@ icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -85372,10 +82327,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -85393,7 +82350,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/medical/cmo) "dpv" = ( /obj/structure/cable{ @@ -85409,7 +82371,10 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -85423,6 +82388,13 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10; + initialize_directions = 10 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" @@ -85435,9 +82407,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" @@ -85450,10 +82419,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/turf/simulated/floor/plasteel{ + icon_state = "dark" }, -/turf/simulated/floor/plasteel, /area/medical/cmo) "dpz" = ( /obj/structure/cable{ @@ -85480,7 +82448,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/medical/cmo) "dpA" = ( /obj/structure/cable{ @@ -85489,10 +82462,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitebluecorner" @@ -85511,25 +82480,15 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/medbay) -"dpC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" - }, -/area/medical/medbay) "dpF" = ( /obj/structure/cable{ d1 = 1; @@ -85561,6 +82520,7 @@ }, /area/medical/surgeryobs) "dpI" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -85568,7 +82528,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -85653,7 +82612,10 @@ department = "Research Director's Office" }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/crew_quarters/hor) "dpR" = ( /obj/structure/chair/wood{ @@ -85671,7 +82633,9 @@ /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dpU" = ( /turf/simulated/floor/greengrid, @@ -85683,16 +82647,17 @@ "dpW" = ( /obj/machinery/recharge_station, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dpX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dpY" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 @@ -85705,8 +82670,8 @@ pixel_x = -32 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "escape" + dir = 1; + icon_state = "whitepurplecorner" }, /area/toxins/mixing) "dpZ" = ( @@ -85722,19 +82687,11 @@ /area/toxins/xenobiology) "dqa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/mixing) -"dqb" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/toxins/mixing) "dqc" = ( /obj/machinery/light, /obj/machinery/status_display{ @@ -85742,21 +82699,10 @@ }, /obj/machinery/computer/robotics, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/crew_quarters/hor) -"dqd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/toxins/misc_lab) -"dqe" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plating, -/area/toxins/misc_lab) "dqf" = ( /turf/simulated/wall, /area/crew_quarters/hor) @@ -85772,7 +82718,10 @@ }, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dqh" = ( /obj/effect/spawner/window/reinforced, @@ -85780,14 +82729,10 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "rdprivacy"; - name = "Research Director Office Shutters"; - opacity = 0 + name = "Research Director Office Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/hor) @@ -85811,7 +82756,9 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) "dqk" = ( /obj/structure/cable{ @@ -85827,19 +82774,16 @@ /area/assembly/robotics) "dqm" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "robodesk"; - name = "Robotics Desk Shutters"; - opacity = 0 + name = "Robotics Desk Shutters" }, /turf/simulated/floor/plating, /area/assembly/robotics) "dqn" = ( /obj/structure/sign/science, -/turf/simulated/wall, +/turf/simulated/wall/r_wall, /area/assembly/robotics) "dqo" = ( /obj/structure/cable{ @@ -85855,9 +82799,6 @@ /turf/simulated/wall/r_wall, /area/assembly/robotics) "dqq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Research West Hallway"; network = list("Research","SS13") @@ -85871,7 +82812,7 @@ /obj/structure/table/glass, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/machinery/light{ dir = 8 @@ -85882,6 +82823,9 @@ network = list("Medical","SS13") }, /obj/item/storage/box/disks, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" @@ -85894,29 +82838,24 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/genetics) "dqt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/maintenance/aft) "dqu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Genetics Desk Maintenance"; req_access_txt = "9" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/maintenance/aft) "dqv" = ( @@ -85937,43 +82876,27 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/command/glass{ name = "Chief Medical Officer"; req_access_txt = "40" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/medical/cmo) "dqw" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/medical/genetics) "dqx" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -85981,30 +82904,7 @@ icon_state = "whiteblue" }, /area/medical/genetics) -"dqy" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/genetics) "dqz" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -86016,21 +82916,19 @@ }, /area/medical/genetics) "dqA" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/hologram/holopad, /obj/effect/landmark/start{ name = "Geneticist" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -86041,7 +82939,7 @@ icon_state = "pipe-c" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -86056,62 +82954,26 @@ name = "Monkey Pen"; req_access_txt = "9" }, -/turf/simulated/floor/plasteel, -/area/medical/genetics) -"dqD" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 4; - icon_state = "2-4"; - tag = "" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/grass, /area/medical/genetics) "dqE" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" }, /area/medical/medbay) "dqF" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + icon_state = "white" }, /area/medical/medbay) "dqG" = ( @@ -86121,7 +82983,9 @@ /area/medical/cmo) "dqH" = ( /obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/medical/cmo) "dqI" = ( /obj/structure/cable{ @@ -86130,27 +82994,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "cmo" - }, -/area/medical/cmo) -"dqJ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "cmo" - }, -/area/medical/cmo) -"dqK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" @@ -86220,7 +83063,6 @@ }, /area/hallway/secondary/construction) "dqU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -86249,8 +83091,14 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + icon_state = "white" }, /area/medical/medbay) "dqX" = ( @@ -86309,7 +83157,7 @@ "drf" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plating, /area/maintenance/gambling_den) @@ -86318,15 +83166,17 @@ pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "drh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/mech_bay_recharge_floor, /area/medical/research) "dri" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 @@ -86337,15 +83187,6 @@ icon_state = "neutralfull" }, /area/medical/research) -"drj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/medical/research) "drk" = ( /obj/structure/chair/office/light, /obj/effect/decal/warning_stripes/south, @@ -86367,26 +83208,25 @@ pixel_y = -6 }, /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, /area/toxins/mixing) "drn" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dro" = ( /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "drp" = ( /obj/structure/cable{ d1 = 2; @@ -86394,59 +83234,32 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) -"drq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/effect/spawner/lootdrop/maintenance, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "drr" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 4 - }, +/obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/pump, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "arrival" + dir = 1; + icon_state = "whitepurplecorner" }, /area/toxins/mixing) "drs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/grille{ density = 0; icon_state = "brokengrille" }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "drt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" - }, -/area/toxins/mixing) -"dru" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 - }, -/obj/machinery/meter, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" + icon_state = "whitepurplefull" }, /area/toxins/mixing) "drv" = ( @@ -86466,14 +83279,17 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ name = "Research Director's Quarters"; req_access = null; req_access_txt = "30" }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/crew_quarters/hor) "drw" = ( /obj/machinery/atmospherics/unary/portables_connector{ @@ -86483,20 +83299,26 @@ pixel_x = 32 }, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "drx" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/toxins/misc_lab) "dry" = ( /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/toxins/misc_lab) "drz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 4; + dir = 1; icon_state = "whitepurplecorner" }, /area/crew_quarters/hor) @@ -86507,14 +83329,20 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" + icon_state = "whitepurple" }, /area/crew_quarters/hor) "drB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -86522,6 +83350,9 @@ /area/crew_quarters/hor) "drC" = ( /obj/structure/dresser, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurplecorner" @@ -86552,34 +83383,18 @@ pixel_y = -4 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/chargebay) -"drG" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/medical{ - name = "Genetics Office"; - req_access_txt = "9" - }, -/turf/simulated/floor/plasteel, -/area/medical/genetics) "drH" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/medical/genetics) "drI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_x = -32 @@ -86592,12 +83407,9 @@ /area/medical/research) "drJ" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - density = 0; - icon_state = "shutter0"; +/obj/machinery/door/poddoor/shutters/preopen{ id_tag = "robodesk"; - name = "Robotics Desk Shutters"; - opacity = 0 + name = "Robotics Desk Shutters" }, /turf/simulated/floor/plating, /area/assembly/robotics) @@ -86606,12 +83418,12 @@ /obj/item/paper_bin, /obj/item/pen, /turf/simulated/floor/plasteel{ + dir = 8; icon_state = "purplefull" }, /area/hallway/primary/aft) "drL" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/science{ pixel_x = -32; pixel_y = 32 @@ -86623,7 +83435,6 @@ /area/hallway/primary/aft) "drM" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/sign/science{ pixel_x = 32; pixel_y = 32 @@ -86633,23 +83444,22 @@ }, /area/hallway/primary/aft) "drN" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research) "drO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/structure/chair/office/light{ dir = 8 }, @@ -86665,19 +83475,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/genetics) -"drQ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -86690,13 +83487,10 @@ /area/medical/genetics) "drS" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 8; - icon_state = "shutter0"; id_tag = "geneticsdesk"; - name = "Genetics Desk Shutters"; - opacity = 0 + name = "Genetics Desk Shutters" }, /turf/simulated/floor/plating, /area/medical/genetics) @@ -86722,10 +83516,6 @@ }, /area/medical/genetics) "drV" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -86757,29 +83547,16 @@ dir = 8 }, /mob/living/carbon/human/monkey, -/turf/simulated/floor/plasteel, -/area/medical/genetics) -"dsa" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/cable, -/turf/simulated/floor/plating, +/turf/simulated/floor/grass, /area/medical/genetics) "dsb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "whitepurplecorner" + icon_state = "whitebluecorner" }, /area/medical/medbay) "dsc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/camera{ c_tag = "Medbay South Central Hall"; dir = 8; @@ -86795,13 +83572,15 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/structure/bed/dogbed{ name = "kitty basket" }, /mob/living/simple_animal/pet/cat/Runtime, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/medical/cmo) "dse" = ( /obj/structure/cable{ @@ -86811,7 +83590,6 @@ tag = "" }, /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" @@ -86819,6 +83597,8 @@ /area/medical/cmo) "dsf" = ( /obj/structure/chair/office/light, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" @@ -86831,7 +83611,6 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/chair/office/light, /turf/simulated/floor/plasteel{ dir = 8; @@ -86857,10 +83636,11 @@ dir = 8; network = list("Medical","SS13") }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/medical/cmo) "dsi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/radio/intercom{ dir = 4; pixel_x = 28 @@ -86879,7 +83659,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small{ dir = 8 }, @@ -86912,44 +83691,34 @@ /turf/simulated/floor/plating, /area/medical/research) "dso" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dsp" = ( /obj/machinery/mech_bay_recharge_port{ dir = 1 }, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plating, +/turf/simulated/floor/greengrid, /area/medical/research) "dsq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dsr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dss" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random_spawners/grille_maybe, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dst" = ( /obj/structure/cable{ d1 = 1; @@ -86957,17 +83726,13 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dsu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -86976,8 +83741,13 @@ /area/medical/research) "dsv" = ( /obj/structure/closet/secure_closet/RD, -/obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, /area/crew_quarters/hor) "dsw" = ( /obj/structure/cable{ @@ -86987,19 +83757,14 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/toxins/mixing) -"dsx" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/toxins/mixing) "dsy" = ( /obj/structure/cable{ d1 = 4; @@ -87007,14 +83772,15 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/mixing) "dsz" = ( -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/toxins/misc_lab) "dsA" = ( /obj/machinery/atmospherics/unary/portables_connector{ @@ -87022,11 +83788,14 @@ }, /obj/machinery/portable_atmospherics/canister, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dsB" = ( /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/toxins/misc_lab) "dsC" = ( /obj/structure/cable{ @@ -87037,16 +83806,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/engine, /area/toxins/misc_lab) -"dsD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/crew_quarters/hor) "dsE" = ( /obj/structure/cable{ d1 = 1; @@ -87054,20 +83815,14 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/landmark/start{ name = "Research Director" }, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "whitepurplefull" }, /area/crew_quarters/hor) "dsF" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -87098,11 +83853,12 @@ name = "Robotics Lab"; req_access_txt = "29" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dsI" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -87132,7 +83888,9 @@ pixel_y = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dsK" = ( /obj/structure/table/reinforced, @@ -87142,12 +83900,20 @@ /obj/item/assembly/prox_sensor, /obj/item/assembly/prox_sensor, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/obj/item/healthanalyzer, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dsL" = ( /obj/machinery/mecha_part_fabricator, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dsM" = ( /obj/structure/rack, @@ -87161,31 +83927,20 @@ /obj/item/circuitboard/mecha/ripley/main, /obj/item/circuitboard/mecha/ripley/peripherals, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dsN" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 8; - icon_state = "shutter0"; id_tag = "geneticsdesk"; - name = "Genetics Desk Shutters"; - opacity = 0 + name = "Genetics Desk Shutters" }, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/medical/genetics) "dsO" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/filingcabinet/chestdrawer, /obj/structure/noticeboard{ pixel_y = -32 @@ -87208,13 +83963,6 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -87237,7 +83985,7 @@ /area/medical/genetics) "dsS" = ( /obj/machinery/ai_status_display, -/turf/simulated/wall/r_wall, +/turf/simulated/wall, /area/medical/genetics) "dsT" = ( /obj/structure/table/reinforced, @@ -87253,18 +84001,9 @@ }, /area/medical/genetics) "dsU" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ name = "Genetics Office"; @@ -87276,15 +84015,13 @@ /obj/machinery/light, /obj/machinery/computer/scan_consolenew, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/genetics) "dsW" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -87320,17 +84057,13 @@ pixel_y = -30 }, /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, +/turf/simulated/floor/plasteel, /area/medical/genetics) "dta" = ( /obj/effect/spawner/window/reinforced, -/obj/structure/cable, /turf/simulated/floor/plating, /area/medical/genetics) "dtb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/electricshock{ pixel_x = -32; pixel_y = -32 @@ -87341,19 +84074,18 @@ }, /area/medical/medbay) "dtc" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -87362,7 +84094,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" @@ -87372,7 +84103,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -24 }, /turf/simulated/floor/plasteel, /area/gateway) @@ -87395,10 +84126,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" @@ -87417,11 +84144,10 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table/glass, /obj/item/paper_bin, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" @@ -87439,10 +84165,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/table/glass, /obj/item/folder/white, /obj/item/folder/blue{ @@ -87463,7 +84185,9 @@ }, /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/medical/cmo) "dtk" = ( /obj/effect/spawner/window/reinforced, @@ -87521,6 +84245,7 @@ /turf/simulated/wall/r_wall, /area/medical/research) "dtq" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/hologram/holopad, /obj/structure/cable{ d1 = 1; @@ -87529,7 +84254,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkblue" @@ -87571,10 +84295,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plating, /area/maintenance/starboard) "dtv" = ( @@ -87584,36 +84304,19 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; d2 = 8; icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /area/maintenance/starboard) -"dtw" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "dtx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -87629,9 +84332,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 1; @@ -87650,43 +84350,33 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /area/maintenance/starboard) -"dtA" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "dtB" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/hallway/secondary/construction) "dtC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + icon_state = "white" }, /area/medical/medbay) "dtD" = ( @@ -87707,7 +84397,7 @@ pixel_y = -32 }, /turf/simulated/floor/plasteel, -/area/maintenance/auxsolarstarboard) +/area/maintenance/starboardsolar) "dtE" = ( /obj/structure/cable{ d1 = 2; @@ -87789,9 +84479,10 @@ /turf/simulated/floor/plating, /area/medical/research) "dtN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dtO" = ( /obj/structure/rack, @@ -87800,55 +84491,45 @@ /turf/simulated/floor/plating, /area/medical/research) "dtP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dtQ" = ( /obj/machinery/light/small, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dtR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" + icon_state = "white" }, /area/toxins/mixing) "dtS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Research Hallway"; network = list("Research","SS13") }, /obj/structure/closet/walllocker/emerglocker/north, /turf/simulated/floor/plasteel{ - dir = 1; + dir = 4; icon_state = "whitepurplecorner" }, /area/medical/research) -"dtT" = ( -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" - }, -/area/toxins/mixing) "dtU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/structure/grille{ density = 0; icon_state = "brokengrille" }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dtV" = ( /obj/structure/cable{ d1 = 1; @@ -87856,11 +84537,15 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "whitepurplefull" }, /area/toxins/mixing) "dtW" = ( @@ -87868,15 +84553,20 @@ pixel_x = 32 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/structure/closet/secure_closet/scientist, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurple" + }, /area/toxins/mixing) "dtX" = ( /obj/machinery/light/small, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/toxins/misc_lab) "dtY" = ( /turf/simulated/floor/plasteel{ + dir = 8; icon_state = "whitepurplecorner" }, /area/crew_quarters/hor) @@ -87890,7 +84580,8 @@ pixel_y = -30 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + dir = 1; + icon_state = "whitepurple" }, /area/crew_quarters/hor) "dua" = ( @@ -87920,21 +84611,10 @@ /area/crew_quarters/hor) "duc" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplecorner" }, /area/medical/research) -"dud" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/assembly/robotics) "due" = ( /obj/structure/cable{ d1 = 1; @@ -87943,7 +84623,9 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "duf" = ( /obj/structure/table/reinforced, @@ -87959,18 +84641,18 @@ pixel_x = 24; pixel_y = 34 }, -/turf/simulated/floor/plasteel, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/obj/item/flash, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dug" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/item/robot_parts/robot_suit, +/turf/simulated/floor/plasteel, /area/assembly/robotics) "duh" = ( /obj/structure/table/reinforced, @@ -87980,24 +84662,20 @@ req_access_txt = "9" }, /obj/machinery/door/window/westleft, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 8; - icon_state = "shutter0"; id_tag = "geneticsdesk"; - name = "Genetics Desk Shutters"; - opacity = 0 + name = "Genetics Desk Shutters" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ + dir = 8; icon_state = "purplefull" }, /area/medical/genetics) "dui" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/obj/effect/decal/warning_stripes/yellow/hollow, +/turf/simulated/floor/plasteel, /area/assembly/robotics) "duj" = ( /obj/structure/table/reinforced, @@ -88015,43 +84693,41 @@ /obj/item/wrench, /obj/item/clothing/glasses/welding, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/item/clothing/glasses/hud/diagnostic{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/item/clothing/glasses/hud/diagnostic{ + pixel_x = 2; + pixel_y = 5 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "duk" = ( /turf/simulated/wall, /area/medical/morgue) "dul" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/medical/cmo) "dum" = ( /obj/structure/sign/nosmoking_2, /turf/simulated/wall, /area/medical/morgue) -"dun" = ( -/turf/simulated/wall/r_wall, -/area/medical/morgue) -"duo" = ( -/obj/structure/sign/nosmoking_2, -/turf/simulated/wall/r_wall, -/area/medical/morgue) -"dup" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/medical/morgue) "duq" = ( /obj/structure/cable{ d1 = 1; @@ -88064,6 +84740,7 @@ name = "Medbay Maintenance"; req_access_txt = "5" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/medical/morgue) "dur" = ( @@ -88073,12 +84750,16 @@ }, /obj/item/clipboard, /obj/item/toy/figure/crew/cmo, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/medical/cmo) "dus" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -88092,8 +84773,13 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -88101,13 +84787,15 @@ }, /area/medical/cmo) "duu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/chair/office/light{ dir = 1 }, /obj/effect/landmark/start{ name = "Chief Medical Officer" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" @@ -88118,13 +84806,14 @@ pixel_x = 32 }, /obj/machinery/computer/card/minor/cmo, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/medical/cmo) "duw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /obj/machinery/camera{ c_tag = "Mini Satellite Access"; dir = 4; @@ -88136,12 +84825,9 @@ }, /area/medical/medbay) "dux" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "whitebluecorner" }, /area/medical/medbay) "duy" = ( @@ -88154,7 +84840,7 @@ }, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -88201,7 +84887,7 @@ "duE" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 23 + pixel_x = 24 }, /obj/machinery/light{ dir = 4 @@ -88212,9 +84898,6 @@ }, /area/medical/surgery2) "duG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/status_display{ pixel_y = -32 }, @@ -88233,6 +84916,7 @@ dir = 8; initialize_directions = 11 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "duJ" = ( @@ -88262,7 +84946,9 @@ /turf/simulated/floor/plating, /area/maintenance/starboard) "duM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "duN" = ( @@ -88272,7 +84958,10 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -88290,19 +84979,10 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, /area/maintenance/auxsolarstarboard) "duP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/machinery/camera{ c_tag = "Engine Room South"; dir = 1; @@ -88332,7 +85012,9 @@ /obj/item/clipboard, /obj/item/folder/white, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "duT" = ( /obj/structure/table/wood/poker, @@ -88350,7 +85032,7 @@ /obj/machinery/light/small, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plating, /area/medical/research) @@ -88373,7 +85055,10 @@ }, /obj/item/assembly/prox_sensor, /obj/effect/decal/warning_stripes/northeastcorner, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "duX" = ( /obj/structure/table, @@ -88384,7 +85069,7 @@ /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/toxins/misc_lab) "duZ" = ( /obj/structure/cable{ @@ -88393,14 +85078,13 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Robotics Maintenance"; req_access_txt = "29" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/assembly/robotics) +/area/maintenance/fpmaint2) "dva" = ( /obj/structure/cable{ d1 = 1; @@ -88409,6 +85093,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -88418,13 +85103,15 @@ dir = 6 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/mixing) "dvc" = ( /obj/machinery/suit_storage_unit/standard_unit, -/obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/crew_quarters/hor) "dvd" = ( /obj/structure/sign/fire, @@ -88435,8 +85122,7 @@ dir = 10 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/mixing) "dvf" = ( @@ -88445,21 +85131,14 @@ "dvg" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, -/obj/machinery/door/poddoor/shutters{ - density = 0; +/obj/machinery/door/poddoor/shutters/preopen{ dir = 2; - icon_state = "shutter0"; id_tag = "rdprivacy"; - name = "Research Director Office Shutters"; - opacity = 0 + name = "Research Director Office Shutters" }, /turf/simulated/floor/plating, /area/crew_quarters/hor) "dvh" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/machinery/light{ dir = 8 }, @@ -88472,27 +85151,14 @@ icon_state = "whitepurplecorner" }, /area/medical/research) -"dvi" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/research) "dvj" = ( /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -88533,41 +85199,28 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/turf/simulated/floor/plasteel, /area/assembly/robotics) "dvo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/assembly/robotics) -"dvp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/effect/landmark/start{ name = "Roboticist" }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/turf/simulated/floor/plasteel, +/area/assembly/robotics) +"dvp" = ( +/obj/structure/window/reinforced/polarized, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/computer/rdconsole/robotics, +/turf/simulated/floor/plasteel, /area/assembly/robotics) "dvq" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/obj/structure/window/reinforced/polarized, +/obj/effect/decal/warning_stripes/southeast, +/obj/structure/filingcabinet/chestdrawer, +/turf/simulated/floor/plasteel, /area/assembly/robotics) "dvr" = ( /obj/structure/chair/office/light{ @@ -88598,13 +85251,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/medical/morgue) "dvv" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light/small{ dir = 1 }, @@ -88637,6 +85289,7 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plating, /area/medical/morgue) "dvz" = ( @@ -88657,7 +85310,6 @@ /turf/simulated/floor/plasteel, /area/medical/morgue) "dvC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small{ dir = 1 }, @@ -88671,6 +85323,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/medical/morgue) "dvE" = ( @@ -88690,10 +85343,11 @@ /obj/machinery/photocopier/faxmachine{ department = "Chief Medical Officer's Office" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/medical/cmo) "dvG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" @@ -88706,13 +85360,14 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" }, /area/medical/cmo) "dvI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light_switch{ pixel_x = 26; pixel_y = -26 @@ -88735,7 +85390,9 @@ name = "Chief Medical Officer Requests Console"; pixel_x = 30 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, /area/medical/cmo) "dvK" = ( /obj/machinery/door/firedoor, @@ -88788,10 +85445,10 @@ /turf/simulated/floor/plating, /area/medical/research) "dvQ" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "darkblue" @@ -88823,7 +85480,7 @@ dir = 10; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dvW" = ( /obj/structure/cable{ d1 = 1; @@ -88831,19 +85488,17 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dvX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/closet, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dvY" = ( /obj/structure/table/reinforced, /obj/machinery/requests_console{ @@ -88867,10 +85522,12 @@ pixel_x = 5 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dvZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/reinforced, /obj/item/assembly/timer{ pixel_x = 5; @@ -88887,23 +85544,7 @@ /obj/item/assembly/timer, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/toxins/mixing) -"dwa" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/toxins/mixing) "dwb" = ( @@ -88911,7 +85552,7 @@ dir = 8 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/mixing) "dwc" = ( @@ -88919,7 +85560,9 @@ dir = 8 }, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dwd" = ( /obj/structure/cable{ @@ -88940,22 +85583,16 @@ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/mixing) "dwf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/structure/chair/office/light{ dir = 8 }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/mixing) "dwg" = ( @@ -88963,7 +85600,9 @@ dir = 8 }, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dwh" = ( /obj/structure/filingcabinet/chestdrawer, @@ -88978,38 +85617,27 @@ /turf/simulated/wall/r_wall, /area/toxins/server) "dwj" = ( -/obj/structure/table, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, -/obj/item/clipboard, -/obj/item/wrench, +/obj/machinery/computer/rdservercontrol, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/toxins/server) "dwk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/toxins/server) "dwl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/unary/thermomachine/freezer/on/server, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/toxins/server) "dwm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, /area/toxins/server) @@ -89026,12 +85654,9 @@ req_access_txt = "29" }, /obj/machinery/door/window/eastleft, -/obj/machinery/door/poddoor/shutters{ - density = 0; - icon_state = "shutter0"; +/obj/machinery/door/poddoor/shutters/preopen{ id_tag = "robodesk"; - name = "Robotics Desk Shutters"; - opacity = 0 + name = "Robotics Desk Shutters" }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -89055,9 +85680,6 @@ }, /area/medical/medbay) "dwq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/stack/cable_coil/random, /obj/item/flash, @@ -89067,7 +85689,11 @@ pixel_y = 22 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/item/robotanalyzer, +/obj/item/mmi/robotic_brain, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dwr" = ( /obj/structure/cable{ @@ -89076,27 +85702,24 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/assembly/robotics) "dws" = ( -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/turf/simulated/floor/plasteel, /area/assembly/robotics) "dwt" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -89104,14 +85727,13 @@ /area/hallway/primary/aft) "dwu" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/camera{ c_tag = "Mining Dock External"; dir = 8 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -89137,13 +85759,6 @@ icon_state = "neutralfull" }, /area/medical/morgue) -"dwy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/medical/morgue) "dwz" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -89151,13 +85766,11 @@ }, /area/medical/morgue) "dwA" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -89174,7 +85787,6 @@ }, /area/medical/morgue) "dwD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/medical/morgue) @@ -89187,6 +85799,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/medical/morgue) "dwF" = ( @@ -89199,12 +85812,11 @@ /turf/simulated/wall, /area/medical/cmo) "dwH" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/medical/cmo) "dwI" = ( @@ -89222,24 +85834,24 @@ name = "CMO's Office"; req_access_txt = "40" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/cmo) "dwJ" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/medical/cmo) "dwK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/machinery/light{ dir = 8 @@ -89295,6 +85907,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -89405,11 +86018,15 @@ pixel_y = 26 }, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dxc" = ( /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dxd" = ( /obj/structure/table/reinforced, @@ -89424,12 +86041,18 @@ /obj/structure/disaster_counter/toxins{ pixel_y = 32 }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dxe" = ( /obj/machinery/atmospherics/unary/portables_connector, -/obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, +/obj/effect/decal/warning_stripes/south, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dxf" = ( /obj/machinery/atmospherics/unary/portables_connector, @@ -89438,19 +86061,23 @@ on = 1 }, /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dxg" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/machinery/newscaster{ pixel_y = 32 }, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dxh" = ( /turf/simulated/wall/rust, @@ -89476,11 +86103,10 @@ pixel_y = -2 }, /obj/effect/decal/warning_stripes/southeastcorner, -/turf/simulated/floor/plasteel, -/area/toxins/mixing) -"dxj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dxk" = ( /obj/structure/cable{ @@ -89502,7 +86128,9 @@ network = list("Toxins") }, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dxm" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ @@ -89510,13 +86138,13 @@ }, /obj/machinery/meter, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/mixing) "dxn" = ( /obj/machinery/portable_atmospherics/canister/nitrogen, /obj/machinery/alarm{ - pixel_y = 22 + pixel_y = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -89544,14 +86172,12 @@ /turf/simulated/floor/plasteel, /area/toxins/storage) "dxq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/reinforced, /obj/item/wrench, /obj/item/screwdriver, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/mixing) "dxr" = ( @@ -89569,7 +86195,10 @@ network = list("Research","SS13") }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, /area/toxins/explab) "dxs" = ( /obj/structure/cable{ @@ -89581,7 +86210,10 @@ name = "west bump"; pixel_x = -24 }, -/obj/machinery/computer/rdservercontrol, +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -89599,9 +86231,8 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -89614,10 +86245,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -89629,9 +86259,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/command{ name = "Server Room"; req_access = null; @@ -89648,16 +86275,13 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" }, /area/medical/research) "dxx" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -89670,36 +86294,25 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/research) -"dxy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" - }, -/area/medical/research) "dxz" = ( -/obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel, /area/assembly/robotics) "dxA" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /obj/effect/landmark/start{ name = "Medical Doctor" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" @@ -89709,26 +86322,36 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ name = "Robotics Lab"; req_access_txt = "29" }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dxC" = ( /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dxD" = ( /obj/structure/cable{ @@ -89737,35 +86360,30 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/assembly/robotics) "dxE" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, /obj/machinery/camera{ c_tag = "Research Secure Entrance"; dir = 8; network = list("Research","SS13") }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dxF" = ( /obj/structure/disposalpipe/junction{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -89777,7 +86395,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ id_tag = null; @@ -89794,19 +86411,10 @@ dir = 2; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/medical/morgue) -"dxI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/medical/morgue) "dxJ" = ( /obj/structure/cable{ d1 = 1; @@ -89820,25 +86428,11 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/area/medical/morgue) -"dxK" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -89854,6 +86448,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -89874,6 +86471,9 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -89889,6 +86489,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -89914,6 +86517,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/morgue) "dxR" = ( @@ -89930,6 +86536,9 @@ name = "blobstart" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/medical/morgue) "dxS" = ( @@ -89942,8 +86551,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/medical/morgue) "dxT" = ( @@ -89964,6 +86575,10 @@ initialize_directions = 11 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -89990,13 +86605,14 @@ }, /area/hallway/primary/central) "dxW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "cmo" }, /area/medical/cmo) "dxX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light_switch{ pixel_x = 26; pixel_y = 26 @@ -90022,22 +86638,25 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; - external_pressure_bound = 100; - on = 1 + initialize_directions = 11 }, /turf/simulated/floor/plasteel{ - icon_state = "whitebluefull" + icon_state = "white" }, /area/medical/medbay) "dya" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ name = "Operating Theatre Storage"; req_access_txt = "45" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -90046,7 +86665,6 @@ /turf/simulated/floor/plating, /area/crew_quarters/theatre) "dyc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/rack, /obj/effect/landmark/costume/random, /obj/effect/landmark/costume/random, @@ -90063,6 +86681,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "dye" = ( @@ -90148,16 +86767,16 @@ /area/toxins/test_area) "dyp" = ( /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dyq" = ( /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, /area/toxins/mixing) "dyr" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -90173,8 +86792,9 @@ }, /area/toxins/mixing) "dyt" = ( -/obj/machinery/atmospherics/trinary/filter{ - dir = 8 +/obj/machinery/atmospherics/trinary/mixer{ + dir = 8; + req_access = null }, /turf/simulated/floor/plasteel{ dir = 1; @@ -90195,7 +86815,6 @@ }, /area/toxins/mixing) "dyv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, /area/toxins/mixing) @@ -90206,7 +86825,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -90215,7 +86833,10 @@ /obj/structure/table/reinforced, /obj/item/storage/firstaid/toxin, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dyy" = ( /obj/machinery/driver_button{ @@ -90226,13 +86847,13 @@ dir = 8 }, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dyz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/mixing) "dyA" = ( @@ -90243,8 +86864,9 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "whitepurplefull" }, /area/toxins/mixing) "dyB" = ( @@ -90252,18 +86874,15 @@ dir = 5 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/mixing) "dyC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/extinguisher_cabinet{ - pixel_x = -28 - }, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plasteel, +/obj/machinery/computer/area_atmos, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/storage) "dyD" = ( /obj/structure/cable{ @@ -90272,21 +86891,22 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/storage) "dyE" = ( /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/storage) "dyF" = ( /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/storage) "dyG" = ( /obj/machinery/portable_atmospherics/canister, @@ -90294,7 +86914,9 @@ dir = 8 }, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dyH" = ( /obj/structure/cable{ @@ -90303,9 +86925,11 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/storage) "dyI" = ( /obj/effect/spawner/window/reinforced, @@ -90331,9 +86955,7 @@ name = "Server Room"; req_access_txt = "30" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -90344,24 +86966,20 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, /turf/simulated/floor/plating, /area/toxins/server) "dyL" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - icon_state = "purplefull" + icon_state = "white" }, /area/medical/research) "dyM" = ( @@ -90371,7 +86989,9 @@ /obj/item/storage/firstaid, /obj/item/paicard, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dyN" = ( /obj/structure/cable{ @@ -90380,21 +87000,17 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/assembly/robotics) "dyO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/robot_parts/robot_suit, -/obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, +/obj/effect/decal/warning_stripes/southeastcorner, +/turf/simulated/floor/plasteel, /area/assembly/robotics) "dyP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/navbeacon{ codes_txt = "delivery;dir=1"; location = "Robotics" @@ -90403,15 +87019,10 @@ /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/assembly/robotics) -"dyQ" = ( -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/assembly/robotics) "dyR" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/assembly/robotics) "dyS" = ( @@ -90419,13 +87030,14 @@ name = "Roboticist" }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/assembly/robotics) "dyT" = ( -/obj/machinery/computer/rdconsole/robotics, -/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/window/reinforced/polarized, +/obj/effect/decal/warning_stripes/south, +/obj/machinery/r_n_d/circuit_imprinter, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/simulated/floor/plasteel, /area/assembly/robotics) "dyU" = ( @@ -90439,16 +87051,6 @@ icon_state = "vault" }, /area/medical/morgue) -"dyV" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/medical/morgue) "dyW" = ( /obj/structure/cable{ d1 = 1; @@ -90456,57 +87058,20 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/medical/morgue) -"dyX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/medical/morgue) -"dyY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/morgue, -/obj/effect/landmark{ - name = "revenantspawn" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "vault" - }, -/area/medical/morgue) -"dyZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/medical/morgue) "dza" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/medical/morgue) "dzb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table, /obj/item/paper_bin, /turf/simulated/floor/plasteel{ @@ -90514,40 +87079,15 @@ icon_state = "vault" }, /area/medical/morgue) -"dzc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/fungus, -/turf/simulated/wall, -/area/medical/morgue) -"dzd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/medical/morgue) "dze" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/medical/morgue) -"dzf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plating, -/area/medical/morgue) "dzg" = ( /obj/structure/cable{ d1 = 1; @@ -90556,6 +87096,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -90569,28 +87110,29 @@ /turf/simulated/floor/plasteel, /area/medical/morgue) "dzi" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + tag = "" + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "dzj" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -90598,9 +87140,8 @@ }, /area/medical/cmo) "dzk" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -90619,6 +87160,9 @@ /obj/effect/landmark/start{ name = "Chief Medical Officer" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -90631,7 +87175,6 @@ }, /area/medical/surgery2) "dzo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/landmark/costume/random, @@ -90682,31 +87225,44 @@ "dzv" = ( /obj/item/target, /obj/structure/window/reinforced, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dzw" = ( +/obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, /area/toxins/mixing) "dzx" = ( +/obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutral" + }, /area/toxins/mixing) "dzy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/research{ name = "Toxin Test Firing Range"; req_access_txt = "47" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing) "dzz" = ( @@ -90721,18 +87277,26 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/item/radio/beacon, /obj/effect/landmark{ name = "blobstart" }, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing) "dzA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -90745,14 +87309,17 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/research{ name = "Toxin Mixing"; req_access_txt = "47" }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing) "dzC" = ( @@ -90765,7 +87332,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" @@ -90778,26 +87347,35 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_x = -26; pixel_y = -26 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dzE" = ( /obj/machinery/doppler_array{ - dir = 4 + dir = 8 }, /obj/structure/extinguisher_cabinet{ pixel_x = -32; pixel_y = -32 }, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dzF" = ( /obj/structure/cable{ @@ -90809,10 +87387,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/mixing) "dzG" = ( @@ -90834,6 +87413,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -90845,11 +87425,14 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/mixing) "dzI" = ( @@ -90858,34 +87441,33 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/storage) "dzJ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/southeastcorner, /obj/effect/decal/warning_stripes/southwestcorner, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/storage) "dzK" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/storage) "dzL" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 28 }, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/storage) "dzM" = ( /obj/structure/cable{ @@ -90894,11 +87476,16 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dzN" = ( /obj/structure/cable{ @@ -90907,14 +87494,17 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Toxins Storage"; req_access_txt = "8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/mixing) "dzO" = ( @@ -90929,19 +87519,18 @@ d2 = 8; icon_state = "1-8" }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/toxins/storage) "dzP" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - external_pressure_bound = 140; - external_pressure_bound_default = 140; - name = "server vent"; - on = 1; - pressure_checks = 0 +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 6 }, /turf/simulated/floor/bluegrid{ icon_state = "gcircuit"; @@ -90952,7 +87541,9 @@ }, /area/toxins/server) "dzQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 9 + }, /turf/simulated/floor/bluegrid{ icon_state = "dark"; name = "Mainframe Floor"; @@ -91003,9 +87594,16 @@ pixel_y = 6 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, /area/crew_quarters/hor) "dzT" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -91018,7 +87616,8 @@ icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -91028,7 +87627,6 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -91039,21 +87637,23 @@ }, /area/medical/research) "dzV" = ( -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/disposal, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, /obj/machinery/power/apc{ dir = 8; name = "west bump"; pixel_x = -24 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dzW" = ( /obj/structure/cable{ @@ -91068,7 +87668,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, /area/assembly/robotics) @@ -91084,8 +87683,7 @@ name = "Robotics Operating Computer" }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/assembly/robotics) "dzZ" = ( @@ -91095,16 +87693,13 @@ /obj/machinery/status_display{ pixel_y = -32 }, +/obj/item/storage/firstaid/machine, +/obj/item/storage/firstaid/machine, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/assembly/robotics) "dAa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, -/area/assembly/robotics) -"dAb" = ( /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/assembly/robotics) @@ -91134,6 +87729,9 @@ pixel_y = -24 }, /obj/machinery/optable, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plating, /area/medical/morgue) "dAf" = ( @@ -91158,7 +87756,7 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plating, /area/medical/morgue) @@ -91180,11 +87778,6 @@ /obj/structure/closet/wardrobe/white, /turf/simulated/floor/plating, /area/medical/morgue) -"dAm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/medical/morgue) "dAn" = ( /obj/structure/cable{ d1 = 1; @@ -91193,6 +87786,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/medical/morgue) "dAo" = ( @@ -91212,6 +87806,9 @@ opacity = 1; req_access_txt = "6" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -91259,29 +87856,37 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, /area/medical/medbay) "dAu" = ( +/obj/structure/disposalpipe/junction{ + dir = 1; + icon_state = "pipe-y" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/structure/disposalpipe/junction{ - dir = 1; - icon_state = "pipe-y" - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, /area/medical/surgery2) "dAv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/camera{ c_tag = "Medbay Surgery East Storage"; dir = 1 @@ -91289,9 +87894,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -91326,6 +87928,7 @@ dir = 8; initialize_directions = 11 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -91383,10 +87986,8 @@ }, /area/crew_quarters/theatre) "dAE" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /obj/effect/landmark{ name = "xeno_spawn"; @@ -91407,13 +88008,15 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/storage) "dAH" = ( -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dAI" = ( /obj/structure/cable{ @@ -91422,70 +88025,60 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/toxins/storage) -"dAJ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/toxins/storage) +"dAJ" = ( /obj/structure/sign/vacuum{ pixel_y = -32 }, /obj/machinery/light, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dAK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dAL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table, /obj/item/clothing/gloves/color/white, /obj/item/clothing/glasses/science, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dAM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/firealarm{ dir = 4; pixel_x = 28 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/mixing) "dAN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light/small, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, /area/toxins/mixing) -"dAO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall/r_wall, -/area/toxins/mixing) "dAP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/light/small, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, @@ -91497,10 +88090,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -91509,12 +88098,15 @@ "dAR" = ( /obj/structure/dispenser, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dAS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/rack, /obj/structure/extinguisher_cabinet{ pixel_y = -30 @@ -91523,7 +88115,10 @@ /obj/item/clothing/head/hardhat/red, /obj/item/clothing/mask/gas, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dAT" = ( /obj/structure/cable{ @@ -91532,12 +88127,10 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurple" + }, /area/toxins/mixing) "dAU" = ( /obj/machinery/door/window/southright{ @@ -91561,6 +88154,9 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/toxins/storage) "dAW" = ( @@ -91571,6 +88167,9 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel, /area/toxins/storage) "dAX" = ( @@ -91581,17 +88180,14 @@ "dAY" = ( /obj/structure/chair, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dAZ" = ( /obj/structure/chair, /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dBa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; @@ -91599,12 +88195,11 @@ }, /obj/structure/closet/secure_closet/scientist, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dBb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical{ pixel_x = -6; @@ -91615,12 +88210,14 @@ pixel_y = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dBc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table, /obj/item/paper_bin, /obj/item/pen, @@ -91635,7 +88232,7 @@ /area/toxins/storage) "dBd" = ( /obj/machinery/r_n_d/server/core, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 }, /turf/simulated/floor/bluegrid{ @@ -91648,7 +88245,9 @@ /area/toxins/server) "dBe" = ( /obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ + dir = 4 + }, /turf/simulated/floor/bluegrid{ icon_state = "dark"; name = "Mainframe Floor"; @@ -91659,7 +88258,7 @@ /area/toxins/server) "dBf" = ( /obj/machinery/r_n_d/server/robotics, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 }, /turf/simulated/floor/bluegrid{ @@ -91670,47 +88269,26 @@ temperature = 80 }, /area/toxins/server) -"dBg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/medical/research) "dBh" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research{ name = "Science Break Room"; req_access_txt = "47" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/medical/research) -"dBi" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) "dBj" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -91729,11 +88307,6 @@ /obj/effect/decal/cleanable/fungus, /turf/simulated/wall, /area/medical/morgue) -"dBl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/fungus, -/turf/simulated/wall, -/area/medical/morgue) "dBm" = ( /obj/structure/cable{ d1 = 1; @@ -91743,13 +88316,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/medical/morgue) -"dBn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/greencross, -/turf/simulated/wall, -/area/medical/medbay) "dBo" = ( /obj/structure/cable{ d1 = 1; @@ -91761,6 +88330,8 @@ name = "Medbay Maintenance"; req_access_txt = "5" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/medical/medbay) "dBp" = ( @@ -91786,11 +88357,11 @@ }, /area/crew_quarters/theatre) "dBt" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -91811,20 +88382,10 @@ }, /area/security/detectives_office) "dBw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/toxins/storage) -"dBx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes/west, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/toxins/storage) "dBy" = ( /obj/machinery/portable_atmospherics/scrubber/huge, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -91849,11 +88410,11 @@ /turf/simulated/wall, /area/toxins/mixing) "dBC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dBD" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -91866,43 +88427,35 @@ icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ name = "Research Division"; req_access_txt = "47" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/misc_lab) "dBE" = ( /obj/structure/chair{ dir = 4 }, /obj/effect/decal/warning_stripes/northwest, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dBF" = ( /obj/effect/decal/warning_stripes/northwestcorner, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dBG" = ( /obj/effect/decal/warning_stripes/northeastcorner, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dBH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) -"dBI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) "dBJ" = ( /obj/structure/cable{ d1 = 4; @@ -91910,19 +88463,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) -"dBK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) "dBL" = ( /obj/structure/cable{ d1 = 4; @@ -91930,35 +88473,22 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/maintenance/aft) -"dBM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) -"dBN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/hallway/primary/aft) "dBO" = ( -/obj/machinery/alarm{ - dir = 8; - pixel_x = 25 - }, -/obj/machinery/r_n_d/circuit_imprinter, -/obj/item/reagent_containers/glass/beaker/sulphuric, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/structure/table/reinforced, +/obj/item/robotanalyzer, +/obj/item/bonegel, +/obj/item/FixOVein, +/obj/item/surgicaldrill, +/obj/structure/mirror{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dBP" = ( /obj/structure/cable{ @@ -91967,26 +88497,21 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/aft) "dBQ" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -92014,15 +88539,16 @@ dir = 1 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dBS" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/centcom{ id_tag = null; @@ -92045,8 +88571,11 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dBU" = ( /obj/structure/cable{ d1 = 4; @@ -92054,9 +88583,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/aft) "dBV" = ( @@ -92066,27 +88592,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/aft) -"dBW" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/maintenance/aft) "dBX" = ( /obj/structure/cable{ d1 = 4; @@ -92100,9 +88608,6 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/aft) "dBY" = ( @@ -92112,9 +88617,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; @@ -92128,9 +88630,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/spawner/random_spawners/oil_maybe, /turf/simulated/floor/plating, /area/maintenance/aft) @@ -92141,15 +88640,9 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plating, /area/maintenance/aft) "dCb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/girder, /turf/simulated/floor/plating, /area/maintenance/aft) @@ -92160,9 +88653,6 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; @@ -92176,7 +88666,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" @@ -92195,9 +88684,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/maintenance/aft) "dCf" = ( @@ -92207,25 +88694,15 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, /area/maintenance/aft) "dCg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel, /area/maintenance/aft) "dCh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 1; @@ -92239,46 +88716,21 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" }, /area/medical/medbay) "dCj" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" }, /area/medical/medbay) -"dCk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/maintenance/starboard) -"dCl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "neutral" - }, -/area/maintenance/starboard) "dCm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/light/small{ dir = 1 }, @@ -92306,9 +88758,6 @@ /turf/simulated/floor/plating, /area/medical/surgeryobs) "dCp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 1 @@ -92409,14 +88858,14 @@ network = list("SS13,Toxins") }, /obj/item/target, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless/indestructible, /area/toxins/test_area) "dCA" = ( /obj/structure/chair{ dir = 8 }, /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dCB" = ( /obj/effect/decal/warning_stripes/west, @@ -92448,15 +88897,14 @@ "dCG" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dCH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/rack, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dCI" = ( /obj/machinery/light/small{ dir = 1 @@ -92465,25 +88913,19 @@ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dCJ" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dCK" = ( /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/toxins/storage) -"dCL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/west, -/obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, -/area/toxins/storage) "dCM" = ( /obj/machinery/portable_atmospherics/canister/sleeping_agent, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -92491,18 +88933,11 @@ /area/toxins/storage) "dCN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 - }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + icon_state = "white" }, /area/toxins/mixing) "dCO" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/machinery/light/small{ dir = 8 }, @@ -92538,7 +88973,6 @@ }, /area/medical/research) "dCR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/radio/intercom{ dir = 1; pixel_y = 28 @@ -92549,20 +88983,21 @@ }, /area/medical/research) "dCS" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, /area/medical/research) "dCT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ dir = 5; @@ -92570,10 +89005,9 @@ }, /area/medical/research) "dCU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dCV" = ( /obj/structure/cable{ d1 = 2; @@ -92587,12 +89021,14 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dCW" = ( /obj/structure/cable{ d1 = 4; @@ -92604,8 +89040,11 @@ dir = 4 }, /obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dCX" = ( /obj/structure/cable{ d1 = 4; @@ -92618,21 +89057,11 @@ }, /obj/machinery/light/small, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/hallway/primary/aft) -"dCY" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/hallway/primary/aft) "dCZ" = ( /obj/structure/rack, /obj/machinery/light{ @@ -92647,7 +89076,9 @@ /obj/item/multitool, /obj/item/clothing/head/welding, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dDa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -92655,7 +89086,9 @@ }, /obj/machinery/light/small, /obj/structure/closet/firecloset, -/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dDb" = ( @@ -92669,7 +89102,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" @@ -92681,9 +89116,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -92691,7 +89125,12 @@ /area/hallway/primary/aft) "dDd" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -92710,12 +89149,16 @@ req_access_txt = "19" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/bridge) "dDf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/wall, /area/hallway/primary/aft) "dDg" = ( @@ -92723,12 +89166,18 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/aft) "dDh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft) "dDi" = ( @@ -92736,6 +89185,9 @@ dir = 4 }, /obj/structure/girder, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft) "dDj" = ( @@ -92744,12 +89196,18 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft) "dDk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -92763,6 +89221,9 @@ name = "south bump"; pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft) "dDm" = ( @@ -92770,6 +89231,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -92783,6 +89247,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -92797,6 +89264,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft) "dDp" = ( @@ -92808,10 +89278,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft) "dDq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -92826,6 +89300,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/aft) "dDs" = ( @@ -92838,6 +89315,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/aft) "dDt" = ( @@ -92851,8 +89331,11 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/medical/medbay) +/area/maintenance/aft) "dDu" = ( /obj/structure/cable{ d1 = 4; @@ -92860,7 +89343,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" @@ -92889,12 +89377,8 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -92909,7 +89393,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -92926,6 +89412,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "dDC" = ( @@ -92939,6 +89428,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -92953,6 +89445,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "dDE" = ( @@ -92965,6 +89460,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, @@ -92978,6 +89476,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "neutral" @@ -93007,7 +89508,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -93034,7 +89535,7 @@ /area/security/detectives_office) "dDP" = ( /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dDQ" = ( /obj/machinery/portable_atmospherics/canister/oxygen, @@ -93059,7 +89560,7 @@ /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dDV" = ( /obj/structure/cable{ d1 = 1; @@ -93072,9 +89573,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dDW" = ( /obj/structure/cable{ d1 = 4; @@ -93082,11 +89582,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dDX" = ( /obj/structure/cable{ d1 = 4; @@ -93094,14 +89591,11 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dDY" = ( /obj/structure/cable{ d1 = 1; @@ -93114,9 +89608,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dDZ" = ( /obj/structure/cable{ d1 = 2; @@ -93124,15 +89617,11 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dEa" = ( /obj/machinery/portable_atmospherics/canister/toxins, /obj/effect/decal/cleanable/dirt, @@ -93140,7 +89629,6 @@ /turf/simulated/floor/plasteel, /area/toxins/storage) "dEb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/medical/research) @@ -93149,7 +89637,7 @@ dir = 4 }, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dEd" = ( /obj/effect/decal/cleanable/dirt, @@ -93159,58 +89647,52 @@ }, /area/medical/research) "dEe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 2; d2 = 4; icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, /area/medical/research) "dEf" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, /area/medical/research) "dEg" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, /area/medical/research) "dEh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/chair/stool, /turf/simulated/floor/plasteel{ dir = 4; @@ -93218,31 +89700,19 @@ }, /area/medical/research) "dEi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/girder, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"dEj" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/yellow, -/obj/machinery/door/airlock/public/glass, -/turf/simulated/floor/plasteel, -/area/hallway/primary/aft) -"dEk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/bridge) +/area/maintenance/apmaint) "dEl" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/airlock/public/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dEm" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /obj/machinery/door/airlock/public/glass, @@ -93255,9 +89725,10 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dEo" = ( /turf/simulated/wall, @@ -93270,9 +89741,8 @@ /turf/simulated/floor/plating, /area/maintenance/aft) "dEr" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -93280,7 +89750,9 @@ }, /area/medical/medbay) "dEs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -93308,11 +89780,11 @@ /area/medical/surgery1) "dEv" = ( /obj/effect/decal/warning_stripes/southwestcorner, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dEw" = ( /obj/effect/decal/warning_stripes/southeastcorner, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dEx" = ( /obj/machinery/field/generator{ @@ -93329,28 +89801,19 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) -"dEz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/twohanded/required/kirbyplants, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) +/area/maintenance/apmaint) "dEA" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "sw_maint2_outer"; locked = 1; - name = "West Maintenance External Access"; - req_access = null + name = "West Maintenance External Access" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dEB" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; @@ -93371,7 +89834,7 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dEC" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -93380,21 +89843,19 @@ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dED" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dEE" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "sw_maint2_inner"; locked = 1; name = "West Maintenance External Access"; - req_access = null; req_access_txt = "10;13" }, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -93402,7 +89863,7 @@ }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dEF" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -93417,7 +89878,7 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dEG" = ( /obj/structure/cable{ d1 = 4; @@ -93425,9 +89886,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, @@ -93436,28 +89894,24 @@ dir = 10; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dEH" = ( /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dEI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dEJ" = ( /obj/structure/cable{ d1 = 1; @@ -93465,23 +89919,19 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dEK" = ( /obj/structure/chair{ dir = 8 }, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dEL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/effect/landmark{ name = "blobstart" }, @@ -93495,15 +89945,9 @@ }, /turf/simulated/floor/plating, /area/medical/research) -"dEM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall, -/area/medical/research) "dEN" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -93511,38 +89955,39 @@ }, /area/medical/research) "dEO" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, /area/medical/research) "dEP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/start{ name = "Scientist" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, /area/medical/research) "dEQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/chair/stool, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -93553,12 +89998,12 @@ dir = 1; network = list("Research","SS13") }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, +/turf/simulated/floor/engine, /area/toxins/explab) "dES" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; @@ -93566,11 +90011,11 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dET" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ @@ -93593,13 +90038,13 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "blue" }, /area/bridge) "dEV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/photocopier, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = 32; @@ -93629,17 +90074,16 @@ /obj/item/storage/box/bodybags, /obj/item/borg/upgrade/rename, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, -/area/assembly/robotics) -"dEY" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/item/stock_parts/cell/high, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "escape" + icon_state = "white" }, -/area/hallway/primary/aft) +/area/assembly/robotics) "dEZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "escape" @@ -93647,7 +90091,6 @@ /area/hallway/primary/aft) "dFa" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "escape" @@ -93664,13 +90107,12 @@ dir = 4 }, /obj/machinery/alarm{ - pixel_y = 22 + pixel_y = 24 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dFc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ @@ -93690,7 +90132,6 @@ }, /area/medical/medbay) "dFe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light/small, /turf/simulated/floor/plasteel{ dir = 5; @@ -93703,7 +90144,7 @@ dir = 1; layer = 2.9 }, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dFg" = ( /turf/simulated/wall, @@ -93725,7 +90166,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, @@ -93739,20 +90179,18 @@ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dFm" = ( /turf/simulated/wall/r_wall, /area/toxins/storage) "dFn" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/storage) "dFo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/vending/coffee, /turf/simulated/floor/plasteel{ dir = 8; @@ -93760,22 +90198,18 @@ }, /area/medical/research) "dFp" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, /area/medical/research) "dFq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "redyellowfull" }, @@ -93809,8 +90243,9 @@ /obj/effect/landmark{ name = "blobstart" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dFu" = ( /obj/machinery/computer/med_data, /obj/machinery/status_display{ @@ -93828,10 +90263,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -93839,12 +90272,18 @@ /area/bridge) "dFw" = ( /obj/structure/table/reinforced, -/obj/structure/window/reinforced{ +/obj/structure/window/reinforced/polarized{ dir = 8 }, -/obj/item/cautery, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/item/tank/internals/anesthetic, +/obj/item/clothing/mask/breath/medical, +/obj/item/mmi, +/obj/item/mmi, +/obj/item/mmi, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dFx" = ( /obj/structure/table/reinforced, @@ -93860,33 +90299,22 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/ai_status_display{ - pixel_x = 32 - }, /obj/item/retractor, /obj/item/hemostat, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/item/bonesetter, +/obj/item/stack/medical/bruise_pack/advanced{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/machinery/button/windowtint{ + id = 1; + pixel_x = 24 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) -"dFz" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/aft) -"dFA" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/primary/aft) "dFB" = ( /obj/structure/chair{ dir = 8 @@ -93898,19 +90326,17 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/hallway/primary/aft) -"dFD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall/r_wall, -/area/medical/medbay) "dFE" = ( /obj/structure/table/glass, /obj/machinery/cell_charger, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, /area/medical/medbay) "dFF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/sign/biohazard, /turf/simulated/wall/r_wall, /area/medical/medbay) @@ -93971,18 +90397,6 @@ icon_state = "grimy" }, /area/library/abandoned) -"dFO" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/library/abandoned) "dFP" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, @@ -94024,14 +90438,14 @@ dir = 1 }, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dFV" = ( /obj/structure/chair{ dir = 1 }, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/plasteel/airless, /area/toxins/test_area) "dFW" = ( /obj/structure/cable{ @@ -94047,7 +90461,7 @@ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dFX" = ( /obj/effect/landmark{ name = "blobstart" @@ -94057,13 +90471,13 @@ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dFY" = ( /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dFZ" = ( /obj/machinery/light/small, /obj/machinery/newscaster{ @@ -94077,36 +90491,32 @@ /turf/simulated/floor/plasteel, /area/medical/research) "dGa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 4; icon_state = "0-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plating, /area/medical/cmo) "dGb" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, /area/medical/research) "dGc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/status_display{ pixel_y = -32 }, @@ -94132,9 +90542,8 @@ }, /area/medical/research) "dGf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dGg" = ( /obj/structure/cable{ d1 = 1; @@ -94144,8 +90553,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dGh" = ( /obj/structure/cable{ d2 = 4; @@ -94157,6 +90567,9 @@ pixel_x = -24 }, /obj/machinery/computer/card, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "bluefull" @@ -94179,6 +90592,12 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -94191,7 +90610,9 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -94207,6 +90628,9 @@ /obj/structure/chair/office/light{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "bluefull" @@ -94240,17 +90664,19 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dGn" = ( -/obj/structure/table, /obj/item/radio/intercom{ dir = 1; name = "Station Intercom (General)"; pixel_y = -29 }, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/structure/closet/secure_closet/roboticist, +/obj/item/radio/headset/headset_sci{ + pixel_x = -3 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dGo" = ( /obj/structure/disposalpipe/segment, @@ -94281,7 +90707,7 @@ name = "blobstart" }, /turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) +/area/maintenance/starboardsolar) "dGs" = ( /obj/structure/cable{ d1 = 4; @@ -94309,9 +90735,12 @@ }, /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) +/area/maintenance/starboardsolar) "dGt" = ( /obj/item/twohanded/required/kirbyplants, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreencorner" @@ -94325,6 +90754,12 @@ tag = "" }, /obj/item/twohanded/required/kirbyplants, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" @@ -94332,6 +90767,9 @@ /area/medical/virology) "dGv" = ( /obj/item/twohanded/required/kirbyplants, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -94349,6 +90787,7 @@ pixel_y = 28 }, /obj/item/paper_bin, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreencorner" @@ -94383,6 +90822,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -94448,18 +90888,17 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dGK" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dGL" = ( /obj/machinery/atmospherics/trinary/filter{ dir = 8 @@ -94468,7 +90907,7 @@ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dGM" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -94477,22 +90916,27 @@ dir = 8; icon_state = "neutralfull" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dGN" = ( +/obj/structure/grille, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/grille, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dGO" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/west, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/storage) "dGP" = ( /obj/machinery/computer/crew, @@ -94517,7 +90961,6 @@ }, /area/bridge) "dGR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -94538,12 +90981,18 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dGU" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -94570,11 +91019,9 @@ }, /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "solar_xeno_inner"; locked = 1; name = "Engineering External Access"; - req_access = null; req_access_txt = "13" }, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -94582,7 +91029,7 @@ }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) +/area/maintenance/starboardsolar) "dGY" = ( /obj/machinery/door/airlock/maintenance{ name = "Science Toilet" @@ -94605,6 +91052,14 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1379; + master_tag = "viro_lab_airlock_control"; + name = "Virology Lab Access Button"; + pixel_y = -24; + req_access_txt = "39" + }, /obj/machinery/door/airlock/medical{ autoclose = 0; frequency = 1379; @@ -94614,14 +91069,6 @@ name = "Virology Lab Internal Airlock"; req_access_txt = "39" }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "viro_lab_airlock_control"; - name = "Virology Lab Access Button"; - pixel_y = -24; - req_access_txt = "39" - }, /turf/simulated/floor/plasteel, /area/medical/virology) "dHb" = ( @@ -94709,9 +91156,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreencorner" @@ -94730,94 +91174,47 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) -"dHh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitegreencorner" - }, -/area/medical/virology) -"dHi" = ( -/obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/medical/virology) "dHj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/glass, /obj/item/clipboard, /obj/item/toy/figure/crew/virologist, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreencorner" }, /area/medical/virology) "dHk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/grille, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) -"dHl" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/virology) +/area/maintenance/port) "dHm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Mining Dock External"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" }, /area/medical/virology) -"dHn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/medical/virology) "dHo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/table/glass, /obj/item/flashlight/lamp, /obj/machinery/newscaster{ pixel_y = 32 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -94829,9 +91226,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/bed, /obj/item/bedsheet/medical, /obj/effect/landmark/start{ @@ -94851,6 +91245,7 @@ pixel_x = 28 }, /obj/machinery/computer/med_data/laptop, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -94899,7 +91294,7 @@ }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /turf/simulated/floor/plating, /area/library/abandoned) @@ -94913,17 +91308,13 @@ dir = 10; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dHy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralcorner" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dHz" = ( /obj/structure/cable{ d1 = 1; @@ -94937,15 +91328,15 @@ icon_state = "2-4"; tag = "" }, +/obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 6 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dHA" = ( /obj/structure/cable{ d1 = 4; @@ -94953,19 +91344,19 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dHB" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dHC" = ( /obj/structure/cable{ d1 = 1; @@ -94978,15 +91369,14 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dHD" = ( /obj/structure/cable{ d1 = 4; @@ -94994,16 +91384,16 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dHE" = ( /obj/structure/cable{ d1 = 4; @@ -95019,37 +91409,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"dHF" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) -"dHG" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dHH" = ( /obj/structure/cable{ d1 = 4; @@ -95063,16 +91423,19 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dHI" = ( /obj/structure/cable{ d1 = 1; @@ -95085,15 +91448,17 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dHJ" = ( /obj/structure/cable{ d1 = 4; @@ -95101,12 +91466,17 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dHK" = ( /obj/structure/cable{ d1 = 4; @@ -95117,11 +91487,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dHL" = ( /obj/structure/cable{ d1 = 4; @@ -95129,12 +91502,14 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dHM" = ( /obj/structure/cable{ d1 = 1; @@ -95147,10 +91522,17 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dHN" = ( /obj/structure/table/reinforced, /obj/item/radio, @@ -95178,9 +91560,6 @@ }, /area/bridge) "dHP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "blue" @@ -95199,7 +91578,7 @@ /area/bridge) "dHR" = ( /obj/structure/table/reinforced, -/obj/structure/window/reinforced{ +/obj/structure/window/reinforced/polarized{ dir = 8 }, /obj/item/mmi, @@ -95209,7 +91588,9 @@ }, /obj/item/storage/box/masks, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dHS" = ( /obj/structure/disposalpipe/junction{ @@ -95285,14 +91666,13 @@ }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dIc" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable, /turf/simulated/floor/plating, /area/medical/virology) "dId" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -95314,19 +91694,24 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) "dIf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/grille, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dIg" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 4 @@ -95339,12 +91724,11 @@ }, /obj/machinery/portable_atmospherics/scrubber, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "escape" + dir = 1; + icon_state = "whitepurplecorner" }, /area/toxins/mixing) "dIh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera{ c_tag = "Research Firing Range"; dir = 4; @@ -95352,11 +91736,10 @@ pixel_y = -22 }, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plating, +/turf/simulated/floor/engine, /area/toxins/misc_lab) "dIi" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/camera{ c_tag = "Research Central Hall"; dir = 8; @@ -95367,18 +91750,12 @@ }, /area/medical/research) "dIj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/landmark/start{ name = "Virologist" }, /obj/structure/chair/office/dark{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -95390,8 +91767,11 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -95409,6 +91789,12 @@ name = "Virology Bedroom"; req_access_txt = "39" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/virology) "dIm" = ( @@ -95418,6 +91804,12 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreencorner" @@ -95435,8 +91827,8 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -95449,6 +91841,9 @@ /obj/machinery/status_display{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -95468,24 +91863,12 @@ }, /area/library/abandoned) "dIr" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 }, /turf/simulated/floor/plating, /area/library/abandoned) -"dIs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/library/abandoned) "dIt" = ( /obj/structure/cable{ d1 = 1; @@ -95493,10 +91876,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -95527,30 +91906,17 @@ /obj/machinery/atmospherics/unary/portables_connector, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) -"dIz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/chapel/office) +/area/maintenance/apmaint) "dIA" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"dIB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "neutral" - }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dIC" = ( /obj/structure/disposalpipe/trunk{ dir = 4 }, /obj/machinery/disposal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ dir = 10; @@ -95558,28 +91924,14 @@ }, /area/medical/research) "dID" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dIE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) -"dIF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/hallway/secondary/exit) +/area/maintenance/apmaint) "dIG" = ( /obj/structure/cable{ d1 = 1; @@ -95587,14 +91939,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) +/area/maintenance/apmaint) "dIH" = ( /turf/simulated/wall, /area/hallway/secondary/exit) @@ -95645,14 +91995,6 @@ /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/assembly/chargebay) -"dIM" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/obj/effect/decal/warning_stripes/south, -/obj/machinery/door/airlock/public/glass, -/turf/simulated/floor/plasteel, -/area/hallway/primary/aft) "dIN" = ( /obj/structure/sign/directions/evac{ pixel_y = -8 @@ -95678,13 +92020,6 @@ /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, /area/medical/virology) -"dIY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitegreencorner" - }, -/area/medical/virology) "dIZ" = ( /obj/structure/cable{ d1 = 1; @@ -95692,9 +92027,10 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -95712,6 +92048,9 @@ name = "Virology Office"; req_access_txt = "39" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -95724,9 +92063,10 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreencorner" @@ -95750,8 +92090,8 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -95767,8 +92107,9 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -95776,7 +92117,9 @@ }, /area/medical/virology) "dJe" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -95784,21 +92127,12 @@ /area/medical/virology) "dJf" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, /turf/simulated/floor/plating, /area/medical/virology) -"dJg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/wall, -/area/medical/virology) "dJh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_x = -26; pixel_y = 4 @@ -95815,9 +92149,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -95842,7 +92173,7 @@ dir = 8; icon_state = "whitebluecorner" }, -/area/medical/surgery) +/area/medical/surgery1) "dJl" = ( /obj/structure/cable{ d2 = 4; @@ -95898,7 +92229,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -95937,20 +92267,7 @@ icon_state = "dark" }, /area/chapel/office) -"dJv" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/chapel/office) "dJw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -95971,11 +92288,7 @@ req_access_txt = "47" }, /turf/simulated/floor/plasteel, -/area/medical/research) -"dJz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, -/area/chapel/main) +/area/maintenance/apmaint) "dJA" = ( /obj/item/twohanded/required/kirbyplants, /obj/structure/sign/poster/official/nanotrasen_logo{ @@ -95993,6 +92306,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/northwest, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dJC" = ( @@ -96016,6 +92330,9 @@ network = list("Medical","SS13") }, /obj/item/reagent_containers/dropper, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluefull" }, @@ -96059,7 +92376,6 @@ }, /area/medical/surgery) "dJP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, @@ -96075,21 +92391,13 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) -"dJR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitegreencorner" - }, -/area/medical/virology) "dJS" = ( -/obj/machinery/atmospherics/unary/tank/air{ - dir = 1 - }, /obj/machinery/light/small{ dir = 8 }, @@ -96097,18 +92405,18 @@ dir = 8; pixel_x = -24 }, +/obj/structure/table, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/medical/virology) "dJT" = ( -/obj/machinery/atmospherics/unary/portables_connector{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/air, /obj/machinery/status_display{ pixel_y = -32 }, +/obj/machinery/atmospherics/unary/tank/air{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -96120,7 +92428,10 @@ icon_state = "1-2"; tag = "" }, -/obj/structure/table, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/unary/portables_connector{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -96149,10 +92460,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -96165,18 +92472,29 @@ /area/medical/virology) "dKa" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library/abandoned) "dKb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/library/abandoned) "dKc" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/wood{ broken = 1; icon_state = "wood-broken" @@ -96192,7 +92510,6 @@ }, /area/chapel/office) "dKe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ dir = 4 @@ -96201,6 +92518,9 @@ dir = 4; pixel_x = 28 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -96249,12 +92569,12 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/main) "dKk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /obj/item/radio/intercom{ pixel_y = 26 @@ -96287,6 +92607,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dKo" = ( @@ -96324,11 +92645,6 @@ icon_state = "dark" }, /area/chapel/main) -"dKs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) "dKx" = ( /obj/structure/cable{ d1 = 4; @@ -96356,7 +92672,7 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) +/area/maintenance/starboardsolar) "dKz" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -96394,7 +92710,6 @@ /turf/simulated/floor/plating, /area/medical/virology) "dKC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; pixel_x = -25 @@ -96409,7 +92724,6 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 4 }, @@ -96439,12 +92753,11 @@ /turf/simulated/floor/plating, /area/library/abandoned) "dKH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/closet/crate, /obj/item/flashlight, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dKI" = ( /obj/structure/cable{ d1 = 1; @@ -96452,20 +92765,7 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/chapel/office) -"dKJ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -96494,11 +92794,6 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/chapel/main) -"dKN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -96532,6 +92827,7 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dKV" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -96544,10 +92840,17 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/effect/landmark/start{ name = "Medical Doctor" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -96565,17 +92868,18 @@ icon_state = "2-8"; tag = "" }, +/obj/effect/decal/warning_stripes/yellow, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 }, -/obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dKY" = ( /obj/structure/cable{ d1 = 1; @@ -96583,11 +92887,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Crematorium Maintenance"; req_access_txt = "27" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -96599,17 +92904,14 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dLa" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -96635,7 +92937,6 @@ }, /area/medical/virology) "dLc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera{ c_tag = "Mining Dock External"; dir = 8 @@ -96647,9 +92948,6 @@ /turf/simulated/floor/plasteel, /area/medical/virology) "dLd" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/structure/sink{ dir = 8; pixel_x = -12; @@ -96662,7 +92960,6 @@ /turf/simulated/floor/plasteel, /area/medical/virology) "dLe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreen" @@ -96678,12 +92975,13 @@ /obj/effect/landmark{ name = "lightsout" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) "dLg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/radio/intercom{ dir = 4; pixel_x = 28 @@ -96698,42 +92996,56 @@ }, /area/medical/virology) "dLh" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreencorner" }, /area/medical/virology) "dLi" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/machinery/light/small{ dir = 1 }, /mob/living/carbon/human/monkey, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreencorner" }, /area/medical/virology) "dLj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" }, /area/medical/virology) "dLk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light/small{ dir = 1 }, /mob/living/carbon/human/monkey, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" }, /area/medical/virology) "dLl" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -96754,20 +93066,21 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dLo" = ( /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dLp" = ( /obj/structure/table, /obj/item/radio/intercom{ @@ -96785,24 +93098,18 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark/start{ name = "Chaplain" }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/chapel/office) -"dLr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/office) "dLs" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -96830,11 +93137,6 @@ /obj/effect/landmark{ name = "lightsout" }, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/chapel/main) -"dLv" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8; initialize_directions = 11 @@ -96844,8 +93146,8 @@ }, /area/chapel/main) "dLw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -96856,6 +93158,9 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -96869,43 +93174,30 @@ }, /area/chapel/main) "dLz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dLA" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) -"dLC" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, +"dLD" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) -"dLD" = ( /obj/structure/cable{ d1 = 4; d2 = 8; @@ -96918,38 +93210,35 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/secondary/exit) "dLE" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/secondary/exit) "dLF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -96984,16 +93273,6 @@ icon_state = "neutralfull" }, /area/hallway/secondary/exit) -"dLJ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) "dLK" = ( /obj/machinery/light{ dir = 4 @@ -97002,6 +93281,7 @@ /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dLP" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/structure/cable{ d1 = 1; @@ -97014,7 +93294,6 @@ name = "Operating Theatre"; req_access_txt = "45" }, -/obj/structure/disposalpipe/segment, /obj/machinery/holosign/surgery{ id = "surgery2" }, @@ -97028,9 +93307,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -97041,20 +93317,7 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitegreencorner" - }, -/area/medical/virology) -"dLS" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitegreencorner" + icon_state = "whitegreen" }, /area/medical/virology) "dLT" = ( @@ -97064,12 +93327,8 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitegreencorner" + icon_state = "whitegreen" }, /area/medical/virology) "dLU" = ( @@ -97079,35 +93338,11 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) -"dLV" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/medical/virology) -"dLW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitegreencorner" - }, -/area/medical/virology) "dLX" = ( /obj/structure/cable{ d1 = 4; @@ -97115,7 +93350,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitegreencorner" @@ -97126,13 +93360,6 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/medical/virology) -"dLZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitegreencorner" - }, -/area/medical/virology) "dMa" = ( /obj/machinery/light/small, /obj/structure/extinguisher_cabinet{ @@ -97143,17 +93370,10 @@ /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, /area/medical/virology) -"dMb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitegreencorner" - }, -/area/medical/virology) "dMc" = ( /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "wood" @@ -97170,9 +93390,6 @@ /turf/simulated/floor/plating, /area/library/abandoned) "dMf" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 @@ -97186,11 +93403,13 @@ /turf/simulated/floor/plating, /area/library/abandoned) "dMh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera{ c_tag = "Chapel Backroom"; dir = 8 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -97213,13 +93432,6 @@ icon_state = "chapel" }, /area/chapel/main) -"dMl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "chapel" - }, -/area/chapel/main) "dMm" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -97235,24 +93447,27 @@ }, /area/chapel/main) "dMo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dMp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 }, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dMq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -97264,6 +93479,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -97274,7 +93492,9 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -97297,11 +93517,15 @@ tag = "" }, /turf/simulated/floor/plasteel{ - dir = 8; + dir = 4; icon_state = "whitegreen" }, /area/medical/virology) "dMx" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -97319,29 +93543,35 @@ icon_state = "2-4"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 4; + icon_state = "whitegreen" }, /area/medical/virology) "dMy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) "dMz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -97359,14 +93589,14 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 4; + dir = 8; icon_state = "whitegreen" }, /area/medical/virology) @@ -97382,9 +93612,15 @@ /obj/item/healthanalyzer, /obj/item/clothing/glasses/hud/health, /obj/effect/decal/warning_stripes/southeastcorner, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dMB" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -97402,31 +93638,35 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Virology Lab"; req_access_txt = "39" }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/virology) "dMC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -97435,6 +93675,10 @@ }, /area/medical/virology) "dMD" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -97446,36 +93690,18 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/virology) -"dME" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4; initialize_directions = 11 }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitegreencorner" + icon_state = "white" }, /area/medical/virology) -"dMF" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/medical/virology) "dMG" = ( /obj/structure/table/glass, /obj/item/folder/white, @@ -97490,15 +93716,17 @@ pixel_y = 30 }, /obj/effect/decal/warning_stripes/south, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dMH" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/medical/virology) "dMI" = ( @@ -97523,38 +93751,7 @@ icon_state = "wood-broken" }, /area/library/abandoned) -"dML" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/table/wood, -/obj/item/folder, -/obj/item/pen, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/library/abandoned) -"dMM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "wood" - }, -/area/library/abandoned) -"dMN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood{ - broken = 1; - icon_state = "wood-broken" - }, -/area/library/abandoned) "dMO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/morgue{ name = "Occult Study" }, @@ -97563,9 +93760,6 @@ }, /area/library/abandoned) "dMP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/spawner/random_spawners/blood_maybe, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -97586,29 +93780,33 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, /obj/effect/landmark{ name = "blobstart" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/office) "dMS" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -97626,14 +93824,6 @@ icon_state = "chapel" }, /area/chapel/main) -"dMV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/chair/wood, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "chapel" - }, -/area/chapel/main) "dMW" = ( /obj/structure/disposalpipe/segment, /obj/structure/chair/wood, @@ -97656,11 +93846,6 @@ /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) -"dMZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) "dNa" = ( /obj/structure/cable{ d1 = 1; @@ -97696,13 +93881,6 @@ icon_state = "neutralfull" }, /area/hallway/secondary/exit) -"dNd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) "dNi" = ( /obj/structure/cable{ d1 = 1; @@ -97712,7 +93890,10 @@ }, /obj/machinery/computer/pandemic, /obj/effect/decal/warning_stripes/southeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dNj" = ( /obj/structure/chair/office/dark{ @@ -97722,32 +93903,36 @@ name = "Virologist" }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitegreencorner" + dir = 1; + icon_state = "whitegreen" }, /area/medical/virology) "dNk" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitegreencorner" + dir = 1; + icon_state = "whitegreen" }, /area/medical/virology) "dNl" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ + dir = 1; icon_state = "whitegreen" }, /area/medical/virology) "dNm" = ( /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitegreencorner" + dir = 1; + icon_state = "whitegreen" }, /area/medical/virology) "dNn" = ( @@ -97757,42 +93942,9 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitegreencorner" - }, -/area/medical/virology) -"dNo" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitegreencorner" - }, -/area/medical/virology) -"dNp" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/virology) -"dNq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitegreencorner" + dir = 1; + icon_state = "whitegreen" }, /area/medical/virology) "dNr" = ( @@ -97811,7 +93963,6 @@ }, /area/medical/virology) "dNt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreencorner" @@ -97824,34 +93975,31 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "whitegreen" }, /area/medical/virology) "dNv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" }, /area/medical/virology) "dNw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/table/glass, /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/item/radio/intercom{ dir = 4; pixel_x = 28 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreencorner" @@ -97885,13 +94033,15 @@ }, /area/library/abandoned) "dNB" = ( -/obj/item/twohanded/required/kirbyplants, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "wood" }, /area/library/abandoned) "dNC" = ( /obj/machinery/light/small, +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plating, /area/library/abandoned) "dND" = ( @@ -97923,7 +94073,6 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -97935,10 +94084,11 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/newscaster{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -97957,14 +94107,6 @@ icon_state = "chapel" }, /area/chapel/main) -"dNL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/chair/wood, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "chapel" - }, -/area/chapel/main) "dNM" = ( /obj/structure/disposalpipe/segment, /obj/structure/chair/wood, @@ -98011,7 +94153,10 @@ "dNW" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitegreen" + }, /area/medical/virology) "dNX" = ( /obj/machinery/light{ @@ -98029,7 +94174,10 @@ icon_state = "0-2" }, /obj/item/twohanded/required/kirbyplants, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dNY" = ( /obj/structure/cable{ @@ -98038,9 +94186,11 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dNZ" = ( /obj/effect/decal/cleanable/dirt, @@ -98067,23 +94217,33 @@ }, /obj/machinery/reagentgrinder, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dOd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreencorner" }, /area/medical/virology) "dOe" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -98095,8 +94255,11 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 5; @@ -98110,13 +94273,16 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/medical{ name = "Virology"; req_access_txt = "39" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/medical/virology) "dOh" = ( @@ -98132,6 +94298,9 @@ icon_state = "2-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -98147,7 +94316,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -98164,12 +94338,11 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/landmark{ name = "blobstart" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -98181,8 +94354,12 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -98201,13 +94378,18 @@ icon_state = "2-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/glass, /obj/item/folder/white, /obj/item/pen/red, /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitegreen" @@ -98224,7 +94406,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 8 @@ -98233,11 +94414,7 @@ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) -"dOo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall, -/area/chapel/office) +/area/maintenance/apmaint) "dOp" = ( /obj/structure/cable{ d1 = 1; @@ -98245,12 +94422,13 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/centcom{ name = "Chapel Morgue"; opacity = 1; req_access_txt = "27" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -98270,13 +94448,6 @@ icon_state = "chapel" }, /area/chapel/main) -"dOs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "chapel" - }, -/area/chapel/main) "dOt" = ( /obj/structure/chair/wood, /obj/machinery/light{ @@ -98300,7 +94471,6 @@ }, /area/hallway/secondary/exit) "dOv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ dir = 8 @@ -98361,10 +94531,6 @@ /turf/simulated/floor/plating, /area/medical/virology) "dOG" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/machinery/light{ dir = 8 }, @@ -98374,29 +94540,19 @@ }, /area/medical/virology) "dOH" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/virology) -"dOI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitegreencorner" - }, -/area/medical/virology) "dOJ" = ( /obj/structure/cable{ d1 = 1; @@ -98404,10 +94560,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, /obj/structure/sink{ dir = 8; pixel_x = -12; @@ -98419,19 +94571,14 @@ }, /area/medical/virology) "dOK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreencorner" }, /area/medical/virology) "dOL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/iv_drip, /obj/machinery/firealarm{ dir = 1; @@ -98442,10 +94589,8 @@ }, /area/medical/virology) "dOM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitegreencorner" @@ -98458,10 +94603,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, /obj/structure/table/glass, /obj/item/paper_bin, /obj/machinery/newscaster{ @@ -98472,27 +94613,24 @@ dir = 8 }, /obj/item/storage/box/monkeycubes, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitegreencorner" }, /area/medical/virology) "dOO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dOP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dOQ" = ( /obj/structure/cable{ d1 = 1; @@ -98500,40 +94638,24 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dOR" = ( /obj/effect/spawner/random_spawners/cobweb_right_frequent, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dOS" = ( /turf/simulated/wall/r_wall, /area/chapel/office) "dOT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/crematorium, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/office) -"dOU" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/chapel/office) "dOV" = ( /obj/structure/cable{ d2 = 4; @@ -98580,6 +94702,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -98587,7 +94710,7 @@ "dOZ" = ( /obj/machinery/alarm{ dir = 8; - pixel_x = 25 + pixel_x = 24 }, /turf/simulated/floor/plasteel{ dir = 4; @@ -98606,87 +94729,47 @@ }, /area/hallway/secondary/exit) "dPb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/closet/emcloset, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) -"dPc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) -"dPd" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) -"dPe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) -"dPf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) "dPg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/iv_drip, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dPj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/item/twohanded/required/kirbyplants, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitegreencorner" }, /area/medical/virology) "dPk" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10; - initialize_directions = 10 - }, /obj/structure/table, /obj/item/crowbar, /obj/item/wrench, /obj/item/restraints/handcuffs/cable, -/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -98698,18 +94781,16 @@ /obj/structure/sign/vacuum{ pixel_y = -32 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitegreencorner" }, /area/medical/virology) -"dPm" = ( -/obj/effect/spawner/window/reinforced, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/medical/virology) "dPn" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -98717,7 +94798,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -98745,13 +94825,12 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/spawner/random_spawners/blood_maybe, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dPs" = ( /obj/structure/cable{ d1 = 4; @@ -98761,7 +94840,7 @@ }, /obj/effect/spawner/random_spawners/blood_maybe, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dPt" = ( /obj/structure/cable{ d1 = 4; @@ -98771,11 +94850,13 @@ }, /obj/machinery/light/small, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dPu" = ( /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/south, /obj/machinery/door/airlock/public/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dPv" = ( @@ -98791,11 +94872,17 @@ icon_state = "2-4"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "blue" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dPw" = ( /obj/structure/cable{ d1 = 4; @@ -98803,8 +94890,14 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dPx" = ( /obj/structure/cable{ d1 = 4; @@ -98812,11 +94905,17 @@ icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "blue" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dPy" = ( /obj/structure/cable{ d1 = 4; @@ -98825,11 +94924,17 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "blue" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dPz" = ( /obj/structure/cable{ d1 = 4; @@ -98843,9 +94948,15 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dPA" = ( /obj/structure/cable{ d1 = 4; @@ -98860,11 +94971,17 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 0; icon_state = "blue" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dPB" = ( /obj/structure/cable{ d1 = 4; @@ -98875,26 +94992,38 @@ /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dPC" = ( /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dPD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/item/radio/intercom{ dir = 8; pixel_x = -28 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -98906,15 +95035,14 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 8; - external_pressure_bound = 100; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/crema_switch{ pixel_x = 26 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4; + initialize_directions = 11 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -98925,50 +95053,13 @@ icon_state = "chapel" }, /area/chapel/main) -"dPG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - icon_state = "chapel" - }, -/area/chapel/main) -"dPH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "chapel" - }, -/area/chapel/main) -"dPI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "chapel" - }, -/area/chapel/main) "dPJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/chapel/main) -"dPK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "chapel" - }, -/area/chapel/main) "dPL" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ @@ -98977,11 +95068,9 @@ }, /area/chapel/main) "dPM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dPN" = ( @@ -98997,14 +95086,13 @@ /turf/simulated/wall/r_wall/rust, /area/medical/virology) "dPT" = ( +/obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, /obj/structure/cable, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/plating, /area/medical/virology) "dPU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/bed, /obj/item/bedsheet/medical, /turf/simulated/floor/plasteel{ @@ -99013,27 +95101,22 @@ }, /area/medical/virology) "dPV" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitegreen" }, /area/medical/virology) "dPW" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitegreen" }, /area/medical/virology) "dPX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/bed, /obj/item/bedsheet/medical, /turf/simulated/floor/plasteel{ @@ -99042,7 +95125,6 @@ }, /area/medical/virology) "dPY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/vending/cola, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -99068,13 +95150,13 @@ "dQb" = ( /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dQc" = ( /obj/structure/cable, /obj/effect/spawner/window/reinforced, /obj/structure/barricade/wooden, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dQd" = ( /obj/structure/cable{ d1 = 4; @@ -99088,6 +95170,9 @@ /obj/effect/landmark/start{ name = "Coroner" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -99101,7 +95186,7 @@ }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dQf" = ( /obj/machinery/door/poddoor/shutters{ dir = 2; @@ -99115,7 +95200,7 @@ }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dQg" = ( /obj/structure/cable{ d1 = 1; @@ -99123,20 +95208,21 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/barricade/wooden, /obj/machinery/door/airlock/command/glass{ name = "Auxiliary E.V.A."; req_one_access_txt = "18" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dQh" = ( /obj/structure/morgue, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -99149,7 +95235,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/light{ dir = 4 }, @@ -99157,17 +95242,12 @@ c_tag = "Cremator"; dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/office) -"dQj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "chapel" - }, -/area/chapel/main) "dQk" = ( /obj/structure/table/wood, /turf/simulated/floor/plasteel{ @@ -99175,16 +95255,10 @@ }, /area/chapel/main) "dQl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/wood, /obj/item/storage/bible, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/chapel/main) -"dQm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -99197,9 +95271,8 @@ }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dQo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/vending/snack, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -99219,9 +95292,6 @@ /area/hallway/secondary/exit) "dQq" = ( /obj/structure/table/reinforced, -/obj/structure/mirror{ - pixel_x = 24 - }, /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, @@ -99230,11 +95300,13 @@ }, /obj/item/circular_saw, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/item/cautery, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/assembly/robotics) "dQr" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/power/apc{ dir = 4; name = "east bump"; @@ -99255,9 +95327,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) @@ -99276,7 +95345,7 @@ /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, -/area/medical/surgery) +/area/medical/surgery2) "dQv" = ( /obj/structure/cable{ d1 = 4; @@ -99297,29 +95366,38 @@ }, /obj/machinery/smartfridge/secure/chemistry/virology/preloaded, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitegreen" + }, /area/medical/virology) "dQw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitegreen" }, -/obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, /area/medical/virology) "dQx" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/iv_drip, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitegreen" @@ -99330,6 +95408,10 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitegreen" @@ -99340,16 +95422,20 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "whitegreen" }, /area/medical/virology) "dQA" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, /obj/machinery/iv_drip, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 6; icon_state = "whitegreen" @@ -99375,10 +95461,6 @@ /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"dQE" = ( -/obj/effect/decal/warning_stripes/southwestcorner, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "dQF" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, @@ -99394,6 +95476,8 @@ }, /obj/effect/decal/warning_stripes/yellow, /mob/living/carbon/human/monkey, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "whitegreen" }, @@ -99410,10 +95494,13 @@ /obj/item/reagent_containers/dropper, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/effect/decal/warning_stripes/east, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dQI" = ( /obj/machinery/door/airlock/external{ @@ -99447,11 +95534,9 @@ }, /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "robotics_solar_outer"; locked = 1; name = "Engineering External Access"; - req_access = null; req_access_txt = "10;13" }, /obj/effect/decal/warning_stripes/east, @@ -99492,18 +95577,16 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dQN" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/effect/decal/cleanable/cobweb, +/obj/item/reagent_containers/food/drinks/coffee, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dQO" = ( /obj/structure/cable{ d1 = 4; @@ -99513,11 +95596,9 @@ }, /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "robotics_solar_inner"; locked = 1; name = "Engineering External Access"; - req_access = null; req_access_txt = "13" }, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -99532,7 +95613,7 @@ on = 1 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dQQ" = ( /obj/structure/cable{ d1 = 4; @@ -99570,14 +95651,17 @@ pixel_y = -4 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dQS" = ( /turf/simulated/wall/r_wall/rust, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dQT" = ( /obj/structure/table, /obj/item/storage/box/gloves, /obj/item/storage/box/bodybags, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -99589,8 +95673,10 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -99608,14 +95694,6 @@ icon_state = "chapel" }, /area/chapel/main) -"dQW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "chapel" - }, -/area/chapel/main) "dQX" = ( /obj/structure/table/wood, /obj/item/flashlight/lantern, @@ -99624,24 +95702,15 @@ }, /area/chapel/main) "dQY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/landmark/start{ name = "Chaplain" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, /area/chapel/main) -"dQZ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump{ - on = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "chapel" - }, -/area/chapel/main) "dRa" = ( /obj/item/twohanded/required/kirbyplants, /obj/machinery/light{ @@ -99663,10 +95732,6 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/landmark{ name = "xeno_spawn"; pixel_x = -1 @@ -99681,9 +95746,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/engineering{ name = "Aft Port Solar Access"; req_access_txt = "10" @@ -99705,7 +95767,10 @@ /obj/item/storage/box/beakers, /obj/item/storage/box/syringes, /obj/effect/decal/warning_stripes/northeastcorner, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dRg" = ( /obj/structure/table/glass, @@ -99714,31 +95779,39 @@ }, /obj/item/paper_bin, /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dRh" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, /obj/effect/decal/warning_stripes/northeast, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dRi" = ( /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitegreen" + }, /area/medical/virology) "dRj" = ( /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dRk" = ( /obj/structure/cable{ d1 = 1; @@ -99746,12 +95819,12 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/warning_stripes/north, -/turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) -"dRl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel, +/area/maintenance/apmaint) +"dRl" = ( /obj/structure/closet/firecloset, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, @@ -99760,14 +95833,15 @@ /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 4; - pixel_x = -22 + pixel_x = -24 }, /obj/item/stack/cable_coil/random, /obj/item/multitool, +/obj/item/clothing/suit/fire/firefighter, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dRn" = ( /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, @@ -99788,7 +95862,7 @@ "dRp" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -24 }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, @@ -99805,7 +95879,7 @@ "dRr" = ( /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dRs" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/black, @@ -99814,10 +95888,11 @@ /obj/machinery/newscaster{ pixel_x = 32 }, +/obj/item/reagent_containers/food/drinks/coffee, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dRt" = ( /obj/structure/morgue, /obj/machinery/firealarm{ @@ -99835,6 +95910,8 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -99848,6 +95925,9 @@ /obj/machinery/ai_status_display{ pixel_y = -32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -99864,20 +95944,10 @@ icon_state = "whiteblue" }, /area/medical/surgery2) -"dRy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "grimy" - }, -/area/chapel/main) "dRz" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -99897,7 +95967,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dRC" = ( /obj/structure/cable{ d1 = 2; @@ -99905,34 +95975,29 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dRD" = ( /obj/machinery/shieldwallgen, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dRE" = ( /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dRF" = ( /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dRG" = ( /obj/structure/chair, /obj/machinery/light{ @@ -99959,15 +96024,15 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dRJ" = ( /obj/effect/decal/cleanable/fungus, /turf/simulated/wall/r_wall, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dRK" = ( /obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dRL" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance{ @@ -99975,7 +96040,7 @@ name = "2maintenance loot spawner" }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dRM" = ( /obj/structure/cable{ d1 = 1; @@ -99987,6 +96052,8 @@ name = "Chapel Morgue"; req_access_txt = "22" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -100000,13 +96067,11 @@ }, /area/chapel/main) "dRO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/status_display, /turf/simulated/wall, /area/chapel/main) "dRP" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/centcom{ name = "Chapel Office"; opacity = 1; @@ -100018,60 +96083,13 @@ /area/chapel/main) "dRQ" = ( /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) -"dRR" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) -"dRS" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - tag = "" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) -"dRT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) -"dRU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "neutralfull" - }, -/area/hallway/secondary/exit) -"dRV" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 + dir = 4 }, +/turf/simulated/floor/plasteel, +/area/maintenance/apmaint) +"dRV" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -100079,8 +96097,12 @@ /area/hallway/secondary/exit) "dRZ" = ( /obj/effect/decal/warning_stripes/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/item/clothing/suit/fire/firefighter, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSa" = ( /obj/structure/closet/crate/internals, /obj/item/clothing/suit/storage/hazardvest, @@ -100102,7 +96124,7 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSb" = ( /obj/structure/cable{ d1 = 1; @@ -100115,7 +96137,7 @@ /obj/item/radio, /obj/item/clothing/mask/breath, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSc" = ( /obj/structure/cable{ d1 = 1; @@ -100128,8 +96150,11 @@ /obj/item/radio, /obj/item/clothing/mask/breath, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSd" = ( /obj/structure/sign/greencross, /turf/simulated/wall, @@ -100141,6 +96166,8 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -100184,23 +96211,18 @@ }, /area/chapel/office) "dSj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/light{ dir = 1; on = 1 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/office) "dSk" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -100208,7 +96230,6 @@ /area/chapel/office) "dSl" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -100236,12 +96257,12 @@ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dSp" = ( @@ -100251,12 +96272,12 @@ dir = 4; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSr" = ( /obj/machinery/door/airlock/centcom{ name = "Chapel Office"; @@ -100272,13 +96293,9 @@ dir = 5 }, /obj/effect/decal/warning_stripes/southwest, -/turf/simulated/floor/plasteel, -/area/hallway/secondary/exit) -"dSt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dSu" = ( @@ -100291,7 +96308,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) @@ -100306,12 +96325,15 @@ /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dSC" = ( @@ -100329,17 +96351,16 @@ }, /area/medical/surgery) "dSD" = ( +/obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dSE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) @@ -100352,7 +96373,7 @@ }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSG" = ( /obj/structure/cable{ d1 = 4; @@ -100368,7 +96389,7 @@ }, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSH" = ( /obj/structure/cable{ d1 = 2; @@ -100378,7 +96399,7 @@ }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSI" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, @@ -100387,7 +96408,7 @@ pixel_x = 28 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSJ" = ( /obj/item/radio/intercom{ dir = 1; @@ -100399,6 +96420,7 @@ /area/chapel/office) "dSK" = ( /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -100411,7 +96433,6 @@ /area/chapel/office) "dSM" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/chair/office/dark, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -100432,7 +96453,7 @@ }, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSP" = ( /turf/simulated/wall, /area/security/checkpoint) @@ -100449,7 +96470,7 @@ }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSR" = ( /obj/effect/spawner/window/reinforced, /obj/structure/cable{ @@ -100472,15 +96493,16 @@ tag = "" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/checkpoint) "dST" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/checkpoint) "dSU" = ( @@ -100488,7 +96510,6 @@ /turf/simulated/wall, /area/security/checkpoint) "dSV" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -100499,7 +96520,7 @@ d2 = 4; icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/checkpoint) "dSW" = ( @@ -100511,9 +96532,8 @@ }, /obj/effect/decal/warning_stripes/northwest, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dSX" = ( -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -100524,7 +96544,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/security/checkpoint) "dSY" = ( @@ -100557,24 +96577,30 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ name = "Experimentor"; req_access_txt = "47" }, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/explab) "dTf" = ( /obj/structure/table/reinforced, /obj/item/storage/toolbox/emergency, /obj/item/wrench, +/obj/item/reagent_containers/food/drinks/coffee, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dTg" = ( /obj/structure/cable{ d1 = 4; @@ -100591,7 +96617,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/north, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dTh" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/decal/warning_stripes/south, @@ -100604,7 +96630,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ name = "Security Checkpoint"; @@ -100619,7 +96644,7 @@ }, /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dTk" = ( /obj/structure/cable{ d1 = 2; @@ -100639,6 +96664,8 @@ req_access_txt = "63" }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/security/checkpoint) "dTl" = ( @@ -100648,7 +96675,7 @@ amount = 8 }, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dTm" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -100656,6 +96683,9 @@ dir = 8; pixel_x = -28 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -100666,6 +96696,11 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4; + initialize_directions = 11 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -100706,6 +96741,7 @@ /obj/machinery/status_display{ pixel_y = 32 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -100738,6 +96774,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -100749,27 +96786,33 @@ icon_state = "1-2" }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitegreencorner" + icon_state = "whitegreen" }, /area/medical/virology) "dTv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 8; + icon_state = "whitegreen" }, /area/medical/virology) "dTw" = ( @@ -100787,15 +96830,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/door/airlock/medical{ - autoclose = 0; - frequency = 1379; - icon_state = "door_locked"; - id_tag = "viro_lab_airlock_exterior"; - locked = 1; - name = "Virology Lab External Airlock"; - req_access_txt = "39" - }, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1379; @@ -100805,6 +96839,15 @@ pixel_x = -24; req_access_txt = "39" }, +/obj/machinery/door/airlock/medical{ + autoclose = 0; + frequency = 1379; + icon_state = "door_locked"; + id_tag = "viro_lab_airlock_exterior"; + locked = 1; + name = "Virology Lab External Airlock"; + req_access_txt = "39" + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -100822,7 +96865,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -100852,12 +96894,13 @@ req_access_txt = "63" }, /obj/item/folder/red, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, /area/security/checkpoint) "dTD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/reinforced, /obj/item/storage/fancy/donut_box, /turf/simulated/floor/plasteel{ @@ -100880,7 +96923,6 @@ }, /area/security/checkpoint) "dTG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/chair, /turf/simulated/floor/plasteel{ dir = 1; @@ -100894,13 +96936,14 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" }, /area/security/checkpoint) "dTI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -100932,7 +96975,7 @@ /obj/effect/spawner/window/reinforced, /obj/structure/cable, /turf/simulated/floor/plating, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dTX" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -100948,14 +96991,11 @@ }, /area/chapel/office) "dTZ" = ( -/turf/simulated/floor/plasteel{ - icon_state = "grimy" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/area/chapel/office) -"dUa" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -100965,6 +97005,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -100973,26 +97016,33 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/office) "dUd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/airlock/centcom{ name = "Chapel Office"; opacity = 1; req_access_txt = "27" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, /area/chapel/office) "dUe" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -101008,16 +97058,12 @@ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/table/wood, /obj/item/folder, /obj/item/pen, /turf/simulated/floor/carpet, /area/chapel/office) "dUh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/item/paper_bin, /obj/structure/table/wood, /obj/item/pen, @@ -101033,7 +97079,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/southwest, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dUj" = ( /obj/structure/cable{ d2 = 4; @@ -101068,7 +97114,7 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -101084,7 +97130,7 @@ }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dUm" = ( /obj/structure/cable{ d1 = 4; @@ -101100,6 +97146,12 @@ /obj/structure/chair/office/dark{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -101112,9 +97164,8 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -101170,7 +97221,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -101189,15 +97240,20 @@ icon_state = "2-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/security/checkpoint) "dUt" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -101245,7 +97301,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/decal/warning_stripes/southeastcorner, +/obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plating/airless, /area/space/nearstation) "dUG" = ( @@ -101325,7 +97381,7 @@ "dUN" = ( /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/machinery/light_switch{ pixel_x = 26; @@ -101349,9 +97405,8 @@ }, /area/chapel/office) "dUP" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/plasteel{ icon_state = "grimy" @@ -101373,9 +97428,6 @@ /turf/simulated/floor/carpet, /area/chapel/office) "dUR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/chair/office/dark{ dir = 1 }, @@ -101391,7 +97443,7 @@ }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dUT" = ( /obj/structure/table/reinforced, /obj/machinery/newscaster/security_unit{ @@ -101465,7 +97517,7 @@ /obj/structure/closet/secure_closet/security, /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 6; @@ -101549,13 +97601,7 @@ dir = 8; network = list("SS13","Research") }, -/obj/machinery/atmospherics/unary/vent_pump{ - external_pressure_bound = 140; - external_pressure_bound_default = 140; - name = "server vent"; - on = 1; - pressure_checks = 0 - }, +/obj/machinery/atmospherics/pipe/simple/heat_exchanging, /turf/simulated/floor/bluegrid{ icon_state = "gcircuit"; name = "Mainframe Floor"; @@ -101594,8 +97640,11 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, -/area/hallway/primary/aft) +/area/maintenance/apmaint) "dVn" = ( /obj/machinery/power/solar{ name = "Aft Starboard Solar Panel" @@ -101615,7 +97664,7 @@ /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dVp" = ( /turf/simulated/wall/r_wall, /area/security/checkpoint) @@ -101631,10 +97680,10 @@ /obj/machinery/ai_status_display{ pixel_x = -32 }, +/obj/effect/decal/warning_stripes/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/effect/decal/warning_stripes/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -101645,7 +97694,6 @@ /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dVx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ @@ -101664,7 +97712,6 @@ /turf/simulated/floor/plating/airless, /area/engine/engineering) "dWa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -101672,6 +97719,12 @@ tag = "" }, /obj/effect/decal/warning_stripes/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "dWb" = ( @@ -101731,23 +97784,20 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dWh" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance{ name = "Engineering Maintenance"; @@ -101755,8 +97805,9 @@ req_one_access_txt = null }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/engine/engineering) +/area/maintenance/port) "dWi" = ( /obj/structure/reagent_dispensers/watertank, /obj/effect/decal/warning_stripes/northeast, @@ -101766,15 +97817,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass{ name = "Research Division"; req_access_txt = "47" }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dWk" = ( /obj/structure/cable{ @@ -101788,14 +97838,11 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/port) "dWl" = ( /obj/structure/cable{ d1 = 1; @@ -101803,19 +97850,20 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - external_pressure_bound = 101; - on = 1 - }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "dWm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "dWn" = ( /obj/structure/cable{ @@ -101824,10 +97872,9 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plasteel, -/area/toxins/mixing) +/area/maintenance/port) "dWo" = ( /obj/structure/cable{ d1 = 1; @@ -101835,7 +97882,6 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/maintenance{ name = "Toxin Mixing Lab Maintenance"; req_access_txt = "47" @@ -101849,7 +97895,9 @@ dir = 4 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "dWq" = ( /obj/structure/cable{ @@ -101864,7 +97912,9 @@ req_access_txt = "47" }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "dWr" = ( /obj/structure/table/reinforced, @@ -101881,7 +97931,9 @@ pixel_y = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "dWs" = ( /obj/structure/disposalpipe/trunk, @@ -101894,7 +97946,9 @@ pixel_y = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "dWt" = ( /obj/structure/cable{ @@ -101904,20 +97958,23 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /obj/effect/decal/warning_stripes/yellow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "dWu" = ( /obj/machinery/newscaster{ pixel_y = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "dWv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table, /obj/machinery/light, /obj/item/crowbar, @@ -101927,7 +97984,9 @@ pixel_x = 26 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/toxins/xenobiology) "dWw" = ( /obj/machinery/light/small{ @@ -101948,16 +98007,13 @@ icon_state = "2-4"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dWy" = ( /obj/structure/cable{ d1 = 4; @@ -101965,24 +98021,19 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dWz" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "arrival_south_inner"; locked = 1; - name = "Arrivals External Access"; - req_access = null + name = "Arrivals External Access" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -102002,6 +98053,9 @@ }, /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -102035,11 +98089,9 @@ "dWH" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "arrival_south_outer"; locked = 1; - name = "Arrivals External Access"; - req_access = null + name = "Arrivals External Access" }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plasteel, @@ -102051,13 +98103,17 @@ "dWK" = ( /obj/machinery/hologram/holopad, /obj/effect/decal/warning_stripes/yellow/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" }, /area/hallway/primary/aft) "dWL" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /obj/structure/closet/emcloset, /obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel, @@ -102078,9 +98134,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/yellow, /turf/simulated/floor/plasteel{ @@ -102122,7 +98175,10 @@ pixel_y = -32 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dWT" = ( /obj/structure/cable{ @@ -102131,12 +98187,11 @@ icon_state = "1-2"; tag = "" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dWU" = ( /obj/structure/closet/secure_closet/medical1, @@ -102145,10 +98200,12 @@ pixel_x = 24 }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dWV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Isolation A"; @@ -102156,10 +98213,11 @@ }, /obj/effect/decal/warning_stripes/yellow/partial, /obj/effect/decal/warning_stripes/arrow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/medical/virology) "dWW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/airlock/medical/glass{ id_tag = null; name = "Isolation B"; @@ -102167,6 +98225,8 @@ }, /obj/effect/decal/warning_stripes/yellow/partial, /obj/effect/decal/warning_stripes/arrow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/medical/virology) "dWX" = ( @@ -102206,14 +98266,14 @@ name = "Chapel Maintenance"; req_access_txt = "12" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "dark" }, -/area/chapel/main) +/area/maintenance/fpmaint2) "dXb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 1; - level = 2 +/obj/machinery/atmospherics/binary/valve{ + dir = 4 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -102221,8 +98281,9 @@ }, /area/medical/virology) "dXc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ + dir = 1; + level = 2 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -102254,6 +98315,9 @@ pixel_y = -28 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/medical/virology) "dXg" = ( @@ -102261,6 +98325,9 @@ /obj/item/folder/white, /obj/item/pen/red, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/medical/virology) "dXh" = ( @@ -102270,15 +98337,15 @@ icon_state = "1-2"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 10 + }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitegreencorner" }, /area/medical/virology) "dXi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "whitegreencorner" @@ -102286,36 +98353,33 @@ /area/medical/virology) "dXj" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, /obj/effect/decal/warning_stripes/south, /obj/machinery/door/airlock/public/glass, /turf/simulated/floor/plasteel, /area/hallway/primary/aft) "dXk" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/machinery/light{ dir = 8 }, /obj/machinery/ai_status_display{ pixel_x = -32 }, -/obj/effect/decal/warning_stripes/east, /obj/machinery/camera{ c_tag = "Research Director's Bedroom"; dir = 4; network = list("Research","SS13"); pixel_y = -22 }, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, /area/crew_quarters/hor) "dXl" = ( /obj/structure/grille, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dXm" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, @@ -102342,11 +98406,8 @@ icon_state = "brokengrille" }, /turf/simulated/floor/plasteel, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dXp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/camera{ c_tag = "Medbay Hallway East"; dir = 1; @@ -102371,16 +98432,16 @@ }, /area/medical/morgue) "dXr" = ( -/obj/item/twohanded/required/kirbyplants, -/obj/structure/noticeboard{ - pixel_x = 32 - }, /obj/machinery/camera{ c_tag = "Robotics Lab"; dir = 8; network = list("Research","SS13") }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /obj/effect/decal/warning_stripes/east, +/obj/item/twohanded/required/kirbyplants, /turf/simulated/floor/plasteel, /area/assembly/robotics) "dXs" = ( @@ -102392,7 +98453,7 @@ dir = 8; icon_state = "neutral" }, -/area/maintenance/fpmaint2) +/area/maintenance/apmaint) "dXu" = ( /obj/machinery/light{ dir = 4 @@ -102406,10 +98467,11 @@ network = list("Research","SS13") }, /obj/effect/decal/warning_stripes/west, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, /area/toxins/mixing) "dXv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/camera{ c_tag = "Research South Hallway"; dir = 4; @@ -102425,13 +98487,13 @@ }, /area/medical/research) "dXw" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -102449,15 +98511,15 @@ }, /area/chapel/main) "dXy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/structure/table/wood, /obj/machinery/camera{ c_tag = "Research Break Room"; dir = 8; network = list("Research","SS13") }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "neutral" @@ -102479,9 +98541,6 @@ }, /area/medical/cmo) "dXA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/sign/securearea, /obj/effect/decal/cleanable/fungus, /turf/simulated/wall/r_wall, @@ -102535,7 +98594,10 @@ network = list("SS13","Medical") }, /obj/effect/decal/warning_stripes/yellow/hollow, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitegreencorner" + }, /area/medical/virology) "dXH" = ( /obj/structure/cable{ @@ -102554,15 +98616,18 @@ /turf/simulated/floor/plating, /area/maintenance/portsolar) "dXI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /obj/machinery/light, /obj/machinery/camera{ c_tag = "Chapel South"; dir = 1 }, /obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "grimy" }, @@ -102573,13 +98638,16 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -24 }, /obj/machinery/camera{ c_tag = "Departure Lounge South"; dir = 1 }, /obj/effect/decal/warning_stripes/south, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/hallway/secondary/exit) "dXK" = ( @@ -102749,6 +98817,7 @@ }, /area/medical/genetics) "dYd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; @@ -102756,16 +98825,16 @@ }, /area/medical/genetics) "dYi" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -102778,14 +98847,14 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/power/apc{ dir = 4; name = "east bump"; pixel_x = 24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; @@ -102793,37 +98862,21 @@ }, /area/medical/genetics) "dYk" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /turf/simulated/floor/plasteel{ icon_state = "white" }, /area/medical/genetics) "dYl" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" @@ -102850,7 +98903,9 @@ }, /obj/effect/decal/warning_stripes/yellow, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dYq" = ( /obj/machinery/light/small, @@ -102862,11 +98917,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/medical/research) -"dYs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/maintenance/gambling_den) "dYt" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -102877,16 +98927,6 @@ icon_state = "wood" }, /area/maintenance/gambling_den) -"dYv" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/maintenance/gambling_den) "dYw" = ( /obj/effect/decal/warning_stripes/northwest, /obj/effect/decal/cleanable/dirt, @@ -102918,14 +98958,15 @@ /area/medical/research) "dYB" = ( /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/greengrid, /area/medical/research) "dYC" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 4; - on = 1 - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "neutralfull" @@ -102970,6 +99011,8 @@ /obj/effect/decal/warning_stripes/arrow{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -102978,7 +99021,9 @@ /obj/item/twohanded/required/kirbyplants, /obj/effect/decal/warning_stripes/yellow, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dYH" = ( /obj/item/twohanded/required/kirbyplants, @@ -102987,7 +99032,9 @@ }, /obj/effect/decal/warning_stripes/yellow, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, /area/medical/research) "dYI" = ( /obj/structure/cable{ @@ -103190,27 +99237,27 @@ dir = 8; icon_state = "redcorner" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "dZP" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "dZQ" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitehall" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "dZR" = ( /obj/machinery/optable, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "white" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "dZS" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -103219,7 +99266,7 @@ dir = 1; icon_state = "whitehall" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "dZT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -103227,14 +99274,14 @@ dir = 1; icon_state = "redcorner" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "dZU" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "dZV" = ( /obj/docking_port/stationary{ dir = 8; @@ -103261,12 +99308,6 @@ icon_state = "showroomfloor" }, /area/medical/surgery1) -"ehq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/medical/medbay) "ejA" = ( /obj/structure/cable{ d1 = 1; @@ -103363,7 +99404,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/maintenance/auxsolarstarboard) +/area/maintenance/starboardsolar) "exL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -103374,7 +99415,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/plasteel{ dir = 8; - icon_state = "neutralcorner" + icon_state = "purplecorner" }, /area/hallway/primary/central) "ezR" = ( @@ -103484,6 +99525,9 @@ }, /area/crew_quarters/theatre) "eSe" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/door/airlock/medical{ name = "Operating Theatre Storage"; req_access_txt = "45" @@ -103491,7 +99535,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -103598,9 +99642,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /obj/effect/landmark{ name = "xeno_spawn"; @@ -103617,7 +99660,6 @@ }, /obj/machinery/recharger, /obj/structure/table/reinforced, -/obj/item/key/security, /obj/machinery/door_control{ id = "Secure Armory"; name = "Secure Armory Shutter Control"; @@ -103656,12 +99698,6 @@ /turf/simulated/floor/plating, /area/security/brig) "fBl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -103734,7 +99770,7 @@ }, /obj/structure/lattice/catwalk, /turf/space, -/area/maintenance/auxsolarstarboard) +/area/maintenance/starboardsolar) "fHe" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ @@ -103807,16 +99843,16 @@ /turf/simulated/floor/plating, /area/security/brig) "fVZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -103861,24 +99897,10 @@ icon_state = "red" }, /area/security/processing) -"gmN" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - tag = "" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) "goP" = ( /turf/simulated/wall, /area/security/processing) "gpX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark{ name = "blobstart" }, @@ -103918,12 +99940,12 @@ }, /area/security/processing) "gxd" = ( -/obj/structure/chair{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/chair{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -103983,17 +100005,17 @@ }, /area/security/brig) "gGu" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, -/area/maintenance/starboard) +/area/maintenance/starboard2) "gGJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -104041,12 +100063,10 @@ /area/hallway/primary/starboard) "gKi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -104081,13 +100101,6 @@ "gTW" = ( /turf/simulated/floor/plasteel, /area/security/securearmoury) -"gYw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "arrival" - }, -/area/hallway/secondary/entry) "haD" = ( /obj/structure/cable{ d2 = 8; @@ -104180,20 +100193,18 @@ }, /area/security/brig) "hjo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/closet/crate, /obj/effect/landmark/costume/random, /obj/effect/spawner/lootdrop/maintenance, /turf/simulated/floor/plating, /area/maintenance/starboard) "hmC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ icon_state = "whitebluecorner" }, @@ -104203,20 +100214,21 @@ /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) "hos" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/starboard) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/medical/psych) "hzb" = ( /obj/machinery/light{ dir = 4 @@ -104322,6 +100334,9 @@ /turf/simulated/wall, /area/magistrateoffice) "hTW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/camera{ c_tag = "Medbay Surgery East Storage"; dir = 1 @@ -104330,9 +100345,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -104343,6 +100355,21 @@ icon_state = "redcorner" }, /area/hallway/primary/starboard) +"ibc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atm{ + pixel_y = 32 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "ibR" = ( /obj/effect/decal/warning_stripes/east, /obj/structure/cable{ @@ -104361,15 +100388,15 @@ /turf/simulated/floor/plasteel, /area/security/securearmoury) "ifj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -104433,14 +100460,14 @@ }, /area/maintenance/starboard) "iDa" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/door_control{ id = "magistrate"; name = "Privacy Shutters Control"; pixel_y = 25 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/table/wood, /obj/machinery/computer/secure_data/laptop, /turf/simulated/floor/plasteel{ @@ -104530,6 +100557,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/maintenance/starboard) "iVV" = ( @@ -104607,8 +100635,8 @@ /area/security/processing) "jkU" = ( /obj/structure/disposalpipe/trunk, -/obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/disposal, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -104663,18 +100691,27 @@ }, /area/security/warden) "jCU" = ( -/obj/structure/sign/poster/official/random{ - pixel_y = 32 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, /obj/structure/filingcabinet, /turf/simulated/floor/plasteel{ icon_state = "cult" }, /area/magistrateoffice) +"jHa" = ( +/obj/machinery/atm{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "neutralcorner" + }, +/area/crew_quarters/fitness) "jIs" = ( /turf/simulated/wall/r_wall, /area/security/evidence) @@ -104706,6 +100743,7 @@ }, /area/hallway/primary/central) "jUH" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -104718,7 +100756,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -104743,32 +100780,33 @@ /turf/simulated/floor/plating, /area/security/seceqstorage) "khY" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, -/area/maintenance/starboard) +/area/maintenance/starboard2) "kii" = ( /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plasteel, /area/security/securearmoury) "kiL" = ( /obj/structure/rack, -/obj/item/ammo_box/shotgun/rubbershot, -/obj/item/ammo_box/shotgun/rubbershot, -/obj/item/ammo_box/shotgun/rubbershot, -/obj/item/ammo_box/shotgun/rubbershot, -/obj/item/ammo_box/shotgun/rubbershot, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, +/obj/item/ammo_box/shotgun/rubbershot, +/obj/item/ammo_box/shotgun/buck, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/buck, +/obj/item/storage/box/buck, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -104783,6 +100821,7 @@ /area/security/permabrig) "kkM" = ( /obj/vehicle/secway, +/obj/item/key/security, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -104832,11 +100871,9 @@ }, /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "sol_inner"; locked = 1; - name = "Arrivals External Access"; - req_access = null + name = "Arrivals External Access" }, /turf/simulated/floor/plating, /area/hallway/secondary/entry) @@ -104849,11 +100886,11 @@ }, /area/security/detectives_office) "kyq" = ( -/obj/structure/table/reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/table/reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -104862,14 +100899,14 @@ }, /area/security/prisonershuttle) "kzg" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, /area/security/warden) "kCi" = ( @@ -104932,8 +100969,8 @@ /area/security/securearmoury) "kVM" = ( /obj/structure/disposalpipe/trunk, -/obj/effect/decal/warning_stripes/yellow/hollow, /obj/machinery/disposal, +/obj/effect/decal/warning_stripes/yellow/hollow, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -105006,13 +101043,13 @@ }, /area/security/seceqstorage) "loP" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -105056,19 +101093,22 @@ }, /area/crew_quarters/courtroom) "ltY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/effect/decal/warning_stripes/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/maintenance/starboard) "luc" = ( @@ -105107,7 +101147,6 @@ opacity = 0 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -105186,7 +101225,6 @@ }, /area/security/seceqstorage) "lVO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/turretid/lethal{ control_area = "\improper Telecoms Central Compartment"; name = "Telecommunications Turret Control"; @@ -105220,8 +101258,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -105310,7 +101347,7 @@ tag = "" }, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -105360,7 +101397,7 @@ "mqS" = ( /obj/structure/table/reinforced, /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/item/storage/box/chemimp, /obj/item/storage/box/trackimp, @@ -105412,15 +101449,9 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/security/hos) +/area/crew_quarters/heads/hos) "mzg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -105498,6 +101529,20 @@ icon_state = "neutralfull" }, /area/security/brig) +"mOF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atm{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "arrival" + }, +/area/hallway/secondary/entry) "mQk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -105530,11 +101575,9 @@ "mWj" = ( /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "sol_outer"; locked = 1; - name = "Arrivals External Access"; - req_access = null + name = "Arrivals External Access" }, /obj/machinery/access_button{ command = "cycle_exterior"; @@ -105755,6 +101798,15 @@ icon_state = "redcorner" }, /area/security/permasolitary) +"nQq" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atm{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/hallway/primary/aft) "nQJ" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -105805,10 +101857,11 @@ }, /area/security/processing) "obN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "neutral" }, -/turf/simulated/floor/plating, /area/maintenance/starboard) "odY" = ( /obj/machinery/camera{ @@ -105818,7 +101871,7 @@ /obj/machinery/portable_atmospherics/canister/air, /obj/effect/decal/warning_stripes/northeast, /turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) +/area/maintenance/starboardsolar) "oei" = ( /obj/machinery/computer/secure_data, /turf/simulated/floor/plasteel{ @@ -105858,23 +101911,26 @@ /turf/simulated/floor/plating, /area/security/detectives_office) "osS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "neutral" }, -/area/maintenance/fsmaint) +/area/maintenance/fore2) "oBE" = ( /obj/effect/spawner/lootdrop/maintenance, /obj/item/vending_refill/coffee, @@ -105887,9 +101943,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ dir = 1; @@ -105926,8 +101979,8 @@ tag = "" }, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /obj/structure/cable{ d1 = 2; @@ -105970,7 +102023,21 @@ icon_state = "redcorner" }, /area/security/permasolitary) +"pfp" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atm{ + pixel_x = 32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "pgF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ id_tag = "BrigWest"; @@ -105981,9 +102048,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/door/poddoor{ density = 0; icon_state = "open"; @@ -106220,8 +102284,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1; - initialize_directions = 11 + dir = 1 }, /turf/simulated/floor/plasteel{ dir = 1; @@ -106269,21 +102332,19 @@ }, /obj/machinery/door/airlock/external{ frequency = 1379; - icon_state = "door_locked"; id_tag = "solar_xeno_outer"; locked = 1; name = "Engineering External Access"; - req_access = null; req_access_txt = "10;13" }, /obj/effect/decal/warning_stripes/west, /turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) +/area/maintenance/starboardsolar) "qVp" = ( /obj/structure/table/reinforced, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/machinery/light{ dir = 8 @@ -106297,7 +102358,7 @@ /area/security/warden) "qXF" = ( /obj/machinery/alarm{ - pixel_y = 23 + pixel_y = 24 }, /obj/structure/cable{ d1 = 2; @@ -106412,10 +102473,7 @@ icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" }, @@ -106442,7 +102500,7 @@ /turf/simulated/floor/plasteel/airless{ icon_state = "solarpanel" }, -/area/maintenance/auxsolarstarboard) +/area/maintenance/starboardsolar) "rsF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -106505,6 +102563,9 @@ }, /area/security/securearmoury) "rSI" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) "rTc" = ( @@ -106514,7 +102575,7 @@ /turf/simulated/floor/plasteel{ icon_state = "grimy" }, -/area/security/detectives_office) +/area/crew_quarters/theatre) "rTE" = ( /obj/structure/cable{ d1 = 1; @@ -106523,8 +102584,7 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4; - initialize_directions = 11 + dir = 4 }, /obj/effect/decal/warning_stripes/south, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -106624,12 +102684,12 @@ /turf/simulated/floor/plating, /area/hallway/secondary/entry) "soN" = ( +/obj/structure/disposalpipe/segment, /obj/machinery/computer/operating, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkblue" @@ -106691,6 +102751,7 @@ }, /area/security/processing) "sEN" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -106703,7 +102764,6 @@ icon_state = "2-8"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -106722,11 +102782,11 @@ }, /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -24 }, /obj/effect/decal/warning_stripes/southeast, /turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) +/area/maintenance/starboardsolar) "sTz" = ( /obj/structure/closet/secure_closet/security, /turf/simulated/floor/plasteel{ @@ -106931,13 +102991,13 @@ /turf/simulated/floor/plating, /area/crew_quarters/theatre) "tJH" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; tag = "" }, -/obj/structure/disposalpipe/segment, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; @@ -107030,12 +103090,10 @@ /area/crew_quarters/theatre) "tVa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -107200,7 +103258,7 @@ }, /obj/effect/decal/warning_stripes/south, /turf/simulated/floor/plating, -/area/maintenance/auxsolarstarboard) +/area/maintenance/starboardsolar) "uCE" = ( /obj/machinery/status_display, /turf/simulated/wall/r_wall, @@ -107226,16 +103284,16 @@ dir = 1; icon_state = "whiteblue" }, -/area/crew_quarters/theatre) +/area/medical/surgery2) "uSJ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/effect/spawner/window/reinforced, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plating, /area/security/main) "uUu" = ( @@ -107252,9 +103310,8 @@ /turf/simulated/floor/plating, /area/security/permabrig) "uVQ" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - dir = 1; - on = 1 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /obj/effect/landmark{ name = "xeno_spawn"; @@ -107393,7 +103450,7 @@ /obj/effect/decal/warning_stripes/southwest, /obj/machinery/alarm{ dir = 1; - pixel_y = -25 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ dir = 10; @@ -107447,9 +103504,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, /turf/simulated/floor/bluegrid, /area/tcommsat/chamber) "vCk" = ( @@ -107468,15 +103522,9 @@ }, /area/security/warden) "vDg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/alarm{ dir = 1; - pixel_y = -22 + pixel_y = -24 }, /turf/simulated/floor/plasteel{ icon_state = "dark" @@ -107494,6 +103542,17 @@ icon_state = "red" }, /area/security/seceqstorage) +"vEw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atm{ + pixel_x = -32 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/hallway/primary/central) "vFf" = ( /obj/structure/table/wood, /obj/item/crowbar/red, @@ -107517,12 +103576,10 @@ tag = "" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8; - initialize_directions = 11 + dir = 8 }, /turf/simulated/floor/plasteel{ icon_state = "red" @@ -107559,7 +103616,7 @@ /obj/item/restraints/handcuffs, /obj/machinery/alarm{ dir = 4; - pixel_x = -23 + pixel_x = -24 }, /obj/machinery/light{ dir = 8 @@ -107629,12 +103686,18 @@ /area/space/nearstation) "wvH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plasteel, /area/hallway/secondary/entry) "wAE" = ( /obj/structure/dresser, /turf/simulated/floor/plating, /area/security/detectives_office) +"wAP" = ( +/obj/effect/decal/warning_stripes/yellow/hollow, +/obj/structure/closet/radiation, +/turf/simulated/floor/plasteel, +/area/engine/controlroom) "wIT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/rack, @@ -107679,7 +103742,6 @@ name = "Prison Lockdown Blast Doors"; opacity = 0 }, -/obj/effect/spawner/window/reinforced, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -107851,15 +103913,15 @@ }, /area/security/warden) "xHj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/simulated/floor/plasteel{ icon_state = "showroomfloor" }, @@ -107903,21 +103965,24 @@ }, /area/hallway/primary/starboard) "xQW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8"; tag = "" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/starboard) "xUI" = ( @@ -107937,9 +104002,6 @@ icon_state = "4-8"; tag = "" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/starboard) @@ -108007,10 +104069,10 @@ /turf/simulated/floor/plasteel, /area/security/permasolitary) "ygv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -114067,17 +110129,17 @@ aaa aaa abj bkt -bJO -bzu +bpn +brp bRu -bzu +brp bRr -bRr -bLT -bzu -bzu -bzu -bJX +blv +blO +brp +brp +brp +cpb brs abi aaa @@ -114324,7 +110386,7 @@ abi abi abi bku -bJP +bpo bLM bms bPC @@ -114334,7 +110396,7 @@ bVH brq bms bnR -bJP +bpo brr abj aaa @@ -114581,17 +110643,17 @@ bpm bmo bpm bnM -bJP +bpo brr bNM bNM bNM bTt -bVI +bNM bNM bNM bkt -bJP +bpo brs abi aaa @@ -114831,13 +110893,13 @@ brp brp brp bwM -bxW -bzu -bzu -bzu -bzu -bzu -bzu +brp +brp +brp +brp +brp +brp +brp bJQ brs bNM @@ -114848,7 +110910,7 @@ bVJ ccx bNM bkt -bJP +bpo brr abi abi @@ -115101,11 +111163,11 @@ bNM bPH bSr bTv -bVK +bXI cgI bNM bkt -bJP +bpo bLS bmo bpm @@ -115362,10 +111424,10 @@ bVL chu bNM bku -bJY -bzu -bzu -chS +boe +brp +brp +brp brp brp cpb @@ -115614,8 +111676,8 @@ btd bNM bPP bUD -bTx -bVM +bTL +bXI chE bNM aaa @@ -115871,7 +111933,7 @@ btd bNM bPQ bXm -bTy +bTI bVN cmx bNM @@ -116117,19 +112179,19 @@ btd btd bwG bxY -bzx +byg bBd bCU bBd bBf -bIg +bxY bBf bwG bNM bNM bNM bTz -bVI +bNM bNM bNM qrT @@ -116375,17 +112437,17 @@ bvz bwH bxZ bzy -bBe +bIh bCV -bBe -bBe +bIh +bIh bIh bJS -bLN +bLQ bNN bPI -bRy -bTA +bVO +bTG bVO bPI bNM @@ -116623,37 +112685,37 @@ aaa abi bkt bmp -bnN -bpp -brt -btc -btc -btc -bwI -bya +cqK +bpq +brr +btd +btd +btd +bBf +bye bzz bBf bBf bED bBf -bBf +bgN bJT bLO bNM bPJ bRz bTB -bVP +bVS bXH bNM caV +caW ccU -ceM ccU -chV -cjD -cnV -cpc +chX +qrT +bku +bmq cqK csk brr @@ -116888,25 +112950,25 @@ btd bvA bwJ byb -bzz +bBf btd bCW btd btd bIi -bJT +bhV bNL -bNO +bNM bSo -bRA -bTC -bVQ +bVS +bTE +bVS bXI -bNO -caW -caW -ceN +bNM +ccU caW +ceP +ccU fBl qrT bkt @@ -117136,7 +113198,7 @@ aaa aaa abj bkt -bmq +bav bnP bvv bRG @@ -117145,14 +113207,14 @@ btd bwF bwK byc -bLP +bwJ bBg bCX bEE btd bIj bJU -bCU +biX bNP bPL bRB @@ -117161,15 +113223,15 @@ bVR bXJ bZh caX -ccW +boh cgu ccW chW qrT cKl -bmq +bav bnP -bpq +btk brr abj aaa @@ -117393,40 +113455,40 @@ aaa aaa abi bku -bmq -bnO -bpq +baE +bcA +bdZ brs btd btd bvC bwJ byd -bzz +bBf btd bCY btd btd bIk bJV -bwL -bNQ -bPM -bRC +bBf +bNM +bXI +bVS bTE bVS lVO -bNQ +bNM caY ccX ceP -ccX +ccU vDg qrT bkt -bmq -cqL -bpq +brT +bsb +btx brs abi aaa @@ -117651,36 +113713,36 @@ aaa abi bkt bmr -bnQ +cqM bps -brv -bte -bte -bte -bwL +brr +btd +btd +btd +bBf bye bzA -bwL -bwL +bBf +bBf bEF -bwL +bBf bIl -bJT +bip bBf bNM bPJ bRD bTF -bVP +bVS bXK bNM caV +ccX ccU -ceQ ccU chX -cjF -cnX +qrT +bku cpd cqM csl @@ -117909,7 +113971,7 @@ abi aaa bms bnR -bpo +bJP brs aaa btd @@ -117917,28 +113979,28 @@ bvz bwH byf bzB -bBh +bIm bCZ -bBh -bBh +bIm +bIm bIm bJW bLQ bNR bPI -bRE +bVT bTG bVT bXL bNM qrT -rSI +bon vzz hng qrT qrT bkt -bpo +bJP bLM bpu aaa @@ -118166,14 +114228,14 @@ abi abi abi bku -bpo +bJP brr abj btd btd bwG byg -bzC +bIn bBd bCU bBd @@ -118183,9 +114245,9 @@ bBf bwG bNM bNM -bRF +bNM bTH -bVI +bNM bNM bNM qrT @@ -118195,7 +114257,7 @@ qrT qrT qrT bkt -bpo +bJP brr abi abi @@ -118423,7 +114485,7 @@ aaa aaa abi bkt -bpo +bJP brs aaa btd @@ -118452,7 +114514,7 @@ qrT qrT abj bku -bpo +bJP brs abi aaa @@ -118680,7 +114742,7 @@ aaa aaa abj bkt -bpo +bJP brs abj abj @@ -118697,9 +114759,9 @@ bzv btd bNM bQC -bRH -bTJ -bVK +bXI +bTL +bXI bXM bNM aaa @@ -118709,7 +114771,7 @@ bmo bpm bmo cnY -bpo +bJP brr abi aaa @@ -118937,7 +114999,7 @@ aaa aaa abi bkt -bpo +bJP brr alW abj @@ -118954,18 +115016,18 @@ btd btd bNM bQD -bRH +bjE bTK -bVM +bXI bXN bNM bku bJO -bzu -bzu chS -brp -brp +chS +chS +chS +chS cpe brs abj @@ -119194,7 +115256,7 @@ aaa aaa abi bkt -bpo +bJP brw bpm bmo @@ -119211,9 +115273,9 @@ bmo aaa bNM bRt -bRI +bXI bTL -bVM +bXI bXO bNM bkt @@ -119451,26 +115513,26 @@ aaa aaa abi bku -bpt -brp -brp -brp -brp +bJY +chS +chS +chS +chS bxM -bxW -bzu -bzu -bzu -bzu -bzu -bzu +chS +chS +chS +chS +chS +chS +chS bJX brs bNM bPN -bRE -bTG bVT +blG +bmS bXP bNM bkt @@ -119725,9 +115787,9 @@ bJP bLR bNM bNM -bRF +bNM bTM -bVI +bNM bNM bNM bku @@ -120238,14 +116300,14 @@ bkt bJY bLT bRv -bzu -bRK +chS +bVW bTO bVW -bzu -bzu -bzu -bJQ +chS +chS +chS +cpe brs abj abj @@ -120496,8 +116558,8 @@ bnR bLU bLM bPC -bRL -bTP +bmq +bTS bpq brq bms @@ -120755,7 +116817,7 @@ brr bku bRL bTQ -bpq +bmY brr abi abi @@ -121010,7 +117072,7 @@ aaa bUJ aaa bku -bRL +bmq bTR bpq brr @@ -121267,7 +117329,7 @@ aaa bUJ aaa bku -bRL +bmq bTS bpq brr @@ -127719,15 +123781,15 @@ bXU bXU abj cPY -bYh -bYh +cHA +cHA cJK -bYh -bYh -bYh +cHA +cHA +cHA cJK -bYh -bYh +cHA +cHA cCx cJK cCx @@ -127974,13 +124036,13 @@ cie cie cie bXU -cEz +dmq cGw -bYh +cHA cjV cJP cLC -bYh +cHA cQs cRD cTi @@ -128231,16 +124293,16 @@ aaa abj cbb bXU -cEz +dmq cFN -bYh +cHA cJL -cJQ -cMT -bYh +cWl +cYb +cHA cQv -cQt -cbC +drn +drn cTg cUQ cWl @@ -128453,11 +124515,11 @@ abj abi abj bwN -bzF -bBk bzE -bEH -bGr +bzE +bzE +bzE +bzE bwN abj abj @@ -128490,19 +124552,19 @@ cbb cDx bXU cIu -bYh -bYh +cHA +cHA cjX cLz -bYh -bYh +cHA +cHA cjX -bYh -bYh -bYh +cHA +cHA +cHA cjX -bYh -bYh +cHA +cHA abj aaa aaa @@ -128729,7 +124791,7 @@ cbb cxG abj czw -cjH +cwt clp cuO clp @@ -128739,7 +124801,7 @@ clp clp cuO clp -dQE +cwv czw abj cCg @@ -128749,17 +124811,17 @@ bXU cFP cHe cIv -cJN +dhG cLA cMS cLA cQu cLA cLA -cEG +drn cWm cXT -bYh +cHA abj aaa aaa @@ -128969,8 +125031,8 @@ abj bwN bzH bBo -bBo -bBo +bfO +bge bGu bwN abj @@ -129003,19 +125065,19 @@ cCg cDt dCx bXU -cFQ -cHf -cdu +cWn +dhG +bLN cJO -cfm -cfm -cfm -cbC -cEF +cNh +cNh +cNh +drn +drs cJO -cfm -cHf -cdt +cNh +dhG +dhG cJK abj aaa @@ -129230,10 +125292,10 @@ bDf bEI bGv bwN -bwP +byl bPD -bRw -bwP +byl +byl abj csy bWd @@ -129260,8 +125322,8 @@ cCg cbb cDv bXU -cbC -cHg +drn +drn cIw cIx cIx @@ -129272,8 +125334,8 @@ cIx cIx cIx cWn -cFR -bYh +dtU +cHA abj abj aaa @@ -129490,7 +125552,7 @@ bwN bJZ bPE bVt -bwP +byl bZf ctI ctJ @@ -129517,8 +125579,8 @@ cCg cDu dUG bXU -cbC -cHh +drn +cXU cIx cKt cMU @@ -129530,7 +125592,7 @@ deZ cIx cWo cXU -bYh +cHA abj abj abj @@ -129746,8 +125808,8 @@ bGx bwN byl bPF -bVz -bwP +byl +byl bRT bUc bWf @@ -129774,8 +125836,8 @@ cbb cDv bXU bXU -cFQ -cHh +cWn +cXU cIy cLx cOx @@ -129786,8 +125848,8 @@ cOx dfd cIx cWn -cXV -bYh +dsr +cHA aMW dbz aMW @@ -129968,9 +126030,9 @@ abj aGY aGY aLr -aLa -aMz -aNX +aGY +aGZ +aNV aPq aQN aGZ @@ -129993,18 +126055,18 @@ bpv bpv aSN abj +bzL bwN -bwN -bwN -bBq +bzL +bEL bDi bEL -bwN +bzL bwN bKa bMd bNW -bSf +bUP bNX bUd bWg @@ -130033,7 +126095,7 @@ bXU cEA cFR cFO -cJM +bLP cJR cLD cMV @@ -130250,7 +126312,7 @@ bry btf aSN acF -bwN +bzL byi bzL bBt @@ -130260,7 +126322,7 @@ bGy bLX bKb bMe -bNX +bRU bQe bRU bUe @@ -130300,19 +126362,19 @@ cLE cID cUR cWq -cXW +drn cLz aUp -dfQ -dam -dez -dkq -dfL -dfL -dfL -dYs -ddd -dYv +dnH +dcX +aUp +dYu +aRm +aRm +aRm +dYt +dnH +dnH dcX dkr dbz @@ -130514,7 +126576,7 @@ bPK bDk bEO bIp -bwT +byl bKc bMf bNY @@ -130560,8 +126622,8 @@ cWr cXX cLz dbG -dbB -dcN +aUp +aRm aSP aUp dhw @@ -130764,21 +126826,21 @@ aSM bbF aSM acF -bwN +bzL byk bzL bDe bDl bGt -bGz -bGz -bGz -bGz -bGz -bGz -bGz -bGz -bGz +bgJ +bgJ +bgJ +bgJ +bgJ +bgJ +bgJ +bgJ +bgJ bXU bZl cbb @@ -130803,7 +126865,7 @@ cbb cDv bXU cFU -cHh +cXU cIx cIx cLG @@ -130814,10 +126876,10 @@ cLG cIx cIx cWs -cKe +dlM cLz dag -dbC +dcX dcO deA dfM @@ -130999,7 +127061,7 @@ aJO aLe aMC aOb -aPu +aOb aOb aOg aOg @@ -131024,10 +127086,10 @@ aOg bwP byl byl -bBu +byl bEJ byl -bGz +bgJ bIq bKd bMg @@ -131059,8 +127121,8 @@ cCg cDt dUI bXU -czD -cHh +cWw +cXU cIx cJS cLH @@ -131070,9 +127132,9 @@ cOA cRF cTk cIx -ckb +cFY cXY -bYh +cHA dah dbD dcP @@ -131254,10 +127316,10 @@ aGZ aIx aJO aLf -aMD -aOc -aPv -aQS +aMC +aOb +aPH +aPH aSA aTW aVC @@ -131284,13 +127346,13 @@ bzN bBv bDm bET -bGz +bgJ bIr bKe bMh bOa -bOa -bOa +bjz +bjP bUh bWk bXU @@ -131317,7 +127379,7 @@ cbb cDv bXU cFU -cHh +cXU cIx cJU cLI @@ -131329,10 +127391,10 @@ cLH cIx cWt cXY -bYh +cHA dai dbE -dcQ +aRm deC dcX dnH @@ -131513,7 +127575,7 @@ aJP aLg aMI aOh -aPw +aPH aQT aSB aTX @@ -131539,9 +127601,9 @@ bwQ byn bzN bBw -bDn +bDp bEQ -bGz +bgJ bIs bKf bMi @@ -131574,7 +127636,7 @@ cCh dVy bXU cFV -cHg +drn cIB cJV cLJ @@ -131585,10 +127647,10 @@ cRH cTl cIx cWt -cXZ -bYh +dsr +cHA aOs -dfT +dfU dcR deD dfN @@ -131770,7 +127832,7 @@ aJQ aLh aMF aOb -aPw +aPH aQU aSC aTY @@ -131790,15 +127852,15 @@ aUi bpA brB aTZ -beI +ban bvF -bwR -byo +bwP +bFg bzO bBx bDo bER -bGz +bgJ bIt bKf bMj @@ -131831,22 +127893,22 @@ cCk bXU bXU cFU -cHf +dhG cIC cJW cLJ -cNb -cOD +cNe +cdi cQA cRI cJW cIx cWt -cYa -bYh +dhG +cHA daj dbE -dcS +dmM deD dfN aUp @@ -132027,20 +128089,20 @@ aJR aLi aMG aOb -aPw +aPH aQV -aSD -aTZ -aVF +aPF +aSc +aSI aXj aYz bam bam bam -beI -aYJ -aYJ -aYJ +ban +ban +aXW +aYt bkA bmw bnU @@ -132055,7 +128117,7 @@ bzN bBy bDp bES -bGz +bgJ bIu bKg bMk @@ -132086,7 +128148,7 @@ bXU bXU cCj cDz -bXU +bQr cFW dWg cHi @@ -132096,12 +128158,12 @@ cNc cOE cQB cRJ -cOG +cjH cUS cXS -cHz -cwC -dak +drn +cHA +aUp dfU dcT deD @@ -132267,16 +128329,16 @@ abi abi abj atd -auK -auK -axH -auK -auK -auK atd -auK -auK -auK +axl +axH +axl +axl +atd +atd +axl +axl +axl axH atd aGZ @@ -132312,7 +128374,7 @@ bzP bBz bDq bEU -bGz +bgJ bIv bKh bMl @@ -132343,14 +128405,14 @@ dWi cdd cbi dWb -bXU -cFX -cHm -cIA -cJY -cLL -cNd -cOD +bQr +cFY +dsr +cIx +cJW +cLM +cNe +cdy cQC cRK cJW @@ -132531,23 +128593,23 @@ ayF ayF aAf aBh -aCd -aCd -aCd +aLq +aLq +aLq axG aGd aGZ aJU aPs aMK -aOf +aOg aPy aQX aSD -aTZ +aUc aVF aXl -aYB +ban ban bbP ban @@ -132560,16 +128622,16 @@ bmy bnV bpD brE -btk +ban bus bvI -bwT -byr -bzQ -bBu +bwP +byl +byl +byl bDr byl -bGz +bgJ bIw bKk bMm @@ -132600,14 +128662,14 @@ ceV bXU cCl cDA -bXU +bQr cFY -cHn +dlM cIx cJZ cLM cNe -cOD +ceM cQD cRL cTm @@ -132615,17 +128677,17 @@ cIx cWw cYc cZl -ddd -dbH -dcV -deF +dnH +dcX +drb +drb dfP -dhx +dra dja -dku -dlJ +aSP +aRm dmQ -dow +aRm dcX drf aMW @@ -132781,7 +128843,7 @@ abj atd atd atd -avy +aLs aFd axI aFd @@ -132804,7 +128866,7 @@ aSF aUb aVH aXm -aYC +beJ bao bbQ bdp @@ -132841,7 +128903,7 @@ cbk cde ceW cid -cjM +bpp cjQ clr cmT @@ -132852,28 +128914,28 @@ cDG clr cuU cjM -cid +bzQ cAC cAD cDy cDE -bXU +bQr cFY cHo cIx cKa cLN -cNf +cOF cOF cOF cRM cTn cIx dGN -cFY +cYc cLz dan -dbI +dcX dcW dcX dcX @@ -133055,10 +129117,10 @@ aJT aLn aML aOg -aPA +aPH aQZ aSD -aTZ +aUc aVI aXn aYD @@ -133068,8 +129130,8 @@ bap beK aXq bhk -ban -bkD +biT +bkM bmA aOb bpF @@ -133081,7 +129143,7 @@ bwP byl byl bBB -bEP +bLW bIy bGA bKj @@ -133114,8 +129176,8 @@ czk cAE cCm cdh -bXU -cFZ +bQr +cGc cHp cIx cKb @@ -133126,7 +129188,7 @@ cOA cOG cJT cIx -cWn +cFU cYd cLz aOs @@ -133298,7 +129360,7 @@ auF avA awJ axJ -aCW +aCp ayV aCS aCS @@ -133312,13 +129374,13 @@ aJW aLo aMM aOj -aTr +aUM aUM aSD -aTZ +aUc aVJ aXo -aYE +aXo aOb aOb aOb @@ -133350,8 +129412,8 @@ bSd bUp bWp cxE -bZu -cbm +bZx +cbo cdh ceY cig @@ -133369,10 +129431,10 @@ cbn czp czl cAF -cCn -cDF -bXU -cGa +cbo +cdh +bQr +cWt drs cIx cIx @@ -133383,7 +129445,7 @@ cIx cIw cIw cIx -cHg +cWw cYe cfn cfn @@ -133553,7 +129615,7 @@ atd aub auF avB -awK +awR axL ayL azT @@ -133563,16 +129625,16 @@ ayP aCj aDf aFe -aHf +aHh aID aCk -aLq +wAP aMN aOg -aPA +aPH aQZ aSD -aTZ +aUc aVI aOb aYF @@ -133580,9 +129642,9 @@ baq bbR bdq beL -bge -bhm -aYJ +aOb +bhk +biT bkF bmC aYK @@ -133594,20 +129656,20 @@ aOg bwW byu bBm -bBD +bBE bDu bEW bGC -bEW -bKm +bIA +bKp bMp bGz bQm -bSc -bUo -bWq +bjT +blH +bnj cxE -bZv +bZx cbn cdh ceY @@ -133631,7 +129693,7 @@ cDD cEB cGd cHq -cir +cly cKc cLP cNg @@ -133639,11 +129701,11 @@ cOM cLP cRN cTo -csE +cAS cWx cYf cLP -dao +dro dbK dcY ddI @@ -133655,7 +129717,7 @@ cZt dmV dpT dpW -dhJ +dso dsn dtM duQ @@ -133813,14 +129875,14 @@ avC awL axM ayM -azX -azX -azX -ayM +aAd +aAd +aEk +aEV aCj aEf aFf -aHg +aHl aIE atd aLp @@ -133828,12 +129890,12 @@ atd aOg aPC aRb -aSG +aSD aUc -aVK +aVI aXp aYG -bar +ban bbS bdr beM @@ -133852,11 +129914,11 @@ bwX byv bzT bBE -bDv +bDw bEX bGD bIA -bKn +bKp bMq bGz bVr @@ -133864,7 +129926,7 @@ bTV bWI bOf cxF -bZv +bZx cbo cdh ceZ @@ -133885,34 +129947,34 @@ czm cAF cbo duP -cEC +bQr cGc -cpF -bZH -cKd -bZH -cNh -cgU +dhG +drn +drn +drn cNh +dhG cNh cNh cNh cNh +clz cYg -cXW -ckb +cqY +csJ cZt dcY deH cAZ -cAZ -dhD +cxM +cAK dYo cIW -cYA +cwq dYw dYA -cAZ +cPT deJ dhD duR @@ -134064,17 +130126,17 @@ aaa abi abj atd -auc -auH -avD +aue +auI +aLu awH axO ayM azY aBi aCg -aCX -aEg +aDb +ayM aFg aFe aHh @@ -134083,10 +130145,10 @@ atd aPE aRa aOg -aPA +aPH aRc aSD -aTZ +aUc aVI aOb aYH @@ -134105,15 +130167,15 @@ brJ btn bux aOg -bwP -bwP -bwP +byl +byl +byl bBF -bDv +bDw bEX bGE bEX -bKo +bKp bMr bGz bGz @@ -134122,23 +130184,23 @@ bGz bGz bQr cbu -cbn +bod cdj cfc -cfc -cfc -cfc -cfc -cfc +bow +bow +bow +bow +bow cok cps cqX -cfc -cfc -cfc -cfc -cfc -cfc +bwI +bwI +bwI +bwI +bwI +bAn cCe cCo cDH @@ -134146,30 +130208,30 @@ dWh cHl cHr dtU -cKe -cEz -cEz -cEz -cEz -cEz -cEz -cEz -cEz -cEz -czD +dlM +dmq +dmq +dmq +dmq +dmq +dmq +dmq +dmq +dmq +drn dap dbL dbZ deJ dfS dov -dpS +cBG dky dbM dmS dYx dYo -drl +cPV drl dpS dtQ @@ -134333,17 +130395,17 @@ azZ aCY aEh aFh -aFi -aHi +aJs +aHl aIG aJV aLs aMP aOi -aPD -aRd +aPH +aQZ aSD -aTZ +aUc aVL aXo aXo @@ -134361,27 +130423,27 @@ bpK brK bto buy -bvL +aYO bwY -byw -bzU +bOg +bzW bBG bDw -bEY +bIA bGF -bIB +bEX bKp -bMs +bMu bOg bQq -bTW +bWK bWK bYo bXZ bZx cbp -cdi -cfb +cgN +bos cgN cfb cgN @@ -134389,22 +130451,22 @@ cfb cgN cfb cpt -cqY -cgN cfb cgN cfb cgN cfb +cgN +bos cAG cCp -cDI -bXU +cdh +bQr cGe -cdt -cHg +dhG +drn cKf -cEz +dmq cNi cNi cIM @@ -134412,21 +130474,21 @@ cVG cIM cIM cIM -cEz -czD +dmq +drn daq cZt dcd deI -deI -dpS -dpS -dhJ +cxq +cyc +cCn +cHX dlL -deJ -dYx +cLY +cOl dYB -dpU +cPZ dpU dfW dYo @@ -134594,7 +130656,7 @@ aFX aGi aIH aJZ -aLt +aMQ aMQ aOm aTT @@ -134615,7 +130677,7 @@ bkJ bmG bob bpL -bmG +bob btp buz bvM @@ -134639,29 +130701,29 @@ bZy cbq cdk cfe -cfe +boA cjN -cfe -cfe +boA +boA coc col cpu cqV -crc +cAB ctG cuV -crc +cAB cAB dWa cAN cCv cDJ -bXU +bQr cGe -cdt -cIF +dhG +dhG cKg -cEz +dmq cNj cOI cKo @@ -134669,7 +130731,7 @@ cKo cKo cKo cWy -cEz +dmq cZm dap dbL @@ -134677,16 +130739,16 @@ dcZ deI cZw dhB -deJ +cDF dYp cZt -cYA +cwq deI dpV drh dsp deJ -dhJ +dso cZt abj aaa @@ -134848,25 +130910,25 @@ aDa aEi aFh aFY -aHk +aHl aII -aJX +aJT aLu aMR aOk -aPF -aRe -aSI +aPH +aQZ +aSD aUe aVN aXr aYJ bau -aYJ -aYJ -aYJ +bau +bau +aXG aXr -aYJ +bau biV bkK bmH @@ -134877,23 +130939,23 @@ btq buA aOk bxa -byy +bOi bzW bBI bDy bFa bGH bHh -bEW +bIA bMu bOi bRS -bTX +cAB bWN cfB bYb -bZz -cbr +bZA +cbo cdl cfd cgO @@ -134905,20 +130967,20 @@ com cpv cqZ css -bXU -clv +bQr +byr cwx cxK czs cAI cCr -clv -clv +byr +byr cGf -cBc -cdt -cKh -cEz +cHr +dhG +ddh +dmq cIM cNi cIM @@ -134926,11 +130988,11 @@ cIM cIM cIM cIM -cEz +dmq dHk dap cZt -cYA +cwq deI dkz dkz @@ -134940,7 +131002,7 @@ cZt dmT deI deJ -dfV +cQX dkA dfW dYG @@ -135093,8 +131155,8 @@ abi abj atd aue -auJ -avH +auI +aLs awQ axS ayM @@ -135102,13 +131164,13 @@ aAc aBk aCh aDb -aEg +ayM ayM aFZ aHh aID atd -aLq +wAP aNZ aOg aPG @@ -135117,21 +131179,21 @@ aSD aTZ aVO aXs +aUQ aXs -bav bbV aXs +aXN aXs aXs aXs -biW bkL bmI -bod -bpN -brM +aOg +aOg +aOb btr -buB +bmN aOg aOg aOg @@ -135140,7 +131202,7 @@ aOg aOg bFb bGI -bIE +bIA bIA bMv byl @@ -135152,13 +131214,13 @@ bQr bZA cbs cdm -ceY +bou cgP cim cmM clv cmV -con +cra cpw cra cmV @@ -135170,12 +131232,12 @@ cCd cAO cDB cDK -clv +byr cGg -cbC -cbC -czD -cEz +drn +drn +drn +dmq cIH cOJ cIM @@ -135183,9 +131245,9 @@ cIM cTp cOJ cIH -cEz -cFU -ckc +dmq +cWn +dar cZt ddc deI @@ -135197,7 +131259,7 @@ cIW dmU deJ dhJ -dfV +cQX dYD dfW duS @@ -135357,9 +131419,9 @@ axN ayM aAd aAd -aAd -ayM -aCT +aEs +aFo +aDc aEj aGa aHl @@ -135381,14 +131443,14 @@ aYK aYK bgg ban -biX +ban bkM bmJ -boe -bpO +aOg +brN brN bts -buC +buD bvN bxb byz @@ -135396,7 +131458,7 @@ bzX bBJ aOg bFc -bGI +bGH bIF bKr bMw @@ -135422,17 +131484,17 @@ cst clv cuY cwz -cxM -czq -cAK +cpy +bAq +cAM cCt cDL -clv +byr cGh cHs cIG cKi -cEz +dmq cNk cOK cQE @@ -135440,16 +131502,16 @@ cRP cTq cUT cVh -cEz -cKe +dmq +dlM daq dbM dkp deL dfR -dfR +cyE djg -dYr +cHY cIW dmW deI @@ -135607,7 +131669,7 @@ abi abj atd aub -auK +axl avI awR axL @@ -135638,11 +131700,11 @@ bbW beP bgh bhp -biY +bhp bkN bmK aOg -bpP +brO brO btt buD @@ -135654,7 +131716,7 @@ bBK aOg byl bGJ -bIG +byl bKs bMx bMx @@ -135668,12 +131730,12 @@ cfg cdn cff bXU -bXU -bXU +bQr +bQr clv cop cqP -cpy +buB cso cuR clv @@ -135684,12 +131746,12 @@ czu cAL cCu cDM -clv +byr cGi -cHv -cEz +dmq +dmq dgr -bYh +cHA cNm cOO cRQ @@ -135697,21 +131759,21 @@ cTs cUV cWC cNm -cEz +dmq cZn daq cZt dda deM dfX -dhJ +dso djm dcY cIW dmX deI dYr -drj +dfV dhJ dfW duV @@ -135864,13 +131926,13 @@ abj abj atd auf -auK +axl avI awS axT ayI azV -aAh +aCU aCU aEe aFV @@ -135904,15 +131966,15 @@ brP btu buE bvP -aXs +bfv byB bzZ bBL -bDz +aOg bFd bGK bID -bKt +bQt bMy bOk bQt @@ -135941,9 +132003,9 @@ czq cAM cCt cED -clv +byr cGi -cHv +dmq cII cKk cIL @@ -135954,8 +132016,8 @@ cTt cRR dWl dWt -cEz -cFU +dmq +cWn daq cZt cZt @@ -135968,7 +132030,7 @@ cZt dox dje dfR -djh +dfR dfR dYo dYH @@ -136127,7 +132189,7 @@ awT axV ayR aAg -aBm +ayR aAg aDd aEm @@ -136156,16 +132218,16 @@ bja bkP bmM aOg -bpR -brQ +btv +btv btv buF bvQ -aYJ +ban byC -bAa +ban bBM -bDA +aOg bFe bGM bIH @@ -136182,7 +132244,7 @@ cbw cdp cfh bXU -cbA +ddg cio clv cmZ @@ -136198,9 +132260,9 @@ dlt cAR cDC cGb -clv +byr cGi -cHv +dmq cIJ cKm cNo @@ -136211,12 +132273,12 @@ cRS cUX cUW dWu -cEz -cFU +dmq +cWn dar -cEG +drn cLA -cIE +drn cZt cZt djc @@ -136379,8 +132441,8 @@ abj atd atd atd -avJ -awM +aLu +aHp axU ayK azW @@ -136413,7 +132475,7 @@ baj aOg bmN aOg -bpS +btw brR btw buG @@ -136422,11 +132484,11 @@ bxc byD bAb bBN -bDA +aOg bFf bGL bII -bKv +bQv bMA bOm bQv @@ -136440,7 +132502,7 @@ cdq cfi bXU cip -cjW +cYb clw cna cot @@ -136448,33 +132510,33 @@ cpA crg csx clv -clv -clv -clv -clv -clv -clv -clv -clv +byr +byr +byr +byr +byr +byr +byr +byr cGj -cHv +dmq cIK cLQ cIL cOL -cOU -cRT +dWm +cWA cTu -cVa +cWA dWm dWv dmq -cZo +dhG das -dbN +ddf ddf deN -bYh +cHA dhz djd dhz @@ -136670,23 +132732,23 @@ buX bkQ aOW aOg -bpT -brS -btx +aOg +aOg +bvK buH bvS bxd byE bAc aOg -bDA +aOg bFg bGN bIK bKw -bMB -bMB -bMB +bKs +bKs +bKs bMB bMB bMB @@ -136700,38 +132762,38 @@ ciq cjX clv cIP -cnb -cpz -cnb +bsc +bvc +bwu csz clv cvb -cdw -cdw +cly +cly czt -cit +cAS cCw -cdw -cit +cly +cAS cGk -cHv +dmq cIL cIL cIL cIL cOP -cRU +cVb cTw cVb cOP cIL -cEz -cEz -cEz -cEz +dmq +dmq +dmq +dmq ddg deO -dfY +dhG dhG djj cLA @@ -136741,7 +132803,7 @@ cLA dpX drn dsq -bYh +cHA aaa abj abj @@ -136901,8 +132963,8 @@ ayU atd aCk aDg -auK -auK +axl +axl atd atd atd @@ -136926,35 +132988,35 @@ aVR bah aSN aOW -alI +bcP bpU -brT +bty bty buI bvT -bxe -byF -bAd -byF -bDB +bty byF +bty +bfE +bty +bty bGO -bIL -bKx -bIL +bWz +bWz +bWz bOn -bIL -bIL +bWz +bWz bUA bWz bYe -bYh +cHA cby cdr cfk -cbC -cdv -cjZ +drn +cLA +cQu clv cnc cnd @@ -136962,43 +133024,43 @@ cpy cnb csA clv -cvc -bYh +cYc +cHA cxP cxP -bYh +cHA cCx -bYh -bYh +cHA +cHA cGi -cHv +dmq cIM cIM cIM cNp cQF -cRV -cNm +cWA +cTu cWA dWp cWD cYi cIM cIM -cEz +dmq ddh deP dfZ dhH djk -dbN -dbN +cAS +cAS dna doA -dbN +cAS dro dIf -bYh +cHA abj dkI dkK @@ -137009,7 +133071,7 @@ dkI dCB dkI dEA -bYh +dFg abj abj abj @@ -137183,7 +133245,7 @@ bhs bjb aSN aOo -alI +bcP bpV brU btz @@ -137194,23 +133256,23 @@ byG bAe bBO bDC -bBO +bDC bGQ -bIM -bIM -bIM bOo -bIM +bOo +bOo +bOo +bOo bSp bUB bWA bYf -bZF +dWn cdg -cds +cHy cfl -cgR -cir +dst +cly cka clv cnd @@ -137220,7 +133282,7 @@ cnb cuT clv cvd -bYh +cHA cxS cAH cCi @@ -137228,7 +133290,7 @@ cCy cDN cCx cGl -cHv +dmq cSi cKn cIM @@ -137247,7 +133309,7 @@ ddi ddi ddi dhA -djl +ddi ddi ddi ddi @@ -137407,22 +133469,22 @@ apH apH apG apG -alI -alI -alI -amh -amh -alI -alI -amh -amh -amh -alI -alI -alI -alI -alI -alI +awX +awX +awX +awM +awM +awX +awX +awM +awM +awM +awX +awX +awX +awX +awX +awX aOW aaa abj @@ -137440,7 +133502,7 @@ bht bgm aSN aOW -alI +bcP bpW brV btA @@ -137449,26 +133511,26 @@ buK bxg byH bAf +bfG +brV brV -bDD -bFh bGR -bFh -bFh -bFh -bOp +brV +brV +brV +brV bQw bSq bUC -bWB bYg -bYh -cbA -cdt -cfm +bYg +cHA +ddg +dhG +cNh ctS -cis -ckb +dtP +cYc clv cne cph @@ -137476,24 +133538,24 @@ cpC crh csB clv -cvc -bYh +cYc +cHA cxT -cbC +drn cAP cCz cEO -bYh +cHA cGe -cHv +dmq cIM cIM cLR cNr cQI -cQM -cRW -cTx +cQP +cSd +cTz dWr cNw cIM @@ -137505,13 +133567,13 @@ deQ dga djf djn -dkC -dlN -dnb -dlP ddi -cFY -cHh +dng +dng +dng +ddi +cYc +cXU cJK abj dkK @@ -137536,14 +133598,14 @@ dMc dMI dNx dFg -bYh +ddy dPq dPq dRc dPq dPq -cCx -bYh +dku +ddy abj abi abj @@ -137664,22 +133726,22 @@ aqw ate auh auL -amb -amb +aor +aor aqF ayW -alZ -alZ -awZ -alZ -amb -amb +azb +azb +aEt +azb +aor +aor aqF -amb -alZ +aor +azb aKa -alJ -alI +aNe +awX aOo abj abj @@ -137697,8 +133759,8 @@ bhu bgm aSN aOo -alI -bpX +awX +btF brW brW brW @@ -137718,14 +133780,14 @@ brW bVC cjA cpP -bYh -bYh +cHA +cHA cbB -cdu +dlM cfn -cgT -cdt -ckb +dlM +dhG +cYc clv cnf cov @@ -137733,22 +133795,22 @@ cpD csw csC clv -cvc +cYc cfn czn czv cAQ cCA cDP -bYh +cHA cGe -cHv +dmq cIL cIL cIL cIL cOT -cQM +cQP cRX cTy cOW @@ -137767,9 +133829,9 @@ dlO dnc doB ddi -cGa -cHh -bYh +cQY +cXU +cHA aaa dkI dxd @@ -137795,12 +133857,12 @@ dNy dFg dOO dPr -cNg +deW dQM -cdv -cdt +dcA +dbp dSn -cJK +dlc abj abi abi @@ -137917,16 +133979,16 @@ aaa apG aqw arp -asi +arp arp aui apG -amb +aor awW axY -alZ +azb ayX -aql +ayC aCl aCl aCl @@ -137934,9 +133996,9 @@ aCl aCl aCl aCl -amb +aor aLx -alI +awX aOW aaa abj @@ -137954,7 +134016,7 @@ aSN aSN aSN aOW -alI +awX bpY brW aaa @@ -137972,41 +134034,41 @@ bKy bMC bOq brW -bSt -bUE -bWD -bYh +bSA +bUI +bWH +cHA bZG -cbC -cdv +drn +cLA cfo -cEF -cbC -ckc +drs +drn +cYe clv clw clv -cpE +clv clv clv clv cve -bYh +cHA czo cAJ cCq -cbC +drn cDQ -bYh +cHA cGl -cHv +dmq cIM cIM cIM cNp cQL -cQM -cRY +cQP +cSd cTz dWs cWD @@ -138022,9 +134084,9 @@ dkx dkE dlP dnd -dlP +cPf ddi -cGa +cQY dss cJK abj @@ -138043,21 +134105,21 @@ dGD dHs dIr dJn -dIu +ddz dHs dIu dMd dMg dNz dFg -cHg +dOO dPs -cbC -cgT -cbC -cis +dOO +dEi +dOO +djA dSp -cJK +dlc abj abj abj @@ -138174,15 +134236,15 @@ aaa apH aqx arq -asj +aro atf auj apG avL -aql +ayC axZ ayX -alZ +azb aBo aCl aDk @@ -138193,7 +134255,7 @@ aHd aCl auR asq -alI +awX aFz aJz aEp @@ -138211,7 +134273,7 @@ aJz aEp aJz bRm -alI +awX bpZ brW aaa @@ -138229,34 +134291,34 @@ bDF bDF bOj brW -bSt -bUE +bjU +blL bWE bYi -bZH -cbD -bZH -bZH -ctT -cbD -ckd +drn +cHr +drn +drn +drs +cHr +cYc clx -bZH -bZH -cpF -cri -csD -bZH -cvf -cwC -cxU -cwC +drn +drn +dhG +dpX +cLA +drn +cYe +cHA +cCx +cHA cCs -cwC -cwC -cwC +cHA +cHA +cHA cGm -den +dmq cSl cKo cIM @@ -138273,23 +134335,23 @@ dpP ddi ddq deT -dgd +dgf dhM djs dkF dlP dne -dlP +cPf ddi -cGa -cHh +cQY +cXU cJK aaa dkK dxf dyt dzx -dAK +dbh dkK dCE dkI @@ -138298,7 +134360,7 @@ dFi dFN dFN dFN -dIs +dFN dJo dKa dFN @@ -138309,14 +134371,14 @@ dNA dFg dOP dPt -cEz -cEz -cEz -cEz -cEz -cEz +dbw +dbw +dbw +dbw +dbw +dbw dQS -cEz +dbw abj abj abj @@ -138431,14 +134493,14 @@ aaa apG aqy arr -ask +ars atg auk apG auS -aob -aob -arU +apU +apU +aCB aAj aBp aCl @@ -138449,26 +134511,26 @@ aEr aHj aIM auR -aql -alI -alI -alI -alI -alI -amh -amh -amh -alI -amh -amh -amh -alI -amh -amh -amh -alI -alI -alI +ayC +awX +awX +awX +awX +awX +awM +awM +awM +awX +awM +awM +awM +awX +awM +awM +awM +awX +awX +awX bqa brW aaa @@ -138483,44 +134545,44 @@ bFj bGU bIJ bKu -bMD +bBR bOr -bQx -bSu -bUF -bWF -bYh +brW +bSA +bUI +bWH +cHA bZI cbE -cdw -cfp -cgV -cit +cly +dna +cHs +cAS cke cly -cng -cir -cpG -crj -csE -cir +dna +cly +cHs +cHs +cAS +cly cvg cwD -csE +cAS czx cAS -csE +cAS cDR cEE cGn -cHv +dmq cIM cIM cLR cNr cNl -cQM -cRY +cQP +cSd cTz cTG cNw @@ -138529,18 +134591,18 @@ cIM cIM ddi dxr -deU +dge dge dhR djt -dkG -dlP +dkH +cKs dnf dER ddi -cFY +cYc dsr -bYh +cHA abj dkI dxg @@ -138552,19 +134614,19 @@ dCF dkI dWx dFj -dFO -dFO -dFO +dIt +dIt +dIt dIt dJp dKb -dKb -dKb -dKb -dML +dFN +dFN +dFN +dNy dMI dFg -cHg +dOO dXo dQb dQN @@ -138688,12 +134750,12 @@ aaa apH aqz ars -ask +ars ath ars apG avM -amb +aor aya axY aAk @@ -138701,30 +134763,30 @@ asq aCl aDm aEq -aEq +aFP aGj aHq aCl -alZ -amb +azb +aor aqF -amb -amb -awZ -awZ -alZ -alZ -amb -amb +aor +aor +aEt +aEt +azb +azb +aor +aor aqF aqF aqF -amb -alZ -awZ +aor +azb +aEt aqF bkR -aql +ayC aqF bqb brX @@ -138754,7 +134816,7 @@ bYj bYj bYj ckf -clz +bYj bYj bYj bYj @@ -138768,9 +134830,9 @@ bYj bYj bYj cDS -cdt +dhG cGo -cHv +dmq cIL cIL cIL @@ -138786,24 +134848,24 @@ cIL cIL ddi deK -deV +dgc dgf dhT dju -dkG -dlO -dlP -dlP +dkH +cKu +dng +dng ddi -cGa -cHf -bYh -bYh +cQY +dhG +cHA +cHA dkI dkI dkI dzy -dAO +dkI dkI dkI dkI @@ -138815,19 +134877,19 @@ dHt dIu dIq dKc -dIp -dHs -dIu -dMM +dez +deU dNB -dFg -dOP +dNB +dNB +dgA +dgR dPv dQc -cdt +dbp dRr dRK -cdt +dbp dSF dUi dTW @@ -138945,25 +135007,25 @@ aaa apH aqA art -ask +ars ati aul auM avN -alI -alI -alI -alI -are +awX +awX +awX +awX +aDH aCl aDn aEq -aEq +aGN aGk aHr aCl -alZ -aql +azb +ayC aMV aMV aMW @@ -138975,14 +135037,14 @@ aMW aBo baC bcb -alZ -amb +azb +aor bgn bgn -amb +aor aCo -alZ -alZ +azb +azb bqc brW aaa @@ -139000,9 +135062,9 @@ bBR bBR bOt brW -bSt -bUE -bWD +bSA +bUI +bWH bYj bZJ cbF @@ -139010,8 +135072,8 @@ cdx cfq cgW cgX -ckg -clA +cni +clC cnh cow cpH @@ -139025,16 +135087,16 @@ czy bZK bYj cDT -cgT -ckc -cHv +dlM +bGr +dmq cIM cIM cIM cNp cOR cQP -cSa +cSd cTz dWp cWD @@ -139043,19 +135105,19 @@ cIM cIM ddi deX -deW +dgc dgc dhU djw dkH -dlQ dng -dlP +dng +dng ddi cYe -cHg -cdv -cbC +drn +cLA +drn dvV dxh dyq @@ -139071,20 +135133,20 @@ dGE dHs dIu dIu -dIu +ddB dJr dIu dIu -dMN +dHs dNC dFg -cHn +dEi dPw dQe dRj dRB dRQ -dRQ +dBC dSG dUl dTW @@ -139206,16 +135268,16 @@ asl atj aum apG -avO -alI +aDw +awX ayb ayY aAl -amb +aor aCl aDo aEr -aEr +aHD aGk aHs aCl @@ -139229,17 +135291,17 @@ aSP aUp aOs aMY -aql +ayC baD -any -amb +aVK +aor beS bgo -any -any -aql -aqp -are +aVK +aVK +ayC +aCL +aDH bqd brW aaa @@ -139257,21 +135319,21 @@ bBT bBT bOu brW -bSt -bUE -bWD +bSA +bUI +bWH bYk -bZK +bnk cbG -cdy +ckj cfr cgX ciu -ckg -clA cni clC -ckj +cni +clC +bvL clC bYk ctH @@ -139282,9 +135344,9 @@ crn cAT bYj cDU -cbC -ckb -cHv +drn +deO +dmq cSq cKn cIM @@ -139300,25 +135362,25 @@ cKo dpZ ddi dgh -deW +dgc dgg dhQ djx dkF -dlP +dng dnh doD ddi drp dst -cir -cgR +cly +dst dvW dWn dyw dzz dAQ -dWn +dbk dEy dDV dEH @@ -139332,16 +135394,16 @@ dIq dIu dIq dMe -dMM +dIu dND dFg -cWo +dhx dPx dQf dRj -cbC -dRZ +dOO dRZ +dko dSO dUS dQS @@ -139464,11 +135526,11 @@ atk aun auN avP -alI -amb -alZ -aAl -aAl +awX +aor +azb +aCR +aEg aCl aDp aEr @@ -139482,21 +135544,21 @@ aMW aOq aPK aRk -aSP +aPM aRm aVV aMW aYP -alZ -any -aql -alI -are -aqp +azb +aVK +ayC +awX +aDH +aCL bjc -amb +aor bmP -alI +awX bqe brW aaa @@ -139514,41 +135576,41 @@ bKB bME bOw brW -bSs -bUE -bWE -cqH -bZL +bSy +bUI +bWH +ctU bZL cdz -bZL -bZL +cdz +cdz +cdz civ ckh clB cnj -bZL -civ -bZL +bso +bwo +bso csF -bZL +bso cvi cwG cxX -czz +czA ctH bYj cDS -cbC -ckb -cHv +drn +deO +dmq cIM cIM cLR cNr cQI -cRV -cNm +cWA +cTu cWA cTH cNw @@ -139562,23 +135624,23 @@ dgk dhV djy ddi -dlP -dlP -dlP +dng +dng +dng ddi -drq +dsq cNh dtP cNh dvX -dxj +dBA dyv dzC dAP -dxj +dBA dCH dDW -cHh +dID dFk dFQ dGG @@ -139589,18 +135651,18 @@ dIq dHs dHt dMe -dMN +dHs dNE dFg -cHf +dbp dPy -cEz +dbw dQP dRC dSc dSb dSQ -cfn +dlJ dQS abj abi @@ -139716,20 +135778,20 @@ aaa apH aqz arw -asn +ars atl arr apG avQ awV -ayc +ayZ ayZ aAm aBq aCl aDq aEq -aEr +aHE aGm aHu aHy @@ -139739,23 +135801,23 @@ aMW aOr aPL aRl -aRm +aPV aUq aRo aMW aCo -alZ -alZ -alZ -awZ -awZ -amb +azb +azb +azb +aEt +aEt +aor aqF -amb +aor aqF aqF -bqf -brY +bqe +brW brW brW brX @@ -139771,24 +135833,24 @@ bxh bxh bxh bxh -bSw -bUH +bSy +bUI bWH -crs +ctU bZM -cbH -bZM -bZM -cbH -ciw -cki -bZM -bZM -bZM -ciw +crn +crn +crn +crn +ciz +crn +crn +crn +crn bZM +crn csG -bZM +crn cvj cwH cxY @@ -139796,15 +135858,15 @@ czA cAU bYj cDS -cEF -ckb -cHv +drs +deO +dmq cIL cIL cIL cIL cOY -cPd +cSb cQQ cSb cOY @@ -139835,7 +135897,7 @@ dkI dkI dCI dDX -cHg +dOO dFg dFR dGH @@ -139849,16 +135911,16 @@ dFg dMO dFg dFg -cWw +dOO dPz dQg dRk dRE -cdt +djZ dRK dSW dTj -cEz +dbw abj abi aaa @@ -139972,32 +136034,32 @@ aaa aaa apG aqD -arx +arr ars atm auo apG -avR -alI -alZ +aBB +awX +azb aza -amb +aCT aBr aCl aDr -aEs -aEq +aEr +aHF aEr aHv aCl -aKd -alZ +aKe +azb aMW aOs -aPM +aSP aRm aSQ -aUr +dcO aVW aMW aYQ @@ -140013,57 +136075,57 @@ aEu aMZ bqg brZ -aEu -aEu -aOv +aty +aty +apU aIQ byJ bAl apU apU aty -ayi +bgL apU apU bMF bOv bUt bSx -bUE -bWD +bUI +bWH bYk bZN -cbI +ctO cdA cfs -cgY -cix +crn +ciz ckj clC ckj clC -cpJ +ckj clC bYk ctO cvk cwI cxZ -cix +crn cAV bYj cDS -cgT -ckb -cHv +dlM +deO +dmq cIO cIO cIO cIL cOS -cRV -cNm -cWA +cgZ +cjD +cgZ cTM cVm cWT @@ -140090,9 +136152,9 @@ dyx dzD dAR dkI -cFR +dbo dDX -cHf +dbp dFg dFS dGI @@ -140106,15 +136168,15 @@ dMf dMP dNF dFg -cWn -dPx +dik +diD dQn dRj dRF -dRQ +dkh dSq dTg -cit +dOQ dTW abj abj @@ -140233,92 +136295,92 @@ ary aso atn aup -auO -avS +auL +aDy awX ayd azb aAn aBs -aCm -aEk -aEt -aFo -aFo +aCl +aDl +aEr +aEq +aEq aHw -aIP +aIM aKe -aLB -aMX +baD +aMW aOt aPN aRn aSR aUs -aVX -aMX -aYR -baE -baE -baE -baE -baE -baE -baE -baE -baE -baE -baE -baE -baE -baE -baE -baE -aYR -bAm -bBV -bBV -bBV -bBV -bBV -bBV -bBV -bBV -bBV +aVV +aMW +bqe +baF +baF +baF +baF +baF +baF +baF +baF +baF +baF +baF +baF +baF +baF +baF +baF +aDt +bOC +bOC +bOC +bOC +bOC +bOC +bOC +bOC +bOC +bOC bSy -bUF -bWF +bUI +bWH bYj bZO cbJ cdB cft -cgY +crn ciy ckj clC ckj clC -cpJ +ckj clC bYj ctN -cvl -cwJ ctO -czB +cwJ +bAa +ctO cAW bYj cDT dmy cGp -cHv +dmq cIO cKp cLS cNu cOV -cQR +cWI cSd cTD cVf @@ -140327,14 +136389,14 @@ cWU dtH dau cMm -ddt -deY -dgm +cPn +cIW +deH dhY -djB +dhD dkK dlS -dlS +cMD dve dwe dCN @@ -140347,9 +136409,9 @@ dyz dzF dAS dkI -cgT +dEi dDX -cHg +dOO dFg dFg dFg @@ -140363,13 +136425,13 @@ dMg dGE dNG dFg -cHf +dbp dPA dQc -cbC -cMT -dRZ -cdt +dOO +djl +dko +dkC dSH dVo dTW @@ -140491,12 +136553,12 @@ apH apG apG apG -aKd -alI -alI -aqp -alI -alI +aDy +awX +awX +aCL +awX +awX aCl aFm aEr @@ -140510,11 +136572,11 @@ aMY aOu aPO aRo -aRm +aQq aUt aOs aMW -awg +bqe baF bcc bdw @@ -140531,8 +136593,8 @@ bmQ buP bvZ baF -awg -bAn +aDt +bOC bBX bDP bFm @@ -140551,25 +136613,25 @@ bYj bYj cfu cgY -cix +bpN +brt ckj ckj ckj ckj -cpJ crk csH ctK -cvm +ctO cwK cya czC cAX bYj cDV -bYh +cHA cGq -cHv +dmq cSC cKq cLT @@ -140580,36 +136642,36 @@ cSe cTE cVg cWJ -cOX +cpE dhS -dau -cMl +ctm +cvl ddu dhX -deI +cxu dhZ djC dlR dlT dnj -doG +drt dqa drt dsw dtV dva -dwa +dyA dva dyA dzG dAT dWo -dbN +dOQ dDY -cHg +dOO dFl -cdv -cbC +dcA +dOO dHx dFg dFg @@ -140620,9 +136682,9 @@ dFk dFk dFg dOm -cWn +dik dPB -cEz +dbw dQR dRs dRI @@ -140734,7 +136796,7 @@ acC acC adb acC -adN +adb acC kpH acC @@ -140746,11 +136808,11 @@ abj abj abj abj -amh +awM apK avT -alI -ayf +awX +aze ayg aAo aBt @@ -140762,17 +136824,17 @@ aCl aCl aCl aKf -alZ +azb aMW aMW aMV aMW -aSO +aQw aUu aMW aMW -aYS -baG +bqe +baF bcd bdx beU @@ -140788,72 +136850,72 @@ bkT buQ bwa baF -axw -bAn +aDw +bOC bBY bDK bFn bFn -bFn +bgQ bFn bMH bOy bDQ -bSt -bUE -bWD +bSA +bUI +bWH bYj bZP cbK bYj cfv -cgY -cix +crn +ciz ckj clC ckj clC -cpJ +ckj clC bYj ctL cvn cwL cyb -cvl +ctO cAY bYj cDS -cgT -ckc -cHv +dlM +bGr +dmq cIO -cKp +bQx cLU cNw cOZ -cQT -cSf +cVf +cVf cSc -cSf +cVf cWK cWV dvN -dav +dau dbP -ddv -dfa -dgn +cPn +cIW +dje dib djD dkK dlU -dlU -doH -dqb -dru -dsx -dtT +cNf +dvb +dwb +dxm +dyB +dyz dvb dwb dxm @@ -140861,32 +136923,32 @@ dyB dzH dBa dkI -cdt +dbp dDX dEI -cEG -cEG -cEG +dOO +dOO +dOO dHy -dpX -cEG -dlM +ddv +dOO +dEi dKH dLn -cNg -csE -cLP +deW +dOQ +dgm dOn dOQ dPC -cEz +dbw dQS dQS dRJ -cEz -cEz -cEz -cEz +dbw +dbw +dbw +dbw abj abi abj @@ -140977,8 +137039,7 @@ adZ adZ afJ agd -agA -adZ +age adZ adZ adZ @@ -140988,6 +137049,7 @@ adZ adZ adZ adZ +aip agA agg adZ @@ -140997,36 +137059,36 @@ qHs ani anH adb -alI -alI -alI -alI -alI -alI -alI -aql -apr -alI -ayf -azc +awX +awX +awX +awX +awX +awX +awX +ayC +aAF +awX +aze +azd aAp -alI -alI +awX +awX aDs -aEu +aty aFq -aEu -aEu +aty +aty aIQ aKg aLD -aMZ -aOv -aOv -aMZ +aFy +aTk +aTk +aFy aRu aUv -aOv +apU aXy aYT baH @@ -141035,55 +137097,55 @@ bdy beV baF bhx -bdx -bkU -bmR -bkU -bkU +aYB +aZN +baI +aZN +bee bkU bkU beU bwa baF -axu -bAn +aEz +bOC bBZ bDL bFo bHa -bFo +bgY bFo bMI bOz bDQ -bSt -bUE -bWD +bjU +blL +bWE bYj bZQ cbL cdC -cfw -cgZ -cix +ckj +crn +ciz ckj clC ckj clC -cpK +ckj clC bYj bYj bYj bYj bYj -clz +bYj cFM bYj cDT -cbC -ckb -cHv +drn +deO +dmq cIO cIO cIO @@ -141101,7 +137163,7 @@ dbQ cPv dfb dxE -dhW +cyG djz dkM dlZ @@ -141122,25 +137184,25 @@ dCJ dDZ dEJ dEJ -dbN +dOQ dGJ dHz -cit -cit -cfp -cgV +ddx +ddx +ddW +deF dLo -cfm -cbC -cdt -cgT -cdt -cbC -cgT +deY +dfL +dgn +dgP +dgn +djh +dEi dXs -cdt +dbp dSn -cJK +dlc abj aaa aaa @@ -141233,71 +137295,71 @@ aeJ aea aea aea -age aea -aea -aea -aea -aea -aea -aea -aea -ajx +agJ ajZ ajZ ajZ ajZ ajZ -amv +ajZ +ajZ +ajZ +ajZ +ahg +ajZ +ajZ +ajZ +amA amM -anj +anu wvH anI adb aor aoR aqF -alZ +azb asp -amb -alI +aor +awX auP avU -awY -amb +aBg +aor azd aAq -alI +awX aCn aDt -awX -aFr -aFr -aFr -aFr -aFr -aFr -aFr -aOw -aOw -aOw +aFx +aFx +aFx +aFx +aFx +aFx +aFx +aFx +aOx +aOx +aOx aSS -aUw -aOw -aOw -aYU -baI +aOx +aOx +aOx +bqe +baF bcf bdz beW bgq bhy -bjg -bkV +bjh +bkW bkU bog bqi -bsb +bkU btB beU bwa @@ -141308,21 +137370,21 @@ bCa bDL bFp bGZ -bHb -bKD +bhm +bFo bMJ bOA -bSe +bIV bTZ -bUE -bWD +bUI +bWH bYj bZR cbM bYj cfx -cgY -cix +crn +ciz ckj clD cnk @@ -141334,14 +137396,14 @@ ctM cvo cwM bYj -czD -cBa +drn +cDZ cCB cDW -cEG +drn cGr -cHv -cEz +dmq +dmq cKr cKr cKr @@ -141354,12 +137416,12 @@ cVo cXa cKr dqq -cMm -cPv +dbP +cPn cKr cKr dWj -djA +cKr dkI dkI dkI @@ -141375,10 +137437,10 @@ dkJ dzN dXA dkI -cEz -cEz -cEz -cEz +dbw +dbw +dbw +dbw dHB dGK dHA @@ -141392,12 +137454,12 @@ dIx dIx dIx dOR -cdt -cdt -cbC -cis +dbp +dbp +dOO +djA dRL -cJK +dlc abj abj abj @@ -141492,22 +137554,22 @@ aeb afK agf agB +aeb +aeb +aeb +aeb +aeb +aeb +aeb +aeb +aeb agB -agB -agB -agB -agB -agB -agB -ajG -agB -agB -agB +aeb alu -agB -amw -ang -gYw +aeb +amB +amL +anv ank anJ ahw @@ -141520,14 +137582,14 @@ ato auq auQ avV -alI +awX ayg aze ayg -alI +awX aCo -aDu -alI +aEz +aFx aFs aGo aHA @@ -141542,19 +137604,19 @@ aSU aUx aVY aOx -avO -baJ +aXJ +baF bcg bdA beX -baE +baF bhz bjh bkW -bmS -boh -bqj -bsc +bkU +bqi +bog +bkU btC beU bwa @@ -141566,40 +137628,40 @@ bDM bFo bHb bIS -bFo -bIU +biW +biY bOB -bIV +bjD bUa -bUE +bUG bWJ bYj bYj bYj bYj cfy -cgY -cix +crn +ciz ckj clE cnl -cnl +btc cnl crm bYj ctN cvp cwN -cyc -czE -cgU -cgU +bYj +cZm +dhG +dhG cDX -cgU +dhG cGs cHw cIQ -cKr +cZt cLV cKr cKr @@ -141610,18 +137672,18 @@ cKr cKr cKr cKr -day -cMl -cPv +dau +dbP +cPn dfc dgp dic djE -dkN +dkP dmd dnl dIh -dqd +dsz drx dsz dtX @@ -141774,24 +137836,24 @@ aqH arz asq atp -alI +awX auR -aKd -alI +aDy +awX ayh aze aAr -alI -amb -aDv -alI +awX +aor +aEy +aFx aFt aGp aHB aFx aKi aLF -aNb +cAq aOx aPQ aRq @@ -141799,75 +137861,75 @@ aST aUy aVZ aOx -alL -baJ +bpZ +baF bch bdB beY baF bhA bji -bkX +bmT bmT boi -bkU +bej bkU bmR beU bwa baF byM -bAn +bOC bCc bDN bFo bHd -bFo +bhJ bFo bMI bFr bDQ bSA bUI -bWD +bWH bYj bZS cbN bYj cfz -cgY -cix -ckj +crn +bpS +brv clF cnm -cnl -cnl -crn +bte +bwp +bso csI -ctO +bwT cvq cwO bYj czF cBb -cBc +cHr cDY -cbC +drn cGt cHx -cIR -cKs -cLW -cLW -cPf -cPf -cLW +cXU +cZt +dau +dau +dau +dau +dau cTI -cLW -cLW -cLW +dau +dau +dau cYs -daz +dau dbR ddw dBD @@ -141897,14 +137959,14 @@ dIy dGM dKX dKY -dJv -dJv +dKI +ddY dKI dLq -dJv +dfa dMR dNH -dOo +dIx dOT dPD dQh @@ -142022,7 +138084,7 @@ aaa aaa aaa adb -anm +ant anL aoo aoo @@ -142032,16 +138094,16 @@ aoo aoo aoo aoo -amb -avR +aor +aBB any any aBg -are -aql +aDH +ayC auR aDw -alI +aFx aFu aGq aHC @@ -142056,15 +138118,15 @@ aSW aUz aWa aOx -aEy -baJ +byM +baF bci bdC beZ baF bhB bjj -bkY +bmU bmU bmU bmU @@ -142073,8 +138135,8 @@ bmU buR bwa baF -apr -bAn +bpZ +bOC bCd bDO bFq @@ -142084,16 +138146,16 @@ bFq bMK bPY bDQ -bSt -bUE -bWD +bSA +blM +bWH bYj bZQ cbO cdC -cfw -cgZ -cix +ckj +crn +ciz ckk clG cnl @@ -142102,31 +138164,31 @@ cnl cro csH ctH -bZN +bzx cwP bYj -cbC -cBc -cbC +drn +cHr +drn cDZ cEH cGu cHy -cdw +cly cLB cLX cNx cPg -cQW -cMm +daA +daA cMl -cMm -cMl -cMm +daA +daA +daA cYt daA dbS -ddx +cPn dfe dxP dia @@ -142135,7 +138197,7 @@ dkP dni dnm dni -dqe +dsz dry dsB duY @@ -142144,25 +138206,25 @@ dxn dyE dzJ dAI -dBx -dCL -dCL +dGO +dFn +dFn dFn dGO dFm dFW -cdw +dcN dHC -dIz +dIx dJw dKe -dKJ -dLr +dSi +dSi dMh dMS dNI dOp -dOU +dRu dPE dQi dQU @@ -142279,8 +138341,8 @@ abj alW abj acC -anl -anK +ant +anP aoo aoT apL @@ -142289,32 +138351,32 @@ arA asr aoT aoo -alZ -aKd +azb +aDy awZ awZ -aoH -amb +aor +aor aqF -alZ -aDu -alI -aFv -aGr -aHD +azb +aEz aFx -aKk +aHQ +aGr +aFv +aFx +aMD aLH aNd aOx aPS -aRq +aPw aSX aUy aWb aOx -auV -baJ +bqe +baF bcj bdD beU @@ -142330,8 +138392,8 @@ btD buS bwb baF -aKd -bAn +bqe +bOC bCg bDS bFr @@ -142341,57 +138403,57 @@ bFr bMG bPZ bOC -bSs -bUE -bWD +bSy +blM +bWH bYj bZR cbM bYj cfA -cha +crn ciz -ckl +cfs clH cnn coz cpM crp -csJ +bYj ctP cvr cbK bYj czG cBd -cgT +dlM cEa -cEI +cJO cGv -cHz +drn cIS -cKu -cLY -cNy +cZt +cMn +cKF cPh -cQX +cKF cVJ cNy -cNy -cNy +cKF +cKF cYo cYu daB -dbT -ddy +dbV +cPn dff dff -dfg +czd djK dff -dfi +cKv dff -dfi +cKv dff dff dff @@ -142428,7 +138490,7 @@ dJx dJx dIx dTo -dUa +dUb dUL dTX aaa @@ -142537,7 +138599,7 @@ abj acC adb ann -anK +anP aoo aoU apM @@ -142551,18 +138613,18 @@ avW axa ayi azg -aty -aty -ayi +aBD +aBD +aES aDx -alI +aFx aFw -aGr -aHE +aJt +cyT aFx aKl -aLH -aNe +aNX +cAq aOx aPT aOn @@ -142571,7 +138633,7 @@ aUA aWc aOx aYV -baJ +baF bck bdE bfa @@ -142588,11 +138650,11 @@ buT baF baF btF -bAn +bOC bCe bDQ bDQ -bHf +bIV bIV bDQ bDQ @@ -142619,19 +138681,19 @@ bYj bYj bYj bYj -bYh -bYh -bYh -bYh -cEJ +cHA +cHA +cHA +cHA +cHA cIz cHA -bYh -cKv +cHA +cLZ cLZ cNz cQw -cQY +cRc cLZ cLZ cVi @@ -142665,9 +138727,9 @@ dDS dDS dFm dFY -cfm +dcQ dHA -cbC +dOO dJx dKf dKL @@ -142793,17 +138855,17 @@ aaa abj amx ajy -anl -anK +ant +anP aoo aoV -apN +apM aqL arC apM atr aoo -alL +aEz avX axb axb @@ -142812,27 +138874,27 @@ axb axb axb aDy -alI +aFx aFx aGs -aHF +aFx aFx aFx aLI -aHF +aFx +aOx aOx aOx -aRs aSY -aUB +aOx aOx aOx aYW -aHF -aFx +baF +baF bdF bfb -aFx +baF bhE bjm blb @@ -142844,12 +138906,12 @@ bSg buU buU bxl -byO -bAq +baG +buU bEa bDR bEp -bHg +bJd bJd bDR bDR @@ -142857,14 +138919,14 @@ bOD bSg byO bUK -bWL +chc bOW bZT cbV -bOW +vEw bOW chc -bWL +bpT bOW bOW bOW @@ -142884,7 +138946,7 @@ chc cGx cHB bvV -cKv +cLZ cMa cNA cPj @@ -142895,20 +138957,20 @@ cVj cWN cTJ cYv -cNL -cMi -ddx +cKF +dbV +cPn dfg dgt dif djG dkR dma -dno +dsF doL dfi drz -dsD +dsF dtY dff dwi @@ -142924,7 +138986,7 @@ cKr cZt dbM dHE -cgT +dEi dJx dKg dKL @@ -142934,10 +138996,10 @@ dMU dNK dMU dOW -dPG -dQj -dQW -dRv +dOr +dMj +dOr +djB dJx dKm dIx @@ -143050,13 +139112,13 @@ aaa acC acC acC -anl -anK +ant +anP aoo aoW -apO -aqK +apM aqK +aqY apM ats aoo @@ -143067,22 +139129,22 @@ ayj azh aAs aBw -aCp +axb aDz aEv -aFy -aGt -aHG +aFr +aLJ +aRt aIR aKm aLJ aNf -aOy -aOy +aRt +aRt aRt aSZ aUC -aOy +aRt aXz aYX baK @@ -143141,7 +139203,7 @@ cDd cGy xqH ddm -cKv +cLZ cMb cNB cPk @@ -143152,9 +139214,9 @@ cVk cWO cYp cYz -daC -cMh -ddx +cKF +dbV +cPn dfh dhN djp @@ -143180,7 +139242,7 @@ dEL dGY dFZ dbM -dHF +dHL dIA dJx dKh @@ -143191,10 +139253,10 @@ dMT dNJ dMT dOX -dPH +dPF dQk dQX -dKL +dLw dJx dSg dIx @@ -143307,13 +139369,13 @@ alE alY afb alY -anl -anK +ant +anP aoo aoX -apO -aqM apM +aqM +arx asr att aoo @@ -143327,15 +139389,15 @@ aBv aCq aDD aEJ -aGM -aGu +aUD +aRv aHH aHS aIU -aLK +aUD aNg -aOz -aOz +aUD +aUD aRv aTa aUD @@ -143346,22 +139408,22 @@ baL bcm bdH bfd -bgs +aFx bhG bjo bld -bmY -bon -bqo +bmW +boo +bqp bsf cqm buW buW buW byQ -chB +bfy bDG -chB +bfy bFt bHi bIX @@ -143398,7 +139460,7 @@ cEL bqu cHC ddn -cKv +cLZ cMc cNC cPl @@ -143409,9 +139471,9 @@ cVl cWP cTL cYA -day -cMi -ddx +cKF +dbV +cPn dfi dhO djq @@ -143433,12 +139495,12 @@ dBe cKr cZt dFT -dEM cZt cZt cZt -dHG -dIB +cZt +dPw +dID dJx dKi dKL @@ -143448,7 +139510,7 @@ dMU dNK dOr dOW -dPI +dOr dQk dKL dRw @@ -143456,7 +139518,7 @@ dJx dSh dIx dTr -dUc +dml dUO dIx abj @@ -143564,17 +139626,17 @@ aaa acC acC acC -anl -anM -aop +ant +anP +aoo aoY -apP +ast aqN arD aqN atu aoo -auV +aDt avZ axb ayl @@ -143595,7 +139657,7 @@ aLU aLU aLU aTc -aUE +aLU aLU aLU aYZ @@ -143655,20 +139717,20 @@ cFp dxV ddl cIV -cKv -cKv +cLZ +cLZ cNz cPm cRc -cKv -cKv +cLZ +cLZ cTL cVp cLZ cZt dtS dbV -ddy +cPn dfj dhP djr @@ -143693,7 +139755,7 @@ dEd dEN dFo dIC -cKs +cZt dHH dKZ dXa @@ -143713,7 +139775,7 @@ dJx dSi dSJ dTs -dUc +dml dSi dTX abj @@ -143821,8 +139883,8 @@ aaa abj amy ajf -ano -anJ +ant +alm ahy aoZ apQ @@ -143840,7 +139902,7 @@ aAv aBy aCr aEw -auV +aDt aFA aGv aHJ @@ -143857,10 +139919,10 @@ aWe aXB aZa baM -bco +bfg bdJ bfe -bgt +aYZ bhI bjq blf @@ -143910,7 +139972,7 @@ cCC csK cEM bqu -xqH +bIG cIW cKw cMd @@ -143918,16 +139980,16 @@ cND cPn cRd cSm -cKr +cZt cTU cVq cXb cZt -day -cMi -ddx +cKF +dbV +cPn dfk -dgu +dig dig dkU dff @@ -143953,19 +140015,19 @@ dGb dJy dHI dID -dJz +dJx dKk -dKN -dLv -dMl -dMV -dNL -dOs -dMl -dPK -dQm -dKN -dRy +dKL +dLw +dMk +dMT +dNJ +dPF +dMk +dPF +dQk +dKL +dLt dRO dSj dSK @@ -144078,8 +140140,8 @@ aaa abj acC adb -anl -anK +akG +als aoo apa apR @@ -144088,7 +140150,7 @@ arF aqN atu aoo -alL +aEz avX axb ayn @@ -144097,7 +140159,7 @@ aAw aBz aCs aEC -auV +aDt aFA aGw aHK @@ -144106,11 +140168,11 @@ aIX aLM aFA aOB -aPV -aRx +aOD +aOD aTe -aUG -aWf +aOD +aOD aXC aYZ baQ @@ -144119,7 +140181,7 @@ bdK bff aYZ bdQ -bjr +bjt blg aYZ boo @@ -144182,34 +140244,34 @@ cXc cYB daE dbW -ddz -dfl -dfl +cPn +cPn dih +cPn djL dkV -dfl -dnt -dfl +cPn +cPn +cPn drI -dfl -dfl -dfl +cPn +cPn +cPn dvh dih dxw -dnt +cPn dXv -dBg -cKu +cRd +cZt dCR dEf dEP dFq dGc -cKu +cZt dHJ -cHf +dbp dJx dKh dKL @@ -144335,8 +140397,8 @@ abj abj abj acC -anl -anK +ant +anP aoo apb apS @@ -144345,7 +140407,7 @@ arG ast atw aoo -alL +aEz avX axb ayo @@ -144357,17 +140419,17 @@ aDE aEy aFA aGx -aHL +aHM aIW aIX aLN aFA aOC aPX -aPX +aPA aTg -aPW -aPW +aSd +aTr aXD aYZ bcs @@ -144375,7 +140437,7 @@ bcq bdL bfg bgu -bhJ +bdP bjs blh aYZ @@ -144427,37 +140489,37 @@ bqu cHF cIY cKy -cMf +cMe cNE -cPp +cPr cMm cPn -cTN +cKI cUZ cWz cYj cKI daF -dbR +cvm ddA -cMe -cMf +cRe +cxD dii djM dkW -dme -dvi -doP +dyL +dyL +dyL drN -doP +dyL +dyL +dyL dkW -doP -dvi -doP +cZH dxx dyL dzT -doP +dbj dBh dCS dEg @@ -144465,8 +140527,8 @@ dEQ dFr dGd cZt -cFY -cHg +ddt +dOO dJx dKg dKL @@ -144478,7 +140540,7 @@ dMW dMm dPL dMm -dQZ +dPL dRz dRP dSl @@ -144592,8 +140654,8 @@ aaa aaa aaa adb -ano -anN +ant +anP aoo apc apT @@ -144602,8 +140664,8 @@ arG asu atx aoo -auV -aoH +aDt +aBb axb axc axb @@ -144687,35 +140749,35 @@ cKy cMg cNF cPq -cRf -cSo +cMe +ddw cTC cVc cWH cYk cZr -daG +cKE dbX -ddv +cSt dfm dgv dij -djN +duc dkX -djN -dnv +duc +duc dIi dsu -dkX -dkX +duc +duc duc dvj dgv -dxy -dgv +cSt +cSt dzU -dgv -cKs +cSt +cZt dCT dEh dXy @@ -144850,12 +140912,12 @@ acC adb adb anp -anK +anP aoo aoo aoo aoo -apd +aHX aoo aoo aoo @@ -144879,7 +140941,7 @@ aFA aOE aPY aRz -aRz +aQS aRz aRz aXF @@ -144889,8 +140951,8 @@ bcv bcz bfi aYZ -bdP -bju +aYa +aYC blk aYZ boo @@ -144938,49 +141000,49 @@ cEr cEQ cIT bqu -xqH +bIG cIW cKz -cMh +cMi cNG cPr cMm cRd -cTP +cZx cVd cZG cYl cZx -cNL +cKF dbY -ddB -dfn -dfn -dik -dfn +cRg +dfo +dfo +dfp +dfo dnF -dfn -dnw -dfn +dfo +dfp +dfo +dqp dql dql -dql -dud +dwn dxB dwn dql dql dql -dqp -cKr +dql +cZt cZt cZt cZt cZt cZt dbM -cYe -cEJ +dHA +ddy dJx dKm dKr @@ -145089,23 +141151,23 @@ afc adZ adZ agg -adZ +aip agA adZ -aig -aip -aip -aip -aip -aip -aip -aip -als -alx -aip +adZ +adZ +adZ +adZ +adZ +adZ +adZ aip +agA +agg +adZ +adZ amz -ang +amL anq anO aon @@ -145117,14 +141179,14 @@ asv aty aur auX -awc +awd axe axe axe aAz aAz axe -aDH +axe aEA aFA aFA @@ -145136,10 +141198,10 @@ aFA aOF aPZ aRA -aRA +aRd aRA aPZ -aXG +aIZ aYZ aYZ aYZ @@ -145147,7 +141209,7 @@ aYZ aYZ aYZ bhK -bjv +aYE bll bmZ boo @@ -145195,13 +141257,13 @@ cEr cER cIT bqu -xqH +bIG cIW cKA cMi cNG cPr -cMl +cMm cSp cTQ cVr @@ -145213,13 +141275,13 @@ daH ddC dfo dim -div +doU dmf doy doT doU dqj -dql +dqp dsJ duj dwq @@ -145228,29 +141290,29 @@ dyM dzV dCZ dGn -dqp -dBI +dql +dGf dCU dEi dES dCU dGf -cgU +dbp dHL -dIF -dEz -dEz -dKs +dIH +dJH +dJH +dKP dLA dMo -dKs -dKs +dKP +dKP dOv dPb dPY dQo dRl -dEz +dJH dSo dKP dTh @@ -145346,33 +141408,33 @@ afh aea aea aea -aea -aea -aea -ahU -aea -aea -aea -aea -ajB -aea -aea -aea -aea -aea -aea +agJ +ajZ +ajZ +ajZ +ajZ +ajZ +ajZ +ajZ +ajZ +ajZ +ahg +ajZ +ajZ +ajZ +ajZ amA -amL -anl -anK -aos -aos -aos -aos -aos -aos -aos -aos +amM +anu +alx +aop +aop +aop +aop +aop +aop +aop +aop auY awd axe @@ -145381,21 +141443,21 @@ azo aBu aCw aCu -aDH -aKd +axe +aDt aFA aGA -aHN +aMg aIZ aKr aQt aNh -aNi -aNi -aNi -aNi -aNi -aNi +aOG +aOG +aOG +aRe +aOG +aOG aXH aZb baR @@ -145404,7 +141466,7 @@ bdN bfj bgy bhL -bju +aZh blm bmZ boq @@ -145470,9 +141532,9 @@ dca ddj dfo din -djO -dnx +doV dnx +cIp dnx doV dqk @@ -145486,13 +141548,13 @@ dzW dEn dEn duZ -dBi +dEy dCV -cir -cwD +dbC +dbI dFt dGg -cwD +dbI dHM dIG dJB @@ -145500,15 +141562,15 @@ dKn dKn dLz dMp -dMZ -dMZ -dMZ dPM -dMZ -dMZ -dMZ -dMZ -dMp +dPM +dPM +dPM +dPM +dPM +dPM +dPM +dkq dSs dSP dTy @@ -145611,26 +141673,26 @@ aeb aeb aeb aeb -ajY -agH -agH +aeb +aeb +agB alt aly -agH -agH +aeb +aeb amB -amM -anr -anP -aos +amL +ant +mOF +aop ape apV aqR arJ asw atz -aos -alL +aop +aEz awe axe ayr @@ -145638,30 +141700,30 @@ azp aAA axe axe -aDH -aKd +axe +aDt aFA aGB -aHN +aMi aJa aKs aTp -aNi aOG -aQa -aRB -aNi -aLR +aOG +aWj +aWj +aRe +aWj aLS -aNi -aNi +aUj +aOG aTp bcx bdP bdQ bdP bdQ -bjv +aYE blo bmZ boo @@ -145709,28 +141771,28 @@ cEN csK cES bqu -xqH +bIG cIW cKC cMk cNI cPs -cMf +cMe cSr cTS cVt -cWX -cYw -cZz daJ -cWZ +daJ +cZA +daJ +cvT ddD dfp diq -djP +doW dny dla -dny +cLv doW dqo dqm @@ -145742,8 +141804,8 @@ dui dzX dEX dGT -dqp -dBK +dql +dCU dCW aos aos @@ -145755,18 +141817,18 @@ dIH dJC dKo dKo -dLC +dLE dMq dKo dKo dKo -dPc -dNd -dNd -dNd -dNd -dRR -dSt +dKo +dKo +dKo +dKo +dKo +dKo +dSB dSP dXK dUj @@ -145877,9 +141939,9 @@ acC acC adb amN -anl -anK -aot +ant +anP +apN apf aqg aqS @@ -145895,30 +141957,30 @@ azq aAB aCw aEO -aDH -apr +axe +aEz aFA aGC -aHN +aMg aIZ aKs aTp -aNi -aLR +aOG +aWj aQb aRC -aNi +aRs aUI aWg -aLR -aNi +aUo +aOG aTp bdT bdQ bfk bgA bhQ -bju +aZk bln aZa bor @@ -145966,10 +142028,10 @@ cCK csK cET bqu -xqH +bIG cIW cKD -cMl +cMm cNG cPr cMm @@ -145977,16 +142039,16 @@ cRg cTR cVu cWY -cYx +daJ cZA daK -cWZ +cvT ddE dfo diq dio djQ -dla +cIq dmg dnA dIL @@ -146001,7 +142063,7 @@ dtN dtN dyP dBC -cGo +dbB aos dET dFu @@ -146013,16 +142075,16 @@ dJD dKo dKo dLD +dfn +dNa +dNa +dNa +dKp dKp dNa dNa dNa -dPd dKp -dNa -dNa -dNa -dRS dSu dTi dTA @@ -146134,42 +142196,42 @@ aaa aaa aaa adb -anl -anK -aos +ant +anP +aop apg apX aqT arL asy atB -aos +aop ava -awg +aYS axe ayt azr aAB axe axe -aDH -apr +axe +aEz aFA aGD aHP -aIZ -aKs -aTp -aNi -aLR +aMj +aMX +aOc +aOQ +aPu aQc aRD aTh aUJ aWh -aLR -aNi -aNi +aUw +aOG +aOG aYZ bdR bgv @@ -146223,17 +142285,17 @@ csK csK cEU bqu -cHC +bKt cIY cKE cMe cNJ cPt -cMf +cMe cSs cTT cVv -cWZ +cYy cYy cZB daL @@ -146251,13 +142313,13 @@ dqm dsL dvl dui +dvn dvp -dui -dzX +dam dFw dHR -dqp -cKh +dql +dGf dBR dDe dEU @@ -146270,17 +142332,17 @@ dJD dKo dKo dLE +dMq +dNb +dNN +dOw +dKo dKo dNb dNN dOw -dPe dKo -dNb -dNN -dOw -dRT -dSt +dSB dSR dTB dWA @@ -146391,17 +142453,17 @@ abj abj abj acC -anl -anK -aos -aos +ant +anP +aop +aop aqi -aot +apN arQ -asz -aos -aos -alI +asn +aop +aop +awX ayw axe axe @@ -146409,30 +142471,30 @@ azs aAC aCw aFQ -aDH -avU +axe +aFH aFA aGE -aHN -aJa +aIZ +aMk aKs aVQ -aNi -aLR +aOG +aWj aQd aRE -aNi +aRs aUI aWi -aLR -aNi +aUB +aOG aVQ bfl bdQ bfm bhN bli -bju +bdQ bne bmZ boo @@ -146480,10 +142542,10 @@ cCL cEe cEL bqu -xqH +bIG cJa cKF -cMl +cMm cNG cPr cMm @@ -146492,15 +142554,15 @@ cTF cVw cWQ cYn -cWZ -cWZ -cWZ +daJ +daJ +daJ ddF dfo diq djR djQ -dla +cIq dmg doX drD @@ -146508,15 +142570,15 @@ dsH due dvm dws -dvq -dws -dzX +dvn +dyT +dav dyR dzY -dqp -dBM -dCY -dEk +dql +dCU +dHL +aos dEV dVx dGj @@ -146527,17 +142589,17 @@ dJD dKo dKo dLE -dKo +dMq dNc dNO dXF -dPe +dKo dKo dQp dNO dRG -dRT -dSt +dKo +dlp dSS dTC dUm @@ -146630,7 +142692,7 @@ aaa abj aaa aaa -afM +agE agD agE ahB @@ -146660,36 +142722,36 @@ asY awh avb awi -axf +aoA axe -azp +aCP aAD axe aAz -aDI -apr +aAz +aEz aFA aGF -aHQ aIZ +aMl aKs aTp -aNi -aNi -aLR -aRF -aNi -aUK +aOG +aOG +aWj +aWj +aRs +aWj aWj aXI -aNi -bRq +aOG +aTp bfo -bdS -bfn -bdS -bfn -bjx +bdP +bdQ +bdP +bdQ +bdP bQy bmZ boo @@ -146737,13 +142799,13 @@ cCM cEf cEL bqu -xqH +bIG cIW cKG cMm cNK cPu -cMl +cMm cSu cTT cVx @@ -146756,8 +142818,8 @@ ddH dfo dis djS -djS -djS +cDI +cJq djS djS drE @@ -146766,12 +142828,12 @@ duf dvr dxz dXr -dyQ -dAb +dvq +dav dyS dzZ -dqp -cKh +dql +dGf dBT aos dEW @@ -146784,16 +142846,16 @@ dJD dKo dKo dLE +dMq +dNb +dNP +dOw +dKo dKo dNb dNP dOw -dPe dKo -dNb -dNP -dOw -dRT dSB dST dTD @@ -146887,7 +142949,7 @@ aaa abj aaa aee -afM +agE agE agT ahC @@ -146905,17 +142967,17 @@ aaa aaa aaa acC -ano +anl anR -aov -apu -aov -aov -aov asB -aov apu -aov +aqX +asB +asi +asB +asD +apu +asB awj axg aAI @@ -146923,22 +142985,22 @@ azt aAE aEB aCx -aDH +axe aHW aFA aGG aHR aJb -aKs +aBE aZZ aNj -aNi -aNi -aRG -aNi +aWk +aWk +aWk +aRx aUL -aNi -aNi +aWk +aWk aZc baT aZa @@ -146949,7 +143011,7 @@ bdS bjy bQy aYZ -boo +ibc bqp bqv btH @@ -146994,12 +143056,12 @@ cyk gyY cEV cGz -xqH +bIG cIW cKH cMn cNL -cPv +cSt cRg cSv cTR @@ -147021,14 +143083,14 @@ drF dqp drJ dwo +cTP drJ -dqp -dyT +dql dBO dFy dQq -dqp -dBN +dql +dfu dVj aos aos @@ -147041,17 +143103,17 @@ dXC dKp dKp dLF -dKo +dMq dOu dNQ dOx -dPe +dKo dPN dQF dNQ dRH -dRT -dSt +dKo +dSB dSU dTE dUo @@ -147147,14 +143209,14 @@ aee agk agF agU -ahD ahC ahC ahC ahC ahC ahC -ahD +ahC +ahC akx agE agE @@ -147162,15 +143224,15 @@ agF agE aaa acC -anm -anS +ant +anT aow apj aqa aqV arO -asC -aqe +aqV +auH apk avc awk @@ -147180,15 +143242,15 @@ axe axe axe axe -aDH +axe aHX aFA aFA aFA aFA aFA -aLU -aLU +aFA +aFA aOH aOH aXR @@ -147196,8 +143258,8 @@ aZf bcw aOH aOH -aLU -aLU +aFA +aFA aYZ aYZ bgI @@ -147278,13 +143340,13 @@ dfo dqp drK dce -ddJ -dqp -dqp -dqp -dqp -dqp -dqp +dce +cWa +dql +dql +dql +dbg +dql dBH dCX dfu @@ -147298,16 +143360,16 @@ dJD dKo dKo dLG +dMq +dNb +dNN +dOw +dKo dKo dNb dNN dOw -dPe dKo -dNb -dNN -dOw -dRT dXJ dSP dTa @@ -147404,14 +143466,14 @@ aee agk agF agV -ahD +ahC ahC aim aim aim aim ajD -ahD +ahC aky akY alv @@ -147419,51 +143481,51 @@ alH agF aaa acC -anl +ant anT aoy acC aqb aqW +asj aqW -asD atC adb axF awl ayx -aBB -azu -aAF -aBC -aBC -aDJ +byN +bhO +bhO +bhO +bhO +bhO aED aFB aGH -aBC -aBC +bhO +bhO aKt -aBC -aBC -aBC -aBC -aRI -aBC -aDJ -aBC -aBC +bhO +bhO +bhO +bhO +bhO +aRW +aWl +bhO +bhO aZd baU bfp -aBC -aBC -aBC +aWq +bhO +bhO bhO bjA -aBC +bhO byN -bos +boo bqs bsm btH @@ -147509,16 +143571,16 @@ cEg cEL bqu cHI -dEj -cKJ -cKJ +dEm +cVA +cVA cNN -cPx -cKJ -cKJ +cVA +cVA +cVA cTV cVA -cVA +clA cVA cVA cVA @@ -147529,25 +143591,25 @@ dgC diu dnC doS -doS +dnC dnD doY dft drL cVA cVA -dgC -cKJ -cKJ -cKJ -cKJ -cKJ -cPx +cVA +cZR +doY +doY +doY +doY +doY dDb -dIM -dEY -dFz -dFz +dXj +dFa +dGo +dGo dGU dHS dXm @@ -147559,13 +143621,13 @@ dMr dNc dNO dPa -dPe +dKo dKo dNb dNO dRG -dRT -dSt +dKo +dSB dSR dTF dUq @@ -147657,8 +143719,8 @@ acF abj abj aaa -afM -afM +agE +agE agD agW ahC @@ -147676,7 +143738,7 @@ alH agF aaa acC -anl +ant anU aoz acC @@ -147688,37 +143750,37 @@ atD adb axX awm -anT +asB aBj azv aAG -aBD -aCy -aCy -aEE -aCy -aGI -aCy -aCy -aKu -aCy -aCy -aCy -aCy -aRJ -aTj -aCy -aWk -aXJ aZe -aCy +aZe +aZe +aGI +aIg +aGI +aZe +aZe +aKu +aZe +aZe +aZe +aZe +aZe +aTj +aWm +aZe +aZe +aZe +aZe bgw -aCy -aCy -bgz +aIg +aZe +aZe bhP bjB -aCy +bar bMa bot bqt @@ -147767,61 +143829,61 @@ cEW cGA cHJ dEl -cKK -cKK +doZ +doZ cNO cPy -cKK -cKK -cKK -cVB -cKK -cKK -cKK -cKK -cKK -cKK -dfB -cKK doZ -djU -cKK -cKK -cKK +doZ +doZ +doZ +cnV +doZ +doZ +doZ +doZ doZ dfB -cKK -cKK -cKK -cKK +doZ +doZ +doZ +cnV +doZ +doZ +doZ +dfB +doZ +doZ +doZ +doZ dwt -cKK -cKK -cKK -cKK +doZ +doZ +doZ +doZ dBP dDc dPu dEZ -cKK +dcj dWK -cKK +dcS dHT dXn dJD dKo dKo dLI -dLG +dfG dNb dNP dOw -dPe +dKo dKo dNb dNP dOw -dRU +dKo dSD dSV dTG @@ -147918,14 +143980,14 @@ aee agk agF agX -ahD +ahC ahC ail ail ail ail ajF -ahD +ahC aky ala alv @@ -147933,13 +143995,13 @@ alH agF aaa acC -anl +ant anT aoF acC aqd -aqX aqW +asj aqW atE adb @@ -147949,9 +144011,9 @@ ayy aBU azw aAH -aBE -aCz -aCz +aEF +aEF +aEF aEF aFC aGJ @@ -147961,23 +144023,23 @@ aKw aJc aRH aOI -aCz -aRK -aCz -aCz -aTk -aWl aEF -aCz +aRK +aEF +aSe +aEF +aJc +aEF +aEF bgx -aCz -bhM +aSe +bhY bhY blq -bhM +bhY bSB bMb -bou +bov bqu bsm btH @@ -148029,9 +144091,9 @@ cKL cNP cPz cRh -cSw +diw cTW -cVC +cYC cXd cYC cYC @@ -148039,47 +144101,47 @@ daO cYC cYC dgw -cSw +diw diw dle -cSw +cJY dmh dnE dpa dsI drM dnE -cSw +nQq cTW dwu dxF -cSw +diw dQr dBj dBQ dDd dXj dFa -dFA dGo dGo +dcV dHU dXm dJF dKq dKq -dLJ +dKq dMs -dNd -dNd -dNd -dPf +dKo +dKo +dKo +dKo dKo dKo dRn dKo dRV -dSt +dlD dTk dTH dUs @@ -148175,14 +144237,14 @@ aee agk agF agU -ahD ahC ahC ahC ahC ahC ahC -ahD +ahC +ahC akz agE agE @@ -148190,18 +144252,18 @@ agF agE aaa acC -anl +ant anT aoA apk aqe -aqY +asE arO asE atF apj avg -awk +aBm axk ayz ayA @@ -148222,14 +144284,14 @@ aGK aGK aGK aGK -aWm +aJd aXK aJd aGK aGK bdU bfq -bjz +bhU blr bfq bdU @@ -148302,7 +144364,7 @@ dfv dnI dfv dmi -drG +dsU dmi dce drK @@ -148319,7 +144381,7 @@ dfu dFb dFB dGp -dFB +ddd dHV dIN dJG @@ -148429,7 +144491,7 @@ aaa abj aaa aee -afM +agE agE agT ahC @@ -148447,19 +144509,19 @@ aaa aaa aaa acC -ano -anR -aov -apu -aov -anR -aov -aov -aov -apu -aov +ant +anT +aea +aeJ +aea +aea +ask +aea +aea +aeJ +aea awo -axk +ayy ayA azx aAJ @@ -148541,7 +144603,7 @@ cJg cKM cMo cNR -cPB +cPL cRj cSx cTX @@ -148686,7 +144748,7 @@ aaa abj aaa aaa -afM +agE agD agE ahE @@ -148708,7 +144770,7 @@ ans anV aoB apv -aqf +aqZ aqZ asW asZ @@ -148716,7 +144778,7 @@ asZ axi avh awp -axl +aow ayA ayA ayA @@ -148729,7 +144791,7 @@ aGK aIh aEN aNx -aLX +aUU aNm aOK aQf @@ -148737,12 +144799,12 @@ aRM aJd aUO aWo -aXN -aZh +aNm +aNm baW -bcA +aJd bdW -bfs +bfu bgD bhT bfu @@ -148796,9 +144858,9 @@ bqu cHN cJg cKN -cMp +cMq cNS -cPC +cRk cRk cSy cTY @@ -148821,10 +144883,10 @@ dqr drO dsO duk -dvt +cYN dww -dxI -dyV +dww +dwz dAd dwB dBL @@ -148961,8 +145023,8 @@ abj abj abj acC -anl -anK +ant +anP aoC aoC aqu @@ -148971,7 +145033,7 @@ asX asF aoC aoC -alI +axm awq axm ayA @@ -148987,14 +145049,14 @@ aEM aEN aNp aLY -aNn +aZi aOL aQg aRN aJe aUP aWp -aXO +aUE aZi baX aZs @@ -149002,7 +145064,7 @@ bdX bft bcN bec -bjD +bfu blu bhU bov @@ -149053,7 +145115,7 @@ bqu cHN cJh cKO -cMq +dea cNT cPD cRl @@ -149218,8 +145280,8 @@ aaa aaa aaa adb -anl -anK +akG +als aoC apl aqh @@ -149235,7 +145297,7 @@ ayA azz aAL aBH -aCB +aAK aBY aDM aFF @@ -149248,21 +145310,21 @@ aNo aNo aQh aRO -aTl -aUQ -aWq +aJd +aUU +aWr aXP -aZj +aNm baY aJd bdY bfu -bdZ +bcC bgE -bjE -blv -bhV -bow +bfu +blu +bhU +bov bqu ckH btH @@ -149280,7 +145342,7 @@ bKX bNb bOU bWX -aaa +bkY abj aaa bQI @@ -149310,18 +145372,18 @@ bqu cHN cJh cKO -cMp +dea cNU cPE -cMq +cUn cSA cUa cVH cXh cYF dlW -daT -dcj +cXg +cXg ddN dgD dfv @@ -149332,13 +145394,13 @@ dfv dYc dYi dYk -drQ +drX dsQ duk dvv -dwy -dxK -dyX +dwz +dxL +dwz dAf duk dBV @@ -149475,14 +145537,14 @@ acC acC adb amN -anl -anK +ant +anP aoD apm arM arb arS -arb +asC atH aut avj @@ -149491,12 +145553,12 @@ axo ayB azA aAM -aBI aCC -aBI +aCC +aCC aEK -aFG -aGN +aFJ +aGK aKv aKx aKx @@ -149508,13 +145570,13 @@ aGK aGK aUR aWr -aXQ -aZj +aXP +aNm baZ aGK bbC bfu -bgG +bfu bhW bfu blw @@ -149567,10 +145629,10 @@ bqu cHN cJg cKP -cMq -cNT +dea +cbr cPF -cMs +cha cSB cUb cVI @@ -149578,7 +145640,7 @@ cXi cYG doC daU -cXg +cvU ddO dgE dgT @@ -149595,10 +145657,10 @@ dum dvw dvx dxL -dyY +dvx dvx duk -dBW +dCd dDj dEo aaa @@ -149715,23 +145777,23 @@ afc adZ adZ agm +age +adZ +adZ +adZ +adZ +adZ +adZ +adZ +adZ +adZ +aip agA -adZ -adZ -aig -aip -aiL -aip -aip -aip -aip -aip -als alG -aip -aip +adZ +adZ amz -ang +amL ant anW aoC @@ -149745,40 +145807,40 @@ aoC avk awt axp -ayC +ayA azB aAN aBJ aCD aCf aDO -aFH +aFE aGL aHZ aJh aKz -aJh +aOf aJh aON aJh aRP aTm aUS -aWr +aTx aXM aZj -baY +aVb aJd bcB -bfv +bfu bea bgF -bft +aZm blx bhX -bou -bqu -ckH +aXX +aXY +aXZ btH aaa abj @@ -149824,15 +145886,15 @@ bqu cHN cJg cKQ -cMp -cNT -cPG +dea +cNS cMq +cUn cSA cTZ cZF cXg -cXg +cpJ doE daV cXk @@ -149842,20 +145904,20 @@ dfy dfy dfy dfy -dml +dmi dnK -dph +dmi dsU drS dsS -dun +duk dvt dww dQd -dyZ +dwz dXq duk -dBW +dCd dDk dEq abj @@ -149970,25 +146032,25 @@ aez aeK afh aea -aea -aea -aea -aea -aea -ahU -aea -aiJ -aea -aea -ajB -aea -aea -aea -aea -aea -aea +afM +ajZ +ahg +ajZ +ahi +ajZ +ajZ +ajZ +ajZ +ajZ +ajZ +ahi +ahg +ajZ +ajZ +ajZ +ahi amA -amL +amM anu anX aoC @@ -150000,7 +146062,7 @@ aoC aoC awx aql -apr +aps axq ayA azC @@ -150014,7 +146076,7 @@ aGO aGO aJi aKA -aMb +aOw aGO aGO aQj @@ -150022,13 +146084,13 @@ aMb aTn aUT aWs -aXS -aZk +aNm +aNm bba aJd bcB bfu -bdZ +bcC bgH bfu blu @@ -150082,9 +146144,9 @@ ukK cJi cKR cMr -cNT +cbr cPH -cMp +cUn cSD cTY cVK @@ -150099,17 +146161,17 @@ dgI diA djX dlg -dml +dmi dnL dpi dqw drT dsT -dun +duk dvx dvx dxL -dyY +dvx dvx dwB dBU @@ -150230,33 +146292,33 @@ aeb afN agn agH -agH -ahT -agH -agH aiT -agH -agH -akb ahT -agH -agH +aiT +aiT +aiT +aiT +aiT +akb +aiL +agB +aeb alK -agH -agH +aeb +ajH amB -amM -anj +amL +ant anY -alI +axm +apo apo -anx ard -amO +aoE ard -atJ auu -anx +auu +apo awu axr ayA @@ -150279,14 +146341,14 @@ aRQ aTo aUU aWr -aXQ -aZj +aNm +aNm bbb aJd bcB bfu -bgG -bhW +bfu +aYc bfu bly bfq @@ -150338,13 +146400,13 @@ bqu cHN cJg cKS -cMp -cNT -cPG +dea +cNS cMq +cUn cSE cTX -cVL +cXe cXe cYI cXe @@ -150356,16 +146418,16 @@ dgJ diB djY doF -dml +dmi dnN dpj dqx drU dsV -duo +dum dvt dwz -dxL +day dza dAh duk @@ -150491,21 +146553,21 @@ agI aif agI agI -aiu agI agI -ajH +agI +agI akV akB alc akB -alI +axm awY -alI -alI +axm +axm anv anZ -alI +axm app aqk aob @@ -150536,14 +146598,14 @@ aRR aNv aUV aWs -aXQ -aZj +aNm +aNm bbc bQb bcC bfu bgG -bhW +aYe bfu blz bfq @@ -150595,10 +146657,10 @@ bqu cHN cJg cKT -cMq -cNT -cPG -cMp +dea +cbr +dea +cUn cRm cJg cVM @@ -150611,19 +146673,19 @@ ddS dfy dgK diC -djZ +dka dli -dml +dmi doa dpk -dqy +dqz drV dsZ -dun +duk dvx dvx dxL -dyY +dvx dvw duk dBY @@ -150751,39 +146813,39 @@ ait aiW aje ajC -ajI +agI akc akC ald akB alJ alZ -amb -alI +apo +axm anz aoe -alI +axm apq aql -alI -alI -alI +axm +axm +axm ave -alI -alI -alI +axm +axm +axm axt ayA azF aAR -aBN +aCH aCH aDQ aEP aFL aGO aIc -aJl +aMe aKD aMe aNs @@ -150855,32 +146917,32 @@ cKU cMs cNV cPI -cMq +cUn cSF cUc cVN cXn -cYK -cZH +cSA +cJg daZ dcn -ddT +ddU dfz dgL diC dka dlj -dmm +dta dnO dpl dqz drW dsW -dun +duk dvy dwA dxN -dyZ +dwz dAi duk dBU @@ -151000,35 +147062,35 @@ afe afy afQ agp -agJ +agI agZ ahH -ahY -aiq -aiM -aiY +ahZ +air +aiN +aiN ajg -ajJ +agI akd -akD +ale ale alz alX ama amC -alI -alI -alI -alI -apr +axm +axm +axm +axm +aps aqm -alI +axm arV asI atM auw avm -alI +axm axs ayA ayA @@ -151051,12 +147113,12 @@ aTn ayD bai bcI -aZm +ayD bbe bbe bbi bin -bgJ +bbi blJ bbi bbe @@ -151109,31 +147171,31 @@ bqu cHN cJh cKV -cMq -cNT -cPD -cMp +dea +cbH +ceQ +cUn cSF cUd cUn cXo cYL cZI -cPG +ctr dco -ddU +cSA dfz dgM -diD +diC dkb dlq dnM -dnP +dpm dpm dqA drX dsX -dun +duk dvz dww dxO @@ -151259,23 +147321,23 @@ afR agq agI aha -ahG +ahj ahZ air aiN aiN ajh -ajH +agI ake akE alf akB -alL +aps amb amD -amO -anx -amO +aoE +apo +aoE aoE aps aqn @@ -151285,7 +147347,7 @@ asJ aKd aux arW -alI +axm axu ayD azG @@ -151299,7 +147361,7 @@ aJm aId aJn aKF -aMg +aKF aNt aQu aSq @@ -151366,35 +147428,35 @@ bqu cHN cJg cKW -cMp +cMq cNS -cPC +cRk cMq cSF cUd cVO -cMq +cnX cSF cJg -cPG +cKO dqW -ddU +cSA dfz dgN diE dkc dll -dmo +dta dnQ dpn dqB drY dsY -dun +duk duk dwB dAo -dzc +dBk duk duk dCa @@ -151522,7 +147584,7 @@ aiA aiN aiN aiN -ajH +agI akf akF alg @@ -151555,8 +147617,8 @@ aGQ aKb aBS aJo -aKG -aES +aBS +aCN aCN aBS aKK @@ -151564,13 +147626,13 @@ aRV aTs aUY aWw -aXW +aBS aZo -bbg +bbi bcE -bee -bfy -bgL +bfA +bfA +bfA bib bjH blN @@ -151633,25 +147695,25 @@ cVP cXp cYM cKY -cPG -dco -ddU +cKO +dqW +cSA dfy dgO diF dkd dlm -dml +dmi dnR dpo dqC drZ dtf -dun +duk dvA dww dxQ -dzd +dvE dAk duk dCb @@ -151773,66 +147835,66 @@ aeB abj agI ahc -ahG +ahk aib aiB aiN aiN -aiN -ahd +ahY +agI akg -akG +ahe alh agK alN amd amF alN -alI +axm alN amF alN -alI -alI +axm +axm arY -amb +apo atO asM avo -alI +axm axu ayD azI aAV -aBR -aDi -aDU -aER aGR aDi -aDU +aTu +aTu +aGR +aJv +aTu aJp -aKH -aMh +aTu +aNu aNu aNu aTV -azL +aPD aTt -aUZ +aSG aWx -aXX +aTu aZp bcO bcF -bef +bfz bfz blE bic -bfy +bfA bnf bNB -boA +cpO bqu bsr bsv @@ -151890,21 +147952,21 @@ cJg cXr cJg cKY -cPG -dco +cKO +dqW dlh dfA dfz diH dki dfz -dml -dnS -dpp -dqD -dsa +dmi dta -dun +dta +dta +dta +dta +duk dvB dwC dxR @@ -152032,59 +148094,59 @@ agI ahd ahJ agI -aiu +agI aiO aiO -aiO -ahd -akg -aiw +aig +agI +aiM +ahe ali agK alO ame amG amQ -any +alk aoc -aoH +apo apw aqp arf arW -alZ +auu atP -asM -asM +axf +axf aww -axu +aBN ayD azJ -aAV +aDI aBS -aCL aCN -aES aCN -aBS +aCN +aCN +aJX aEQ aJo aNw aBS aEY aCN -aUj -aRW -aDU -aDU +aWz +azL +aBS +aBS aWy -aXY +aBS aZq bbi bcG beg bfA -bgN +bgS bid bjI bnh @@ -152141,33 +148203,33 @@ cMu cNR cPL cRn -cRn +cKO cUe -cRn -cYU -cYN +ckg +cMq +cKO cZJ -dba +cKO don -ddW +cSA dgx -dgP +cSA diJ dkf -dln +dqE dmp -dln -dpq +dqE +cSA dqE dsb dtb -dup +duk dvC dwD dxS -dzf -dAm -dBl +dww +dAi +dBk dCd dDk dEq @@ -152287,7 +148349,7 @@ aeB abj agK ahe -ahK +ahe ahe aiv aiP @@ -152299,19 +148361,19 @@ akH alj agK alP -ame -amG +ajI +ajM amR anA -amb +apo aoI -amb -alI +apo +axm arg arZ asL atQ -alZ +auu avp are axv @@ -152319,23 +148381,23 @@ ayE azK aAW aBT -aCM -aDV aET -aDV -aDV +aET +aET +aET +aKG aKL aJq -aOQ -aMi -aQq -aOR -aUo -aRX -aTu -aTu +aIe +aBS +aEZ +aCN +aWz +azL +aBS +aBS bbh -aXZ +aBS bcJ bbe bcH @@ -152397,13 +148459,13 @@ cKY cMv cNY cPM -cMs cSH -cMs cSH -cMs +cSH +cki +cYO +cYO cYO -cSH dbb dcr ddX @@ -152411,12 +148473,12 @@ dgy dgQ diI dkg -dlo +dqF dKV -dlo +dgQ dpr dqF -dkg +dqF dtc duq dvD @@ -152544,15 +148606,15 @@ aeC abj agK ahf -ahK -ahe -aiw ahe ahe ahe ahe ahe -aix +ahe +ahe +aiY +ahe afA agK alQ @@ -152563,9 +148625,9 @@ anC aod aoJ apx -alI +axm arh -alZ +auu asM atR asK @@ -152578,27 +148640,27 @@ aFO aBS aCN aBS -aES aCN aCN +aLa +aBS aBS aBS aBS -aMj aBS aCN aWu aRV -aBS -aBS +aRX +aEU aWA -aYa +aUG bcK bbe bbe bbi bio -bgJ +bbi blK bbi bbe @@ -152608,7 +148670,7 @@ bqA bsu bSV bEq -bwo +bEq bxz bzb bEq @@ -152627,7 +148689,7 @@ bXa bSF cau bSF -bSF +pfp cfS cnw cnC @@ -152645,34 +148707,34 @@ cyA bSF bSF bSF -bSF +bBV cFc cGE cHQ dWR cKY cMw -dlp -cPN -cRo -cRo +cKV +cKV +cKV +cKV cUf cRo -cRo -cRo -cRo -dbc -dcn -ddY -dgz -dgR -dlc +cKV +cKV +cKV +cKV +don +cSF +dil +cSF +cSF dld -dkh +cSF dmr -dkh +cSF dps -dkh +cSF dsc dtd duk @@ -152800,17 +148862,17 @@ aeC abj abj agK -ahg -ahL ahe +ahe +ahD aix +aix +aix +aix +aix +aji ahe -ahe -ahe -ahe -ahe -ahe -ahe +ajG agK alR amg @@ -152824,32 +148886,32 @@ aqp ari asa asN -amb +auJ asJ avn awy -axu +aBZ ayD azM aFO aEY aCN aEQ -aES -aHz aCN +aHz +aLa aEX aBS aOS -aMk +aCN aOS aCN aWz azL aTv aUZ -aWA -aYb +aWy +aBS bcL bbe bfw @@ -152865,15 +148927,15 @@ bng bsv bsv btH -bwp +btH bxA btH btH bsv bsv -bng +bgs bHD -bng +bgs bLh bLh bLh @@ -152901,13 +148963,13 @@ cxn cxn cxn cxn -cxn -bng -bng +cLc +cLc +cHR cGF cHR -bng -bng +cLc +cLc cMx cMx cPO @@ -152923,8 +148985,8 @@ ddM dfr cKY cJg -cZN -cZN +czB +cEC cJg dms dnT @@ -153059,30 +149121,30 @@ abj agK ahh ahe +ahK ahe ahe ahe ahe ahe -ajL aki -aki -alk +ahe +ahe agK alS -ame +ajJ amI -amS +ajY aoa -aod -aoJ +ang +apO apz -alI +axm arj -ame -ame -atR -amb +amG +amG +auO +apo avq awy axw @@ -153092,27 +149154,27 @@ aFO aIe aBS aEX -aEU +aBS aIe -aCN +aLa aEQ aBS aQn -aMk +aCN aQr aCN aKK azL aTw aVa -aWA -aYc +aWy +aBS aZu bel bfC -bej -bfE -bgQ +ben +bgT +bgT bih bjL boD @@ -153122,15 +149184,15 @@ bng aaa abj aaa -bwp +btH bxA btH aaa abj aaa -bng +bgs bHE -bng +bgs bLi bNi bPd @@ -153152,20 +149214,20 @@ coI cqq bYH ctd -cuq -bsh +cuu +bqv cxn cyB cAc cBE -cDe +cLc cEm cFd hos cmt -cJn +bMD cKZ -cMy +bVz cOa cPP cRp @@ -153175,13 +149237,13 @@ cPO cXt cYQ cPO -dlD -dco -cNT +cKV +dqW +cSF cJg dgS cMp -cMp +cFe dFE dmt dnU @@ -153314,27 +149376,27 @@ abj abj aaa agK -ahg ahe ahe ahe ahe ahe ahe -ajM +ahe +ahe ahe ahe all agK alT -amg -amg +ajL +ajN amU anC aof -aoI +apP apA -alI +axm amQ asb asO @@ -153342,31 +149404,31 @@ atS auy avr awy -axs +aCd ayD azO aFO aEQ aBS -aEY +aFG aEU -aEQ -aCN +aIP +aLX aMf +aMz +aNb aBS -aEQ -aMj aEX aBS -aWC +aKK aRY -aTx -aVb +aDX +aDX aWB aYd aZv bey -bfM +boF bek bfF bgR @@ -153377,17 +149439,17 @@ bQa bQg bng aaa -btL +abj btL bwq bxB bzc btL -btL +abj aaa -bng +bgs bHF -bng +bgs bLj bNj bPe @@ -153409,18 +149471,18 @@ cax cax bYK ctd -cuq -bsh +cuu +bqv cxn cyC cAd cBF -cxn -cjp -boG +cLc +bDz +bDD cGG cHS -boG +bNO cLa cMy cOb @@ -153434,7 +149496,7 @@ cYR cZK dbf dct -cNT +cSF cKY dgU diL @@ -153571,29 +149633,29 @@ abj abi abj agK -ahi ahe ahe ahe ahe ahe ahe -ajM ahe ahe -alm +ahe +ahe +ahe agK alQ -ame -amg +amG +ajL amV -alI +axm aog aoL apW -alI +axm are -alI +axm amh amh are @@ -153606,26 +149668,26 @@ aFO aBP aBS aEZ -aEV +aBS aEZ aBS aEZ aBS aNw -aMl +aBS aEZ aBS aWG aRZ aSa -aVc +aSa bbj -aYe -aZw +aSa +aSa aSb bfN bhZ -bfG +bfI bfA bij bjN @@ -153635,14 +149697,14 @@ boG bqB abj btL -bvc +btL bwr bxC bwv -bvc +btL btL abj -bng +bgs buY bxx bLk @@ -153667,19 +149729,19 @@ chC lEt ctf cus -cvT +bsg cxn cyD +bBk cAc -cBF -cDe -boG -cjn +cLc +bDA +bEH cGH cHT -boG +bNQ cLb -cMy +bVI cOc cPR cRr @@ -153689,8 +149751,8 @@ cVR cXv cYS cZL -dbg -dcu +cKO +dqW dea cJg dgV @@ -153700,17 +149762,17 @@ dls dmu dnW dpw -dqJ +dxW dsf dth dut dvH dwI dxW -dxW +dba dXz dmt -dBW +dCd dDh dEq aaa @@ -153828,27 +149890,27 @@ aaa abi abj agK -ahj +ahe +ahl +ahL +ahe ahe ahe ahe -agK ahe -aji -ajN akj akI -ajK +ahe agK -alI +axm amh amh -alI -alI -alI +axm +axm +axm aoM -alI -alI +axm +axm abj abj acF @@ -153875,7 +149937,7 @@ aKI aXU aSa aTy -aVd +aYf aWD aYf aZx @@ -153883,7 +149945,7 @@ bbl bfN bif bfH -bgS +aXS bik bjO bbe @@ -153893,15 +149955,15 @@ bqC aaa btL bvd -bws +bwv bxD -bwu +bwv bAI btL aaa -bng +bgs bHH -bng +bgs bLl bNl bPg @@ -153922,32 +149984,32 @@ cay cax cqr bYK -ctg -cur -cvU +ctj +cuu +bqv +cxn cxn -cyE cAe -cBG cxn -cxn -cxn -cGI -cHU -boG cLc -cMy +cLc +cLc +cGI +cLc +cLc +cLc cMx -cPS +cMx +cXw cRs -cSL +cYP cMx cMx cXw cYT cMx -cPG -dqW +daZ +dcn ddU cKY diG @@ -153957,7 +150019,7 @@ dmj dmu dnX dpx -dqK +dvG dsg dti duu @@ -154085,13 +150147,13 @@ abj abi abj agK -ahk -ahk -ahk +agK +agK +agK aiy -agK -agK -agK +aiy +aiy +aiu agK agK agK @@ -154101,11 +150163,11 @@ abj acF acF abj -alI +axm aox aph apY -alI +axm abj asc asc @@ -154129,10 +150191,10 @@ aDX aDX aSw aQv -aYt +aKJ aSa aTz -aVe +aYg aWE aYg aZy @@ -154142,7 +150204,7 @@ bhZ bfI bgS bil -bjP +bjL bxy bng boH @@ -154156,9 +150218,9 @@ bzd bAJ btL aaa -bng +bgs bHF -bqC +bgt bLm bTd bPh @@ -154179,37 +150241,37 @@ ccq coK cqr bYH -ctg -cuq -bsh +ctj +cuu +bqv cxn cyF -cAf -cCU +bBu +cEj cEj cEn -cFe +cxn cGJ -cHV -cJo boG +cJo +bRw cKY cOd -cPT -cRn -cSM +cKO +cKO +cKO cUj -cRn -cRn -cRn +cKO +cKO +cKO cZM -dbh -dco -ddU +cKO +dqW +cSA cJg dgS cMp -cMp +cFA dJE dmt dnY @@ -154341,12 +150403,15 @@ acp aaa abj abj -agL -ahl -ahM +aaa +aaa +aaa ahM aiz agL +agL +aiw +ahM aaa aaa aaa @@ -154355,14 +150420,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -alI +axm aoi -aoN +dZP dZS -alI +axm abj asc asP @@ -154386,7 +150448,7 @@ aJE aJE aQs aQv -aYt +aKJ aSa aTA aVf @@ -154407,15 +150469,15 @@ bng aaa btL bvf -bwu +bwv bxF -bwu +bwv bAK btL aaa -bqC +bgt bHF -bqC +bgt bLn bLn bLn @@ -154436,37 +150498,37 @@ bYK bYH cqs bYH -ctg -cuq +bwL +bxe bsh cxo -cyG +cAf cAg cBI cDg cDg cJl dzi -cHW +cTa cJp -boG +bRF cKY cOe cMq -cMp -cNS +cMq +cMq cUk -cMq -cMp -cMq +ckl +dbi +dbi cZN dbi dco dfE cKY cJg -cZN -cZN +czB +cFB cJg dms dnT @@ -154481,7 +150543,7 @@ dmt dmt dmt dmt -dbo +cKY dDt cKY cKY @@ -154615,11 +150677,11 @@ aaa aaa aaa aaa -alI +axm dZP dZR dZU -alI +axm abj asc asQ @@ -154630,20 +150692,20 @@ awD axB auE ayD -aBb -aBZ -aCP +aFR +aFR +aFR aGP aFN aFR aFN aIk -aJt -aBZ -aBZ -aBZ -aBZ -aQw +aFR +aFR +aFR +aFR +aFR +aFR aSb aTB aVg @@ -154667,10 +150729,10 @@ bvg bwv bxG bwv -bvc +btL btL abj -bng +bgs bHI bJt bLn @@ -154704,45 +150766,45 @@ cxn cxn cxn xQW -cmt boG boG +bSe cKY -cOf +dbn +cKV cKV cKV -cSN -cPN cRo -dkh -cRo -cZP -dbj -dcn -dfG -cZP +cNW +cKV +cKV +dci +cMq +don +cSA +dgx +cSA +cSA +cHV dgW -dld -dld -cYK dmv -dgW +cSA dpA -cYK -cYK -cYK +cSA +cSA +cSA duw -cYK +cSA dwK dgW -dgW -cYK -dBn +cSA +cSA +cJk dCh dDu dEr dFc -dFD +cTX dLa dLd dLY @@ -154872,11 +150934,11 @@ aaa aaa aaa aaa -alI +axm dZO dZQ dZT -alI +axm abj asd afO @@ -154889,7 +150951,7 @@ auE abj abj abj -aCQ +aJu aGf gyp aFS @@ -154901,13 +150963,13 @@ abj abj abj abj -aSc +aSa aTC aVh aWH aYi aZB -aSc +aSa bgW beo bfL @@ -154915,17 +150977,17 @@ bgU bim bjS bMn -bnj +bbi abj aaa aaa +aaa btL btL btL btL btL -btL -btL +aaa aaa bFS bFS @@ -154950,20 +151012,20 @@ cnK coM cqt bYH -ctg -cuq -bso +ctj +cuu +ckH cxn czU -cAf +bBu cBK cDh cEo cxn -hos -cHX -cJq -cJq +cUA +cMz +cMz +cMz cMz cOg cOg @@ -154971,33 +151033,33 @@ cMz cSO cUr cXl -cXK +dbu cUr dbs -dbk +cMp dcv ded dgB dgX -cXx -cVT -cXx -cVT -dnZ -dpB -cXx -cVT -cXx -cVT -cXx +dgX cVT dxZ -cVT +dgX +dnZ +dpB +dgX +dgX +dgX +dgX +dgX +dgX +dxZ +dgX dAt dBo dCi dDv -dgX +dbH dFd dTx dLb @@ -155129,11 +151191,11 @@ aaa aaa aaa aaa -alI -alI -alI -alI -alI +axm +axm +axm +axm +axm abj asc aqG @@ -155146,33 +151208,33 @@ asd aaa aaa aaa -aCR -aIg -aFP -aBZ -aFP -aJs -aJv +aFR +aGP +aFN +aFR +aFN +aIk +aFR aaa aaa aaa aaa abj -aSd +aSa aTD -aVi +aYg aWI -aVi +aYg aZC -bbm -bcP -bep +aSa +bbi +bes +bbi +bbi +bbi +bbi bbi -blG bbi -bjT -blO -bnk abj aaa aaa @@ -155207,18 +151269,18 @@ cnL coN cqt bYH -ctg -cuq -bso +ctj +cuu +ckH cxn czU -cAf +bBu cBK cxn cxn cxn -hos -cHX +cUA +cMz cJr cLd cMA @@ -155231,27 +151293,27 @@ cXq dcE cZp cUr -dcA -don -dgA +cKV +cwo +cSF dil -dlu +cSF diM +cSF dlu -dlu -dlu -dob -dpC -dlu +cSF +dqW +cSF +cSF dsi -dlu -ehq -dlu +cSF +cMq +cSF diM dlu -ehq +cMq hmC -cOl +cKY dCj dDw dEs @@ -155264,7 +151326,7 @@ dIX abj dKA dNi -dLS +dLT dMx dNk dRh @@ -155398,7 +151460,7 @@ aus auC avw ayH -axy +aCm asc aaa aaa @@ -155415,19 +151477,19 @@ aaa aaa aaa abj -aSe +aSa aTE aVj aWJ aYj aZD -aSe -abj +aSa +aVX beq blC -blH -blL -beq +bbi +aaa +aaa abj abj abj @@ -155468,19 +151530,19 @@ ctj cuu cvW cxn -czU +bAd cAi cBL cDh cEq cDe -hos -cHX +cUA +cMz cJs cLe cMB -cMB -cMB +cbI +cfw cRu cSQ cVS @@ -155509,8 +151571,8 @@ cXJ dSd dvK cXJ -dbo -dDt +cKY +dlw cKY cKY cTX @@ -155521,7 +151583,7 @@ dFG aaa dKB dNW -dLj +deV dMy dNl dRi @@ -155678,13 +151740,13 @@ aSb aSb aSb aSb -aSb -aaa +aVc +aWf ber blD blI -blM -ber +aaa +aaa aaa aaa aaa @@ -155721,9 +151783,9 @@ cnM coM cqt bYH -ctg -cuq -bso +ctj +cuu +ckH cxn cyJ cAf @@ -155731,8 +151793,8 @@ cBM cxn cxn cDe -hos -cHX +cUA +cMz cJt cLf cMC @@ -155742,11 +151804,11 @@ cSP cOg daa cXz -daa +cpc cZQ dbu -dlD -dco +cKV +cwp duG cKY dgZ @@ -155766,7 +151828,7 @@ cXJ jkU fVZ cXJ -dCk +cSZ dDE bng aaa @@ -155935,13 +151997,13 @@ abj abj abj abj -abj -aaa +aSa +bbi bes -bfO -blG -bip -bjU +bbi +bbi +aaa +aaa aaa aaa aaa @@ -155978,7 +152040,7 @@ cnN coP cqu bYH -ctg +ctj cuv cvX cxn @@ -155989,22 +152051,22 @@ cDh cFb cFg ltY -cHX +cMz cJu cLf -cMD +cMC cOj -cPV +cMC cRv cSV cVU cXA -cZZ -cZR -cXl -dlD -dqW -cNT +dcE +cZQ +dbu +cKV +cwp +cSF cJg dhe dwN @@ -156023,7 +152085,7 @@ cXJ eha hTW cXJ -dCl +cSY dDy cqJ abj @@ -156192,11 +152254,11 @@ abj abj aaa aaa -abj aaa aaa +aWC +aaa aaa -bgY aaa aaa aaa @@ -156239,14 +152301,14 @@ cwa cuw cJc cxn -cyE +cxn cxn cBN cxn cxn cFg -cGF -cHX +bHf +cMz cJv cLg cMG @@ -156259,9 +152321,9 @@ cXB cYW cZS dbv -dlD -dco -cNT +cKV +cwp +cSF dfD dhe dwP @@ -156280,7 +152342,7 @@ vrB mko dXw cXJ -cmt +boG dDE bng aaa @@ -156294,7 +152356,7 @@ dFG dXG dPg dQw -dLY +dfQ dWU dFG abj @@ -156449,7 +152511,7 @@ aaa aaa aaa aaa -abj +aaa aaa aaa aaa @@ -156503,12 +152565,12 @@ cDi cnP cFh ltY -cHX -cJq +cMz +cMz cLh cMF -cJq -cJq +cMz +cMz cMz cMz cWd @@ -156518,7 +152580,7 @@ cWd cWd dbl dcx -cNT +cwr cJg dhd diN @@ -156549,7 +152611,7 @@ dFG dFG dFG dJW -dLV +dFH dMB dIc dGw @@ -156706,7 +152768,7 @@ abj abj aaa aaa -abj +aaa aaa aaa aaa @@ -156749,8 +152811,8 @@ cnP coR cqw crW -ctm crW +byo cxd crW cyL @@ -156771,10 +152833,10 @@ cUl cVW cXC cYX -cYX +cpK cWd -dlD -dco +cKV +cwp dXp cKY cKY @@ -156794,7 +152856,7 @@ dAx dAx eSe dAx -dCl +cSY dDC bng abj @@ -156802,13 +152864,13 @@ dFG dGt dHf dId -dIY +dNt dJP dKC dLe -dLW +dOd dMC -dNo +dOd dOd dOG dPj @@ -156962,9 +153024,9 @@ abj aaa aaa abj -abj -abj -abj +aaa +aaa +aaa aaa aaa aaa @@ -157001,15 +153063,15 @@ cgc chN bYM ckT -cjn +bqj cnP coR cqw crW ctn +byo +cwc crW -cwb -cxq cyM crW cBP @@ -157017,22 +153079,22 @@ cDk cnP cFj cGN -cHY +boG cJw -cLj +xWD cMH -cPZ +cWd cRx -cPZ +cWd cUm -cVX -cXE +cXG +cXG cYY cZU -dbw -dbm -dqW -cNT +cUr +cKV +cwp +cSF cJg dhd dhc @@ -157051,7 +153113,7 @@ dAx muK ifj dAx -cmt +boG dDE cqJ aaa @@ -157061,11 +153123,11 @@ dHg dIe dIZ dJQ -dIe +dej dLf -dIe +dej dMD -dNp +dOH dOe dOH dPk @@ -157221,7 +153283,7 @@ abj abj aaa aaa -abj +aaa aaa aaa aaa @@ -157277,7 +153339,7 @@ cGO cHZ cJx cLk -cms +cMH des cSR cWd @@ -157308,23 +153370,23 @@ dya dzm dAu dAx -dCk +cSZ dDE bng abj dFG dGv -dHh +dNv dIk dJe -dJR +dNv dKD dLg dLX -dME -dNq +dXi +dXi dOf -dOI +dXi dPl dFG dWZ @@ -157476,14 +153538,14 @@ abj aaa aaa abj +acF +acF +acF +acF +acF +acF +abj abj -aaa -acF -acF -acF -acF -acF -acF abj wtK bsB @@ -157522,7 +153584,7 @@ cqx crW ctp cuz -cwc +bzF cxs cyO crX @@ -157539,14 +153601,14 @@ cQa cSS cSU cUp -cVZ +cXG cXG cYZ cZW cUr -dlD +cKV dtC -cNT +cSF cJg dhe dye @@ -157565,13 +153627,13 @@ dAx vbZ dAv dAx -dCk +cSZ dDE bng aaa dFG dGw -dHi +dNr dJa dJf dGw @@ -157581,7 +153643,7 @@ dKB dGw dNr dOg -dHi +dNr dGw dFG dFG @@ -157803,7 +153865,7 @@ cZX cWd dbn dcz -cNT +cSF cKY dhf diO @@ -157822,7 +153884,7 @@ dAx kVM dAw dAx -dCl +cSY dDC bng abj @@ -157839,7 +153901,7 @@ dGw dNs dOh dOJ -dPm +dIc dPU dQx dXf @@ -158034,10 +154096,10 @@ cnP coS cqz crW -ctr +crW cuB cwd -cxu +crW cyQ cAl cBS @@ -158048,7 +154110,7 @@ cGQ cIc aFx dlw -cHR +bng cWd cWc cWc @@ -158058,9 +154120,9 @@ cWd cWd cWd cWd -dbo +cKY dec -dej +cKY cKY cKY cKY @@ -158091,10 +154153,10 @@ dXc dJT dXE dLi -dLZ -dMF +dOd +dFI dNt -dOi +dOk dOK dWV dPV @@ -158299,26 +154361,26 @@ cyR cxv cBT cDo -cuw +bDB cFn cGR cId aFx cME -cMK +diP cOo cOo diP diP dtu -cWa +cjn cXD cZc cqC -dbp +boG dcB dek -cWa +cjn dhg diP diP @@ -158329,20 +154391,20 @@ diP diP dsj dtu -dko +boG gpX -ctu +cMH dyc dzo hjo -cWa +cjn obN dDE bng aaa dFJ dGz -dHl +dJi dJc dXh dJU @@ -158541,7 +154603,7 @@ ccF cet cgh hTV -cjn +bqj ckW cqI cnP @@ -158562,11 +154624,11 @@ cGS cIe aFx cLn -cML -cML +cbm +cbm cQd cRz -cSW +cjF cUu cWb cWb @@ -158577,14 +154639,14 @@ dcC del dfH dhh -cSW -dby -dby -dmJ -dby -dby -cSW -cSW +cjF +cHW +cHW +cLL +cHW +cHW +cjF +cjF dtv duH dyd @@ -158605,7 +154667,7 @@ dXi dJV dGw dLk -dMb +dXi dMH dNv dOk @@ -158800,7 +154862,7 @@ cgi hTV cjo ckY -boG +brM cnP cnP cnP @@ -158815,7 +154877,7 @@ cnP cnP cnP cFw -bmW +bHg cIm aFx aFx @@ -158837,12 +154899,12 @@ dhi dfI dfI dfI -dmE +dev dfI dfJ dfJ dfI -gmN +xWD duL aOx aOx @@ -158856,9 +154918,9 @@ dDG abj dFG dGw -dHn +dGw dIl -dJg +dGw dJW dGw dLl @@ -158867,7 +154929,7 @@ dGw dNw dOl dON -dPm +dIc dPX dQA dXf @@ -159010,7 +155072,7 @@ aaa tgE boG boG -boG +aOR mhu qXF nPe @@ -159057,13 +155119,13 @@ cgj hTV cjp ckW -boH -bng +brS +bgs coU cJn ctc cqI -boH +brS cqI aFx cyT @@ -159318,7 +155380,7 @@ gGu cnR gGu cqD -coV +gGu khY cuF cqI @@ -159328,9 +155390,9 @@ aFv aFv aFv cEt -cFq -cGU -cIg +bEY +cGV +bKv cEu cAq cAq @@ -159356,7 +155418,7 @@ diS diS doo dsk -dtw +dtx kSX aOx dwR @@ -159573,19 +155635,19 @@ cjr cla cjr cjr -cjn +bqj cqE -bqC -bqB +bgt +bwR ckV -boH +brS aFx cyV cAn aFw aHA aFx -cFq +bEY cGV cIh aFx @@ -159830,12 +155892,12 @@ cjs clb cmy cnS -cqi +ctc cqE csd -cjn +bqj ckW -boH +brS aFx aFx aFx @@ -159853,7 +155915,7 @@ aFx aFx cSY cUy -cXJ +dlz cZg dab ddR @@ -160039,7 +156101,7 @@ ygH aJx nli abQ -aKS +aPv ygH aSi aTG @@ -160064,7 +156126,7 @@ loP tJH bub bzm -bAS +bHZ bub bub bub @@ -160090,7 +156152,7 @@ cnT coX cqF cse -bng +bgs cuG cjm aFx @@ -160099,9 +156161,9 @@ cAo cBW cAq aFx -cFq -cGU -cIg +bEY +cGV +bKv aFx cLp cMN @@ -160347,9 +156409,9 @@ cjr coY cqG csf -bqC +bgt cuH -cjn +bqj aFx cyW cAp @@ -160357,7 +156419,7 @@ cAq cAq cEu cFs -cGU +cGV cIj cJy cLp @@ -160367,7 +156429,7 @@ cQi aFx cSY cUv -cXJ +dlz cZi daR deo @@ -160560,7 +156622,7 @@ ygH aqq ygH ygH -aZN +bOc bbt ygH ygH @@ -160601,10 +156663,10 @@ cjv cle cjv cjr -boH +brS bHF -boH -bng +brS +bgs cuH cmq aFx @@ -160613,8 +156675,8 @@ cAq cBX aKk aFx -cFt -cGU +cFv +cGV cIk aFx cLq @@ -160623,8 +156685,8 @@ cLp cQh aFx cTb -ckW -cXJ +cUA +dlz cZj daS dep @@ -160641,7 +156703,7 @@ dop dpN dqY dfI -dtw +dtx duL dvT dwW @@ -160861,7 +156923,7 @@ cjr coZ csb csg -bng +bgs ckX cmr aFx @@ -160871,7 +156933,7 @@ aFx aFx aFx cFu -cGU +cGV cIk aFx aFx @@ -160893,7 +156955,7 @@ dfI dfI dfI dhi -dmK +cLW dfI dfJ dfJ @@ -161118,7 +157180,7 @@ cjr cpa cqI csh -bng +bgs ckW cmr aFx @@ -161128,7 +157190,7 @@ cBY cyY bmW cFv -cGR +cGV cIl bmW cyY @@ -161139,23 +157201,23 @@ aFx cTc cUA cqC -ctu -ctu -ctu +cMH +cMH +cMH dbx cqC det -cWa +cjn dhq cqC -dko +boG cqC dqU doq doq -ctu +cMH dbx -dtA +xWD ujH aOx dwY @@ -161372,10 +157434,10 @@ cjy ukv cmD cjr -bng -cqJ -bng -bng +bgs +bws +bgs +bgs cuH cqI aFx @@ -161384,8 +157446,8 @@ cAr cAr cAr cEv -cFt -cGU +cFv +cGV cIk cEv cAr @@ -161632,7 +157694,7 @@ cjr aaa aaa abj -cqJ +bws cLm cwk aFx @@ -161641,9 +157703,9 @@ cAs cAs cAs bmW -cFt +bFh cGT -cIk +bKD bmW cLr cAs @@ -161669,8 +157731,8 @@ bng dev bng vMI -bHF -sZT +cSL +cUM bLn dxa dyl @@ -161899,7 +157961,7 @@ bmW aFx aFx cFw -bmW +bHg cIm aFx aFx @@ -162153,7 +158215,7 @@ ctx czb cAt cBZ -ctx +jHa ctx cFx cGX @@ -162181,11 +158243,11 @@ aaa cqJ dmF dor -aeB -aeB +cPC +cPC dtD -aeB -aeB +cPC +cPC iwQ tks dAF @@ -162405,7 +158467,7 @@ abj csj ctx cuL -cwn +czc cxx czc czc @@ -162438,11 +158500,11 @@ abj cqJ dot dos -aeB -dtF -duO -dGZ -aeB +cPC +cRf +cSM +cVL +cPC dAF yiO tks @@ -162662,22 +158724,22 @@ aaa csj ctx cuM -cwo +cuM cxy -ctC +bAm cuM cuM cAu cEw cFz +bIg cFz -cIp cJA cLt cuM cOt cOt -cRC +cuM cTe cUG cOt @@ -162695,11 +158757,11 @@ aaa cqJ cqJ bng -aeB -dtG +cPC +cRC dGr uAP -aeB +cPC vFf pBz ojw @@ -162919,16 +158981,16 @@ aaa csj cty cuM -cwp -cxz -czd +cLt +cxA +cze cAu cuM cDr cEx cze cze -cIq +cze cJB cLu cuM @@ -162952,11 +159014,11 @@ abj abj abj abj -aeB +cPC odY dGs sPS -aeB +cPC bLn mDm bLn @@ -163176,7 +159238,7 @@ abj csj ctz cuM -cwp +cLt cxA cze cAu @@ -163209,11 +159271,11 @@ abi aaa abi abi -aeC -aeC +cPS +cPS dGX -aeC -aeC +cPS +cPS abj abj abj @@ -163433,14 +159495,14 @@ aaa csj ctA cuM -cwp +cLt cxA cze cAu cuM cDr cEx -cFA +cze cze cze cJB @@ -163467,9 +159529,9 @@ aaa aaa aaa abj -aeC +cPS dKx -aeC +cPS abj abj abi @@ -163690,15 +159752,15 @@ abj csj ctB cuM -cwq +cuM cxB czf cuM cuM cAu cEy -cFB cGZ +bIB cGZ cJC cLt @@ -163724,9 +159786,9 @@ aaa aaa aaa abj -aeC +cPS qRT -aeC +cPS abj abj abi @@ -163947,7 +160009,7 @@ aaa csj ctB cuM -cwo +cuM cxC czg czg @@ -163955,9 +160017,9 @@ czg czg czg cFC +bIE czg -czg -czg +bOp czg czg czg @@ -163989,9 +160051,9 @@ aaa abj aaa aaa -kYo -acf -aco +dak +daC +dbc aaa aaa abj @@ -164204,24 +160266,24 @@ abj csj ctB ctB -cwr -cxD +ctB +ctB czh cAv cAv cAv -cxD +ctB cFD cHa cHa cJD -cLv +cWh cMR cMR cQo cMR -cLv -cUM +cWh +cWh cWh cXO csj @@ -164239,20 +160301,20 @@ aaa aaa abi abj -acg +cSN abj aaa -kYo -ace -aco +dak +daz +dbc aaa -kYo -acf -aco +dak +daC +dbc aaa -kYo -acf -aco +dak +daC +dbc aaa abj aaa @@ -164496,20 +160558,20 @@ aaa aaa abj aaa -acp +cTN abj abj -kYo -acf -aco +dak +daC +dbc aaa -kYo -acf -aco +dak +daC +dbc aaa -kYo -acf -aco +dak +daC +dbc aaa abi aaa @@ -164753,20 +160815,20 @@ aaa aaa abi abj -acp +cTN abj aaa -kYo -acf -aco +dak +daC +dbc abj -kYo -acf -aco +dak +daC +dbc abj -kYo -acf -aco +dak +daC +dbc abj abj aaa @@ -164936,13 +160998,13 @@ abj aaa abj aaa -biG +aZw bmk -bmg +baJ bpi brk bmk -biG +aZw aaa aaa ePS @@ -165010,20 +161072,20 @@ aaa aaa abi aaa -acp +cTN abj abj -kYo -acf -aco +dak +daC +dbc aaa -kYo -acf -aco +dak +daC +dbc aaa -kYo -acf -aco +dak +daC +dbc aaa abi aaa @@ -165193,13 +161255,13 @@ abj aaa abj aaa -biG +aZw bml -bmh +bbm bpj brl bta -biG +aZw abj abj ePS @@ -165267,20 +161329,20 @@ aaa aaa abi abj -acp +cTN abj aaa -kYo -acf -aco +dak +daC +dbc aaa abj -acg +cSN abj aaa -kYo -acf -aco +dak +daC +dbc aaa abi abj @@ -165450,13 +161512,13 @@ aJx abj abj abj -biG +aZw bmm bnK myN brm btb -biG +aZw aaa abj ngg @@ -165524,19 +161586,19 @@ aaa aaa abj aaa -acp +cTN abj aaa abj -acg +cSN abj abj abj -acp +cTN abj abj abj -acg +cSN abj aaa aaa @@ -165707,13 +161769,13 @@ aJx aaa abj aaa -biG +aZw bmn bnL bpk -brn +beI btR -biG +aZw abj abj aaa @@ -165781,22 +161843,22 @@ aaa aaa abi abj -acp +cTN ewF -xKG -xKG -xKG -xKG -xKG -xKG -ach -acp -acp -acp +cYU +cYU +cYU +cYU +cYU +cYU +dbm +cTN +cTN +cTN ewF -xKG -xKG -xKG +cYU +cYU +cYU rnO abj abi @@ -165964,13 +162026,13 @@ fcg aaa abj aaa -biG -biG -bmg +aZw +aZw +baJ bpl bro -biG -biG +aZw +aZw aaa abj abj @@ -166042,15 +162104,15 @@ aaa abj aaa abj -aci +daG abj abj abj -acp +cTN abj abj abj -aci +daG abj aaa aaa @@ -166298,17 +162360,17 @@ abi abj abj aaa -kYo -acj -aco +dak +daT +dbc aaa abj -aci +daG abj aaa -kYo -acj -aco +dak +daT +dbc aaa abi abi @@ -166555,17 +162617,17 @@ aaa aaa abj abj -kYo -acj -aco +dak +daT +dbc aaa -kYo -acj -aco +dak +daT +dbc aaa -kYo -acj -aco +dak +daT +dbc aaa abi aaa @@ -166812,17 +162874,17 @@ aaa vXX abi aaa -kYo -acj -aco +dak +daT +dbc abj -kYo -acj -aco +dak +daT +dbc abj -kYo -acj -aco +dak +daT +dbc abj abi aaa @@ -167069,17 +163131,17 @@ aaa vXX abi abj -kYo -acj -aco +dak +daT +dbc aaa -kYo -acj -aco +dak +daT +dbc aaa -kYo -acj -aco +dak +daT +dbc aaa abj aaa @@ -167326,17 +163388,17 @@ aaa aaa abi aaa -kYo -acj -aco +dak +daT +dbc aaa -kYo -acj -aco +dak +daT +dbc aaa -kYo -acj -aco +dak +daT +dbc aaa abi aaa @@ -167587,9 +163649,9 @@ aaa aaa aaa aaa -kYo -acj -aco +dak +daT +dbc aaa aaa aaa diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index a633ddab5eb..d9b98c7724f 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -40,7 +40,6 @@ #define BELOW_OPEN_DOOR_LAYER 2.6 #define BLASTDOOR_LAYER 2.65 #define OPEN_DOOR_LAYER 2.7 -#define DOOR_HELPER_LAYER 2.71 //keep this above OPEN_DOOR_LAYER #define PROJECTILE_HIT_THRESHHOLD_LAYER 2.75 //projectiles won't hit objects at or below this layer if possible #define TABLE_LAYER 2.8 #define BELOW_OBJ_LAYER 2.9 @@ -52,6 +51,7 @@ #define SHUTTER_LAYER 3.12 // HERE BE DRAGONS #define ABOVE_OBJ_LAYER 3.2 #define ABOVE_WINDOW_LAYER 3.3 +#define DOOR_HELPER_LAYER 3.31 // Keep this above doors and windoors #define SIGN_LAYER 3.4 #define NOT_HIGH_OBJ_LAYER 3.5 #define HIGH_OBJ_LAYER 3.6 diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index c61d8319d39..81ef450643b 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -50,7 +50,7 @@ GLOBAL_PROTECT(log_end) /proc/log_access_in(client/new_client) if(GLOB.configuration.logging.access_logging) - var/message = "[key_name(new_client)] - IP:[new_client.address] - CID:[new_client.computer_id] - BYOND v[new_client.byond_version]" + var/message = "[key_name(new_client)] - IP:[new_client.address] - CID:[new_client.computer_id] - BYOND v[new_client.byond_version].[new_client.byond_build]" rustg_log_write(GLOB.world_game_log, "ACCESS IN: [message][GLOB.log_end]") /proc/log_access_out(mob/last_mob) diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm index bf0d7ab2b61..8266d470ff9 100644 --- a/code/__HELPERS/lists.dm +++ b/code/__HELPERS/lists.dm @@ -680,6 +680,7 @@ proc/dd_sortedObjectList(list/incoming) #define UNSETEMPTY(L) if (L && !L.len) L = null #define LAZYREMOVE(L, I) if(L) { L -= I; if(!L.len) { L = null; } } #define LAZYADD(L, I) if(!L) { L = list(); } L += I; +#define LAZYADDOR(L, I) if(!L) { L = list(); } L |= I; #define LAZYACCESS(L, I) (L ? (isnum(I) ? (I > 0 && I <= L.len ? L[I] : null) : L[I]) : null) #define LAZYLEN(L) length(L) // Despite how pointless this looks, it's still needed in order to convey that the list is specificially a 'Lazy' list. #define LAZYCLEARLIST(L) if(L) L.Cut() diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 2eb3d0b36ed..c88dd0671b1 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -616,7 +616,7 @@ so as to remain in compliance with the most up-to-date laws." if(stone) if(alert(usr, "Do you want to be captured by [stoner]'s soul stone? This will destroy your corpse and make it \ impossible for you to get back into the game as your regular character.",, "No", "Yes") == "Yes") - stone.opt_in = TRUE + stone?.opt_in = TRUE /obj/screen/alert/notify_soulstone/Destroy() stone = null diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 1fe1c68522b..9d4edca6ebb 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -1,5 +1,5 @@ /obj/item/proc/melee_attack_chain(mob/user, atom/target, params) - if(!tool_attack_chain(user, target) && pre_attackby(target, user, params)) + if(!tool_attack_chain(user, target) && pre_attack(target, user, params)) // Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example) var/resolved = target.attackby(src, user, params) if(!resolved && target && !QDELETED(src)) @@ -18,7 +18,7 @@ return return -/obj/item/proc/pre_attackby(atom/A, mob/living/user, params) //do stuff before attackby! +/obj/item/proc/pre_attack(atom/A, mob/living/user, params) //do stuff before attackby! if(is_hot(src) && A.reagents && !ismob(A)) to_chat(user, "You heat [A] with [src].") A.reagents.temperature_reagents(is_hot(src)) diff --git a/code/controllers/configuration/sections/system_configuration.dm b/code/controllers/configuration/sections/system_configuration.dm index a0354bb2b77..42e563d7057 100644 --- a/code/controllers/configuration/sections/system_configuration.dm +++ b/code/controllers/configuration/sections/system_configuration.dm @@ -14,6 +14,8 @@ var/shutdown_shell_command = null /// 2FA backend server host var/_2fa_auth_host = null + /// List of IP addresses which bypass world topic rate limiting + var/list/topic_ip_ratelimit_bypass = list() /datum/configuration_section/system_configuration/load_data(list/data) // Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line @@ -24,3 +26,5 @@ CONFIG_LOAD_STR(medal_hub_password, data["medal_hub_password"]) CONFIG_LOAD_STR(shutdown_shell_command, data["shutdown_shell_command"]) CONFIG_LOAD_STR(_2fa_auth_host, data["_2fa_auth_host"]) + + CONFIG_LOAD_LIST(topic_ip_ratelimit_bypass, data["topic_ip_ratelimit_bypass"]) diff --git a/code/controllers/subsystem/mobs.dm b/code/controllers/subsystem/mobs.dm index 8827de67123..e024a1f3d4e 100644 --- a/code/controllers/subsystem/mobs.dm +++ b/code/controllers/subsystem/mobs.dm @@ -9,6 +9,8 @@ SUBSYSTEM_DEF(mobs) var/static/list/clients_by_zlevel[][] var/static/list/dead_players_by_zlevel[][] = list(list()) // Needs to support zlevel 1 here, MaxZChanged only happens when CC is created and new_players can login before that. var/static/list/cubemonkeys = list() + /// The amount of giant spiders that exist in the world. Used for mob capping. + var/giant_spiders = 0 /datum/controller/subsystem/mobs/stat_entry() ..("P:[GLOB.mob_living_list.len]") diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index 85e9e5da52c..71c504b3032 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -37,7 +37,6 @@ SUBSYSTEM_DEF(shuttle) var/list/shoppinglist = list() var/list/requestlist = list() var/list/supply_packs = list() - var/datum/round_event/shuttle_loan/shuttle_loan var/sold_atoms = "" var/list/hidden_shuttle_turfs = list() //all turfs hidden from navigation computers associated with a list containing the image hiding them and the type of the turf they are pretending to be var/list/hidden_shuttle_turf_images = list() //only the images from the above list diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 83963e99562..579a6b7c07c 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -41,7 +41,7 @@ SUBSYSTEM_DEF(vote) CHECK_TICK /datum/controller/subsystem/vote/proc/autotransfer() - initiate_vote("crew_transfer","the server") + initiate_vote("crew transfer", "the server") /datum/controller/subsystem/vote/proc/reset() initiator = null @@ -95,7 +95,7 @@ SUBSYSTEM_DEF(vote) choices[GLOB.master_mode] += non_voters if(choices[GLOB.master_mode] >= greatest_votes) greatest_votes = choices[GLOB.master_mode] - else if(mode == "crew_transfer") + else if(mode == "crew transfer") var/factor = 0.5 switch(world.time / (10 * 60)) // minutes if(0 to 60) @@ -174,9 +174,9 @@ SUBSYSTEM_DEF(vote) if(!SSticker.ticker_going) SSticker.ticker_going = TRUE to_chat(world, "The round will start soon.") - if("crew_transfer") + if("crew transfer") if(. == "Initiate Crew Transfer") - init_shift_change(null, 1) + init_shift_change(null, TRUE) if("map") // Find target map. var/datum/map/top_voted_map @@ -222,7 +222,7 @@ SUBSYSTEM_DEF(vote) if(SSticker.current_state >= 2) return 0 choices.Add(GLOB.configuration.gamemode.votable_modes) - if("crew_transfer") + if("crew transfer") if(check_rights(R_ADMIN|R_MOD)) if(SSticker.current_state <= 2) return 0 @@ -266,16 +266,16 @@ SUBSYSTEM_DEF(vote) Click here or type vote to place your vote. You have [GLOB.configuration.vote.vote_time / 10] seconds to vote."}) switch(vote_type) - if("crew_transfer", "gamemode", "custom", "map") + if("crew transfer", "gamemode", "custom", "map") SEND_SOUND(world, sound('sound/ambience/alarm4.ogg')) if(mode == "gamemode" && SSticker.ticker_going) SSticker.ticker_going = FALSE to_chat(world, "Round start has been delayed.") - if(mode == "crew_transfer" && GLOB.ooc_enabled) + if(mode == "crew transfer" && GLOB.ooc_enabled) auto_muted = TRUE GLOB.ooc_enabled = FALSE to_chat(world, "The OOC channel has been automatically disabled due to a crew transfer vote.") - log_admin("OOC was toggled automatically due to crew_transfer vote.") + log_admin("OOC was toggled automatically due to crew transfer vote.") message_admins("OOC has been toggled off automatically.") if(mode == "gamemode" && GLOB.ooc_enabled) auto_muted = TRUE @@ -314,37 +314,41 @@ SUBSYSTEM_DEF(vote) dat += "(Cancel Vote) " else dat += "

Start a vote:

" var/datum/browser/popup = new(C.mob, "vote", "Voting Panel", nref=src) popup.set_content(dat) @@ -387,14 +391,16 @@ SUBSYSTEM_DEF(vote) var/votedesc = capitalize(mode) if(mode == "custom") votedesc += " ([question])" - log_and_message_admins("cancelled the running [votedesc] vote.") + log_and_message_admins("cancelled the running '[votedesc]' vote.") reset() if("toggle_restart") if(admin) GLOB.configuration.vote.allow_restart_votes = !GLOB.configuration.vote.allow_restart_votes + log_and_message_admins("has [GLOB.configuration.vote.allow_restart_votes ? "enabled" : "disabled"] public restart voting.") if("toggle_gamemode") if(admin) GLOB.configuration.vote.allow_mode_votes = !GLOB.configuration.vote.allow_mode_votes + log_and_message_admins("has [GLOB.configuration.vote.allow_mode_votes ? "enabled" : "disabled"] public gamemode voting.") if("restart") if(GLOB.configuration.vote.allow_restart_votes || admin) initiate_vote("restart",usr.key) @@ -406,7 +412,7 @@ SUBSYSTEM_DEF(vote) initiate_vote("map", usr.key) if("crew_transfer") if(GLOB.configuration.vote.allow_restart_votes || admin) - initiate_vote("crew_transfer",usr.key) + initiate_vote("crew transfer", usr.key) if("custom") if(admin) initiate_vote("custom",usr.key) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 8a7763410bf..18175766871 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -647,20 +647,20 @@ name = "Solar Federation Marine" uniform = /obj/item/clothing/under/solgov suit = /obj/item/clothing/suit/armor/bulletproof - back = /obj/item/storage/backpack/security + back = /obj/item/storage/backpack/ert/solgov belt = /obj/item/storage/belt/military/assault/marines/full head = /obj/item/clothing/head/soft/solgov/marines glasses = /obj/item/clothing/glasses/night gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/combat - l_ear = /obj/item/radio/headset/ert + l_ear = /obj/item/radio/headset/ert/alt/solgov id = /obj/item/card/id l_hand = /obj/item/gun/projectile/automatic/shotgun/bulldog suit_store = /obj/item/gun/projectile/automatic/pistol/m1911 r_pocket = /obj/item/flashlight/seclite pda = /obj/item/pda + box = /obj/item/storage/box/responseteam backpack_contents = list( - /obj/item/storage/box/responseteam = 1, /obj/item/clothing/shoes/magboots = 1, /obj/item/whetstone = 1, /obj/item/clothing/mask/gas/explorer/marines = 1, @@ -702,13 +702,12 @@ head = /obj/item/clothing/head/beret/solgov/command glasses = /obj/item/clothing/glasses/night back = /obj/item/storage/backpack/satchel - l_ear = /obj/item/radio/headset/ert/alt/commander + l_ear = /obj/item/radio/headset/ert/alt/commander/solgov l_hand = null belt = /obj/item/melee/baton/loaded suit_store = /obj/item/gun/projectile/automatic/pistol/deagle l_pocket = /obj/item/pinpointer/advpinpointer backpack_contents = list( - /obj/item/storage/box/responseteam = 1, /obj/item/storage/box/handcuffs = 1, /obj/item/clothing/shoes/magboots/advance = 1, /obj/item/reagent_containers/hypospray/autoinjector/survival = 1, @@ -720,14 +719,14 @@ /datum/outfit/admin/solgov/elite name = "Solar Federation Specops Marine" uniform = /obj/item/clothing/under/solgov/elite - head = /obj/item/clothing/head/soft/solgov/marines/elite + suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov + head = null + mask = /obj/item/clothing/mask/gas/explorer/marines belt = /obj/item/storage/belt/military/assault/marines/elite/full l_hand = /obj/item/gun/projectile/automatic/ar backpack_contents = list( - /obj/item/storage/box/responseteam = 1, /obj/item/clothing/shoes/magboots/advance = 1, /obj/item/whetstone = 1, - /obj/item/clothing/mask/gas/explorer/marines = 1, /obj/item/reagent_containers/hypospray/autoinjector/survival = 1 ) cybernetic_implants = list( @@ -737,22 +736,22 @@ /obj/item/organ/internal/cyberimp/arm/flash, /obj/item/organ/internal/eyes/cybernetic/shield ) + /datum/outfit/admin/solgov/elite/lieutenant name = "Solar Federation Specops Lieutenant" uniform = /obj/item/clothing/under/solgov/command/elite - head = /obj/item/clothing/head/beret/solgov/command/elite + suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov/command + head = null + mask = /obj/item/clothing/mask/gas/explorer/marines glasses = /obj/item/clothing/glasses/night - back = /obj/item/storage/backpack/satchel belt = /obj/item/melee/baton/loaded l_hand = null suit_store = /obj/item/gun/projectile/automatic/pistol/deagle l_pocket = /obj/item/pinpointer/advpinpointer - l_ear = /obj/item/radio/headset/ert/alt/commander + l_ear = /obj/item/radio/headset/ert/alt/commander/solgov backpack_contents = list( - /obj/item/storage/box/responseteam = 1, /obj/item/storage/box/handcuffs = 1, /obj/item/clothing/shoes/magboots/advance = 1, - /obj/item/clothing/mask/gas/explorer/marines = 1, /obj/item/reagent_containers/hypospray/autoinjector/survival = 1, /obj/item/ammo_box/magazine/m50 = 3 ) diff --git a/code/datums/spell.dm b/code/datums/spell.dm index fe2cc8e346b..9fdfb68bbea 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -560,7 +560,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) to_chat(user, "You shouldn't have this spell! Something's wrong.") return 0 - if(is_admin_level(user.z) && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel + var/turf/T = get_turf(user) + if(is_admin_level(T.z) && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel return 0 if(!holy_area_cancast && user.holy_check()) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index d7223c1209d..d8dd3bb44c8 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -273,6 +273,12 @@ /atom/proc/HasProximity(atom/movable/AM) return +/** + * Proc which will make the atom act accordingly to an EMP. + * This proc can sleep depending on the implementation. So assume it sleeps! + * + * severity - The severity of the EMP. Either EMP_HEAVY or EMP_LIGHT + */ /atom/proc/emp_act(severity) return diff --git a/code/game/dna/mutations/powers.dm b/code/game/dna/mutations/powers.dm index c0e20372a19..3d2f991acb6 100644 --- a/code/game/dna/mutations/powers.dm +++ b/code/game/dna/mutations/powers.dm @@ -822,9 +822,10 @@ else M.change_gender(FEMALE) - var/new_eyes = input("Please select eye color.", "Character Generation", eyes_organ.eye_color) as null|color - if(new_eyes) - M.change_eye_color(new_eyes) + if(eyes_organ) + var/new_eyes = input("Please select eye color.", "Character Generation", eyes_organ.eye_color) as null|color + if(new_eyes) + M.change_eye_color(new_eyes) //Alt heads. if(head_organ.dna.species.bodyflags & HAS_ALT_HEADS) diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 6ed1bc1aef8..f7320a40c72 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -238,7 +238,7 @@ blobber.LoseTarget() spawn() var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a blobbernaut?", ROLE_BLOB, TRUE, 10 SECONDS, source = blobber) - if(candidates.len) + if(length(candidates) && !QDELETED(blobber)) var/mob/C = pick(candidates) if(C) blobber.key = C.key diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 03326235953..9ffad32b15d 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -11,7 +11,7 @@ GLOBAL_LIST_INIT(possible_changeling_IDs, list("Alpha","Beta","Gamma","Delta","E name = "changeling" config_tag = "changeling" restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation Brigadier General") protected_species = list("Machine") required_players = 15 required_enemies = 1 diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm index f9d4edb105c..4c7b174749a 100644 --- a/code/game/gamemodes/cult/blood_magic.dm +++ b/code/game/gamemodes/cult/blood_magic.dm @@ -185,7 +185,7 @@ owner.visible_message("[owner]'s body flashes a bright blue!", \ "You speak the cursed words, channeling an electromagnetic pulse from your body.") owner.emp_act(2) - empulse(owner, 2, 5, cause = "cult") + INVOKE_ASYNC(GLOBAL_PROC, /proc/empulse, owner, 2, 5, TRUE, "cult") owner.whisper(invocation) charges-- if(charges <= 0) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 60ded97ac3f..e3ede981b48 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -48,7 +48,7 @@ GLOBAL_LIST_EMPTY(all_cults) /datum/game_mode/cult name = "cult" config_tag = "cult" - restricted_jobs = list("Chaplain", "AI", "Cyborg", "Internal Affairs Agent", "Security Officer", "Warden", "Detective", "Security Pod Pilot", "Head of Security", "Captain", "Head of Personnel", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer") + restricted_jobs = list("Chaplain", "AI", "Cyborg", "Internal Affairs Agent", "Security Officer", "Warden", "Detective", "Security Pod Pilot", "Head of Security", "Captain", "Head of Personnel", "Blueshield", "Nanotrasen Representative", "Magistrate", "Brig Physician", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation Brigadier General") protected_jobs = list() required_players = 30 required_enemies = 3 diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 203d370af8b..b3c3aacad02 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -607,7 +607,7 @@ structure_check() searches for nearby cultist structures required for the invoca set waitfor = FALSE to_chat(user, "[mob_to_revive] was revived, but their mind is lost! Seeking a lost soul to replace it.") var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Would you like to play as a revived Cultist?", ROLE_CULTIST, TRUE, poll_time = 20 SECONDS, source = /obj/item/melee/cultblade/dagger) - if(length(candidates)) + if(length(candidates) && !QDELETED(mob_to_revive)) var/mob/dead/observer/C = pick(candidates) to_chat(mob_to_revive.mind, "Your physical form has been taken over by another soul due to your inactivity! Ahelp if you wish to regain your form.") message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(mob_to_revive)]) to replace an AFK player.") diff --git a/code/game/gamemodes/miniantags/guardian/host_actions.dm b/code/game/gamemodes/miniantags/guardian/host_actions.dm index 1e431a7bb00..c03354a8f4b 100644 --- a/code/game/gamemodes/miniantags/guardian/host_actions.dm +++ b/code/game/gamemodes/miniantags/guardian/host_actions.dm @@ -90,6 +90,8 @@ if(!length(candidates)) to_chat(owner, "There were no ghosts willing to take control of your guardian. You can try again in 5 minutes.") return + if(QDELETED(guardian)) // Just in case + return var/mob/dead/observer/new_stand = pick(candidates) to_chat(guardian, "Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance.") diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index feeffc68c04..3f8eb42b8e4 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -168,6 +168,8 @@ visible_message("[src] disappears in a flash of red light!") qdel(src) return + if(QDELETED(src)) // Just in case + return var/mob/M = pick(demon_candidates) var/mob/living/simple_animal/slaughter/cult/S = src if(!M || !M.client) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 3b8649e26a5..b03a5d10fdf 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -4,6 +4,10 @@ #define NUKE_SEALANT_OPEN 3 #define NUKE_UNWRENCHED 4 #define NUKE_MOBILE 5 +#define NUKE_CORE_EVERYTHING_FINE 6 +#define NUKE_CORE_PANEL_EXPOSED 7 +#define NUKE_CORE_PANEL_UNWELDED 8 +#define NUKE_CORE_FULLY_EXPOSED 9 GLOBAL_VAR(bomb_set) @@ -25,12 +29,17 @@ GLOBAL_VAR(bomb_set) var/yes_code = FALSE var/safety = TRUE var/obj/item/disk/nuclear/auth = null - var/removal_stage = NUKE_INTACT + var/obj/item/nuke_core/plutonium/core = null var/lastentered var/is_syndicate = FALSE use_power = NO_POWER_USE var/previous_level = "" var/datum/wires/nuclearbomb/wires = null + var/removal_stage = NUKE_INTACT + ///The same state removal stage is, until someone opens the panel of the nuke. This way we can have someone open the front of the nuke, while keeping track of where in the world we are on the anchoring bolts. + var/anchor_stage = NUKE_INTACT + ///This is so that we can check if the internal components are sealed up properly when the outer hatch is closed. + var/core_stage = NUKE_CORE_EVERYTHING_FINE /obj/machinery/nuclearbomb/syndicate is_syndicate = TRUE @@ -39,16 +48,19 @@ GLOBAL_VAR(bomb_set) extended = FALSE anchored = FALSE -/obj/machinery/nuclearbomb/New() - ..() - r_code = rand(10000, 99999.0) // Creates a random code upon object spawn. +/obj/machinery/nuclearbomb/Initialize() + . = ..() + r_code = rand(10000, 99999) // Creates a random code upon object spawn. wires = new/datum/wires/nuclearbomb(src) previous_level = get_security_level() GLOB.poi_list |= src + core = new /obj/item/nuke_core/plutonium(src) + STOP_PROCESSING(SSobj, core) //Let us not irradiate the vault by default. /obj/machinery/nuclearbomb/Destroy() SStgui.close_uis(wires) QDEL_NULL(wires) + QDEL_NULL(core) GLOB.poi_list.Remove(src) return ..() @@ -73,16 +85,41 @@ GLOBAL_VAR(bomb_set) else to_chat(user, "You need to deploy [src] first.") return + if(istype(O, /obj/item/stack/sheet/mineral/titanium) && removal_stage == NUKE_CORE_FULLY_EXPOSED) + if(do_after(user, 2 SECONDS, target = src)) + var/obj/item/stack/S = O + if(!loc || !S || S.get_amount() < 5) + return + S.use(5) + user.visible_message("[user] repairs [src]'s inner core plate.", "You repair [src]'s inner core plate. The radiation is contained.") + removal_stage = NUKE_CORE_PANEL_UNWELDED + if(core) + STOP_PROCESSING(SSobj, core) + return + if(istype(O, /obj/item/stack/sheet/metal) && removal_stage == NUKE_CORE_PANEL_EXPOSED) + var/obj/item/stack/S = O + if(do_after(user, 2 SECONDS, target = src)) + if(!loc || !S || S.get_amount() < 5) + return + S.use(5) + user.visible_message("[user] repairs [src]'s outer core plate.", "You repair [src]'s outer core plate.") + removal_stage = NUKE_CORE_EVERYTHING_FINE + return + if(istype(O, /obj/item/nuke_core/plutonium) && removal_stage == NUKE_CORE_FULLY_EXPOSED) + if(do_after(user, 2 SECONDS, target = src)) + if(!user.unEquip(O)) + to_chat(user, "The [O] is stuck to your hand!") + return + user.visible_message("[user] puts [O] back in [src].", "You put [O] back in [src].") + O.forceMove(src) + core = O + else if(istype(O, /obj/item/disk/plantgene)) to_chat(user, "You try to plant the disk, but despite rooting around, it won't fit! After you branch out to read the instructions, you find out where the problem stems from. You've been bamboo-zled, this isn't a nuclear disk at all!") return return ..() /obj/machinery/nuclearbomb/crowbar_act(mob/user, obj/item/I) - if(!anchored) - return - if(removal_stage != NUKE_UNWRENCHED && removal_stage != NUKE_COVER_OFF) - return . = TRUE if(!I.tool_use_check(user, 0)) return @@ -92,9 +129,26 @@ GLOBAL_VAR(bomb_set) return user.visible_message("[user] forces open the bolt covers on [src].", "You force open the bolt covers.") removal_stage = NUKE_COVER_OPEN - else + if(removal_stage == NUKE_CORE_EVERYTHING_FINE) + user.visible_message("[user] starts removing [src]'s outer core plate...", "You start removing [src]'s outer core plate...") + if(!I.use_tool(src, user, 4 SECONDS, volume = I.tool_volume) || removal_stage != NUKE_CORE_EVERYTHING_FINE) + return + user.visible_message("[user] finishes removing [src]'s outer core plate.", "You finish removing [src]'s outer core plate.") + new /obj/item/stack/sheet/metal(loc, 5) + removal_stage = NUKE_CORE_PANEL_EXPOSED + + if(removal_stage == NUKE_CORE_PANEL_UNWELDED) + user.visible_message("[user] starts removing [src]'s inner core plate...", "You start removing [src]'s inner core plate...") + if(!I.use_tool(src, user, 8 SECONDS, volume = I.tool_volume) || removal_stage != NUKE_CORE_PANEL_UNWELDED) + return + user.visible_message("[user] finishes removing [src]'s inner core plate.", "You remove [src]'s inner core plate. You can see the core's green glow!") + removal_stage = NUKE_CORE_FULLY_EXPOSED + new /obj/item/stack/sheet/mineral/titanium(loc, 5) + if(core) + START_PROCESSING(SSobj, core) + if(removal_stage == NUKE_UNWRENCHED) user.visible_message("[user] begins lifting [src] off of the anchors.", "You begin lifting the device off the anchors...") - if(!I.use_tool(src, user, 80, volume = I.tool_volume) || removal_stage != NUKE_UNWRENCHED) + if(!I.use_tool(src, user, 8 SECONDS, volume = I.tool_volume) || removal_stage != NUKE_UNWRENCHED) return user.visible_message("[user] crowbars [src] off of the anchors. It can now be moved.", "You jam the crowbar under the nuclear device and lift it off its anchors. You can now move it!") anchored = FALSE @@ -126,15 +180,19 @@ GLOBAL_VAR(bomb_set) . = TRUE if(!I.use_tool(src, user, 0, volume = I.tool_volume)) return - if(auth) + if(auth || (istype(I, /obj/item/screwdriver/nuke))) if(!panel_open) panel_open = TRUE overlays += image(icon, "npanel_open") to_chat(user, "You unscrew the control panel of [src].") + anchor_stage = removal_stage + removal_stage = core_stage else panel_open = FALSE overlays -= image(icon, "npanel_open") to_chat(user, "You screw the control panel of [src] back on.") + core_stage = removal_stage + removal_stage = anchor_stage else if(!panel_open) to_chat(user, "[src] emits a buzzing noise, the panel staying locked in.") @@ -142,6 +200,8 @@ GLOBAL_VAR(bomb_set) panel_open = FALSE overlays -= image(icon, "npanel_open") to_chat(user, "You screw the control panel of [src] back on.") + core_stage = removal_stage + removal_stage = anchor_stage flick("nuclearbombc", src) /obj/machinery/nuclearbomb/wirecutter_act(mob/user, obj/item/I) @@ -154,8 +214,6 @@ GLOBAL_VAR(bomb_set) /obj/machinery/nuclearbomb/welder_act(mob/user, obj/item/I) . = TRUE - if(removal_stage != NUKE_INTACT && removal_stage != NUKE_COVER_OPEN) - return if(!I.tool_use_check(user, 0)) return if(removal_stage == NUKE_INTACT) @@ -167,7 +225,20 @@ GLOBAL_VAR(bomb_set) visible_message("[user] cuts through the bolt covers on [src].",\ "You cut through the bolt cover.") removal_stage = NUKE_COVER_OFF - else if(removal_stage == NUKE_COVER_OPEN) + if(removal_stage == NUKE_CORE_PANEL_UNWELDED) + user.visible_message("[user] starts welding [src]'s inner core plate...", "You start welding [src]'s inner core plate...") + if(!I.use_tool(src, user, 4 SECONDS, 5, volume = I.tool_volume) || removal_stage != NUKE_CORE_PANEL_UNWELDED) + return + user.visible_message("[user] finishes welding [src]'s inner core plate...", "You finish welding [src]'s inner core plate...") + removal_stage = NUKE_CORE_PANEL_EXPOSED + + else if(removal_stage == NUKE_CORE_PANEL_EXPOSED) + user.visible_message("[user] starts unwelding [src]'s inner core plate...", "You start unwelding [src]'s inner core plate...") + if(!I.use_tool(src, user, 4 SECONDS, 5, volume = I.tool_volume) || removal_stage != NUKE_CORE_PANEL_EXPOSED) + return + user.visible_message("[user] finishes unwelding [src]'s inner core plate...", "You finish unwelding [src]'s inner core plate...") + removal_stage = NUKE_CORE_PANEL_UNWELDED + if(removal_stage == NUKE_COVER_OPEN) visible_message("[user] starts cutting apart the anchoring system sealant on [src].",\ "You start cutting apart the anchoring system's sealant with [I]...",\ "You hear welding.") @@ -181,10 +252,18 @@ GLOBAL_VAR(bomb_set) attack_hand(user) /obj/machinery/nuclearbomb/attack_hand(mob/user as mob) - if(panel_open) - wires.Interact(user) - else - ui_interact(user) + if(!panel_open) + return ui_interact(user) + if(removal_stage != NUKE_CORE_FULLY_EXPOSED || !core) + return wires.Interact(user) + if(timing) //removing the core is less risk then cutting wires, and doesnt take long, so we should not let crew do it while the nuke is armed. You can however get to it, without the special screwdriver, if you put the NAD in. + to_chat(user, "[core] won't budge, metal clamps keep it in!") + return + user.visible_message("[user] starts to pull [core] out of [src]!", "You start to pull [core] out of [src]!") + if(do_after(user, 5 SECONDS, target = src)) + user.visible_message("[user] pulls [core] out of [src]!", "You pull [core] out of [src]! Might want to put it somewhere safe.") + core.forceMove(loc) + core = null /obj/machinery/nuclearbomb/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) @@ -308,6 +387,9 @@ GLOBAL_VAR(bomb_set) if(safety) to_chat(usr, "The safety is still on.") return + if(!core) + to_chat(usr, "[src]'s screen blinks red! There is no plutonium core in [src]!") + return timing = !(timing) if(timing) if(!lighthack) @@ -471,3 +553,7 @@ GLOBAL_VAR(bomb_set) #undef NUKE_SEALANT_OPEN #undef NUKE_UNWRENCHED #undef NUKE_MOBILE +#undef NUKE_CORE_EVERYTHING_FINE +#undef NUKE_CORE_PANEL_EXPOSED +#undef NUKE_CORE_PANEL_UNWELDED +#undef NUKE_CORE_FULLY_EXPOSED diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 7e48eae4c51..b741e1c582c 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -391,6 +391,8 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) explanation_text = "Steal [steal_target]. One was last seen in [get_location()]. " if(length(O.protected_jobs)) explanation_text += "It may also be in the possession of the [english_list(O.protected_jobs, and_text = " or ")]." + if(steal_target.special_equipment) + give_kit(steal_target.special_equipment) return explanation_text = "Free Objective." @@ -412,6 +414,8 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) else steal_target = new new_target explanation_text = "Steal [steal_target.name]." + if(steal_target.special_equipment) + give_kit(steal_target.special_equipment) return steal_target /datum/objective/steal/check_completion() @@ -429,6 +433,23 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) if(I.type in steal_target.altitems) return steal_target.check_special_completion(I) +/datum/objective/steal/proc/give_kit(obj/item/item_path) + var/mob/living/carbon/human/mob = owner.current + var/I = new item_path + var/list/slots = list( + "backpack" = slot_in_backpack, + "left pocket" = slot_l_store, + "right pocket" = slot_r_store, + "left hand" = slot_l_hand, + "right hand" = slot_r_hand, + ) + var/where = mob.equip_in_one_of_slots(I, slots) + if(where) + to_chat(mob, "

In your [where] is a box containing items and instructions to help you with your steal objective.
") + else + to_chat(mob, "Unfortunately, you weren't able to get a stealing kit. This is very bad and you should adminhelp immediately (press F1).") + message_admins("[ADMIN_LOOKUPFLW(mob)] Failed to spawn with their [item_path] theft kit.") + qdel(I) /datum/objective/steal/exchange martyr_compatible = 0 diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 1cb4e6fbb35..14fa2c74ec0 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -74,7 +74,7 @@ Made by Xhuis required_enemies = 2 recommended_enemies = 2 restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Head of Personnel", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation Brigadier General") /datum/game_mode/shadowling/announce() to_chat(world, "The current game mode is - Shadowling!") diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index 780962045be..24ea05d786c 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -12,6 +12,8 @@ var/list/altitems = list() var/flags = 0 var/location_override + /// Do we have a special item we give to somewhen when they get this objective? + var/special_equipment = null /datum/theft_objective/proc/check_completion(datum/mind/owner) if(!owner.current) @@ -138,6 +140,19 @@ protected_jobs = list("Head Of Security", "Warden") location_override = "the Warden's Office" +/datum/theft_objective/supermatter_sliver + name = "a supermatter sliver" + typepath = /obj/item/nuke_core/supermatter_sliver + protected_jobs = list("Chief Engineer", "Engineer", "Atmospheric Technician") //Unlike other steal objectives, all jobs in the department have easy access, and would not be noticed at all stealing this + location_override = "Engineering. You can use the box and instructions provided to harvest the sliver." + special_equipment = /obj/item/storage/box/syndie_kit/supermatter + +/datum/theft_objective/plutonium_core + name = "the plutonium core from the stations nuclear device" + typepath = /obj/item/nuke_core/plutonium + location_override = "the Vault. You can use the box and instructions provided to remove the core, with some extra tools." + special_equipment = /obj/item/storage/box/syndie_kit/nuke + /datum/theft_objective/number var/min=0 var/max=0 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 6cbfeca3c10..bb3df423653 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -11,7 +11,7 @@ name = "traitor" config_tag = "traitor" restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Internal Affairs Agent", "Brig Physician", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Internal Affairs Agent", "Brig Physician", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation Brigadier General") required_players = 0 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/gamemodes/vampire/traitor_vamp.dm b/code/game/gamemodes/vampire/traitor_vamp.dm index b55d6c01c45..b3b05b0c4cc 100644 --- a/code/game/gamemodes/vampire/traitor_vamp.dm +++ b/code/game/gamemodes/vampire/traitor_vamp.dm @@ -2,7 +2,7 @@ name = "traitor+vampire" config_tag = "traitorvamp" traitors_possible = 3 //hard limit on traitors if scaling is turned off - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Solar Federation Brigadier General") restricted_jobs = list("Cyborg") secondary_restricted_jobs = list("AI") required_players = 10 diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index 69972d2bea5..e646213c7da 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -9,7 +9,7 @@ name = "vampire" config_tag = "vampire" restricted_jobs = list("AI", "Cyborg") - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Chaplain", "Brig Physician", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation Brigadier General") protected_species = list("Machine") required_players = 15 required_enemies = 1 diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index f2b28fea297..42d91002257 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -100,6 +100,8 @@ return get_all_centcom_access() + get_all_accesses() if("Special Operations Officer") return get_all_centcom_access() + get_all_accesses() + if("Solar Federation Brigadier General") + return get_all_centcom_access() + get_all_accesses() if("Nanotrasen Navy Representative") return get_all_centcom_access() + get_all_accesses() if("Nanotrasen Navy Officer") @@ -401,7 +403,7 @@ return list("VIP Guest","Custodian","Thunderdome Overseer","Emergency Response Team Member","Emergency Response Team Leader","Intel Officer","Medical Officer","Death Commando","Research Officer","Deathsquad Officer","Special Operations Officer","Nanotrasen Navy Representative","Nanotrasen Navy Officer","Nanotrasen Navy Captain","Supreme Commander") /proc/get_all_solgov_jobs() - return list("Solar Federation Lieutenant","Solar Federation Specops Lieutenant","Solar Federation Marine","Solar Federation Specops Marine","Solar Federation Representative","Sol Trader") + return list("Solar Federation Lieutenant","Solar Federation Specops Lieutenant","Solar Federation Marine","Solar Federation Specops Marine","Solar Federation Representative","Sol Trader","Solar Federation Brigadier General") //gets the actual job rank (ignoring alt titles) //this is used solely for sechuds diff --git a/code/game/jobs/job/central.dm b/code/game/jobs/job/central.dm index e4ce321082e..8a74598951d 100644 --- a/code/game/jobs/job/central.dm +++ b/code/game/jobs/job/central.dm @@ -69,9 +69,9 @@ /datum/outfit/job/ntspecops name = "Special Operations Officer" jobtype = /datum/job/ntspecops + allow_backbag_choice = FALSE uniform = /obj/item/clothing/under/rank/centcom/captain suit = /obj/item/clothing/suit/space/deathsquad/officer - back = /obj/item/storage/backpack/ert/security belt = /obj/item/storage/belt/military/assault gloves = /obj/item/clothing/gloves/combat shoes = /obj/item/clothing/shoes/combat @@ -82,8 +82,8 @@ id = /obj/item/card/id/centcom pda = /obj/item/pda/centcom r_pocket = /obj/item/storage/box/matches + back = /obj/item/storage/backpack/satchel box = /obj/item/storage/box/centcomofficer - backpack = /obj/item/storage/backpack/satchel backpack_contents = list( /obj/item/clothing/shoes/magboots/advance = 1, /obj/item/storage/box/zipties = 1 @@ -104,3 +104,23 @@ if(visualsOnly) return H.mind.offstation_role = TRUE + +/datum/job/ntspecops/solgovspecops + title = "Solar Federation Brigadier General" + outfit = /datum/outfit/job/ntspecops/solgovspecops + +/datum/outfit/job/ntspecops/solgovspecops + name = "Solar Federation Brigadier General" + uniform = /obj/item/clothing/under/rank/centcom/captain/solgov + suit = /obj/item/clothing/suit/space/deathsquad/officer/solgov + head = /obj/item/clothing/head/helmet/space/deathsquad/beret/solgov + +/datum/outfit/job/ntspecops/solgovspecops/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(visualsOnly) + return + var/obj/item/card/id/I = H.wear_id + if(istype(I)) + apply_to_card(I, H, get_centcom_access(name), name, "lifetimeid") + H.sec_hud_set_ID() + H.mind.offstation_role = TRUE diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 6edc4d21eed..563fded5f1d 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -30,6 +30,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) var/list/blacklisted_full = list( /datum/job/ntnavyofficer, /datum/job/ntspecops, + /datum/job/ntspecops/solgovspecops, /datum/job/civilian, /datum/job/syndicateofficer, /datum/job/explorer // blacklisted so that HOPs don't try prioritizing it, then wonder why that doesn't work diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index f831d40acb1..6c9556b5e3e 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -758,8 +758,7 @@ var/mob/living/silicon/robot/R = occupant if(!istype(R)) return ..() - R.contents -= R.mmi - qdel(R.mmi) + QDEL_NULL(R.mmi) for(var/obj/item/I in R.module) // the tools the borg has; metal, glass, guns etc for(var/obj/item/O in I) // the things inside the tools, if anything; mainly for janiborg trash bags O.loc = R @@ -771,7 +770,7 @@ return ..() -/proc/cryo_ssd(mob/living/carbon/person_to_cryo) +/proc/cryo_ssd(mob/living/person_to_cryo) if(istype(person_to_cryo.loc, /obj/machinery/cryopod)) return 0 if(isobj(person_to_cryo.loc)) @@ -779,7 +778,9 @@ O.force_eject_occupant(person_to_cryo) var/list/free_cryopods = list() for(var/obj/machinery/cryopod/P in GLOB.machines) - if(!P.occupant && istype(get_area(P), /area/crew_quarters/sleep)) + if(P.occupant) + continue + if((ishuman(person_to_cryo) && istype(get_area(P), /area/crew_quarters/sleep)) || istype(P, /obj/machinery/cryopod/robot)) free_cryopods += P var/obj/machinery/cryopod/target_cryopod = null if(free_cryopods.len) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 88dc39e568c..13cf62ecf3f 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -85,6 +85,13 @@ else do_animate("deny") +/obj/machinery/door/window/unrestricted_side(mob/M) + var/mob_dir = get_dir(src, M) + if(mob_dir == 0) // If the mob is inside the tile + mob_dir = GetOppositeDir(dir) // Set it to the inside direction of the windoor + + return mob_dir & unres_sides + /obj/machinery/door/window/CanPass(atom/movable/mover, turf/target, height=0) if(istype(mover) && mover.checkpass(PASSGLASS)) return 1 diff --git a/code/game/machinery/tcomms/nttc.dm b/code/game/machinery/tcomms/nttc.dm index 0576bbe7e41..5ca240171b0 100644 --- a/code/game/machinery/tcomms/nttc.dm +++ b/code/game/machinery/tcomms/nttc.dm @@ -51,6 +51,11 @@ "Emergency Response Team Officer" = "dsquadradio", "Nanotrasen Navy Officer" = "dsquadradio", "Special Operations Officer" = "dsquadradio", + "Solar Federation Brigadier General" = "dsquadradio", + "Solar Federation Specops Lieutenant" = "dsquadradio", + "Solar Federation Specops Marine" = "dsquadradio", + "Solar Federation Lieutenant" = "dsquadradio", + "Solar Federation Marine" = "dsquadradio", // Medical "Chemist" = "medradio", "Chief Medical Officer" = "medradio", @@ -119,7 +124,9 @@ /// List of ERT jobs var/list/ert_jobs = list("Emergency Response Team Officer", "Emergency Response Team Engineer", "Emergency Response Team Medic", "Emergency Response Team Leader", "Emergency Response Team Member") /// List of CentComm jobs - var/list/cc_jobs = list("Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer") + var/list/cc_jobs = list("Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation Brigadier General") + /// List of SolGov Marine jobs + var/list/tsf_jobs = list("Solar Federation Specops Lieutenant", "Solar Federation Specops Marine", "Solar Federation Lieutenant", "Solar Federation Marine") // Defined so code compiles and incase someone has a non-standard job var/job_class = "radio" // NOW FOR ACTUAL TOGGLES @@ -278,7 +285,7 @@ // Makes heads of staff bold if(toggle_command_bold) var/job = tcm.sender_job - if((job in ert_jobs) || (job in heads) || (job in cc_jobs)) + if((job in ert_jobs) || (job in heads) || (job in cc_jobs) || (job in tsf_jobs)) for(var/I in 1 to length(message_pieces)) var/datum/multilingual_say_piece/S = message_pieces[I] if(!S.message) diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index d03536e8f5b..378aa09a764 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -107,10 +107,10 @@ if(R.mind && !R.client && !R.grab_ghost()) // Make sure this is an actual player first and not just a humanized monkey or something. message_admins("[key_name_admin(R)] was just transformed by a borg factory, but they were SSD. Polling ghosts for a replacement.") var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a malfunctioning cyborg?", ROLE_TRAITOR, poll_time = 15 SECONDS) - if(!length(candidates)) + if(!length(candidates) || QDELETED(R)) return var/mob/dead/observer/O = pick(candidates) - R.key= O.key + R.key = O.key /obj/machinery/transformer/mime name = "Mimetech Greyscaler" diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index ba1d107c94e..eccfd28717a 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -287,7 +287,7 @@ A.Grant(S) var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as a pyroclastic anomaly slime?", ROLE_SENTIENT, FALSE, 100, source = S, role_cleanname = "pyroclastic anomaly slime") - if(LAZYLEN(candidates)) + if(length(candidates) && !QDELETED(S)) var/mob/dead/observer/chosen = pick(candidates) S.key = chosen.key S.mind.special_role = SPECIAL_ROLE_PYROCLASTIC_SLIME diff --git a/code/game/objects/effects/mapping_helpers.dm b/code/game/objects/effects/mapping_helpers.dm index dd332f676fb..d1193cb3154 100644 --- a/code/game/objects/effects/mapping_helpers.dm +++ b/code/game/objects/effects/mapping_helpers.dm @@ -67,6 +67,11 @@ /obj/effect/mapping_helpers/no_lava icon_state = "no_lava" +/obj/effect/mapping_helpers/no_lava/New() + var/turf/T = get_turf(src) + T.flags |= NO_LAVA_GEN + ..() + /obj/effect/mapping_helpers/airlock layer = DOOR_HELPER_LAYER @@ -78,13 +83,9 @@ if(!mapload) log_world("### MAP WARNING, [src] spawned outside of mapload!") return - var/obj/machinery/door/airlock/airlock = locate(/obj/machinery/door/airlock) in src.loc - if(airlock) - airlock.unres_sides ^= dir + var/obj/machinery/door/door = locate(/obj/machinery/door) in loc + if(door) + door.unres_sides ^= dir else log_world("### MAP WARNING, [src] failed to find an airlock at [AREACOORD(src)]") - ..() -/obj/effect/mapping_helpers/no_lava/New() - var/turf/T = get_turf(src) - T.flags |= NO_LAVA_GEN - . = ..() + ..() diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index ba7d03d1857..56140e7d2ea 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -1,4 +1,6 @@ //generic procs copied from obj/effect/alien +#define SPIDER_SOFT_CAP 30 +#define SPIDER_HARD_CAP 40 /obj/structure/spider name = "web" desc = "it's stringy and sticky" @@ -67,7 +69,11 @@ START_PROCESSING(SSobj, src) /obj/structure/spider/eggcluster/process() - amount_grown += rand(0,2) + if(SSmobs.giant_spiders > SPIDER_SOFT_CAP) //eggs gonna chill out until there is less spiders + return + + amount_grown += rand(0, 2) + if(amount_grown >= 100) var/num = rand(3, 12) for(var/i in 1 to num) @@ -75,7 +81,7 @@ S.faction = faction.Copy() S.master_commander = master_commander if(player_spiders) - S.player_spiders = 1 + S.player_spiders = TRUE qdel(src) /obj/structure/spider/spiderling @@ -168,9 +174,13 @@ if(isturf(loc)) amount_grown += rand(0,2) if(amount_grown >= 100) + if(SSmobs.giant_spiders > SPIDER_HARD_CAP) + qdel(src) + return if(!grow_as) grow_as = pick(typesof(/mob/living/simple_animal/hostile/poison/giant_spider)) var/mob/living/simple_animal/hostile/poison/giant_spider/S = new grow_as(loc) + SSmobs.giant_spiders++ S.faction = faction.Copy() S.master_commander = master_commander if(player_spiders && !selecting_player) @@ -178,7 +188,7 @@ spawn() var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a giant spider?", ROLE_GSPIDER, TRUE, source = S) - if(candidates.len) + if(length(candidates) && !QDELETED(S)) var/mob/C = pick(candidates) if(C) S.key = C.key diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index 3b89a3d0ce9..827968ae0e6 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -1,3 +1,13 @@ +/** + * Will cause an EMP on the given epicenter. + * This proc can sleep depending on the affected objects. So assume it sleeps! + * + * epicenter - The center of the EMP. Can be an atom, as long as the given atom is on a turf (in)directly + * heavy_range - The max distance from the epicenter where objects will be get heavy EMPed + * light_range - The max distance from the epicenter where objects will get light EMPed + * log - Whether or not this action should be logged or not. Will use the cause if provided + * cause - The cause of the EMP. Used for the logging + */ /proc/empulse(turf/epicenter, heavy_range, light_range, log = FALSE, cause = null) if(!epicenter) return diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 4b1058ae359..abe53a4e395 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -329,5 +329,6 @@ ..() /obj/item/paicard/extinguish_light() - pai.extinguish_light() - set_light(0) + if(pai) + pai.extinguish_light() + set_light(0) diff --git a/code/game/objects/items/devices/painter/painter.dm b/code/game/objects/items/devices/painter/painter.dm index e873d507b0e..7a9a5a351f0 100644 --- a/code/game/objects/items/devices/painter/painter.dm +++ b/code/game/objects/items/devices/painter/painter.dm @@ -1,6 +1,7 @@ /obj/item/painter name = "modular painter" icon = 'icons/obj/painting.dmi' + icon_state = "floor_painter" usesound = 'sound/effects/spray2.ogg' flags = CONDUCT | NOBLUDGEON w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 235750a2b48..79f49b39c94 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -307,12 +307,18 @@ icon_state = "com_headset_alt" item_state = "com_headset_alt" +/obj/item/radio/headset/ert/alt/solgov + name = "\improper Trans-Solar Federation Marine's bowman headset" + /obj/item/radio/headset/ert/alt/commander name = "ERT commander's bowman headset" desc = "The headset of the boss. Protects ears from flashbangs. Can transmit even if telecomms are down." requires_tcomms = FALSE instant = TRUE +/obj/item/radio/headset/ert/alt/commander/solgov + name = "\improper Trans-Solar Federation Lieutenant's bowman headset" + /obj/item/radio/headset/centcom name = "centcom officer's bowman headset" desc = "The headset of final authority. Protects ears from flashbangs. Can transmit even if telecomms are down." diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 2cd43506990..607109f4a9d 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -2,6 +2,7 @@ name = "station intercom (General)" desc = "Talk through this." icon_state = "intercom" + layer = ABOVE_WINDOW_LAYER anchored = 1 w_class = WEIGHT_CLASS_BULKY canhear_range = 2 diff --git a/code/game/objects/items/theft_items.dm b/code/game/objects/items/theft_items.dm new file mode 100644 index 00000000000..0a32cf90df7 --- /dev/null +++ b/code/game/objects/items/theft_items.dm @@ -0,0 +1,282 @@ +//Items for nuke theft, supermatter theft traitor objective + + +// STEALING THE NUKE + +//the nuke core, base item +/obj/item/nuke_core + name = "plutonium core" + desc = "Extremely radioactive. Wear goggles." + icon = 'icons/obj/nuke_tools.dmi' + icon_state = "plutonium_core" + item_state = "plutoniumcore" + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + flags_2 = RAD_NO_CONTAMINATE_2 //Don't have the item itself become irradiated when it makes radiation. + var/pulse = 0 + var/cooldown = 0 + var/pulseicon = "plutonium_core_pulse" + +/obj/item/nuke_core/Initialize() + . = ..() + START_PROCESSING(SSobj, src) + +/obj/item/nuke_core/Destroy() + STOP_PROCESSING(SSobj, src) + return ..() + +/obj/item/nuke_core/attackby(obj/item/nuke_core_container/container, mob/user) + if(istype(container)) + container.load(src, user) + else + return ..() + +/obj/item/nuke_core/process() + if(cooldown < world.time - 6 SECONDS) + cooldown = world.time + flick(pulseicon, src) + radiation_pulse(src, 400, 2) + +/obj/item/nuke_core/suicide_act(mob/user) + user.visible_message("[user] is rubbing [src] against [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!") + return TOXLOSS + +/obj/item/nuke_core/plutonium //The steal objective, so it doesnt mess with the SM sliver on pinpointers and objectives + +//nuke core box, for carrying the core +/obj/item/nuke_core_container + name = "nuke core container" + desc = "A solid container for radioactive objects." + icon = 'icons/obj/nuke_tools.dmi' + icon_state = "core_container_empty" + item_state = "metal" + var/obj/item/nuke_core/plutonium/core + +/obj/item/nuke_core_container/Destroy() + QDEL_NULL(core) + return ..() + +/obj/item/nuke_core_container/proc/load(obj/item/nuke_core/plutonium/new_core, mob/user) + if(core || !istype(new_core)) + return + new_core.forceMove(src) + core = new_core + icon_state = "core_container_loaded" + to_chat(user, "Container is sealing...") + addtimer(CALLBACK(src, .proc/seal), 10 SECONDS) + +/obj/item/nuke_core_container/proc/seal() + if(!QDELETED(core)) + STOP_PROCESSING(SSobj, core) + icon_state = "core_container_sealed" + playsound(src, 'sound/items/deconstruct.ogg', 60, TRUE) + if(ismob(loc)) + to_chat(loc, "[src] is permanently sealed, [core]'s radiation is contained.") + +/obj/item/nuke_core_container/attackby(obj/item/nuke_core/plutonium/core, mob/user) + if(!istype(core)) + return ..() + + if(!user.drop_item()) + to_chat(user, "[core] is stuck to your hand!") + return + else + load(core, user) + +/obj/item/paper/guides/antag/nuke_instructions + info = "How to break into a Nanotrasen nuclear device and remove its plutonium core:
\ + " + +// STEALING SUPERMATTER. + +/obj/item/paper/guides/antag/supermatter_sliver + info = "How to safely extract a supermatter sliver:
\ + " + +/obj/item/nuke_core/supermatter_sliver + name = "supermatter sliver" + desc = "A tiny, highly volatile sliver of a supermatter crystal. Do not handle without protection!" + icon_state = "supermatter_sliver" + pulseicon = "supermatter_sliver_pulse" + +/obj/item/nuke_core/supermatter_sliver/attack_tk(mob/user) // no TK dusting memes + return + +/obj/item/nuke_core/supermatter_sliver/can_be_pulled(user) // no drag memes + return FALSE + +/obj/item/nuke_core/supermatter_sliver/attackby(obj/item/I, mob/living/user, params) + if(istype(I, /obj/item/retractor/supermatter)) + var/obj/item/retractor/supermatter/tongs = I + if(tongs.sliver) + to_chat(user, "[tongs] are already holding a supermatter sliver!") + return FALSE + forceMove(tongs) + tongs.sliver = src + tongs.icon_state = "supermatter_tongs_loaded" + tongs.item_state = "supermatter_tongs_loaded" + to_chat(user, "You carefully pick up [src] with [tongs].") + else if(istype(I, /obj/item/scalpel/supermatter) || istype(I, /obj/item/nuke_core_container/supermatter)) // we don't want it to dust + return + else + to_chat(user, "As it touches [src], both [src] and [I] burst into dust!") + radiation_pulse(user, 100) + playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE) + qdel(I) + qdel(src) + +/obj/item/nuke_core/supermatter_sliver/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) + if(!isliving(hit_atom)) + return ..() + var/mob/living/victim = hit_atom + if(victim.incorporeal_move || victim.status_flags & GODMODE) //try to keep this in sync with supermatter's consume fail conditions + return ..() + if(throwingdatum?.thrower) + var/mob/user = throwingdatum.thrower + add_attack_logs(user, victim, "[victim] consumed by [src] thrown by [user] ") + message_admins("[src] has consumed [key_name_admin(victim)] [ADMIN_JMP(src)], thrown by [key_name_admin(user)].") + investigate_log("has consumed [key_name(victim)], thrown by [key_name(user)]", "supermatter") + else + message_admins("[src] has consumed [key_name_admin(victim)] [ADMIN_JMP(src)] via throw impact.") + investigate_log("has consumed [key_name(victim)] via throw impact.", "supermatter") + victim.visible_message("As [victim] is hit by [src], both flash into dust and silence fills the room...", + "You're hit by [src] and everything suddenly goes silent.\n[src] flashes into dust, and soon as you can register this, you do as well.", + "Everything suddenly goes silent.") + victim.dust() + radiation_pulse(src, 500, 2) + playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE) + qdel(src) + +/obj/item/nuke_core/supermatter_sliver/pickup(mob/living/user) + ..() + if(!isliving(user) || user.status_flags & GODMODE) //try to keep this in sync with supermatter's consume fail conditions + return FALSE + user.visible_message("[user] reaches out and tries to pick up [src]. [user.p_their()] body starts to glow and bursts into flames before flashing into dust!", + "You reach for [src] with your hands. That was dumb.", + "Everything suddenly goes silent.") + radiation_pulse(user, 500, 2) + playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE) + user.dust() + +/obj/item/nuke_core_container/supermatter + name = "supermatter bin" + desc = "A tiny receptacle that releases an inert hyper-noblium mix upon sealing, allowing a sliver of a supermatter crystal to be safely stored." + var/obj/item/nuke_core/supermatter_sliver/sliver + +/obj/item/nuke_core_container/supermatter/Destroy() + QDEL_NULL(sliver) + return ..() + +/obj/item/nuke_core_container/supermatter/load(obj/item/retractor/supermatter/I, mob/user) + if(!istype(I) || !I.sliver) + return + I.sliver.forceMove(src) + sliver = I.sliver + I.sliver = null + I.icon_state = "supermatter_tongs" + I.item_state = "supermatter_tongs" + icon_state = "supermatter_container_loaded" + to_chat(user, "Container is sealing...") + addtimer(CALLBACK(src, .proc/seal), 10 SECONDS) + +/obj/item/nuke_core_container/supermatter/seal() + if(!QDELETED(sliver)) + STOP_PROCESSING(SSobj, sliver) + icon_state = "supermatter_container_sealed" + playsound(src, 'sound/items/deconstruct.ogg', 60, TRUE) + if(ismob(loc)) + to_chat(loc, "[src] is permanently sealed, [sliver] is safely contained.") + +/obj/item/nuke_core_container/supermatter/attackby(obj/item/retractor/supermatter/tongs, mob/user) + if(istype(tongs)) + //try to load shard into core + load(tongs, user) + else + return ..() + +/obj/item/scalpel/supermatter + name = "supermatter scalpel" + desc = "A scalpel with a fragile tip of condensed hyper-noblium gas, searingly cold to the touch, that can safely shave a sliver off a supermatter crystal." + icon = 'icons/obj/nuke_tools.dmi' + icon_state = "supermatter_scalpel" + toolspeed = 0.5 + damtype = BURN + usesound = 'sound/weapons/bladeslice.ogg' + var/uses_left + +/obj/item/scalpel/supermatter/Initialize() + . = ..() + uses_left = rand(2, 4) + +/obj/item/retractor/supermatter + name = "supermatter extraction tongs" + desc = "A pair of tongs made from condensed hyper-noblium gas, searingly cold to the touch, that can safely grip a supermatter sliver." + icon = 'icons/obj/nuke_tools.dmi' + icon_state = "supermatter_tongs" + lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items_righthand.dmi' + item_state = "supermatter_tongs" + toolspeed = 0.75 + damtype = BURN + var/obj/item/nuke_core/supermatter_sliver/sliver + +/obj/item/retractor/supermatter/Destroy() + QDEL_NULL(sliver) + return ..() + +/obj/item/retractor/supermatter/afterattack(atom/O, mob/user, proximity) + . = ..() + if(!sliver) + return + if(proximity && ismovable(O) && O != sliver) + Consume(O, user) + +/obj/item/retractor/supermatter/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) // no instakill supermatter javelins + if(sliver) + sliver.forceMove(loc) + visible_message("[sliver] falls out of [src] as it hits the ground.") + sliver = null + icon_state = "supermatter_tongs" + item_state = "supermatter_tongs" + return ..() + +/obj/item/retractor/supermatter/proc/Consume(atom/movable/AM, mob/living/user) + if(ismob(AM)) + if(!isliving(AM)) + return + var/mob/living/victim = AM + if(victim.incorporeal_move || victim.status_flags & GODMODE) //try to keep this in sync with supermatter's consume fail conditions + return + victim.dust() + message_admins("[src] has consumed [key_name_admin(victim)] [ADMIN_JMP(src)].") + investigate_log("has irradiated [key_name(victim)].", "supermatter") + else if(istype(AM, /obj/singularity)) + return + else + investigate_log("has consumed [AM].", "supermatter") + qdel(AM) + + if(user) + add_attack_logs(user, AM, "[AM] and [user] consumed by melee attack with [src] by [user]") + user.visible_message("As [user] touches [AM] with [src], both flash into dust and silence fills the room...", + "You touch [AM] with [src], and everything suddenly goes silent.\n[AM] and [sliver] flash into dust, and soon as you can register this, you do as well.", + "Everything suddenly goes silent.") + user.dust() + radiation_pulse(src, 500, 2) + playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE) + QDEL_NULL(sliver) diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index 374b8ad66ca..c6b4aecd4f2 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -27,6 +27,7 @@ desc = "A screwdriver with an ultra thin tip." icon_state = "screwdriver_nuke" toolspeed = 0.5 + random_color = FALSE /obj/item/screwdriver/suicide_act(mob/user) user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!") diff --git a/code/game/objects/items/weapons/implants/implant_explosive.dm b/code/game/objects/items/weapons/implants/implant_explosive.dm index a776cbce2aa..fe61281b2a5 100644 --- a/code/game/objects/items/weapons/implants/implant_explosive.dm +++ b/code/game/objects/items/weapons/implants/implant_explosive.dm @@ -4,6 +4,7 @@ icon_state = "explosive" origin_tech = "materials=2;combat=3;biotech=4;syndicate=4" actions_types = list(/datum/action/item_action/hands_free/activate/always) + var/detonating = FALSE var/weak = 2 var/medium = 0.8 var/heavy = 0.4 @@ -26,16 +27,20 @@ activate("death") /obj/item/implant/explosive/activate(cause) - if(!cause || !imp_in) return 0 + if(!cause || !imp_in) + return FALSE if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your microbomb implant? This will cause you to explode!", "Microbomb Implant Confirmation", "Yes", "No") != "Yes") - return 0 + return FALSE + if(detonating) + return FALSE heavy = round(heavy) medium = round(medium) weak = round(weak) - to_chat(imp_in, "You activate your microbomb implant.") + detonating = TRUE + to_chat(imp_in, "You activate your microbomb implant.") //If the delay is short, just blow up already jeez if(delay <= 7) - explosion(src,heavy,medium,weak,weak, flame_range = weak) + explosion(src, heavy, medium, weak, weak, flame_range = weak) if(imp_in) imp_in.gib() qdel(src) diff --git a/code/game/objects/items/weapons/implants/implant_misc.dm b/code/game/objects/items/weapons/implants/implant_misc.dm index 9c4049e8904..675b453f92d 100644 --- a/code/game/objects/items/weapons/implants/implant_misc.dm +++ b/code/game/objects/items/weapons/implants/implant_misc.dm @@ -58,7 +58,7 @@ /obj/item/implant/emp/activate() uses-- - empulse(imp_in, 3, 5, 1) + INVOKE_ASYNC(GLOBAL_PROC, .proc/empulse, get_turf(imp_in), 3, 5, 1) if(!uses) qdel(src) diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index 4f3729f7076..379c7403894 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -61,6 +61,9 @@ return if(istype(W, /obj/item)) var/obj/item/IW = W + if(IW.flags & (ABSTRACT | NODROP | DROPDEL)) + to_chat(user, "You can't put [IW] into [src]!") + return if((loadedWeightClass + IW.w_class) > maxWeightClass) to_chat(user, "\The [IW] won't fit into \the [src]!") return diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index b142d5cb7e5..f5a47c31b0a 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -584,3 +584,9 @@ name = "emergency response team janitor backpack" desc = "A spacious backpack with lots of pockets, worn by janitorial members of a Nanotrasen Emergency Response Team." icon_state = "ert_janitor" + +//Solgov +/obj/item/storage/backpack/ert/solgov + name = "\improper TSF marine backpack" + desc = "A spacious backpack with lots of pockets, worn by marines of the Trans-Solar Federation." + icon_state = "ert_solgov" diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 9f145c5bbdb..fc0fc143249 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -12,9 +12,9 @@ /// No message on putting items in. var/silent = FALSE /// List of objects which this item can store (if set, it can't store anything else) - var/list/can_hold = new/list() + var/list/can_hold = list() /// List of objects which this item can't store (in effect only if can_hold isn't set) - var/list/cant_hold = new/list() + var/list/cant_hold = list() /// Max size of objects that this object can store (in effect only if can_hold isn't set) var/max_w_class = WEIGHT_CLASS_SMALL /// The sum of the w_classes of all the items in this storage item. @@ -42,6 +42,9 @@ /// How much of the stack item do you get. var/foldable_amt = 0 + /// Lazy list of mobs which are currently viewing the storage inventory. + var/list/mobs_viewing + /obj/item/storage/Initialize(mapload) . = ..() can_hold = typecacheof(can_hold) @@ -73,6 +76,15 @@ closer.plane = ABOVE_HUD_PLANE orient2hud() +/obj/item/storage/Destroy() + for(var/obj/O in contents) + O.mouse_opacity = initial(O.mouse_opacity) + + QDEL_NULL(boxes) + QDEL_NULL(closer) + LAZYCLEARLIST(mobs_viewing) + return ..() + /obj/item/storage/MouseDrop(obj/over_object) if(!ismob(usr)) //so monkeys can take off their backpacks -- Urist return @@ -177,11 +189,13 @@ user.client.screen += closer user.client.screen += contents user.s_active = src + LAZYADDOR(mobs_viewing, user) /** * Hides the current container interface from `user`. */ /obj/item/storage/proc/hide_from(mob/user) + LAZYREMOVE(mobs_viewing, user) // Remove clientless mobs too if(!user.client) return user.client.screen -= boxes @@ -190,6 +204,16 @@ if(user.s_active == src) user.s_active = null +/** + * Checks all mobs currently viewing the storage inventory, and hides it if they shouldn't be able to see it. + */ +/obj/item/storage/proc/update_viewers() + for(var/_M in mobs_viewing) + var/mob/M = _M + if(!QDELETED(M) && M.s_active == src && (M in range(1, loc))) + continue + hide_from(M) + /obj/item/storage/proc/open(mob/user) if(use_sound) playsound(loc, use_sound, 50, TRUE, -5) @@ -374,6 +398,12 @@ prevent_warning = TRUE I.forceMove(src) I.on_enter_storage(src) + + for(var/_M in mobs_viewing) + var/mob/M = _M + if((M.s_active == src) && M.client) + M.client.screen += I + if(usr) if(usr.client && usr.s_active != src) usr.client.screen -= I @@ -412,7 +442,8 @@ var/obj/item/storage/fancy/F = src F.update_icon(TRUE) - for(var/mob/M in range(1, loc)) + for(var/_M in mobs_viewing) + var/mob/M = _M if((M.s_active == src) && M.client) M.client.screen -= I @@ -498,6 +529,10 @@ close(M) add_fingerprint(user) +/obj/item/storage/equipped(mob/user, slot, initial) + . = ..() + update_viewers() + /obj/item/storage/attack_ghost(mob/user) if(isobserver(user)) // Revenants don't get to play with the toys. @@ -539,14 +574,6 @@ /obj/item/storage/proc/populate_contents() return // Override -/obj/item/storage/Destroy() - for(var/obj/O in contents) - O.mouse_opacity = initial(O.mouse_opacity) - - QDEL_NULL(boxes) - QDEL_NULL(closer) - return ..() - /obj/item/storage/emp_act(severity) ..() for(var/I in contents) diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm index 2747be43612..7f7bd427845 100644 --- a/code/game/objects/items/weapons/storage/uplink_kits.dm +++ b/code/game/objects/items/weapons/storage/uplink_kits.dm @@ -309,3 +309,24 @@ To apply, hold the injector a short distance away from the outer thigh before ap new /obj/item/reagent_containers/syringe/capulettium_plus(src) new /obj/item/reagent_containers/syringe/sarin(src) new /obj/item/reagent_containers/syringe/pancuronium(src) + +/obj/item/storage/box/syndie_kit/nuke + name = "box" //Bit of stealth, since you spawn with it + desc = "It's just an ordinary box." + icon_state = "box" + +/obj/item/storage/box/syndie_kit/nuke/populate_contents() + new /obj/item/screwdriver/nuke(src) + new /obj/item/nuke_core_container(src) + new /obj/item/paper/guides/antag/nuke_instructions(src) + +/obj/item/storage/box/syndie_kit/supermatter + name = "box" + desc = "It's just an ordinary box." + icon_state = "box" + +/obj/item/storage/box/syndie_kit/supermatter/populate_contents() + new /obj/item/scalpel/supermatter(src) + new /obj/item/retractor/supermatter(src) + new /obj/item/nuke_core_container/supermatter(src) + new /obj/item/paper/guides/antag/supermatter_sliver(src) diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index c1aa16efc99..31929110264 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -41,6 +41,7 @@ trigger_alarm() emagged = TRUE + toggle_lock() /obj/structure/displaycase/examine(mob/user) . = ..() @@ -110,12 +111,12 @@ /obj/structure/displaycase/attackby(obj/item/I, mob/user, params) if(I.GetID() && !broken && openable) if(allowed(user) || emagged) - to_chat(user, "You [open ? "close":"open"] [src].") - toggle_lock(user) + to_chat(user, "You [open ? "close":"open"] [src].") + toggle_lock() else - to_chat(user, "Access denied.") + to_chat(user, "Access denied.") else if(open && !showpiece) - if(user.drop_item()) + if(!(I.flags & (ABSTRACT | DROPDEL)) && user.drop_item()) I.forceMove(src) showpiece = I to_chat(user, "You put [I] on display") @@ -151,14 +152,14 @@ if(!I.use_tool(src, user, 20, volume = I.tool_volume)) return to_chat(user, "You [open ? "close":"open"] [src].") - toggle_lock(user) + toggle_lock() /obj/structure/displaycase/welder_act(mob/user, obj/item/I) . = TRUE if(default_welder_repair(user, I)) broken = FALSE -/obj/structure/displaycase/proc/toggle_lock(mob/user) +/obj/structure/displaycase/proc/toggle_lock() open = !open update_icon() diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 04b29784e42..0a3dbb928bc 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -28,7 +28,7 @@ if(GIRDER_DISASSEMBLED) . += "[src] is disassembled! You probably shouldn't be able to see this examine message." -/obj/structre/girder/detailed_examine() +/obj/structure/girder/detailed_examine() return "Use metal sheets on this to build a normal wall. Adding plasteel instead will make a reinforced wall.
\ A false wall can be made by using a crowbar on this girder, and then adding metal or plasteel.
\ You can dismantle the girder with a wrench." diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index 95037046129..08cb723fa46 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -46,9 +46,16 @@ /obj/structure/inflatable/CanAtmosPass(turf/T) return !density -/obj/structure/inflatable/attack_hand(mob/user as mob) +/obj/structure/inflatable/attack_hand(mob/user) add_fingerprint(user) +/obj/structure/inflatable/attackby(obj/item/I, mob/living/user, params) + if(I.sharp || is_type_in_typecache(I, GLOB.pointed_types)) + user.do_attack_animation(src, used_item = I) + deconstruct(FALSE) + return FALSE + return ..() + /obj/structure/inflatable/AltClick() if(usr.stat || usr.restrained()) return diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 73e6fadac80..11943049e1e 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -203,6 +203,7 @@ windoor.req_one_access = electronics.selected_accesses else windoor.req_access = electronics.selected_accesses + windoor.unres_sides = electronics.unres_access_from windoor.electronics = src.electronics electronics.forceMove(windoor) electronics = null diff --git a/code/game/world.dm b/code/game/world.dm index cc567987617..a5ccc80fe7b 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -85,15 +85,16 @@ GLOBAL_LIST_EMPTY(world_topic_handlers) TGS_TOPIC log_misc("WORLD/TOPIC: \"[T]\", from:[addr], master:[master], key:[key]") - // Handle spam prevention - if(!GLOB.world_topic_spam_prevention_handlers[address]) - GLOB.world_topic_spam_prevention_handlers[address] = new /datum/world_topic_spam_prevention_handler + // Handle spam prevention, if their IP isnt in the whitelist + if(!(addr in GLOB.configuration.system.topic_ip_ratelimit_bypass)) + if(!GLOB.world_topic_spam_prevention_handlers[addr]) + GLOB.world_topic_spam_prevention_handlers[addr] = new /datum/world_topic_spam_prevention_handler(addr) - var/datum/world_topic_spam_prevention_handler/sph = GLOB.world_topic_spam_prevention_handlers[address] + var/datum/world_topic_spam_prevention_handler/sph = GLOB.world_topic_spam_prevention_handlers[addr] - // Lock the user out and cancel their topic if needed - if(sph.check_lockout()) - return + // Lock the user out and cancel their topic if needed + if(sph.check_lockout()) + return var/list/input = params2list(T) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index c0346f575db..b1d877e6438 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -92,6 +92,7 @@ GLOBAL_VAR_INIT(nologevent, 0) body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\] " body += "\[" + M.client.get_exp_type(EXP_TYPE_CREW) + " as [EXP_TYPE_CREW]\]" body += "
BYOND account registration date: [M.client.byondacc_date || "ERROR"] [M.client.byondacc_age <= GLOB.configuration.general.byond_account_age_threshold ? "" : ""]([M.client.byondacc_age] days old)[M.client.byondacc_age <= GLOB.configuration.general.byond_account_age_threshold ? "" : ""]" + body += "
BYOND client version: [M.client.byond_version].[M.client.byond_build]" body += "
Global Ban DB Lookup: [GLOB.configuration.url.centcom_ban_db_url ? "Lookup" : "Disabled"]" body += "
" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index ce4ccb9723c..f2c629ea517 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2300,26 +2300,40 @@ else if(href_list["cryossd"]) if(!check_rights(R_ADMIN)) return - var/mob/living/carbon/human/H = locateUID(href_list["cryossd"]) - if(!istype(H)) - to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + var/mob/living/M = locateUID(href_list["cryossd"]) + var/human = ishuman(M) + if(!human && !issilicon(M)) + to_chat(usr, "This can only be used on humans and silicons.") return - if(!href_list["cryoafk"] && !isLivingSSD(H)) + if(!href_list["cryoafk"] && !isLivingSSD(M)) to_chat(usr, "This can only be used on living, SSD players.") return - if(istype(H.loc, /obj/machinery/cryopod)) - var/obj/machinery/cryopod/P = H.loc + if(isAI(M)) + var/mob/living/silicon/ai/A = M + A.cryo_AI() + if(istype(M.loc, /obj/machinery/cryopod)) + var/obj/machinery/cryopod/P = M.loc P.despawn_occupant() - log_admin("[key_name(usr)] despawned [H.job] [H] in cryo.") - message_admins("[key_name_admin(usr)] despawned [H.job] [H] in cryo.") - else if(cryo_ssd(H)) - log_admin("[key_name(usr)] sent [H.job] [H] to cryo.") - message_admins("[key_name_admin(usr)] sent [H.job] [H] to cryo.") + if(human) + var/mob/living/carbon/human/H = M + log_admin("[key_name(usr)] despawned [H.job] [H] in cryo.") + message_admins("[key_name_admin(usr)] despawned [H.job] [H] in cryo.") + else //robot + log_admin("[key_name(usr)] despawned [M] in cryo.") + message_admins("[key_name_admin(usr)] despawned [M] in cryo.") + else if(cryo_ssd(M)) + if(human) + var/mob/living/carbon/human/H = M + log_admin("[key_name(usr)] sent [H.job] [H] to cryo.") + message_admins("[key_name_admin(usr)] sent [H.job] [H] to cryo.") + else + log_admin("[key_name(usr)] sent [M] to cryo.") + message_admins("[key_name_admin(usr)] sent [M] to cryo.") if(href_list["cryoafk"]) // Warn them if they are send to storage and are AFK - to_chat(H, "The admins have moved you to cryo storage for being AFK. Please eject yourself (right click, eject) out of the cryostorage if you want to avoid being despawned.") - SEND_SOUND(H, sound('sound/effects/adminhelp.ogg')) - if(H.client) - window_flash(H.client) + to_chat(M, "The admins have moved you to cryo storage for being AFK. Please eject yourself (right click, eject) out of the cryostorage if you want to avoid being despawned.") + SEND_SOUND(M, sound('sound/effects/adminhelp.ogg')) + if(M.client) + window_flash(M.client) else if(href_list["FaxReplyTemplate"]) if(!check_rights(R_ADMIN)) return diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index c013197837b..8ff8739d3b9 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -92,7 +92,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that log_admin("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]") returnval = WrapAdminProcCall(GLOBAL_PROC, procname, lst) // Pass the lst as an argument list to the proc - to_chat(usr, "[procname] returned: [!isnull(returnval) ? returnval : "null"]") + to_chat(usr, "[procname] returned: [!isnull(returnval) ? returnval : "null"]") SSblackbox.record_feedback("tally", "admin_verb", 1, "Advanced Proc-Call") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! // All these vars are related to proc call protection diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 52c95e63c63..57512a35863 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -528,8 +528,8 @@ if(!antnum || antnum <= 0) return - log_admin("[key_name(owner)] tried making Vampires with One-Click-Antag") - message_admins("[key_name_admin(owner)] tried making Vampires with One-Click-Antag") + log_admin("[key_name(owner)] tried making [antnum] Vampires with One-Click-Antag") + message_admins("[key_name_admin(owner)] tried making [antnum] Vampires with One-Click-Antag") for(var/mob/living/carbon/human/applicant in GLOB.player_list) if(CandCheck(ROLE_VAMPIRE, applicant, temp)) diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 41333760f2d..89712886d41 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -74,7 +74,7 @@ GLOBAL_LIST_EMPTY(antagonists) set waitfor = FALSE var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as a [name]?", job_rank, TRUE, 5 SECONDS) - if(LAZYLEN(candidates)) + if(length(candidates)) var/mob/dead/observer/C = pick(candidates) to_chat(owner, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!") message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(owner.current)]) to replace a jobbaned player.") diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index 9d3bfdb18d4..07bcf113cb4 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -48,7 +48,7 @@ to_chat(user, "You activate [src] and wait for confirmation.") var/image/I = new('icons/mob/simple_human.dmi', "syndicate_space_sword") var/list/nuke_candidates = SSghost_spawns.poll_candidates("Do you want to play as a [rolename]?", ROLE_OPERATIVE, TRUE, 15 SECONDS, source = I) - if(LAZYLEN(nuke_candidates)) + if(length(nuke_candidates)) checking = FALSE if(QDELETED(src) || !check_usability(user)) return diff --git a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm index 70bafafe859..d2bd6de7567 100644 --- a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm +++ b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm @@ -34,21 +34,30 @@ "Virology", "Waste Disposal", // Maintenance + "Aft Maintenance", + "Aft-Port Maintenance", + "Aft-Port Secondary Maintenance", "Aft Port Solar Maintenance", + "Aft Secondary Maintenance", + "Aft-Starboard Maintenance", + "Aft-Starboard Secondary Maintenance", "Aft Starboard Solar Maintenance", - "Arrivals North Maintenance", - "Bar Maintenance", - "Cargo Maintenance", - "Dormitory Maintenance", "Electrical Maintenance", - "EVA Maintenance", - "Engineering Maintenance", + "Electronics Den", + "Fore Maintenance", + "Fore-Port Maintenance", + "Fore-Port Secondary Maintenance", "Fore Port Solar Maintenance", + "Fore Secondary Maintenance", + "Fore-Starboard Maintenance", + "Fore-Starboard Secondary Maintenance", "Fore Starboard Solar Maintenance", + "Gambling Den", "Genetics Maintenance", - "Locker Room Maintenance", - "Medbay Maintenance", - "Science Maintenance", + "Port Maintenance", + "Port Secondary Maintenance", + "Starboard Maintenance", + "Starboard Secondary Maintenance", ), EXTRACTION_DIFFICULTY_MEDIUM = list( // Rooms @@ -89,7 +98,8 @@ "Xenobiology Lab", // Maintenance "Atmospherics Maintenance", - "Bridge Maintenance", + "Central Maintenance", + "Central Secondary Maintenance", ), EXTRACTION_DIFFICULTY_HARD = list( // No AI Chamber because I'm not that sadistic. @@ -100,7 +110,6 @@ "AI Satellite Hallway", "Bar", "Cargo Office", - "Central Primary Hallway", "Chemistry", "Chief Engineer's office", "Chief Medical Officer's office", diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index db507ba2d5a..2472491fab6 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -198,13 +198,7 @@ apply_mode() /obj/machinery/alarm/New(loc, direction, building = 0) - . = ..() - GLOB.air_alarms += src - GLOB.air_alarms = sortAtom(GLOB.air_alarms) - - wires = new(src) - - if(building) + if(building) // Do this first since the Init uses this later on. TODO refactor to just use an Init if(loc) src.loc = loc @@ -214,10 +208,15 @@ buildstage = 0 wiresexposed = 1 set_pixel_offsets_from_dir(-24, 24, -24, 24) - update_icon() - return - first_run() + . = ..() + GLOB.air_alarms += src + GLOB.air_alarms = sortAtom(GLOB.air_alarms) + + wires = new(src) + + if(!building) + first_run() /obj/machinery/alarm/Destroy() SStgui.close_uis(wires) diff --git a/code/modules/awaymissions/mission_code/academy.dm b/code/modules/awaymissions/mission_code/academy.dm index 82e0789e955..84e3bc8183d 100644 --- a/code/modules/awaymissions/mission_code/academy.dm +++ b/code/modules/awaymissions/mission_code/academy.dm @@ -194,7 +194,7 @@ servant_mind.transfer_to(H) var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as the servant of [user.real_name]?", ROLE_WIZARD, poll_time = 30 SECONDS, source = H) - if(LAZYLEN(candidates)) + if(length(candidates) && !QDELETED(H)) var/mob/dead/observer/C = pick(candidates) message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Dice Servant") H.key = C.key diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index dd99bba3211..728884e263f 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -206,11 +206,13 @@ icon_state = "solgovcberet" item_color = "solgovc" dog_fashion = null - armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) + armor = list("melee" = 20, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) strip_delay = 80 /obj/item/clothing/head/beret/solgov/command/elite name = "\improper Trans-Solar Federation Specops Lieutenant's beret" - desc = "A beret worn by marines of the Trans-Solar Federation Psiops division. The insignia signifies the wearer bears the rank of a Lieutenant." + desc = "A beret worn by marines of the Trans-Solar Federation Specops division. The insignia signifies the wearer bears the rank of a Lieutenant." + armor = list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 50, "fire" = 80, "acid" = 80) icon_state = "solgovceliteberet" item_color = "solgovcelite" + resistance_flags = FIRE_PROOF diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index ca0e6d5aad5..f55be1d578e 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -125,28 +125,32 @@ dog_fashion = null /obj/item/clothing/head/soft/solgov/marines - armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 50) - strip_delay = 60 + armor = list("melee" = 20, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) icon_state = "solgovsoft_flipped" + strip_delay = 60 flipped = TRUE /obj/item/clothing/head/soft/solgov/marines/elite name = "\improper Trans-Solar Federation Specops marine cap" - desc = "A soft cap worn by marines of the Trans-Solar Federation Specops division." + desc = "A cap worn by marines of the Trans-Solar Federation Specops division. You aren't quite sure how they made this bulletproof, but you are glad it is!" + armor = list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 50, "fire" = 80, "acid" = 80) icon_state = "solgovelitesoft_flipped" item_color = "solgovelite" + resistance_flags = FIRE_PROOF /obj/item/clothing/head/soft/solgov/marines/command name = "\improper Trans-Solar Federation lieutenant's cap" desc = "A soft cap worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant." + armor = list("melee" = 20, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) icon_state = "solgovcsoft_flipped" item_color = "solgovc" dog_fashion = null - armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 10, "rad" = 0, "fire" = 50, "acid" = 60) strip_delay = 80 /obj/item/clothing/head/soft/solgov/marines/command/elite name = "\improper Trans-Solar Federation Specops Lieutenant's cap" - desc = "A soft cap worn by marines of the Trans-Solar Federation Specops division. The insignia signifies the wearer bears the rank of a Lieutenant." + desc = "A cap worn by marines of the Trans-Solar Federation Specops division. You aren't quite sure how they made this bulletproof, but you are glad it is! The insignia signifies the wearer bears the rank of a Lieutenant." + armor= list("melee" = 35, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 50, "fire" = 80, "acid" = 80) icon_state = "solgovcelitesoft" item_color = "solgovcelite" + resistance_flags = FIRE_PROOF diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index 8e9d3f3e94a..b8c4c7e86f0 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -259,3 +259,38 @@ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/berserker armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100, fire = 80, acid = 80) slowdown = 0 + +// Solgov + +/obj/item/clothing/head/helmet/space/hardsuit/ert/solgov + name = "\improper Trans-Solar Federation Specops Marine helmet" + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + desc = "A helmet worn by marines of the Trans-Solar Federation. Armored, space ready, and fireproof." + icon_state = "hardsuit0-solgovmarine" + item_state = "hardsuit0-solgovmarine" + item_color = "solgovmarine" + armor = list("melee" = 35, "bullet" = 60, "laser" = 15, "energy" = 10, "bomb" = 25, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100) + +/obj/item/clothing/suit/space/hardsuit/ert/solgov + name = "\improper Trans-Solar Federation Specops Marine hardsuit" + max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT + desc = "A suit worn by marines of the Trans-Solar Federation. Armored, space ready, and fireproof." + icon_state = "ert_solgov_marine" + item_state = "ert_solgov_marine" + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/solgov + slowdown = 0 + armor = list("melee" = 35, "bullet" = 60, "laser" = 15, "energy" = 10, "bomb" = 25, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100) + +/obj/item/clothing/head/helmet/space/hardsuit/ert/solgov/command + name = "\improper Trans-Solar Federation Specops Lieutenant helmet" + desc = "A helmet worn by Lieutenants of the Trans-Solar Federation Marines. Has gold highlights to denote the wearer's rank. Armored, space ready, and fireproof." + icon_state = "hardsuit0-solgovcommand" + item_state = "hardsuit0-solgovcommand" + item_color = "solgovcommand" + +/obj/item/clothing/suit/space/hardsuit/ert/solgov/command + name = "\improper Trans-Solar Federation Specops Lieutenant hardsuit" + desc = "A suit worn by Lieutenants of the Trans-Solar Federation Marines. Has gold highlights to denote the wearer's rank. Armored, space ready, and fireproof." + icon_state = "ert_solgov_command" + item_state = "ert_solgov_command" + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/solgov/command diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index d732f3a00ab..226196fbc32 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -87,6 +87,11 @@ armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 50, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) flags = STOPSPRESSUREDMAGE | THICKMATERIAL +/obj/item/clothing/head/helmet/space/deathsquad/beret/solgov + name = "\improper Trans-Solar Federation commander's beret" + desc = "A camouflaged beret adorned with the star of the Trans-Solar Federation, worn by generals of the Trans-Solar Federation." + icon_state = "solgovceliteberet" + /obj/item/clothing/suit/space/deathsquad/officer name = "officer jacket" desc = "An armored jacket used in special operations." @@ -99,6 +104,12 @@ resistance_flags = FIRE_PROOF | ACID_PROOF w_class = WEIGHT_CLASS_NORMAL +/obj/item/clothing/suit/space/deathsquad/officer/solgov + name = "\improper Trans-Solar Federation commander's jacket" + icon_state = "solgovcommander" + item_state = "solgovcommander" + + //Space santa outfit suit /obj/item/clothing/head/helmet/space/santahat name = "Santa's hat" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index e91942e8e5f..71bd1e165d0 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -129,6 +129,10 @@ armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30) displays_id = 0 +/obj/item/clothing/under/rank/centcom/captain/solgov + name = "\improper Trans-Solar Federation commander's uniform" + desc = "Gold trim on space-black cloth, this uniform is worn by generals of the Trans-Solar Federation. It has exotic materials for protection." + /obj/item/clothing/under/rank/centcom/blueshield name = "formal blueshield's uniform" desc = "Gold trim on space-black cloth, this uniform bears \"Close Protection\" on the left shoulder. It's got exotic materials for protection." diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index cbcdf2ef43b..e645c9e264e 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -1470,13 +1470,13 @@ /obj/item/clothing/head/fluff/lfbowler //Lightfire: Hyperion - name = "Classy bowler hat" - desc = "a very classy looking bowler hat" + name = "classy bowler hat" + desc = "A very classy looking bowler hat." icon = 'icons/obj/custom_items.dmi' icon_state = "bowler_lightfire" /obj/item/clothing/under/fluff/lfvicsuit //Lightfire: Hyperion - name = "Classy victorian suit" + name = "classy victorian suit" desc = "A blue and black victorian suit with silver buttons, very fancy!" icon = 'icons/obj/custom_items.dmi' lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm index 09911cf54c6..b13af4cc34e 100644 --- a/code/modules/events/sentience.dm +++ b/code/modules/events/sentience.dm @@ -4,46 +4,46 @@ INVOKE_ASYNC(src, .proc/make_sentient_mob) /datum/event/sentience/proc/make_sentient_mob() - var/list/candidates = SSghost_spawns.poll_candidates("Do you want to awaken as a sentient being?", ROLE_SENTIENT, TRUE) var/list/potential = list() - var/sentience_type = SENTIENCE_ORGANIC for(var/mob/living/simple_animal/L in GLOB.alive_mob_list) var/turf/T = get_turf(L) - if (!is_station_level(T.z)) + if(!is_station_level(T.z)) continue - if(!(L in GLOB.player_list) && !L.mind && (L.sentience_type == sentience_type)) + if(!(L in GLOB.player_list) && !L.mind && (L.sentience_type == SENTIENCE_ORGANIC)) potential += L - if(!candidates.len || !potential.len) //if there are no players or simple animals to choose from, then end + if(!length(potential)) // If there are somehow no simple animals to choose from, then end. return FALSE - var/mob/living/simple_animal/SA = pick(potential) + + var/list/candidates = SSghost_spawns.poll_candidates("Do you want to awaken as \a [SA]?", ROLE_SENTIENT, TRUE, source = SA) + if(!length(candidates) || QDELETED(SA)) // If there's no candidates or the mob got deleted. + return + var/mob/SG = pick(candidates) - var/sentience_report = "NAS Trurl Medium-Priority Update" - - var/data = pick("scans from our long-range sensors", "our sophisticated probabilistic models", "our omnipotence", "the communications traffic on your station", "energy emissions we detected", "\[REDACTED\]", "Steve") - var/pets = pick("animals", "pets", "simple animals", "lesser lifeforms", "\[REDACTED\]") - var/strength = pick("human", "skrell", "vox", "grey", "diona", "IPC", "tajaran", "vulpakanin", "kidan", "plasmaman", "drask", - "slime", "monkey", "moderate", "lizard", "security", "command", "clown", "mime", "low", "very low", "greytide", "catgirl", "\[REDACTED\]") - - sentience_report += "

Based on [data], we believe that one of the station's [pets] has developed [strength] level intelligence, and the ability to communicate." - - - SA.key = SG.key - SA.universal_speak = 1 + SA.universal_speak = TRUE SA.sentience_act() - SA.can_collar = 1 + SA.can_collar = TRUE SA.maxHealth = max(SA.maxHealth, 200) SA.health = SA.maxHealth SA.del_on_death = FALSE greet_sentient(SA) + + var/sentience_report = "NAS Trurl Medium-Priority Update" + + var/data = pick("scans from our long-range sensors", "our sophisticated probabilistic models", "our omnipotence", "the communications traffic on your station", "energy emissions we detected", "\[REDACTED]", "Steve") + var/pets = pick("animals", "pets", "simple animals", "lesser lifeforms", "\[REDACTED]") + var/strength = pick("human", "skrell", "vox", "grey", "diona", "IPC", "tajaran", "vulpakanin", "kidan", "plasmaman", "drask", + "slime", "monkey", "moderate", "lizard", "security", "command", "clown", "mime", "low", "very low", "greytide", "catgirl", "\[REDACTED]") + + sentience_report += "

Based on [data], we believe that one of the station's [pets] has developed [strength] level intelligence, and the ability to communicate." print_command_report(sentience_report, "NAS Trurl Update", FALSE) /datum/event/sentience/proc/greet_sentient(mob/living/carbon/human/M) to_chat(M, "Hello world!") to_chat(M, "Due to freak radiation, you have gained \ - human level intelligence and the ability to speak and understand \ + human level intelligence and the ability to speak and understand \ human language!") diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 38582f141d2..3ede42ef1e6 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -274,7 +274,7 @@ // Bust through windows or other stuff blocking the way if(!target.Enter(holder)) for(var/atom/movable/AM in target) - if(istype(AM, /obj/structure/spacevine) || !AM.density) + if(!AM.density || isvineimmune(AM)) continue AM.ex_act(severity) target.ex_act(severity) // vine immunity handled at /mob/ex_act @@ -697,8 +697,10 @@ . = ..() /proc/isvineimmune(atom/A) - . = FALSE if(isliving(A)) var/mob/living/M = A if(("vines" in M.faction) || ("plants" in M.faction)) - . = TRUE + return TRUE + else if(istype(A, /obj/structure/spacevine) || istype(A, /obj/structure/alien/resin/flower_bud_enemy)) + return TRUE + return FALSE diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index ecddd999ea0..b1464d998a9 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -139,7 +139,7 @@ playsound(loc, pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg'), 50, 1, -1) return BRUTELOSS -/obj/item/scythe/pre_attackby(atom/A, mob/living/user, params) +/obj/item/scythe/pre_attack(atom/A, mob/living/user, params) if(swiping || !istype(A, /obj/structure/spacevine) || get_turf(A) == get_turf(user)) return ..() else diff --git a/code/modules/mining/equipment/resonator.dm b/code/modules/mining/equipment/resonator.dm index 405b29e7c68..68c45aab750 100644 --- a/code/modules/mining/equipment/resonator.dm +++ b/code/modules/mining/equipment/resonator.dm @@ -41,7 +41,7 @@ new /obj/effect/temp_visual/resonance(T, user, src, burst_time) user.changeNext_move(CLICK_CD_MELEE) -/obj/item/resonator/pre_attackby(atom/target, mob/user, params) +/obj/item/resonator/pre_attack(atom/target, mob/user, params) if(check_allowed_items(target, 1)) CreateResonance(target, user) return TRUE diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm index 642745d78c2..e1138ed2688 100644 --- a/code/modules/mining/lavaland/loot/tendril_loot.dm +++ b/code/modules/mining/lavaland/loot/tendril_loot.dm @@ -247,7 +247,7 @@ to_chat(user, "You release the wisp. It begins to bob around your head.") icon_state = "lantern" - wisp.orbit(user, 20) + INVOKE_ASYNC(wisp, /atom/movable/.proc/orbit, user, 20) set_light(0) user.update_sight() diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 95288b458bf..7763957dc6e 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -87,7 +87,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) real_name = name //starts ghosts off with all HUDs. - toggle_all_huds_on() + toggle_all_huds_on(body) ..() /mob/dead/observer/Destroy() @@ -323,10 +323,23 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return GLOB.ghost_hud_panel.ui_interact(src) -/mob/dead/observer/proc/toggle_all_huds_on() +/** + * Toggles on all HUDs for the ghost player. + * + * Enables antag HUD only if the ghost belongs to an admin. + * + * Arguments: + * * user - A reference to the ghost's old mob. This argument is required since `src` does not have a `client` at this point. + */ +/mob/dead/observer/proc/toggle_all_huds_on(mob/user) show_me_the_hud(DATA_HUD_DIAGNOSTIC) show_me_the_hud(DATA_HUD_SECURITY_ADVANCED) show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED) + if(!check_rights((R_ADMIN | R_MOD), FALSE, user)) + return + antagHUD = TRUE + for(var/datum/atom_hud/antag/H in GLOB.huds) + H.add_hud_to(src) /mob/dead/observer/verb/set_dnr() set name = "Set DNR" diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index 360841a510f..6f4e3a15694 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -486,6 +486,14 @@ flags = RESTRICTED | HIVEMIND | NOBABEL follow = TRUE +/datum/language/terrorspider/broadcast(mob/living/speaker, message, speaker_mask) + if(isterrorspider(speaker)) + var/mob/living/simple_animal/hostile/poison/terror_spider/T = speaker + if(T.loudspeaker) + ..(speaker, "[message]") + return + ..(speaker, message) + /datum/language/ling name = "Changeling" desc = "Although they are normally wary and suspicious of each other, changelings can commune over a distance." diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm index 449df48288a..51bb1435fe4 100644 --- a/code/modules/mob/living/silicon/ai/latejoin.dm +++ b/code/modules/mob/living/silicon/ai/latejoin.dm @@ -9,8 +9,9 @@ GLOBAL_LIST_EMPTY(empty_playable_ai_cores) if(alert("WARNING: This will immediately wipe your core and ghost you, removing your character from the round permanently (similar to cryo and robotic storage). Are you entirely sure you want to do this?", "Wipe Core", "No", "No", "Yes") != "Yes") return + cryo_AI() - // We warned you. +/mob/living/silicon/ai/proc/cryo_AI() GLOB.empty_playable_ai_cores += new /obj/structure/AIcore/deactivated(loc) GLOB.global_announcer.autosay("[src] has been moved to intelligence storage.", "Artificial Intelligence Oversight") diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 7571f5d5aff..21d9e75db90 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -284,7 +284,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list( else to_chat(src, "Oops! Something went very wrong, your MMI was unable to receive your mind. You have been ghosted. Please make a bug report so we can fix this bug.") ghostize() - error("A borg has been destroyed, but its MMI lacked a brainmob, so the mind could not be transferred. Player: [ckey].") + log_runtime(EXCEPTION("A borg has been destroyed, but its MMI lacked a brainmob, so the mind could not be transferred. Player: [ckey]."), src) mmi = null if(connected_ai) connected_ai.connected_robots -= src diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 9d18bfbd53f..c19fcadd240 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -129,6 +129,7 @@ status_flags = 0 construct_type = "juggernaut" mob_size = MOB_SIZE_LARGE + move_resist = MOVE_FORCE_STRONG construct_spells = list(/obj/effect/proc_holder/spell/targeted/night_vision, /obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall) force_threshold = 11 playstyle_string = "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, \ diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index c99545e7ed6..109c4043f5e 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -115,7 +115,7 @@ icon_living = "cow" icon_dead = "cow_dead" icon_gib = "cow_gib" - speak = list("moo?","moo","MOOOOOO") + speak = list("Moo?","Moo","MOOOOOO") speak_emote = list("moos","moos hauntingly") emote_hear = list("brays") emote_see = list("shakes its head") diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 6f110d0bb13..98dcd8cac6e 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -56,6 +56,12 @@ for(var/obj/structure/spider/S in range(1, get_turf(src))) return S +/mob/living/simple_animal/hostile/poison/giant_spider/death(gibbed) + . = ..() + if(!.) + return FALSE + SSmobs.giant_spiders-- + //nursemaids - these create webs and eggs /mob/living/simple_animal/hostile/poison/giant_spider/nurse desc = "Furry and black, it makes you shudder to look at it. This one has brilliant green eyes." diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 1916e9dbc29..bf5f45cfe69 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -408,7 +408,7 @@ Difficulty: Hard /obj/effect/decal/cleanable/blood/gibs/bubblegum/can_bloodcrawl_in() return TRUE -/mob/living/simple_animal/hostile/megafauna/bubblegum/do_attack_animation(atom/A, visual_effect_icon) +/mob/living/simple_animal/hostile/megafauna/bubblegum/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect) if(!charging) ..() diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm index 37213bfc816..57bf707ad90 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm @@ -25,6 +25,7 @@ regen_points_per_kill = 200 // >2x normal, since they're food reprocessors idle_ventcrawl_chance = 5 spider_tier = TS_TIER_3 + loudspeaker = TRUE spider_opens_doors = 2 web_type = /obj/structure/spider/terrorweb/mother var/datum/action/innate/terrorspider/ventsmash/ventsmash_action diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm index 7b900d8a881..54b8fb2e8d7 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm @@ -26,6 +26,7 @@ environment_smash = ENVIRONMENT_SMASH_RWALLS idle_ventcrawl_chance = 0 spider_tier = TS_TIER_3 + loudspeaker = TRUE spider_opens_doors = 2 web_type = /obj/structure/spider/terrorweb/purple ai_spins_webs = FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm index cd87f2dd577..cd0a0646bc5 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm @@ -33,6 +33,7 @@ projectilesound = 'sound/weapons/pierce.ogg' projectiletype = /obj/item/projectile/terrorqueenspit spider_tier = TS_TIER_4 + loudspeaker = TRUE spider_opens_doors = 2 web_type = /obj/structure/spider/terrorweb/queen var/spider_spawnfrequency = 1200 // 120 seconds. Default for player queens and NPC queens on station. Awaymission queens have this changed in New() diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm index d910903c009..8d6980114e0 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm @@ -137,6 +137,8 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list) var/killcount = 0 var/busy = 0 // leave this alone! var/spider_tier = TS_TIER_1 // 1 for red,gray,green. 2 for purple,black,white, 3 for prince, mother. 4 for queen + /// Does this terror speak loudly on the terror hivemind? + var/loudspeaker = FALSE var/hasdied = 0 var/list/spider_special_drops = list() var/attackstep = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm index 919f91742cc..543c9f122f2 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm @@ -20,6 +20,7 @@ melee_damage_lower = 5 melee_damage_upper = 15 spider_tier = TS_TIER_2 + loudspeaker = TRUE web_type = /obj/structure/spider/terrorweb/white diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm index f6827b636a3..4c5a16a05ed 100644 --- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm +++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm @@ -49,6 +49,7 @@ name = "venus human trap" desc = "Now you know how the fly feels." icon_state = "venus_human_trap" + icon_living = "venus_human_trap" mob_biotypes = MOB_ORGANIC | MOB_PLANT layer = MOB_LAYER + 0.9 health = 50 diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 493fbff4615..12ee29ebb1f 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -20,10 +20,10 @@ spawn() alert("You have logged in already with another key this round, please log out of this one NOW or risk being banned!") if(matches) if(M.client) - message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].", 1) + message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].", 1) log_adminwarn("Notice: [key_name(src)] has the same [matches] as [key_name(M)].") else - message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ", 1) + message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ", 1) log_adminwarn("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).") /mob/Login() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 161722fa7bd..18b787d2b26 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -116,7 +116,9 @@ var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("[question]?", poll_time = 10 SECONDS, min_hours = minhours, source = M) var/mob/dead/observer/theghost = null - if(LAZYLEN(candidates)) + if(length(candidates)) + if(QDELETED(M)) + return theghost = pick(candidates) to_chat(M, "Your mob has been taken over by a ghost!") message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)])") diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 14dae892908..04aca83e512 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -172,7 +172,7 @@ if(alert(src,"Are you sure you wish to observe? You cannot normally join the round after doing this!","Player Setup","Yes","No") == "Yes") if(!client) return 1 - var/mob/dead/observer/observer = new() + var/mob/dead/observer/observer = new(src) src << browse(null, "window=playersetup") spawning = 1 stop_sound_channel(CHANNEL_LOBBYMUSIC) diff --git a/code/modules/newscaster/obj/newscaster.dm b/code/modules/newscaster/obj/newscaster.dm index 903a2feff7e..cff3ac16d13 100644 --- a/code/modules/newscaster/obj/newscaster.dm +++ b/code/modules/newscaster/obj/newscaster.dm @@ -80,6 +80,7 @@ /datum/job/chaplain, /datum/job/ntnavyofficer, /datum/job/ntspecops, + /datum/job/ntspecops/solgovspecops, /datum/job/civilian, /datum/job/syndicateofficer ) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 11dc0f656ad..996817666ca 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -730,7 +730,20 @@ return if(moveable && default_unfasten_wrench(user, I, time = 20)) return - if(user.drop_item()) + if(istype(I, /obj/item/scalpel/supermatter)) + var/obj/item/scalpel/supermatter/scalpel = I + to_chat(user, "You carefully begin to scrape [src] with [I]...") + if(I.use_tool(src, user, 10 SECONDS, volume = 100)) + if(scalpel.uses_left) + to_chat(user, "You extract a sliver from [src], and it begins to react violently!") + new /obj/item/nuke_core/supermatter_sliver(drop_location()) + matter_power += 800 + scalpel.uses_left-- + if(!scalpel.uses_left) + to_chat(user, "A tiny piece of [I] falls off, rendering it useless!") + else + to_chat(user, "You fail to extract a sliver from [src]! [I] isn't sharp enough anymore.") + else if(user.drop_item()) user.visible_message("As [user] touches [src] with \a [I], silence fills the room...",\ "You touch [src] with [I], and everything suddenly goes silent.\n[I] flashes into dust as you flinch away from [src].",\ "Everything suddenly goes silent.") diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 1002ff117c1..02e797900b9 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -78,6 +78,8 @@ for(var/atom/T in get_turf(D)) D.reagents.reaction(T) sleep(3) + if(QDELETED(D)) + return qdel(D) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 07c92cb8b0a..21c0f648a3b 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -153,10 +153,14 @@ resistance_flags = FLAMMABLE var/static/list/no_wrap = list(/obj/item/smallDelivery, /obj/structure/bigDelivery, /obj/item/evidencebag, /obj/structure/closet/body_bag, /obj/item/twohanded/required) -/obj/item/stack/packageWrap/afterattack(obj/target as obj, mob/user as mob, proximity) - if(!proximity) return - if(!istype(target)) //this really shouldn't be necessary (but it is). -Pete +/obj/item/stack/packageWrap/pre_attack(atom/A, mob/living/user, params) + . = ..() + if(!in_range(A, user)) return + if(!isobj(A)) + return + var/obj/target = A + if(is_type_in_list(target, no_wrap)) return if(target.anchored) @@ -166,62 +170,61 @@ if(istype(target, /obj/item) && !(istype(target, /obj/item/storage) && !istype(target,/obj/item/storage/box) && !istype(target, /obj/item/shippingPackage))) var/obj/item/O = target - if(use(1)) - var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(get_turf(O.loc)) //Aaannd wrap it up! - if(!istype(O.loc, /turf)) - if(user.client) - user.client.screen -= O - P.wrapped = O - O.loc = P - var/i = round(O.w_class) - if(i in list(1,2,3,4,5)) - P.icon_state = "deliverycrate[i]" - P.w_class = i - P.add_fingerprint(usr) - O.add_fingerprint(usr) - add_fingerprint(usr) - else - return + if(!use(1)) + return FALSE + var/obj/item/smallDelivery/P = new /obj/item/smallDelivery(get_turf(O.loc)) //Aaannd wrap it up! + if(!isturf(O.loc)) + if(user.client) + user.client.screen -= O + P.wrapped = O + O.loc = P + var/i = round(O.w_class) + if(i in list(1,2,3,4,5)) + P.icon_state = "deliverycrate[i]" + P.w_class = i + P.add_fingerprint(user) + O.add_fingerprint(user) + add_fingerprint(user) + else if(istype(target, /obj/structure/closet/crate)) - var/obj/structure/closet/crate/O = target - if(O.opened) - return - if(amount >= 3 && do_after_once(user, 15, target = target)) - if(O.opened || !use(3)) - return - var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(O.loc)) - P.icon_state = "deliverycrate" - P.wrapped = O - O.loc = P - else - to_chat(user, "You need more paper.") - return - else if(istype (target, /obj/structure/closet)) - var/obj/structure/closet/O = target - if(O.opened) - return - if(amount >= 3 && do_after_once(user, 15, target = target)) - if(O.opened || !use(3)) - return - var/obj/structure/bigDelivery/P = new /obj/structure/bigDelivery(get_turf(O.loc)) - P.wrapped = O - P.init_welded = O.welded - O.welded = 1 - O.loc = P - else - to_chat(user, "You need more paper.") - return + var/obj/structure/bigDelivery/D = wrap_closet(target, user) + if(!D) + return FALSE + D.icon_state = "deliverycrate" + + else if(istype(target, /obj/structure/closet)) + var/obj/structure/closet/C = target + var/obj/structure/bigDelivery/D = wrap_closet(target, user) + if(!D) + return FALSE + D.init_welded = C.welded + C.welded = TRUE else to_chat(user, "The object you are trying to wrap is unsuitable for the sorting machinery.") - return + return FALSE user.visible_message("[user] wraps [target].") user.create_attack_log("Has used [name] on [target]") add_attack_logs(user, target, "used [name]", ATKLOG_ALL) - if(amount <= 0 && !src.loc) //if we used our last wrapping paper, drop a cardboard tube - new /obj/item/c_tube( get_turf(user) ) - return + if(amount <= 0 && QDELETED(src)) //if we used our last wrapping paper, drop a cardboard tube + var/obj/item/c_tube/T = new(get_turf(user)) + user.put_in_active_hand(T) + return FALSE + +// Separate proc to avoid copy pasting the code twice +/obj/item/stack/packageWrap/proc/wrap_closet(obj/structure/closet/C, mob/user) + if(C.opened) + return + if(amount < 3) + to_chat(user, "You need more paper.") + return + if(!do_after_once(user, 1.5 SECONDS, target = C) || C.opened || !use(3)) // Checking these again since it's after a delay + return + var/obj/structure/bigDelivery/P = new(get_turf(C)) + P.wrapped = C + C.loc = P + return P /obj/item/destTagger name = "destination tagger" diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 964ea0cb754..3f10614af09 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -205,7 +205,7 @@ var/ghostmsg = "Play as [SM.name], pet of [user.name]?" var/list/candidates = SSghost_spawns.poll_candidates(ghostmsg, ROLE_SENTIENT, FALSE, 10 SECONDS, source = M) - if(!src) + if(QDELETED(src) || QDELETED(SM)) return if(candidates.len) diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 5caae9905a0..b70d4e0136b 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -858,7 +858,7 @@ next_request = world.time + 60 SECONDS //1 minute cooldown to_chat(usr, "Your request has been recieved by Centcom.") log_admin("[key_name(usr)] requested to move the transport ferry to Centcom.") - message_admins("FERRY: [key_name_admin(usr)] (Move Ferry) is requesting to move the transport ferry to Centcom.") + message_admins("FERRY: [key_name_admin(usr)] (Move Ferry) is requesting to move the transport ferry to Centcom.") return TRUE diff --git a/code/modules/tgui/modules/ert_manager.dm b/code/modules/tgui/modules/ert_manager.dm index b31adf47120..a39b6239035 100644 --- a/code/modules/tgui/modules/ert_manager.dm +++ b/code/modules/tgui/modules/ert_manager.dm @@ -97,4 +97,3 @@ trigger_armed_response_team(D, commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots) else return FALSE - diff --git a/code/modules/world_topic/_spam_prevention_handler.dm b/code/modules/world_topic/_spam_prevention_handler.dm index 84cfb01b411..0274dd2df31 100644 --- a/code/modules/world_topic/_spam_prevention_handler.dm +++ b/code/modules/world_topic/_spam_prevention_handler.dm @@ -2,6 +2,8 @@ #define WORLD_TOPIC_LOCKOUT_TIME 1 MINUTES /datum/world_topic_spam_prevention_handler + /// IP. Used purely for select purposes. + var/ip = null /// Amount of strikes. [WORLD_TOPIC_STRIKES_THRESHOLD] strikes is a lockout of [WORLD_TOPIC_LOCKOUT_TIME] var/strikes = 0 /// Time of last request @@ -11,6 +13,9 @@ /// Unlock time var/unlock_time = 0 +/datum/world_topic_spam_prevention_handler/New(_ip) + ip = _ip + /** * Lockout handler * diff --git a/code/modules/world_topic/adminmsg.dm b/code/modules/world_topic/adminmsg.dm index 5ad8f535e47..fadceebdd3b 100644 --- a/code/modules/world_topic/adminmsg.dm +++ b/code/modules/world_topic/adminmsg.dm @@ -21,7 +21,7 @@ var/sanitized = sanitize(input["msg"]) var/message = "Discord PM from [input["sender"]]: [sanitized]" - var/amessage = "Discord PM from [input["sender"]] to [key_name_admin(C)]: [sanitized]" + var/amessage = "Discord PM from [input["sender"]] to [key_name_admin(C)]: [sanitized]" // THESE TWO VARS DO VERY DIFFERENT THINGS. DO NOT ATTEMPT TO COMBINE THEM C.received_discord_pm = world.time diff --git a/config/example/config.toml b/config/example/config.toml index 0f46fcf6d7f..254f793221e 100644 --- a/config/example/config.toml +++ b/config/example/config.toml @@ -702,7 +702,8 @@ shutdown_on_reboot = false #shutdown_shell_command = "taskkill /im dreamdaemon.exe /f" # URL for the 2FA backend HTTP host. Do not use https:// or a trailing slash. Comment out to disable #_2fa_auth_host = "http://127.0.0.1:8080" - +# List of IP addresses to be ignored by the world/Topic rate limiting. Useful if you have other services +topic_ip_ratelimit_bypass = ["127.0.0.1"] ################################################################ diff --git a/icons/_nanomaps/Delta_nanomap_z1.png b/icons/_nanomaps/Delta_nanomap_z1.png index 4b3d78c1299..c2506d18013 100644 Binary files a/icons/_nanomaps/Delta_nanomap_z1.png and b/icons/_nanomaps/Delta_nanomap_z1.png differ diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 6fffc9e1f57..4ef2490b554 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 59d04780446..8109e23d3cf 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index aa632b9dad9..78506ad1890 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 3e2a1ea5e2c..7e574384d62 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index e73ec9917eb..61a1003db98 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index c1b757e2f3e..c1228bee4c3 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index b39a4262086..674c20510cf 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/nuke_tools.dmi b/icons/obj/nuke_tools.dmi new file mode 100644 index 00000000000..1e06f1f89ea Binary files /dev/null and b/icons/obj/nuke_tools.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 28b2a79a06d..b75eae77d79 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/paradise.dme b/paradise.dme index d2032cff916..541e1ac2c98 100644 --- a/paradise.dme +++ b/paradise.dme @@ -853,6 +853,7 @@ #include "code\game\objects\items\mixing_bowl.dm" #include "code\game\objects\items\random_items.dm" #include "code\game\objects\items\shooting_range.dm" +#include "code\game\objects\items\theft_items.dm" #include "code\game\objects\items\toys.dm" #include "code\game\objects\items\trash.dm" #include "code\game\objects\items\devices\aicard.dm"