diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
deleted file mode 100644
index c98d8a93f8b8..000000000000
--- a/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,904 +0,0 @@
-# CONTRIBUTING
-
-## Introduction
-
-This is the contribution guide for Paradise Station. These guidelines apply to
-both new issues and new pull requests. If you are making a pull request, please refer to
-the [Pull request](#pull-requests) section, and if you are making an issue report, please
-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
-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 point out specifically and concisely your reasoning in a comment on the issue itself.
-
-### Comment 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.
-
-### Issue Guidelines
-
-- Issue reports should be as detailed as possible, and if applicable, should include instructions on how to reproduce the bug.
-
-## Pull requests
-
-Players are welcome to participate in the development of this fork and submit their own
-pull requests. If the work you are submitting is a new feature, or affects balance, it is
-strongly recommended you get approval/traction for it from our forums before starting the
-actual development.
-
-### Pull Request Guidelines
-
-- Keep your pull requests atomic. Each pull request should strive to address one primary goal, and should not include fixes or changes that aren't related to the main purpose of the pull request. Unrelated changes should be applied in new pull requests. In case of mapping PRs that add features - consult a member of the development team on whether it would be appropriate to split up the PR to add the feature to multiple maps individually.
-
-- Document and explain your pull requests thoroughly. Failure to do so will delay a PR as we question why changes were made. This is especially important if you're porting a PR from another codebase (i.e. TG) and divert from the original. Explaining with single comment on why you've made changes will help us review the PR faster and understand your decision making process.
-
-- Any pull request must have a changelog, this is to allow us to know when a PR is deployed on the live server. Inline changelogs are supported through the format described [here](https://github.com/ParadiseSS13/Paradise/pull/3291#issuecomment-172950466) and should be used rather than manually edited .yml file changelogs.
-
-- Pull requests should not have any merge commits except in the case of fixing merge conflicts for an existing pull request. New pull requests should not have any merge commits. Use `git rebase` or `git reset` to update your branches, not `git pull`.
-
-- Please explain why you are submitting the pull request, and how you think your change will be beneficial to the game. Failure to do so will be grounds for rejecting the PR.
-
-- If your pull request is not finished make sure it is at least testable in a live environment. Pull requests that do not at least meet this requirement may be closed at maintainer discretion. You may request a maintainer reopen the pull request when you're ready, or make a new one.
-
-- 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.
-
-- By ticking or leaving ticked the option "Allow edits and access to secrets by maintainers", either when making a PR or at any time thereafter, you give permission for repository maintainers to push changes to your branch without explicit permission. Repository maintainers will avoid doing this unless necessary, and generally should only use it to apply a merge upstream/master, rebuild TGUI, deconflict maps, or other minor changes required shortly before a PR is to be merged. More extensive changes such as force-pushes to your branch require explicit permission from the PR author each time such a change needs to be made.
-
-#### Using The Changelog
-
-- 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:
-
-```txt
- :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:
-```
-
-```txt
- :cl: UsernameHere
- spellcheck: Fixes some misspelled words under Using Changelog
- /:cl:
-```
-
-## Modifying MILLA
-
-Our atmos engine, MILLA, is in the `milla/` directory. It's written in Rust for performance reasons, which means it's not compiled the same way as the rest of the code. If you're on Windows, you get a pre-built copy by default. If you're on Linux, you built one already to run the server.
-
-If you make changes to MILLA, you'll want to rebuild. This will be very similar to RUSTG:
-https://github.com/ParadiseSS13/rust-g
-The only difference is that you run `cargo` from the `milla/` directory, and don't need to speify `--all-features` (though it doesn't hurt).
-
-The server will automatically detect that you have a local build, and use that over the default Windows one.
-
-When you're ready to make a PR, please DO NOT modify `milla.dll` or `tools/ci/libmilla_ci.so`. Leave "Allow edits and access to secrets by maintainers" enabled, and post a comment on your PR saying `!build_milla`. A bot will automatically build them for you and update your branch.
-
-## Specifications
-
-As mentioned before, you are expected to follow these specifications in order to make everyone's lives easier. It'll save both your time and ours, by making
-sure you don't have to make any changes and we don't have to ask you to. Thank you for reading this section!
-
-### Object Oriented Code
-
-As BYOND's Dream Maker (henceforth "DM") is an object-oriented language, code must be object-oriented when possible in order to be more flexible when adding
-content to it. If you don't know what "object-oriented" means, we highly recommend you do some light research to grasp the basics.
-
-### All BYOND paths must contain the full path
-
-(i.e. absolute pathing)
-
-DM will allow you nest almost any type keyword into a block, such as:
-
-```dm
-datum
- datum1
- var
- varname1 = 1
- varname2
- static
- varname3
- varname4
- proc
- proc1()
- code
- proc2()
- code
-
- datum2
- varname1 = 0
- proc
- proc3()
- code
- proc2()
- ..()
- code
-```
-
-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 = 1
- var/varname2
- var/static/varname3
- var/static/varname4
-
-/datum/datum1/proc/proc1()
- code
-
-/datum/datum1/proc/proc2()
- code
-
-/datum/datum1/datum2
- varname1 = 0
-
-/datum/datum1/datum2/proc/proc3()
- code
-
-/datum/datum1/datum2/proc2()
- ..()
- code
-```
-
-### Do not compare boolean values to TRUE or FALSE
-
-Do not compare boolean values to TRUE or FALSE. For TRUE you should just check if there's a value in that address. For FALSE you should use the ! operator. An exception is made to this when working with JS or other external languages. If a function/variable can contain more values beyond null/0 or TRUE, use numbers and defines instead of true/false comparisons.
-
-```dm
-// Bad
-var/thing = pick(TRUE, FALSE)
-if(thing == TRUE)
- return "bleh"
-var/other_thing = pick(TRUE, FALSE)
-if(other_thing == FALSE)
- return "meh"
-
-// Good
-var/thing = pick(TRUE, FALSE)
-if(thing)
- return "bleh"
-var/other_thing = pick(TRUE, FALSE)
-if(!other_thing)
- return "meh"
-```
-
-### Use `pick(x, y, z)`, not `pick(list(x, y, z))`
-
-`pick()` will happily take a fixed set of options. Wrapping them in a list is redundant and slightly less efficient.
-'''dm
-// Bad
-var/text = pick(list("test_1", "test_2", "test_3"))
-to_chat(world, text)
-
-// Good
-var/text = pick("test_1", "test_2", "test_3")
-to_chat(world, text)
-'''
-
-### User Interfaces
-
-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.
-
-### Do not access return value vars directly from functions
-
-The use of the pointer operator, `.`, should not be used to access the return values of functions directly. This can cause unintended behavior and is difficult to read.
-
-```dm
-//Bad
-var/our_x = get_turf(thing).x
-
-//Good
-var/turf/our_turf = get_turf(thing)
-var/our_x = our_turf.x
-```
-
-### Type paths must begin with a /
-
-eg: `/datum/thing`, not `datum/thing`
-
-### Datum type paths must began with "datum"
-
-In DM, this is optional, but omitting it makes finding definitions harder. To be specific, you can declare the path `/arbitrary`, but it
-will still be, in actuality, `/datum/arbitrary`. Write your code to reflect this.
-
-### Do not use list operators in strings
-
-The use of list operators to augment strings is not allowed. This is roughly 10 times slower than using a list with a Join() Function.
-
-```dm
-//Bad
-var/text = "text"
-text += "More text"
-to_chat(world, text)
-
-//Good
-var/list/text = list("text")
-text += "More text"
-to_chat(world, text.Join(""))
-```
-
-### Do not use text/string based type paths
-
-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
-//Bad
-var/path_type = "/obj/item/baseball_bat"
-
-//Good
-var/path_type = /obj/item/baseball_bat
-```
-
-### Do not use `\The`
-
-The `\The` macro doesn't actually do anything when used in the format `\The [atom reference]`. Directly referencing an atom in an embedded string
-will automatically prefix `The` or `the` to it as appropriate. As an extension, when referencing an atom, don't use `[atom.name]`, use `[atom]`.
-The only exception to this rule is when dealing with items "belonging" to a mob, in which case you should use `[mob]'s [atom.name]` to avoid `The`
-ever forming.
-
-```dm
-//Bad
-var/atom/A
-"\The [A]"
-
-//Good
-var/atom/A
-"[A]"
-```
-
-### Use the pronoun library instead of `\his` macros
-
-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.
-- It always prints the real `gender` variable of the atom it's referencing. This can lead to exposing a mob's gender even when their face is covered, which would normally prevent it's gender from being printed.
-
-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."`
-
-```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]`
-
-BYOND has a system to pass "soft references" to datums, using the format `"\ref[datum]"` inside a string. This allows you to find the object just based
-off of a text string, which is especially useful when dealing with the bridge between BYOND code and HTML/JS in UIs. It's resolved back into an object
-reference by using `locate("\ref[datum]")` when the code comes back to BYOND. The issue with this is that locate() can return a unexpected datum
-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.
-
-```dm
-//Bad
-"Link!"
-
-//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.)
-
-### 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, 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 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.
-
-Instead you can use object orientation, or simply placing repeated code in a function, to obey this specification easily.
-
-### Startup/Runtime tradeoffs with lists and the "hidden" init proc
-
-First, read the comments in [this BYOND thread](http://www.byond.com/forum/?post=2086980&page=2#comment19776775), starting where the link takes you.
-
-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()`)
-
-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.
-
-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.
-
-```dm
-//Bad
-/obj/item/proc1(var/mob/input1, var/input2)
- code
-
-//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
-//Bad
-/datum/proc/do_the_thing(thing_to_do)
- 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
-//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)
- 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 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.
-- All control statements must not contain code on the same line as the statement.
-
- ```DM
- //Bad
- if(x) return
-
- //Good
- if(x)
- return
- ```
-
-### Player Output
-
-Due to the use of "TGchat", 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 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
-```
-
-This is good:
-
-```dm
-/datum/datum1/proc/proc1()
- if(!thing1)
- return
- if(thing2)
- return
- if(thing3 != 30)
- return
- do stuff
-```
-
-This prevents nesting levels from getting deeper then they need to be.
-
-### 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](https://github.com/tgstation/tgstation/pull/22933).
-
-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)
-
-//Good
-/datum/datum1/proc/proc1(target)
- addtimer(CALLBACK(target, PROC_REF(dothing), arg1, arg2, arg3), 5 SECONDS)
-```
-
-### Signals
-
-Signals are a slightly more advanced topic, but are often useful for attaching external behavior to objects that should be triggered when a specific event occurs.
-
-When defining procs that should be called by signals, you must include `SIGNAL_HANDLER` after the proc header. This ensures that no sleeping code can be called from within a signal handler, as that can cause problems with the signal system.
-
-Since callbacks can be connected to many signals with `RegisterSignal`, it can be difficult to pin down the source that a callback is invoked from. Any new `SIGNAL_HANDLER` should be followed by a comment listing the signals that the proc is expected to be invoked for. If there are multiple signals to be handled, separate them with a `+`.
-
-```dm
-/atom/movable/proc/when_moved(atom/movable/A)
- SIGNAL_HANDLER // COMSIG_MOVABLE_MOVED
- do_something()
-
-/datum/component/foo/proc/on_enter(datum/source, atom/enterer)
- SIGNAL_HANDLER // COMSIG_ATOM_ENTERED + COMSIG_ATOM_INITIALIZED_ON
- do_something_else()
-```
-
-If your proc does have something that needs to sleep (such as a `do_after()`), do not simply omit the `SIGNAL_HANDLER`. Instead, call the sleeping code with `INVOKE_ASYNC` from within the signal handling function.
-
-```dm
-/atom/movable/proc/when_moved(atom/movable/A)
- SIGNAL_HANDLER // COMSIG_MOVABLE_MOVED
- INVOKE_ASYNC(src, PROC_REF(thing_that_sleeps), arg1)
-```
-
-### Operators
-
-#### Spacing of operators
-
-- 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 of operators
-
-- 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
-
-```DM
- //Bad
- list(a = "b")
-
- //Good
- list("a" = "b")
-```
-
-#### Bitflags
-
-- Bitshift operators are mandatory, opposed to directly typing out the value. I.E:
-
-```dm
- #define MACRO_ONE (1<<0)
- #define MACRO_TWO (1<<1)
- #define MACRO_THREE (1<<2)
-```
-
-Is accepted, whereas the following is not:
-
-```dm
- #define MACRO_ONE 1
- #define MACRO_TWO 2
- #define MACRO_THREE 4
-```
-
-While it may initially look intimidating, `(1<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`.
-
-```dm
- //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.
-
-```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()`.
-
-```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.
-
-- 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.
-
-```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.
-
-- Information that players could use to metagame (that is, to identify round information and/or antagonist type via information that would not be available to them in character) should be kept as administrator only.
-
-- Where you have code that can cause large-scale modification and _FUN_, make sure you start it out locked behind one of the default admin roles - use common sense to determine which role fits the level of damage a function could do.
-
-### Files
-
-- Because runtime errors do not give the full path, try to avoid having files with the same name across folders.
-
-- File names should not be mixed case, or contain spaces or any character that would require escaping in a uri.
-
-- Files and path accessed and referenced by code above simply being #included should be strictly lowercase to avoid issues on filesystems where case matters.
-
-#### Modular Code in a 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)
-
-Our codebase also has support for checking files so that they only contain one specific typepath, including none of its subtypes. This can be done by adding a specific header at the beginning of the file, which the CI will look for when running. An example can be seen below. You can also run this test locally using `/tools/ci/restrict_file_types.py`
-
-```dm
-RESTRICT_TYPE(/datum/foo)
-
-/datum/proc/do_thing() // Error: '/datum' proc found in a file restricted to '/datum/foo'
-
-/datum/foo
-
-/datum/foo/do_thing()
-
-/datum/foo/bar // Error: '/datum/foo/bar' type definition found in a file restricted to '/datum/foo'
-
-/datum/foo/bar/do_thing() // Error: '/datum/foo/bar' proc found in a file restricted to '/datum/foo'
-```
-
-### 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, 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 `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 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.
-
-- Queries must never specify the database, be it in code, or in text files in the repo.
-
-### Mapping Standards
-
-- For map edit PRs, we do not accept 'change for the sake of change' remaps, unless you have very good reasoning to do so. Maintainers reserve the right to close your PR if we disagree with your reasoning.
-
-- Map Merge
-
- - The following guideline for map merging applies to **ALL** mapping contributers.
- - Before committing a map change, you **MUST** run mapmerge2 to normalise your changes. You can do this manually before every commit with `"\tools\mapmerge2\Run Before Committing.bat"` or automatically by installing the hooks at `"\tools\hooks\Install.bat"`.
- - Failure to run Map Merge on a map after editing greatly increases the risk of the map's key dictionary becoming corrupted by future edits after running map merge. Resolving the corruption issue involves rebuilding the map's key dictionary;
-
-- StrongDMM
-
- - [We strongly encourage use of StrongDMM version 2 or greater, available here.](https://github.com/SpaiR/StrongDMM/releases)
- - When using StrongDMM, the following options must be enabled. They can be found under `File > Preferences`.
- - Sanitize Variables - Removes variables that are declared on the map, but are the same as initial. (For example: A standard floor turf that has `dir = 2` declared on the map will have that variable deleted as it is redundant.)
- - Save format - `TGM`.
- - Nudge mode - pixel_x/pixel_y
-
-- Variable Editing (Var-edits)
-
- - While var-editing an item within the editor is fine, it is preferred that when you are changing the base behavior of an item (how it functions) that you make a new subtype of that item within the code, especially if you plan to use the item in multiple locations on the same map, or across multiple maps. This makes it easier to make corrections as needed to all instances of the item at one time, as opposed to having to find each instance of it and change them all individually.
- - Subtypes only intended to be used on ruin maps should be contained within an .dm file with a name corresponding to that map within `code\modules\ruins`. This is so in the event that the map is removed, that subtype will be removed at the same time as well to minimize leftover/unused data within the repo.
- - When not using StrongDMM (which handles the following automatically) please attempt to clean out any dirty variables that may be contained within items you alter through var-editing. For example changing the `pixel_x` variable from 23 to 0 will leave a dirty record in the map's code of `pixel_x = 0`.
- - Areas should **never** be var-edited on a map. All areas of a single type, altered instance or not, are considered the same area within the code, and editing their variables on a map can lead to issues with powernets and event subsystems which are difficult to debug.
- - Unless they require custom placement, when placing the following items use the relevant "[direction] bump" instance, as it has predefined pixel offsets and directions that are standardised: APC, Air alarm, Fire alarm, station intercom, newscaster, extinguisher cabient, light switches.
-
-- If you are making non-minor edits to an area or room, (non-minor being anything more than moving a few objects or fixing small bugs) then you should ensure the entire area/room is updated to meet these standards.
-
-- When making a change to an area or room, follow these guidelines:
-
- - Unless absolutely necessary, do not run pipes (including disposals) under wall turfs.
- - **NEVER** run cables under wall turfs.
- - Keep floor turf variations to a minimum. Generally, more than 3 floor turf types in one room is bad design.
- - Run air pipes together where possible. The first example below is to be avoided, the second is optimal:
-
- ![image](https://user-images.githubusercontent.com/12197162/120011088-d22c7400-bfd5-11eb-867f-7b137ac5b1b2.png) ![image](https://user-images.githubusercontent.com/12197162/120011126-dfe1f980-bfd5-11eb-96b2-c83238a9cdcf.png)
-
- - Pipe layouts should be logical and predictable, easy to understand at a glance. Always avoid complex layouts like in this example:
-
- ![image](https://user-images.githubusercontent.com/12197162/120619480-ecda6f00-c453-11eb-9d9f-abf0d1a99c34.png)
-
- - Decals are to be used sparingly. Good map design does not require warning tape around everything. Decal overuse contributes to maptick slowdown.
- - Every **area** should contain only one APC and air alarm.
- - Critical infrastructure rooms (such as the engine, arrivals, and medbay areas) should be given an APC with a larger power cell.
- - Every **room** should contain at least one fire alarm, air vent and scrubber, light switch, station intercom, and security camera.
- - Intercoms should be set to frequency 145.9, and be speaker ON Microphone OFF. This is so radio signals can reach people even without headsets on. Larger room will require more than one at a time.
- - Exceptions can be made to security camera placement for certain rooms, such as the execution room. Larger rooms may require more than one security camera. All security cameras should have a descriptive name that makes it easy to find on a camera console.
- - A good example would be the template [Department name] - [Area], so Brig - Cell 1, or Medbay - Treatment Center. Consistency is key to good camera naming.
- - Fire alarms should not be placed next to expected heat sources.
- - Use the following "on" subtype of vents and scrubbers as opposed to var-editing: `/obj/machinery/atmospherics/unary/vent_scrubber/on` and `/obj/machinery/atmospherics/unary/vent_pump/on`
- - Head of staff offices should contain a requests console.
- - Electrochromic windows (`/obj/structure/window/reinforced/polarized`) and doors/windoors (using the `/obj/effect/mapping_helpers/airlock/polarized` helper) are preferred over shutters as the method of restricting view to a room through windows. Shutters are sill appropriate in industrial/hazardous areas of the station (engine rooms, HoP line, science test chamber, etc.).
- - Electrochromic window/windoor/door sets require a unique ID var, and a window tint button (`/obj/machinery/button/windowtint`) with a matching ID var. The default `range` of the button is 7 tiles but can be amended with a var edit.
- - Tiny fans (`/obj/structure/fans/tiny`) can be used to block airflow into problematic areas, but are not a substitute for proper door and firelock combinations. They are useful under blast doors that lead to space when opened.
- - Firelocks should be used at area boundaries over doors and windoors, but not windows. Firelocks can also be used to break up hallways at reasonable intervals.
- - Double firelocks are not permitted.
- - Maintenance access doors should never have firelocks placed over them.
- - Windows to secure areas or external areas should be reinforced. Windows in engine areas should be reinforced plasma glass.
- - Windows in high security areas, such as the brig, bridge, and head of staff offices, should be electrified by placing a wire node under the window.
- - Lights are to be used sparingly, they draw a significant amount of power.
- - Ensure door and windoor access is correctly set, this is now done by using access helpers.
-
- - Multiple accesses can be added to a door by placing multiple access helpers on the same tile. Be sure to pay attention so as to avoid mixing up `all` and `any` subtypes.
- - Old doors that use var edited access should be updated to use the correct access helper, and the var edit on the door should be cleaned.
- - See [`code\modules\mapping\access_helpers.dm`](../code/modules/mapping/access_helpers.dm) for a list of all access helpers.
- - Subtypes of `/obj/effect/mapping_helpers/airlock/access/any` lets anyone with ONE OF THE LISTED ACCESSES open the door.
- - Subtypes of `/obj/effect/mapping_helpers/airlock/access/all` requires ALL ACCESSES present to open the door.
-
- - Departments should be connected to maintenance through a back or side door. This lets players escape and allows antags to break in.
- - If this is not possible, departments should have extra entry and exit points.
- - Engine areas, or areas with a high probability of receiving explosions, should use reinforced flooring if appropriate.
- - 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 almost always 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
-
-- 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.
-
-- If you used regex to replace code during development of your code, post the regex in your PR for the benefit of future developers and downstream users.
-
-- All new var/proc names should use the American English spelling of words. This is for consistency with BYOND.
-
-- All mentions of the company "Nanotrasen" should be written as such - 'Nanotrasen'. Use of CamelCase (NanoTrasen) is no longer proper.
-
-- If you are making a PR that adds a config option to change existing behaviour, said config option must default to as close to as current behaviour as possible.
-
-### Dream Maker Quirks/Tricks
-
-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`).
-
-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 length(list))`
-
-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](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(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` contained ONLY swords, or only SUBTYPES of swords, then the above is inefficient. For example:
-
-```dm
-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)
- best_sword = S
-```
-
-The above code specifies a type for DM to filter by.
-
-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:
-
-```dm
-var/list/bag_of_swords = list(sword, sword, sword, sword)
-var/obj/item/sword/best_sword
-for(var/s in bag_of_swords)
- var/obj/item/sword/S = s
- if(!best_sword || S.damage > best_sword.damage)
- best_sword = S
-```
-
-Of course, if the list contains data of a mixed type then the above optimisation is DANGEROUS, as it will blindly typecast all data in the list as the
-specified type, even if it isn't really that type, causing runtime errors (AKA your shit won't work if this happens).
-
-#### Dot variable
-
-Like other languages in the C family, DM has a `.` or "Dot" operator, used for accessing variables/members/functions of an object instance. eg:
-
-```dm
-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?
-
-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.
-
-## Globals versus static
-
-DM has a var keyword, called global. This var keyword is for vars inside of types. For instance:
-
-```dm
-/mob
- var/global/thing = TRUE
-```
-
-This does NOT mean that you can access it everywhere like a global var. Instead, it means that that var will only exist once for all instances of its type, in this case that var will only exist once for all mobs - it's shared across everything in its type. (Much more like the keyword `static` in other languages like PHP/C++/C#/Java)
-
-Isn't that confusing?
-
-There is also an undocumented keyword called `static` that has the same behaviour as global but more correctly describes BYOND's behaviour. Therefore, we always use static instead of global where we need it, as it reduces suprise when reading BYOND code.
-
-### Global Vars
-
-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
-GLOBAL_VAR(my_global_here)
-```
-
-To access it:
-
-```dm
-GLOB.my_global_here = X
-```
-
-There are a few other defines that do other things. `GLOBAL_REAL` shouldn't be used unless you know exactly what you're doing.
-`GLOBAL_VAR_INIT` allows you to set an initial value on the var, like `GLOBAL_VAR_INIT(number_one, 1)`.
-`GLOBAL_LIST_INIT` allows you to define a list global var with an initial value. Etc.
-
-### GitHub Staff
-
-There are 3 roles on the GitHub, these are:
-
-- Headcoder
-- Commit Access
-- Review Team
-
-Each role inherits the lower role's responsibilities (IE: Headcoders also have commit access, and members of commit access are also part of the review team)
-
-`Headcoders` are the overarching "administrators" of the repository. People included in this role are:
-
-- [farie82](https://github.com/farie82)
-- [S34N](https://github.com/S34NW)
-- [SteelSlayer](https://github.com/SteelSlayer)
-
----
-
-`Commit Access` members have write access to the repository and can merge your PRs. People included in this role are:
-
-- [AffectedArc07](https://github.com/AffectedArc07)
-- [Burzah](https://github.com/Burzah)
-- [Charliminator](https://github.com/hal9000PR)
-- [Contrabang](https://github.com/Contrabang)
-- [DGamerL](https://github.com/DGamerL)
-- [lewcc](https://github.com/lewcc)
-
----
-
-`Review Team` members are people who are denoted as having reviews which can affect mergeability status. People included in this role are:
-
-- [Burzah](https://github.com/Burzah)
-- [Charliminator](https://github.com/hal9000PR)
-- [Contrabang](https://github.com/Contrabang)
-- [DGamerL](https://github.com/DGamerL)
-- [FunnyMan3595](https://github.com/FunnyMan3595)
-- [Henri215](https://github.com/Henri215)
-- [lewcc](https://github.com/lewcc)
-- [Sirryan2002](https://github.com/Sirryan2002)
-- [Warriorstar](https://github.com/warriorstar-orion)
-
----
-
-Full information on the GitHub contribution workflow & policy can be found at [https://www.paradisestation.org/dev/policy/](https://www.paradisestation.org/dev/policy/)
-
-### PR Status
-
-Status of your pull request will be communicated via PR labels. This includes:
-
-- `Status: Awaiting type assignment` - This will be displayed when your PR is awaiting an internal type assignment (for Fix, Balance, Tweak, etc)
-- `Status: Awaiting approval` - This will be displayed if your PR is waiting for approval from the specific party, be it Balance or Design. Fixes & Refactors should never have this label
-- `Status: Awaiting review` - This will be displayed when your PR has passed the design vote and is now waiting for someone in the review team to approve it
-- `Status: Awaiting merge` - Your PR is done and is waiting for someone with commit access to merge it. **Note: Your PR may be delayed if it is pending testmerge or in the mapping queue**
diff --git a/.github/DOWNLOADING.md b/.github/DOWNLOADING.md
deleted file mode 100644
index 5787b807775c..000000000000
--- a/.github/DOWNLOADING.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Info
-
-This document contains all the relevant information for downloading and running your own ParaCode server.
-
-## GETTING THE CODE
-
-The simplest way to obtain the code is using the github .zip feature.
-
-Click [here](https://github.com/ParadiseSS13/Paradise/archive/master.zip) to get the latest code as a .zip file, then unzip it to wherever you want.
-
-The more complicated and easier to update method is using git.
-You'll need to download git or some client from [here](http://git-scm.com/).
-When that's installed, right click in any folder and click on "Git Bash".
-When that opens, type in:
-
-```sh
- git clone https://github.com/ParadiseSS13/Paradise.git --depth 1
-```
-
-(hint: hold down ctrl and press insert to paste into git bash)
-
-This will take a while to download (it is the entire repo + history, not just a snapshot), but it provides an easier method for updating.
-
-## INSTALLATION
-
-First-time installation should be fairly straightforward.
-First, you'll need BYOND installed. We're going to assume you already did this
-
-This is a sourcecode-only release, so the next step is to compile the server files.
-Open paradise.dme by double-clicking it, open the Build menu, and click compile.
-This'll take a little while, and if everything's done right,
-you'll get a message like this:
-
-```sh
- saving paradise.dmb (DEBUG mode)
- paradise.dmb - 0 errors, 0 warnings
-```
-
-If you see any errors or warnings,
-something has gone wrong - possibly a corrupt download or the files extracted wrong,
-or a code issue on the main repo. Feel free to ask on Discord.
-
-Once that's done, open up the config folder.
-Firstly, you will want to copy `config.toml` from the example folder into the regular config folder.
-You'll want to edit the `url_configuration` section of `config.toml` to set `reboot_url` to your server location,
-so that all your players don't get disconnected at the end of each round.
-It's recommended you don't turn on the gamemodes with probability 0,
-as they have various issues and aren't currently being tested,
-so they may have unknown and bizarre bugs.
-
-You'll also want to edit the `admin_configuration` section of `config.toml` to remove the default admins and add your own.
-If you are connecting from localhost to your own test server, you should automatically be admin.
-"Head of Staff" is the highest level of access, and the other recommended admin levels for now are
-"Game Admin". The format is:
-
-```toml
-# Note that your ranks must be cased properly, usernames can be normal keys or ckey
-admin_assignments = [
- {ckey = "Admin1", rank = "Hosting Provider"},
- {ckey = "Admin2", rank = "Game Admin"},
-]
-```
-
-You can define your own ranks in the admin section of `config.toml`.
-
-If you want to run a production scale server, we highly recommend using database administrators.
-
-Finally, to start the server,
-run Dream Daemon and enter the path to your compiled paradise.dmb file.
-Make sure to set the port to the one you specified in the config.txt,
-and set the Security box to 'Trusted'.
-Then press GO and the server should start up and be ready to join.
-
-## Installation (Linux)
-
-The code is fully able to run on linux, however windows is still the recommended platform. The libraries we use for external functions (RUSTG and MILLA) require some extra dependencies.
-
-For debian, please download the latest RUSTG release from [https://github.com/ParadiseSS13/rust-g](https://github.com/ParadiseSS13/rust-g), run the following: `apt-get install libssl-dev:i386 pkg-config:i386 zlib1g-dev:i386`.
-
-After installing these packages, RUSTG should be able to build and function as intended. Build instructions are on the RUSTG page. We assume that if you are hosting on linux, you know what you are doing.
-
-Once you've built RUSTG, you can build MILLA similarly, just go into the `milla/` directory and run `cargo build --release --target=i686-unknown-linux-gnu`.
-
-## UPDATING
-
-If you used the zip method,
-you'll need to download the zip file again and unzip it somewhere else,
-and then copy the `config` and `data` folders over.
-
-If you used the git method, you simply need to type this in to git bash:
-
-```sh
- git pull --depth 1
-```
-
-When you have done this, you'll need to recompile the code, but then it should work fine and be up to date with the live server.
-
-## SQL Setup
-
-The SQL backend is required for storing character saves, preferences, administrative data, and many other things.
-We recommend running a database if your server is going to be used as more than just a local test server.
-Your SQL server details go in the `database_configuration` section of `config.toml`,
-and the SQL schema can be found in `SQL/paradise_schema.sql`.
-More detailed setup instructions are located on our wiki:
-https://www.paradisestation.org/wiki/index.php/Setting_up_the_Database
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f4dbad5742aa..5a0d21b14aac 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -25,7 +25,7 @@
### Declaration
-- [ ] I confirm that I either do not require [pre-approval](https://github.com/ParadiseSS13/Paradise/blob/master/CODE_OF_CONDUCT.md#types-of-changes-that-need-approval) for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.
+- [ ] I confirm that I either do not require [pre-approval](https://github.com/ParadiseSS13/Paradise/blob/master/docs/CODE_OF_CONDUCT.md#types-of-changes-that-need-approval) for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.
diff --git a/.github/SETTING_UP_GIT.md b/.github/SETTING_UP_GIT.md
deleted file mode 100644
index 4eca3d017cb2..000000000000
--- a/.github/SETTING_UP_GIT.md
+++ /dev/null
@@ -1,178 +0,0 @@
-# Setting Up Git (Windows/Mac Only)
-
-## Linux users
-
-You will want to install the `git` package from your distribution's respective
-package manager, whatever that may be.
-
----
-
-## Windows user
-## Git-SCM
-So you want to start contributing to Paradise? Where, well do you start?
-First off, you will need some tools to work with Git, the
-[Version Control System](https://en.wikipedia.org/wiki/Version_control)
-that we operate off. There are many choices out there for dealing with Git,
-including GitHub for Desktop- However, all of them are based off of the same
-command-line tools. As such, we advise, rather than using a GUI Program, you
-learn how to use the command line.
-
-An important note here is that the Git-SCM package for Windows includes
-some GUI-based software in it. This can be used for easily monitoring the
-state of your current branch, without downloading multiple different tools.
-
-## Installing
-The version of Git that we will be using is available at https://git-scm.com/.
-There should be four big orange buttons on the front page of the site when you
-go there. You will want to click on the one labeled "Downloads".
-![https://i.imgur.com/a6tX7IV.png](https://i.imgur.com/a6tX7IV.png)
-
-From here, you will want to select your operating system in this box.
-![https://i.imgur.com/Ee4wVsF.png](https://i.imgur.com/Ee4wVsF.png)
-
-Download the `setup` version, which should automatically start downloading when
-you select your operating system. Place it wherever you prefer to store your
-downloaded files. You should end up with a file that looks like
-`Git-version.number.here-32/64-bit.exe`. You should run this executable file.
-![https://i.imgur.com/jnbodzV.png](https://i.imgur.com/jnbodzV.png)
-
-Click Next, after reading the GNU-GPL license if you wish to do so, which will
-bring you to this screen.
-![https://i.imgur.com/cl9RodU.png](https://i.imgur.com/cl9RodU.png)
-
-Your default options may be different than this- You'll want to amend them to
-match this screenshot. (Future proofing: `Windows Explorer integration` partially
-selected, just for `Git Bash Here`, `Git LFS (Large File Support)` checked,
-and `Associate .git* configuration files with the default text editor` checked.
-All other boxes should be left unchecked). Click next. The next screen is very
-important.
-![https://i.imgur.com/6ii7aRO.png](https://i.imgur.com/6ii7aRO.png)
-
-The screen should say `Adjusting your PATH environment`. You will definitely want
-to select `Use Git from Git Bash only`- This is the safest option, and will not
-change your PATH variables at all. The disadvantage of this is that any future
-terminal emulators will be unable to use Git, as will the windows command prompt.
-
-Select `Use the OpenSSL library` for `Choosing HTTPS transport backend`.
-
-For Windows, you will also get the following screen:
-![https://i.imgur.com/jOZJWvO.png](https://i.imgur.com/jOZJWvO.png)
-
-You will want to select "Checkout Windows-style, commit Unix-style line endings"
-for working with our repository.
-
-If you get the choice between MinTTY and Windows' default console window, select
-MinTTY.
-![https://i.imgur.com/ZdZU0NB.png](https://i.imgur.com/ZdZU0NB.png)
-
-For `configuring extra options`, select `Enable file system caching` and
-`Enable Git Credential Manager`, leaving `Enable symbolic links` disabled.
-![https://i.imgur.com/6gspQAL.png](https://i.imgur.com/6gspQAL.png)
-
-From there, just hit `Install`.
-
-## Configuring
-
-We are going to configure Git for password-less SSH authentication for GitHub.
-There is a simple way to make this require that you instead just enter your
-password once upon opening a terminal for the first time running the program
-after a restart, which we will cover when it is applicable.
-
-This guide is mostly copy-pasted from
-`https://help.github.com/articles/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent/`,
- So you can view that for further instruction.
-
-As we are working with a completely fresh install of Git, we can skip over some
-steps. You will want to open Git Bash, then use the text below, changing the email
-to the one you use for GitHub.
-```bash
-ssh-keygen -t rsa -b 4096 -C "your_email@example.com"
-```
-This will create a new SSH private/public key, using the email as a label.
-```bash
-Generating public/private rsa key pair.
-```
-
-When you're prompted to `Enter a file in which to save the key`, you will want
-to just press enter, to accept the default file location. We will rename the key
-later.
-
-Remember that I mentioned you could either do password-less SSH authentication,
-or require a password one time per session? This is the point at which you
-choose this, with the `Enter passphrase (empty for no passphrase):` prompt. If
-you do not care about having a password on the private key (which you should
-never ever distribute beyond your own computers on secure mediums), you can just
-hit enter twice to completely skip setting a password on the key. Otherwise, enter
-your desired password.
-
-You will now want to go to your home directory `C:/Users/YourName` and open the
-`.ssh` folder. You should see two files in here, `id_rsa` and `id_rsa.pub`. Rename
-them both to `your_github_username_rsa` and `your_github_username_rsa.pub`.
-You'll then want to create two new folders, `public` and `private`. Put the `.pub`
-file into `public`, then put the other one into `private`.
-
-As we are not using GitHub for Desktop, we will need to now setup SSH-agent.
-Start by typing the command `vim ~/.bashrc`. This will open the Vi IMproved text
-editor, which is one of the ones that comes with Git by default. It is entirely
-built into the shell, and the interface will take a bit of getting used to.
-You will want to hit `i`, to go into `Insert Mode`. This will produce a blinking
-cursor on the top section, what you would expect for a text editor. You may now
-type what you like, or right click and paste to paste from your clipboard.
-Paste the following into the file:
-```bash
-#!/bin/bash
-
-SSH_ENV=$HOME/.ssh/environment
-
-function add_keys {
- ssh-add ~/.ssh/private/*
-}
-
-function start_agent {
- echo "Initializing new SSH agent..."
- /usr/bin/ssh-agent | sed 's/^echo/#echo' > ${SSH_ENV}
- echo Suceeded
- chmod 600 ${SSH_ENV}
- . ${SSH_ENV} > /dev/null
- add_keys;
-}
-
-# Source SSH settings, if applicable
-
-if [ -f "${SSH_ENV}" ]; then
- . ${SSH_ENV} > /dev/null
- ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
- start_agent;
- }
-else
- start_agent;
-fi
-```
-
-Hit escape, then hit `:` followed by `wq` and enter. This is, to Vi, Insert Mode
-to command mode (`ESC`), Command start `:`, and `w`rite `q`uit `ENTER` submit.
-
-Restart Git Bash- If you set a password on your SSH key, it will ask it for you
-when it starts. Otherwise, it should just say `Identity added: ...`. You can see
-all of the identities you have by running `ssh-add -l` in the shell at any time.
-
-You will now want to follow the instructions in this article to add the SSH key
-to your GitHub profile:
-https://help.github.com/articles/adding-a-new-ssh-key-to-your-github-account/
-
-Obviously, for the first step, use the key we renamed and put into the `public`
-folder, not the one in the `private` folder.
-
-To test that this all worked, you should run `ssh -T git@github.com`. If there
-are any warning messages about authenticity, type `yes` followed by enter. You
-should then see:
-```
-Hi username! You've successfully authenticated, but GitHub does not
-provide shell access.
-```
-
-If not, follow the troubleshooting directions in this article:
-https://help.github.com/articles/error-permission-denied-publickey/
-
-
-Congratulations, you have now setup Git for Windows.
\ No newline at end of file
diff --git a/.github/TICK_ORDER.md b/.github/TICK_ORDER.md
deleted file mode 100644
index c6e27741e2c8..000000000000
--- a/.github/TICK_ORDER.md
+++ /dev/null
@@ -1,21 +0,0 @@
-The byond tick proceeds as follows:
-1. procs sleeping via walk() are resumed (I don't know why these are first)
-
-2. normal sleeping procs are resumed, in the order they went to sleep in the first place, this is where the MC wakes up and processes subsystems. a consequence of this is that the MC almost never resumes before other sleeping procs, because it only goes to sleep for 1 tick 99% of the time, and 99% of procs either go to sleep for less time than the MC (which guarantees that they entered the sleep queue earlier when its time to wake up) and/or were called synchronously from the MC's execution, almost all of the time the MC is the last sleeping proc to resume in any given tick. This is good because it means the MC can account for the cost of previous resuming procs in the tick, and minimizes overtime.
-
-3. control is passed to byond after all of our code's procs stop execution for this tick
-
-4. a few small things happen in byond internals
-
-5. SendMaps is called for this tick, which processes the game state for all clients connected to the game and handles sending them changes
-in appearances within their view range. This is expensive and takes up a significant portion of our tick, about 0.45% per connected player
-as of 3/20/2022. meaning that with 50 players, 22.5% of our tick is being used up by just SendMaps, after all of our code has stopped executing. That's only the average across all rounds, for most high-pop rounds it can look like 0.6% of the tick per player, which is 30% for 50 players.
-
-6. After SendMaps ends, client verbs sent to the server are executed, and its the last major step before the next tick begins.
-During the course of the tick, a client can send a command to the server saying that they have executed any verb. The actual code defined
-for that /verb/name() proc isnt executed until this point, and the way the MC is designed makes this especially likely to make verbs
-"overrun" the bounds of the tick they executed in, stopping the other tick from starting and thus delaying the MC firing in that tick.
-
-The master controller can derive how much of the tick was used in: procs executing before it woke up (because of world.tick_usage), and SendMaps (because of world.map_cpu, since this is a running average you cant derive the tick spent on maptick on any particular tick). It cannot derive how much of the tick was used for sleeping procs resuming after the MC ran, or for verbs executing after SendMaps.
-
-It is for these reasons why you should heavily limit processing done in verbs, while procs resuming after the MC are rare, verbs are not, and are much more likely to cause overtime since they're literally at the end of the tick. If you make a verb, try to offload any expensive work to the beginning of the next tick via a verb management subsystem.
diff --git a/.github/workflows/devdocs.yml b/.github/workflows/devdocs.yml
new file mode 100644
index 000000000000..515d6f5bee7a
--- /dev/null
+++ b/.github/workflows/devdocs.yml
@@ -0,0 +1,29 @@
+name: Deploy Devdocs
+
+on:
+ push:
+ paths:
+ - 'docs/**'
+
+jobs:
+ build_and_deploy:
+ runs-on: ubuntu-latest
+ name: Build and Deploy
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Build docs
+ run: |
+ python -m pip install mkdocs==1.6.0 mkdocs-material==9.5.31 mkdocs-github-admonitions-plugin==0.0.2
+ python -m mkdocs build
+
+ - name: Deploy docs
+ uses: Azure/static-web-apps-deploy@1a947af9992250f3bc2e68ad0754c0b0c11566c9
+ with:
+ azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN }}
+ action: 'upload'
+ app_location: 'site'
+ skip_app_build: true
+ skip_api_build: true
+ env:
+ SKIP_DEPLOY_ON_MISSING_SECRETS: true
diff --git a/.gitignore b/.gitignore
index 6f6c2dd9c369..e1a2a1e9325b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,6 @@ $RECYCLE.BIN
# Rust output.
/milla/target/*
+
+# mkdocs output.
+site
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 43c12ed66f8a..000000000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Important
-
-The Paradise GitHub is not exempt from Paradise Station community and server rules, especially rules 0, 1, and 4. An inability to abide by the rules on the GitHub will result in disciplinary action up to, or including, a repository ban.
-
-## General Expectations
-
-### PR Discussion
-
-Comments on Pull Requests should remain relevant to the PR in question and not derail discussions.
-
-Under no circumstances are users to be attacked for their ideas or contributions. While constructive criticism is encouraged, toxicity or general mean-spirited behaviour will not be tolerated. All participants on a given PR or issue are expected to be civil. Failure to do so will result in disciplinary action.
-
-"Merge-nagging" or similar behaviour is not acceptable. Comments of this nature will result in warnings or an outright ban from the repository depending on general behaviour.
-
-If you exhibit behaviour that's considered to be a net-negative to the community (offensive commentary, repeat violations, constant nagging, personal attacks, etc.), you may be banned from other Paradise services (Discord, forums, server, wiki, etc.)
-
-Headcoders reserve the right to permanently revoke access from the repository if your behaviour is considered to be a net negative.
-
-### PR Approval/Objection Info
-
-Headcoders (who will take into account the votes from the relevant teams) have the final say on Pull Requests. While thumbsup/thumbsdown reaction ratios are generally taken into account, they do not dictate whether or not a PR will be merged.
-
-After a twenty four hour minimum waiting period, Pull Requests can be merged once they receive approval from the relevant team. An exception is made for refactors and fixes, which may be merged by any member with commit access' discretion with no waiting period.
-
-While normally provided, voting team members are not obligated to publicly state their objections to a Pull Request. Attacking or berating a voting team member over an objection will not be tolerated. Additionally, whining over the closure of a PR, the existence of an objection, or similar behaviour, will not be tolerated.
-
-Headcoders may close your PR at their discretion if your PR history has little focus on improving repo maintainability (ie: making nothing but 20 balance or feature PRs). Likewise, balance PRs may be closed if the PR author has little-to-no time played on the server. This is to ensure balance changes are made by people actually in-touch with the server atmosphere.
-
-### PR Expectations
-
-Contributors may only have a maximum of **2** feature or balance Pull Requests open at any given time. Any additional Pull Requests beyond this limit will be closed at the discretion of the Headcoders. The Headcoders may grant an exemption to this limit on a case-by-case basis, as the need arises.
-
-All Pull Requests are expected to be tested prior to submission. If a submitted Pull Request fails to pass CI checks, the likelihood of it being merged will be significantly lower. If you can't take the time to compile/test your Pull Request, do not expect a warm reception.
-
-Barring highly specific circumstances (such as single line changes, submissions from advanced users, or changes to repo documentation), we will not accept Pull Requests utilising the web editor.
-
-Pull Requests regarding heavy-handed nerfs, particularly immediately after said mechanic was used, will be tagged with `I ded pls nerf`. A bad experience with a particular mechanic is not a justification for nerfing it.
-
-Reactionary revert PRs are not tolerated under any circumstances. Posting a revert immediately after a Pull Request is merged will result in a repoban.
-
-It is expected that contributors discuss larger changes on the [Paradise Station forums](https://www.paradisestation.org/forum/91-code-discussion/), [GitHub discussions tab](https://github.com/ParadiseSS13/Paradise/discussions), or the [Discord project-discussion forum](https://discord.com/channels/145533722026967040/1110966752898207824) prior to starting work on a Pull Request. The amount of time spent on any given Pull Request is not relevant. Repo staff are not responsible for contributors wasting their time creating features nobody asked for. Be sure to inform the corresponding teams about the forum post or discussion.
-
-For changes to content listed below, contributors **must** obtain approval from a headcoder or a member of either the balance, design, mapping, or sprite team (depending on which teams are relevant to the changes) before opening their Pull Request. This approval must be displayed in the Pull Request description body in the form of a screenshot. The Headcoders may grant an exemption to this requirement on a case-by-case basis, as the need arises.
-
-
-
-
-> [!IMPORTANT]
-> ### Currently, changes to the following types of content requires pre-approval:
-> - **Security content (excluding fixes, code improvement, refactors, sprites, and mapping changes)**
-> - **Antagonist content (excluding fixes, code improvement, refactors, sprites, and mapping changes)**
-> - **Species content (excluding fixes, code improvement, and refactors)**
-> - **Large changes (for example PRs that touch multiple systems, many files, many lines of code)**
-> - **Changes that might be controversial**
-> - **Changes with wide-ranging balance or design implications**
diff --git a/README.md b/README.md
index 4976414fc67e..666b84e5f44f 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@
> [!TIP]
> Want to contribute for the first time but unsure where to start?
> Join our Discord and check out the [#coding_chat](https://discord.com/channels/145533722026967040/145700319819464704) channel for helpful links and advice!
-> Alternatively, have a look at our community maintained [Guide to Contributing](https://paradisestation.org/wiki/index.php?title=Guide_to_Contributing)
+> Alternatively, have a look at our community maintained [Getting Started Guide](./docs/contributing/getting_started.md)
# Useful Documents and Links
@@ -64,15 +64,15 @@
This reference site by the creators of BYOND details information on the DM language, the syntax used, functionality of native procs, and a lot more. This is always useful to have on hand when contributing.
-- ### [Autodocumentation Guide](.github/AUTODOC_GUIDE.md)
+- ### [Autodocumentation Guide](./docs/references/autodoc.md)
This guide shows you how to leave code comments that comply with "autodocumentation", a system designed to make everyone's lives easier when reading or reviewing code!
-- ### [Code of Conduct](./CODE_OF_CONDUCT.md)
+- ### [Code of Conduct](./docs/CODE_OF_CONDUCT.md)
All contributors are expected to read our Code of Conduct before they take part in our community.
-- ### [Contribution Guide](.github/CONTRIBUTING.md)
+- ### [Contribution Guide](./docs/CONTRIBUTING.md)
Not sure how to take part and contribute? This guide gives an overview of how to make comments, pull requests, and open issues.
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
index 17b1b003e196..fc8f789a5413 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
@@ -517,10 +517,7 @@
},
/area/ruin/space/abandoned_engi_sat)
"oG" = (
-/obj/structure/closet{
- icon_state = "atmos_wardrobe";
- name = "atmospherics wardrobe"
- },
+/obj/structure/closet/wardrobe/atmospherics_yellow/empty,
/obj/machinery/light_switch{
dir = 1;
pixel_y = -24;
@@ -570,11 +567,7 @@
},
/area/ruin/space/abandoned_engi_sat)
"pX" = (
-/obj/structure/closet{
- icon_state = "eng_secure";
- open_door_sprite = "eng_secure_door";
- name = "engineer's locker"
- },
+/obj/structure/closet/secure_closet/engineering_personal/empty,
/turf/simulated/floor/wood/airless,
/area/ruin/space/abandoned_engi_sat)
"qu" = (
@@ -903,11 +896,7 @@
icon_state = "tube-broken";
status = 2
},
-/obj/structure/closet{
- icon_state = "fire";
- name = "fire-safety closet";
- desc = "It's a storage unit for fire-fighting supplies."
- },
+/obj/structure/closet/firecloset,
/turf/simulated/floor/plasteel{
icon_state = "bot";
dir = 1
@@ -1436,13 +1425,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/abandoned_engi_sat)
"Yz" = (
-/obj/structure/closet{
- icon_state = "emergency";
- open_door_sprite = "emergency_door";
- name = "emergency closet";
- desc = "It's a storage unit for emergency breathmasks and o2 tanks.";
- opened = 1
- },
+/obj/structure/closet/emcloset,
/turf/simulated/floor/plasteel{
icon_state = "bot";
dir = 1
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
index 2db26731792d..f7d730106c91 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
@@ -349,7 +349,7 @@
},
/obj/structure/rack,
/obj/item/melee/baton/cattleprod,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm
index c12b99680ace..e6788fd772a3 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm
@@ -633,7 +633,7 @@
/obj/structure/rack{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/ruin/space/powered/casino/security)
"pB" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
index 893390b5251e..4b7c7a3edcda 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -860,7 +860,7 @@
/area/ruin/space/deepstorage)
"cU" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
@@ -1079,7 +1079,7 @@
/area/ruin/space/deepstorage)
"eI" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
@@ -1211,7 +1211,7 @@
dir = 1
},
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "podfloor"
@@ -1259,7 +1259,7 @@
dir = 4
},
/obj/machinery/light/small,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
@@ -1462,7 +1462,7 @@
dir = 4
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "whiteredcorner";
dir = 1
@@ -1495,7 +1495,7 @@
/area/ruin/space/deepstorage)
"hK" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/poster/contraband/power{
pixel_x = -32
},
@@ -1619,7 +1619,7 @@
/obj/structure/window/reinforced/polarized{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
@@ -1742,7 +1742,7 @@
/area/ruin/space/deepstorage)
"jq" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/ruin/space/deepstorage)
"jr" = (
@@ -1946,7 +1946,7 @@
/obj/structure/window/reinforced/polarized{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/cobweb,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -1981,7 +1981,7 @@
"kG" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "podfloor"
@@ -2093,7 +2093,7 @@
dir = 1
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
@@ -2111,12 +2111,12 @@
dir = 6
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"lL" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 1
},
@@ -2539,7 +2539,7 @@
dir = 4
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "darkredcorners";
dir = 4
@@ -2593,7 +2593,7 @@
/obj/structure/railing/corner,
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
@@ -2757,7 +2757,7 @@
/area/ruin/space/deepstorage)
"qa" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 8
},
@@ -2860,7 +2860,7 @@
/area/ruin/space/deepstorage)
"qQ" = (
/obj/structure/closet/crate/can,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -3011,7 +3011,7 @@
/area/ruin/space/deepstorage)
"rQ" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
@@ -3019,7 +3019,7 @@
/area/ruin/space/deepstorage)
"rS" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -3145,7 +3145,7 @@
/obj/structure/window/reinforced/polarized{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
@@ -3153,7 +3153,7 @@
/area/ruin/space/deepstorage)
"sY" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "podfloor"
@@ -3169,7 +3169,7 @@
/area/ruin/space/unpowered)
"ta" = (
/obj/structure/table/glass,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "whiteredcorner"
},
@@ -3348,7 +3348,7 @@
/area/ruin/space/deepstorage)
"tH" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -3409,7 +3409,7 @@
/area/ruin/space/deepstorage)
"tZ" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -4657,7 +4657,7 @@
/area/ruin/space/deepstorage)
"Cl" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 10;
@@ -4770,7 +4770,7 @@
"CZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "black"
@@ -5233,7 +5233,7 @@
/area/ruin/space/unpowered)
"GE" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
@@ -5465,7 +5465,7 @@
/area/ruin/space/deepstorage)
"IJ" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -5957,7 +5957,7 @@
"Mb" = (
/obj/structure/railing,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"Mf" = (
@@ -6166,7 +6166,7 @@
/area/ruin/space/deepstorage)
"Ob" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "black"
@@ -6283,7 +6283,7 @@
/obj/structure/window/reinforced/polarized{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 10;
@@ -6412,7 +6412,7 @@
/area/ruin/space/deepstorage)
"PU" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 4
},
@@ -6596,7 +6596,7 @@
dir = 10
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/ruin/space/deepstorage)
"Rc" = (
@@ -7108,7 +7108,7 @@
/area/ruin/space/unpowered)
"UM" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "darkredcorners";
dir = 1
@@ -7529,7 +7529,7 @@
dir = 1
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
@@ -7614,7 +7614,7 @@
/area/ruin/space/deepstorage)
"XN" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
@@ -7905,7 +7905,7 @@
"ZS" = (
/obj/effect/decal/cleanable/cobweb2,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/basalt,
/area/ruin/space/deepstorage)
"ZU" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
index 1e380195b61d..24116f28c9cb 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
@@ -442,7 +442,7 @@
/area/ruin/space/moonbase19)
"bh" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "caution";
dir = 4
@@ -527,7 +527,7 @@
dir = 4
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/catwalk,
/area/ruin/space/moonbase19)
"bv" = (
@@ -615,7 +615,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "caution"
@@ -678,7 +678,7 @@
/area/ruin/space/moonbase19)
"bU" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "dark"
@@ -1043,7 +1043,7 @@
dir = 1
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/catwalk,
/area/ruin/space/moonbase19)
"dg" = (
@@ -1329,7 +1329,7 @@
/area/ruin/space/moonbase19)
"eb" = (
/obj/structure/closet/crate/can,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor";
temperature = 273.15
@@ -2165,7 +2165,7 @@
"gX" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/cobweb2,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "caution"
@@ -3083,7 +3083,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/grille/broken,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/ruin/space/moonbase19)
"jy" = (
@@ -3316,7 +3316,7 @@
/area/ruin/space/moonbase19)
"kf" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "caution"
@@ -3783,7 +3783,7 @@
/area/ruin/space/moonbase19)
"mb" = (
/obj/structure/closet/cabinet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/carpet,
/area/ruin/space/moonbase19)
"md" = (
@@ -4416,7 +4416,7 @@
},
/obj/structure/rack,
/obj/structure/window/basic,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/ruin/space/moonbase19)
"ot" = (
@@ -4509,7 +4509,7 @@
/obj/structure/window/reinforced{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/ruin/space/moonbase19)
"oM" = (
@@ -4753,7 +4753,7 @@
"pL" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/cobweb2,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/ruin/space/moonbase19)
"pN" = (
@@ -6485,7 +6485,7 @@
/area/ruin/space/moonbase19)
"xw" = (
/obj/structure/closet/crate/can,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/ruin/space/moonbase19)
"xz" = (
@@ -6864,7 +6864,7 @@
"yZ" = (
/obj/structure/closet/cabinet,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/carpet,
/area/ruin/space/moonbase19)
"zh" = (
@@ -7084,7 +7084,7 @@
"zW" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/ruin/space/moonbase19)
"Aa" = (
@@ -7698,7 +7698,7 @@
"CH" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/cobweb2,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/ruin/space/moonbase19)
"CI" = (
@@ -7893,7 +7893,7 @@
/area/ruin/space/moonbase19)
"Dw" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -7962,7 +7962,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/ruin/space/moonbase19)
"DO" = (
@@ -8370,7 +8370,7 @@
/area/ruin/space/moonbase19)
"FC" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "caution";
dir = 10
@@ -8424,7 +8424,7 @@
/area/ruin/space/moonbase19)
"FT" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whitecorner"
@@ -8877,7 +8877,7 @@
/area/ruin/space/moonbase19)
"HV" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "yellowsiding";
@@ -10248,7 +10248,7 @@
/area/ruin/space/moonbase19)
"Of" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/ruin/space/moonbase19)
"Og" = (
@@ -10839,7 +10839,7 @@
/obj/structure/sign/pods{
pixel_y = 32
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/catwalk,
/area/ruin/space/moonbase19)
"QG" = (
@@ -11045,7 +11045,7 @@
/area/ruin/space/moonbase19)
"Rv" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -11858,7 +11858,7 @@
"Vo" = (
/obj/structure/closet/crate/can,
/obj/effect/decal/cleanable/cobweb2,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "escape"
@@ -12160,7 +12160,7 @@
/turf/simulated/floor/catwalk,
/area/ruin/space/moonbase19)
"WH" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/table,
/turf/simulated/floor/plasteel{
icon_state = "whitecorner";
@@ -12502,7 +12502,7 @@
/area/ruin/space/moonbase19)
"XX" = (
/obj/structure/closet/crate/can,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "cafeteria"
@@ -12830,7 +12830,7 @@
},
/area/ruin/space/moonbase19)
"Zp" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/table,
/turf/simulated/floor/plasteel{
dir = 10;
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm b/_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm
index 73ad23907b0c..cded6ef453ce 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm
@@ -451,7 +451,6 @@
"Ub" = (
/obj/item/reagent_containers/glass/bucket,
/obj/item/mop,
-/obj/item/malfbroom,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm b/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm
index 3feac9757b90..d1560fdd8189 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm
@@ -5,6 +5,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/machinery/floodlight,
/turf/simulated/floor/bluegrid{
name = "Mainframe Base";
nitrogen = 400;
@@ -218,11 +219,6 @@
"dD" = (
/obj/structure/closet/crate,
/obj/item/multitool,
-/obj/machinery/camera{
- c_tag = "Telecomms Entrance South";
- dir = 1;
- network = list("Telecomms")
- },
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/tele)
"dR" = (
@@ -268,6 +264,9 @@
},
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/computer)
+"eA" = (
+/turf/simulated/wall/indestructible/riveted,
+/area/ruin/space/telecomms/foyer)
"eE" = (
/obj/machinery/mecha_part_fabricator,
/turf/simulated/floor/plasteel{
@@ -438,7 +437,7 @@
pixel_x = 29;
pixel_y = 0
},
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms)
"hq" = (
@@ -699,7 +698,7 @@
/area/space/nearstation)
"mN" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms)
"mO" = (
@@ -710,7 +709,7 @@
pixel_x = 0
},
/obj/structure/grille,
-/turf/simulated/floor/plating/airless,
+/turf/simulated/floor/catwalk/airless,
/area/space/nearstation)
"mZ" = (
/obj/machinery/door/airlock/maintenance_hatch{
@@ -718,6 +717,10 @@
locked = 1
},
/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor{
+ id = "dvorak";
+ id_tag = "dvorak"
+ },
/turf/simulated/floor/plasteel{
icon_state = "vault";
dir = 5
@@ -1010,7 +1013,7 @@
/obj/machinery/light_switch{
pixel_y = -28
},
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms)
"qO" = (
@@ -1211,7 +1214,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/computer)
"tW" = (
-/obj/machinery/r_n_d/server/upgraded,
+/obj/machinery/power/grounding_rod,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "vault";
@@ -1512,6 +1515,10 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor{
+ id = "dvorak";
+ id_tag = "dvorak"
+ },
/turf/simulated/floor/plasteel{
icon_state = "vault";
dir = 5
@@ -1645,17 +1652,6 @@
/obj/item/clothing/glasses/night,
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/tele)
-"zg" = (
-/obj/machinery/atmospherics/pipe/simple/visible{
- dir = 4
- },
-/obj/machinery/camera{
- c_tag = "Telecomms Power Control";
- dir = 2;
- network = list("Telecomms")
- },
-/turf/simulated/floor/catwalk,
-/area/ruin/space/telecomms/powercontrol)
"zk" = (
/obj/structure/lattice,
/obj/effect/abstract/cheese_trap,
@@ -1962,6 +1958,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
+/obj/machinery/computer/nonfunctional,
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/foyer)
"Dy" = (
@@ -2345,7 +2342,7 @@
/area/space/nearstation)
"Jb" = (
/obj/effect/spawner/random_spawners/fungus_maybe,
-/turf/simulated/wall/r_wall,
+/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/telecomms/foyer)
"Jm" = (
/obj/machinery/computer/sm_monitor{
@@ -2478,6 +2475,9 @@
temperature = 80
},
/area/ruin/space/telecomms/chamber)
+"Lk" = (
+/turf/simulated/wall/indestructible/riveted,
+/area/ruin/space/telecomms/tele)
"Ln" = (
/obj/structure/window/reinforced{
dir = 4
@@ -2507,6 +2507,17 @@
temperature = 80
},
/area/ruin/space/telecomms/chamber)
+"LC" = (
+/obj/machinery/doppler_array,
+/turf/simulated/floor/plasteel{
+ dir = 1;
+ icon_state = "vault";
+ name = "Mainframe floor";
+ nitrogen = 400;
+ oxygen = 0;
+ temperature = 80
+ },
+/area/ruin/space/telecomms/chamber)
"LK" = (
/obj/structure/cable{
d1 = 4;
@@ -2563,6 +2574,7 @@
/obj/machinery/light/small{
dir = 1
},
+/obj/effect/abstract/bot_trap,
/turf/simulated/floor/plasteel{
icon_state = "vault";
dir = 5
@@ -2745,6 +2757,10 @@
req_access_txt = "61"
},
/obj/machinery/door/firedoor,
+/obj/machinery/door/poddoor/preopen{
+ id = "dvorak";
+ id_tag = "dvorak"
+ },
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/foyer)
"PZ" = (
@@ -2804,6 +2820,12 @@
"Qx" = (
/turf/simulated/floor/catwalk,
/area/ruin/space/telecomms/powercontrol)
+"Qz" = (
+/obj/machinery/door_control{
+ id = "dvorak"
+ },
+/turf/simulated/wall/indestructible/riveted,
+/area/ruin/space/telecomms/chamber)
"QN" = (
/obj/structure/window/reinforced{
dir = 4
@@ -2928,7 +2950,7 @@
/obj/item/stock_parts/micro_laser/high,
/obj/item/stock_parts/micro_laser/high,
/obj/item/stock_parts/micro_laser/high,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/matter_bin,
/obj/item/stock_parts/matter_bin,
@@ -3106,6 +3128,15 @@
temperature = 80
},
/area/ruin/space/telecomms/chamber)
+"Vl" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/grille,
+/turf/simulated/floor/catwalk/airless,
+/area/space/nearstation)
"Vm" = (
/obj/machinery/light/small,
/obj/machinery/light_switch{
@@ -3209,9 +3240,6 @@
dir = 1;
level = 1
},
-/obj/item/radio/intercom{
- pixel_y = 25
- },
/turf/simulated/floor/plasteel,
/area/ruin/space/telecomms/foyer)
"Xf" = (
@@ -6389,7 +6417,7 @@ ik
Sv
lW
Ga
-Ga
+Vl
mh
Lp
Lp
@@ -7123,7 +7151,7 @@ yo
FC
FC
SA
-zg
+Bn
lr
Qx
PA
@@ -7210,7 +7238,7 @@ Zu
EO
yr
Xf
-PQ
+Lk
oG
PQ
PQ
@@ -7296,13 +7324,13 @@ bJ
Tw
eE
il
-tW
+LC
EM
Zu
uM
IL
uM
-uM
+eA
yJ
BZ
PQ
@@ -7394,7 +7422,7 @@ Zu
Qa
nD
eJ
-uM
+eA
DV
Uw
PQ
@@ -7578,7 +7606,7 @@ Zu
WO
nD
Ri
-uM
+eA
xv
Uw
UF
@@ -7758,11 +7786,11 @@ gG
pa
il
qe
-Zu
+Qz
Xb
oz
Ri
-uM
+eA
Rt
Uw
UF
@@ -7854,7 +7882,7 @@ Zu
Gt
GQ
cj
-uM
+eA
Yr
VO
PQ
@@ -7946,7 +7974,7 @@ Zu
ao
nD
Bf
-uM
+eA
iE
AY
PQ
@@ -8017,11 +8045,11 @@ yo
Ed
xa
ik
-ik
+iD
+ux
+ux
+ux
ux
-Hr
-Hr
-Hr
To
ME
Zj
@@ -8038,7 +8066,7 @@ Zu
uM
yD
uM
-uM
+eA
HR
De
PQ
@@ -8130,7 +8158,7 @@ Zu
EO
yr
Xf
-PQ
+Lk
oW
PQ
PQ
@@ -8202,12 +8230,12 @@ Dy
xa
ik
ux
-Hr
+ux
Aj
-Hr
-Hr
-Hr
-Hr
+ux
+ux
+ux
+ux
Zu
fq
EM
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
index a2c98e391d9d..4a04d9c2a6d9 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
@@ -1029,7 +1029,7 @@
/area/ruin/space/derelict/bridge)
"cG" = (
/obj/structure/closet/crate/can,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/item/trash/can,
/obj/item/trash/semki,
/turf/simulated/floor/plasteel{
@@ -1557,7 +1557,7 @@
/area/ruin/space/derelict/arrival)
"dT" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/jackboots,
@@ -3434,7 +3434,7 @@
/area/ruin/space/derelict/arrival)
"iA" = (
/obj/structure/closet/crate/can,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/paper/crumpled{
info = "This note has been crossed out so many times it's hard to make out its contents.
Katerina,
Your eyes are like diamonds,
Forged in the very fire of Cygni-A.
My heart yearns for you,
For your soft beauty
Fuckfucknothat'sbad.
Your voice is like liquid gold,
Smothering me in its delicate contours.
Never before had I known,
The touch,
The touch!
The touch of an angel's voice
note to self: stick to science, poetry is not my forte.";
name = "love poem"
@@ -3561,7 +3561,7 @@
/area/ruin/space/derelict/arrival)
"iS" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/poster/contraband/communist_state{
pixel_x = -32
},
@@ -4822,7 +4822,7 @@
/area/ruin/space/derelict/arrival)
"lL" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
@@ -4894,7 +4894,7 @@
/area/ruin/space/derelict/hallway/primary)
"lV" = (
/obj/structure/closet/crate/can,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/spot{
dir = 4
},
@@ -4989,7 +4989,7 @@
"ml" = (
/obj/effect/landmark/damageturf,
/obj/structure/grille/broken,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/airless,
/area/ruin/space/derelict/hallway/primary)
"mn" = (
@@ -6261,7 +6261,7 @@
/area/ruin/space/derelict/crew_quarters)
"pE" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/spider/stickyweb,
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/crew_quarters)
@@ -7128,7 +7128,7 @@
/area/ruin/space/derelict/arrival)
"rJ" = (
/obj/structure/closet/crate/can,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/item/trash/popcorn,
/obj/item/trash/semki,
/obj/item/paper/crumpled{
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
index f03faedabeda..243674063756 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
@@ -680,7 +680,7 @@
/obj/structure/sign/poster/contraband/smoke{
pixel_x = -32
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "caution"
@@ -709,7 +709,7 @@
/obj/structure/sign/cargo{
pixel_x = -32
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "titanium";
dir = 4
diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm
index ebbcc6a197e5..be524dc396c6 100644
--- a/_maps/map_files/generic/Lavaland.dmm
+++ b/_maps/map_files/generic/Lavaland.dmm
@@ -4408,7 +4408,7 @@
/obj/structure/closet/cabinet,
/obj/item/trash/can,
/obj/item/trash/pistachios,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/clothing/mask/balaclava,
/turf/simulated/floor/wood,
/area/mine/laborcamp)
@@ -5213,7 +5213,7 @@
/area/lavaland/surface/outdoors)
"te" = (
/obj/structure/closet/crate/can,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/cigbutt,
/turf/simulated/floor/plasteel{
icon_state = "darkredyellowfull"
@@ -5636,7 +5636,7 @@
dir = 4
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/stack/cable_coil,
/turf/simulated/floor/plating,
/area/mine/laborcamp)
@@ -8645,7 +8645,7 @@
"Ow" = (
/obj/effect/turf_decal/delivery/hollow,
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/mine/outpost/production)
@@ -8917,7 +8917,7 @@
/area/lavaland/surface/outdoors)
"Qa" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/stack/marker_beacon/ten,
/obj/item/book/random,
/turf/simulated/floor/plating,
@@ -9743,7 +9743,7 @@
dir = 8;
id = "mining_internal"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/mine/outpost/production)
"VN" = (
@@ -10351,7 +10351,7 @@
/area/lavaland/surface/outdoors)
"YP" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/mounted/frame/apc_frame,
/turf/simulated/floor/plating,
/area/mine/laborcamp)
diff --git a/_maps/map_files/shuttles/emergency_cramped.dmm b/_maps/map_files/shuttles/emergency_cramped.dmm
index e1810925cb69..c96a6d1ab9b6 100644
--- a/_maps/map_files/shuttles/emergency_cramped.dmm
+++ b/_maps/map_files/shuttles/emergency_cramped.dmm
@@ -80,7 +80,7 @@
"r" = (
/obj/effect/turf_decal/delivery/hollow,
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/spot{
dir = 4
},
@@ -95,7 +95,7 @@
"u" = (
/obj/effect/turf_decal/delivery/hollow,
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/shuttle/escape)
"w" = (
diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index ad4700d9ec2d..94831feeea42 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -17,7 +17,7 @@
},
/area/station/science/hallway)
"aad" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
@@ -4495,7 +4495,7 @@
/obj/item/storage/secure/safe{
pixel_y = 25
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"aqb" = (
@@ -6633,7 +6633,7 @@
/area/station/security/processing)
"awD" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"awE" = (
@@ -7092,7 +7092,7 @@
dir = 1
},
/obj/item/storage/fancy/donut_box,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"axY" = (
@@ -7126,7 +7126,7 @@
/obj/structure/rack{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"ayf" = (
@@ -8463,7 +8463,7 @@
},
/area/station/legal/magistrate)
"aCh" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"aCi" = (
@@ -8603,7 +8603,7 @@
/area/station/hallway/primary/fore)
"aCz" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"aCB" = (
@@ -8909,7 +8909,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"aDq" = (
@@ -9673,7 +9673,7 @@
/obj/structure/sign/poster/contraband/random{
pixel_x = -32
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aFN" = (
@@ -9782,7 +9782,7 @@
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"aGb" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aGc" = (
@@ -9800,7 +9800,7 @@
"aGe" = (
/obj/structure/table,
/obj/item/restraints/handcuffs/cable,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aGi" = (
@@ -10073,7 +10073,7 @@
/area/station/public/arcade)
"aHb" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aHc" = (
@@ -10148,13 +10148,9 @@
/obj/item/melee/baseball_bat,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
-"aHs" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint)
"aHt" = (
/obj/structure/table/wood/poker,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/carpet,
/area/station/maintenance/fpmaint)
"aHu" = (
@@ -10614,7 +10610,7 @@
/area/station/maintenance/fpmaint)
"aIV" = (
/obj/effect/spawner/random_spawners/blood_often,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/wood,
/area/station/maintenance/fpmaint)
"aIW" = (
@@ -10914,7 +10910,7 @@
/area/station/maintenance/fpmaint)
"aKa" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint2)
"aKb" = (
@@ -10926,7 +10922,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aKd" = (
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint2)
"aKf" = (
@@ -11193,7 +11189,7 @@
icon_state = "0-4"
},
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
@@ -11223,7 +11219,7 @@
"aKY" = (
/obj/structure/closet,
/obj/item/coin/iron,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aKZ" = (
@@ -11246,7 +11242,7 @@
/area/shuttle/pod_1)
"aLc" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aLd" = (
@@ -11411,7 +11407,7 @@
/area/station/service/mime)
"aLB" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint2)
"aLC" = (
@@ -11468,7 +11464,7 @@
/area/station/maintenance/fpmaint)
"aLM" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aLN" = (
@@ -11704,24 +11700,14 @@
/area/station/maintenance/fpmaint2)
"aMi" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"aMj" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fore)
"aMl" = (
/obj/structure/table,
/obj/item/food/donut,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"aMo" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
"aMp" = (
/obj/item/radio/intercom{
name = "east bump";
@@ -12006,11 +11992,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"aNh" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
"aNi" = (
/mob/living/simple_animal/mouse,
/turf/simulated/floor/plating,
@@ -12128,11 +12109,6 @@
},
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_2)
-"aNA" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint2)
"aNB" = (
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/plating,
@@ -12160,11 +12136,6 @@
/obj/machinery/atmospherics/binary/valve,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint2)
-"aNF" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint2)
"aNH" = (
/obj/structure/chair/stool{
dir = 8
@@ -12581,7 +12552,7 @@
"aOX" = (
/obj/structure/lattice,
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance,
/turf/space,
/area/space/nearstation)
"aOY" = (
@@ -12678,7 +12649,7 @@
"aPu" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "showroomfloor"
},
@@ -12933,7 +12904,7 @@
/area/station/maintenance/fpmaint)
"aQj" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aQk" = (
@@ -13038,7 +13009,7 @@
/area/station/public/dorms)
"aQC" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aQD" = (
@@ -13073,7 +13044,7 @@
},
/area/station/public/dorms)
"aQI" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aQJ" = (
@@ -13445,7 +13416,7 @@
/obj/structure/table,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -13922,7 +13893,7 @@
/obj/effect/turf_decal/delivery/blue/hollow,
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "darkbluefull"
},
@@ -14198,7 +14169,7 @@
"aTZ" = (
/obj/structure/closet,
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aUa" = (
@@ -14207,11 +14178,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
-"aUb" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fsmaint)
"aUc" = (
/obj/machinery/door/poddoor{
id_tag = "maint2"
@@ -14230,7 +14196,7 @@
/obj/structure/closet,
/obj/item/reagent_containers/drinks/cans/badminbrew,
/obj/effect/landmark/spawner/nukedisc_respawn,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aUf" = (
@@ -14517,7 +14483,7 @@
/obj/structure/chair/stool{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aUV" = (
@@ -15668,7 +15634,7 @@
/area/station/maintenance/fpmaint)
"aYb" = (
/obj/item/tank/internals/emergency_oxygen,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
@@ -17086,7 +17052,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"bcB" = (
@@ -18903,7 +18869,7 @@
/area/station/public/storage/office)
"bhG" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "darkbluefull"
},
@@ -19156,7 +19122,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"bip" = (
@@ -21755,7 +21721,7 @@
/obj/structure/rack{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/cobweb_left_frequent,
/turf/simulated/floor/plating,
@@ -22623,7 +22589,7 @@
"brF" = (
/obj/structure/rack,
/obj/item/melee/baton/cattleprod,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"brG" = (
@@ -22753,7 +22719,7 @@
layer = 2.9
},
/obj/item/extinguisher,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bsd" = (
@@ -22976,7 +22942,7 @@
/obj/structure/rack{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/storage/secure/safe{
pixel_y = 25
},
@@ -23047,7 +23013,7 @@
/area/station/supply/lobby)
"bsZ" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/maintenance/port)
@@ -23419,7 +23385,7 @@
dir = 8;
layer = 2.9
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"buc" = (
@@ -24149,7 +24115,7 @@
/area/station/maintenance/port)
"bwz" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bwA" = (
@@ -24182,7 +24148,7 @@
/area/station/hallway/secondary/exit)
"bwK" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bwL" = (
@@ -24884,7 +24850,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -25420,7 +25386,7 @@
/area/space)
"bCj" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/port)
"bCk" = (
@@ -26047,7 +26013,7 @@
/obj/structure/rack,
/obj/effect/spawner/random_spawners/cobweb_left_frequent,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"bER" = (
@@ -26094,7 +26060,7 @@
pixel_x = 4;
pixel_y = 3
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bFi" = (
@@ -28003,7 +27969,7 @@
icon_state = "4-8"
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bMg" = (
@@ -31121,7 +31087,7 @@
/area/station/command/office/rd)
"bYk" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint2)
"bYm" = (
@@ -32426,7 +32392,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/turf/simulated/floor/plating,
@@ -33591,7 +33557,7 @@
/area/station/medical/cryo)
"cho" = (
/obj/structure/closet/firecloset,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"chp" = (
@@ -34066,7 +34032,7 @@
/area/station/maintenance/port)
"cjf" = (
/obj/structure/table/glass,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 1
},
@@ -34802,7 +34768,7 @@
/obj/structure/rack{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/securearea{
pixel_x = -32
},
@@ -34970,7 +34936,7 @@
/area/station/science/storage)
"cmH" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cmJ" = (
@@ -36435,7 +36401,7 @@
/area/station/science/toxins/mixing)
"csw" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"csB" = (
@@ -36478,7 +36444,7 @@
/area/station/science/server/coldroom)
"csK" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"csL" = (
@@ -39003,7 +38969,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/controlroom)
"cAU" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint2)
"cAW" = (
@@ -39641,7 +39607,7 @@
/area/station/maintenance/aft)
"cDo" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"cDs" = (
@@ -40358,7 +40324,7 @@
dir = 8;
layer = 2.9
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_left_frequent,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
@@ -41733,7 +41699,7 @@
/area/station/maintenance/asmaint)
"cKF" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"cKK" = (
@@ -41749,12 +41715,12 @@
},
/area/station/maintenance/aft)
"cKO" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cKQ" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint2)
"cKR" = (
@@ -41828,7 +41794,7 @@
/area/station/science/test_chamber)
"cLc" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint2)
"cLd" = (
@@ -42168,7 +42134,7 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 9
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cMt" = (
@@ -43226,7 +43192,7 @@
"cQs" = (
/obj/item/wrench,
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint2)
"cQv" = (
@@ -43249,11 +43215,6 @@
icon_state = "purple"
},
/area/station/science/hallway)
-"cQC" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"cQE" = (
/turf/simulated/floor/plasteel,
/area/station/command/office/ce)
@@ -43608,7 +43569,7 @@
d2 = 8;
icon_state = "2-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/purple,
/obj/structure/cable{
d1 = 2;
@@ -43639,7 +43600,7 @@
/area/station/maintenance/port)
"cRE" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
@@ -44279,7 +44240,7 @@
/area/station/engineering/control)
"cTB" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cTD" = (
@@ -46250,7 +46211,7 @@
/area/station/maintenance/aft)
"dbg" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint2)
"dbi" = (
@@ -46272,7 +46233,7 @@
/obj/structure/closet/crate/freezer,
/obj/item/organ/internal/heart/vox,
/obj/item/organ/internal/liver/vox,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/organ/internal/heart/vox,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -46280,7 +46241,7 @@
/area/station/maintenance/asmaint)
"dbq" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
@@ -46334,7 +46295,7 @@
"dbD" = (
/obj/structure/table,
/obj/item/extinguisher,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
@@ -47150,7 +47111,7 @@
dir = 10
},
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"der" = (
@@ -47411,11 +47372,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/solar_maintenance/aft_starboard)
-"dfc" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint2)
"dfg" = (
/obj/machinery/photocopier,
/turf/simulated/floor/wood,
@@ -47828,13 +47784,13 @@
/area/station/engineering/atmos)
"dgX" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/roller,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"dgY" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/food/donkpocket,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
@@ -47867,7 +47823,7 @@
/area/station/turret_protected/aisat/interior)
"dhk" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/item/toy/minimeteor,
/obj/item/poster/random_contraband,
/turf/simulated/floor/plating,
@@ -49333,14 +49289,9 @@
/area/station/maintenance/aft)
"dmq" = (
/obj/structure/disposalpipe/segment,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
-"dmr" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft)
"dms" = (
/obj/structure/cable{
d1 = 1;
@@ -50659,9 +50610,6 @@
name = "west bump";
pixel_x = -28
},
-/obj/machinery/requests_console/directional/south{
- pixel_x = 30
- },
/turf/simulated/floor/bluegrid,
/area/station/turret_protected/ai)
"drV" = (
@@ -51113,7 +51061,7 @@
/area/station/public/arcade)
"dwT" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint2)
@@ -51143,7 +51091,7 @@
/area/station/medical/morgue)
"dxN" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"dxQ" = (
@@ -52321,7 +52269,7 @@
pixel_x = 2;
pixel_y = 2
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"eaU" = (
@@ -52741,7 +52689,7 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 5
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint2)
"ehp" = (
@@ -53316,7 +53264,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint2)
"euQ" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/closet,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
@@ -53782,7 +53730,7 @@
dir = 4
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_frequent,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
@@ -53888,7 +53836,7 @@
/area/station/security/prison/cell_block/A)
"eIN" = (
/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/eftpos/register,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
@@ -54043,12 +53991,12 @@
},
/area/station/engineering/smes)
"eNn" = (
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"eNs" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fpmaint)
"eND" = (
@@ -54088,19 +54036,13 @@
/area/station/public/dorms)
"eOI" = (
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/effect/decal/cleanable/dirt,
/obj/item/wirerod,
/obj/item/wirecutters,
/obj/item/crowbar/large,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"eOZ" = (
@@ -54308,7 +54250,7 @@
"eUk" = (
/obj/structure/closet/crate/freezer,
/obj/effect/spawner/lootdrop/three_course_meal,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
"eUq" = (
@@ -55235,7 +55177,7 @@
"fof" = (
/obj/structure/rack,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"fog" = (
@@ -55340,7 +55282,7 @@
"fqt" = (
/obj/item/storage/bag/plasticbag,
/obj/item/trash/fried_vox,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"fqw" = (
@@ -55874,7 +55816,7 @@
/area/station/maintenance/asmaint2)
"fDd" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"fDx" = (
@@ -56045,14 +55987,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
-"fHs" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plasteel{
- icon_state = "showroomfloor"
- },
-/area/station/maintenance/fpmaint)
"fHB" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
/obj/structure/cable{
@@ -56311,7 +56245,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"fPq" = (
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/poster/official/random{
pixel_y = 32
},
@@ -56582,7 +56516,7 @@
/area/station/hallway/primary/port/west)
"fVy" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/item/storage/fancy/cigarettes/dromedaryco,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
@@ -56633,7 +56567,6 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/storage/box/monkeycubes,
/turf/simulated/floor/plasteel,
/area/station/science/genetics)
"fXp" = (
@@ -57390,7 +57323,7 @@
"gsd" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -57497,7 +57430,7 @@
/area/station/turret_protected/ai_upload)
"gsY" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 8
},
@@ -57506,7 +57439,7 @@
/area/station/maintenance/aft)
"gta" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"gto" = (
@@ -57561,7 +57494,7 @@
/obj/item/reagent_containers/condiment/peppermill{
pixel_x = -7
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/wood,
/area/station/maintenance/aft)
"guY" = (
@@ -57864,7 +57797,7 @@
/area/station/command/office/captain)
"gEj" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/poster/contraband/random{
pixel_x = -32
},
@@ -58929,7 +58862,7 @@
pixel_y = 30
},
/obj/structure/table_frame,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -59824,7 +59757,7 @@
/turf/simulated/floor/grass,
/area/station/security/permabrig)
"hAG" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint2)
@@ -59838,7 +59771,7 @@
/area/station/maintenance/aft)
"hBu" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/robotanalyzer,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
@@ -60745,7 +60678,7 @@
/area/station/engineering/control)
"hYf" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
@@ -60778,7 +60711,7 @@
"iac" = (
/obj/structure/table,
/obj/item/wrench,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"iag" = (
@@ -60945,7 +60878,7 @@
/area/station/maintenance/asmaint)
"ieW" = (
/obj/structure/closet/firecloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint2)
"ifp" = (
@@ -62894,7 +62827,7 @@
},
/area/station/medical/medbay2)
"jgm" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/table,
/turf/simulated/floor/plating/airless,
/area/station/science/toxins/test)
@@ -63102,7 +63035,7 @@
"jmU" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"jnc" = (
@@ -63120,7 +63053,7 @@
},
/obj/item/tank/internals/emergency_oxygen,
/obj/item/clothing/mask/breath,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"jnh" = (
@@ -63635,7 +63568,7 @@
/area/station/maintenance/port)
"jxj" = (
/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
@@ -64273,7 +64206,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"jPx" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
@@ -64536,7 +64469,7 @@
/area/station/science/toxins/test)
"jUM" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint2)
"jUZ" = (
@@ -64731,7 +64664,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 6
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/alarm/directional/west,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
@@ -65010,7 +64943,7 @@
/obj/structure/chair/sofa/right{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"khU" = (
@@ -65611,7 +65544,7 @@
/area/station/maintenance/disposal)
"kwO" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"kwP" = (
@@ -66092,7 +66025,7 @@
/area/station/public/dorms)
"kIa" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint2)
"kIP" = (
@@ -66510,7 +66443,7 @@
/obj/structure/rack{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/cable{
d1 = 2;
d2 = 4;
@@ -67275,7 +67208,7 @@
},
/area/station/security/permabrig)
"llx" = (
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -67718,7 +67651,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/cobweb_left_frequent,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/item/coin/silver{
pixel_x = 5;
pixel_y = -8
@@ -68211,7 +68144,7 @@
/obj/effect/decal/cleanable/blood/xeno,
/obj/structure/closet/crate/freezer,
/obj/item/organ/internal/lungs/vox,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -68432,24 +68365,11 @@
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
"lNE" = (
-/obj/structure/rack{
- dir = 8;
- layer = 2.9
- },
-/obj/item/storage/box/monkeycubes/wolpincubes,
-/obj/item/storage/box/monkeycubes/nian_worme_cubes,
/obj/machinery/light,
-/obj/item/storage/box/monkeycubes/farwacubes{
- pixel_x = -6
- },
-/obj/item/storage/box/monkeycubes/neaeracubes,
-/obj/item/storage/box/monkeycubes/stokcubes{
- pixel_x = 4;
- pixel_y = -4
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
+/obj/structure/closet/secure_closet/genetics,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -69153,7 +69073,7 @@
/area/station/medical/cryo)
"meB" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/item/tank/internals/oxygen/yellow,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
@@ -69707,7 +69627,7 @@
"mtx" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/asmaint)
"muh" = (
@@ -69915,7 +69835,7 @@
/area/station/security/permabrig)
"mAq" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -69937,7 +69857,7 @@
/area/station/command/office/captain)
"mBE" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 8
},
@@ -70073,7 +69993,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"mEQ" = (
@@ -71420,7 +71340,7 @@
"nsu" = (
/obj/structure/closet/wardrobe/pjs,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
@@ -71430,7 +71350,7 @@
/turf/simulated/wall/r_wall,
/area/station/medical/virology)
"nsP" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/closet/firecloset,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
@@ -71662,11 +71582,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint2)
-"nyh" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/eight,
-/turf/simulated/floor/plating,
-/area/station/maintenance/aft)
"nyC" = (
/obj/structure/rack,
/turf/simulated/floor/plating,
@@ -72651,7 +72566,7 @@
/area/station/science/test_chamber)
"nXK" = (
/obj/structure/closet/firecloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"nYg" = (
@@ -73601,7 +73516,7 @@
/area/station/science/server/coldroom)
"orE" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/blood_maybe,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
@@ -73856,7 +73771,7 @@
/turf/simulated/floor/plating/airless,
/area/station/maintenance/asmaint)
"oxe" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/airless,
/area/station/maintenance/fpmaint2)
"oxf" = (
@@ -73873,7 +73788,7 @@
/area/station/science/hallway)
"oxy" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/engineering{
pixel_x = 29
},
@@ -74939,7 +74854,7 @@
/area/station/maintenance/fsmaint)
"oVs" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_frequent,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint2)
@@ -75170,7 +75085,7 @@
"paW" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table_frame,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/poster/official/healthy{
pixel_x = 31
},
@@ -75612,7 +75527,7 @@
"pon" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint2)
"pop" = (
@@ -75864,7 +75779,7 @@
/obj/structure/rack{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
@@ -75968,7 +75883,7 @@
/turf/simulated/floor/engine/co2,
/area/station/engineering/atmos)
"pxz" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/grille_often,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
@@ -76968,7 +76883,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
/obj/item/storage/box/bodybags,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -77467,7 +77382,7 @@
/area/station/security/permabrig)
"qjC" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
@@ -78164,7 +78079,7 @@
/area/station/maintenance/apmaint)
"qwM" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_frequent,
/obj/machinery/light/small{
dir = 1
@@ -78284,7 +78199,7 @@
/area/station/hallway/secondary/exit)
"qAg" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "cmo"
},
@@ -78595,7 +78510,7 @@
/area/station/science/toxins/test)
"qES" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel/airless,
/area/station/science/toxins/test)
"qFg" = (
@@ -79438,7 +79353,7 @@
/area/station/maintenance/asmaint)
"raL" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/soap,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
@@ -79988,7 +79903,7 @@
/area/station/maintenance/aft)
"rmI" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/cable{
d1 = 4;
d2 = 8;
@@ -80014,7 +79929,7 @@
/obj/structure/rack{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint2)
"rnd" = (
@@ -80171,11 +80086,6 @@
icon_state = "freezerfloor"
},
/area/station/public/toilet/unisex)
-"rrg" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/apmaint)
"rrh" = (
/obj/machinery/light/small,
/obj/structure/disposalpipe/segment/corner{
@@ -80223,7 +80133,7 @@
/obj/structure/rack{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_frequent,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
@@ -81275,7 +81185,7 @@
/area/station/hallway/primary/port/east)
"rVK" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"rVV" = (
@@ -81376,7 +81286,7 @@
/area/station/science/rnd)
"rYt" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint2)
"rYY" = (
@@ -81650,7 +81560,7 @@
/area/station/hallway/primary/port/east)
"sfc" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/door/window/classic/normal{
dir = 1;
name = "Kitchen"
@@ -81904,7 +81814,7 @@
req_one_access = list(33,41);
req_one_access_txt = "33;41"
},
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance,
/mob/living/simple_animal/hostile/scarybat,
/turf/simulated/floor/plasteel{
icon_state = "vault"
@@ -81982,7 +81892,7 @@
"spr" = (
/obj/structure/table,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"spy" = (
@@ -82138,16 +82048,6 @@
icon_state = "bar"
},
/area/station/security/permabrig)
-"ssr" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/apmaint2)
"ssF" = (
/obj/structure/closet/secure_closet/hop,
/obj/machinery/camera/autoname{
@@ -82161,7 +82061,7 @@
},
/area/station/public/toilet/unisex)
"ssL" = (
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/item/clothing/gloves/color/blue,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -82469,7 +82369,7 @@
/obj/structure/rack{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"sDp" = (
@@ -82765,7 +82665,7 @@
},
/area/station/command/office/ce)
"sKQ" = (
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/poster/official/help_others{
pixel_y = 31
},
@@ -83215,13 +83115,6 @@
icon_state = "grimy"
},
/area/station/command/office/hop)
-"sXJ" = (
-/obj/structure/rack{
- dir = 1
- },
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/apmaint)
"sXR" = (
/obj/structure/cable{
d1 = 1;
@@ -83326,17 +83219,14 @@
dir = 1
},
/obj/item/stack/spacecash/c10,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plasteel,
/area/station/maintenance/port)
"sZg" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"sZh" = (
@@ -83741,11 +83631,6 @@
icon_state = "dark"
},
/area/station/engineering/control)
-"tkT" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/apmaint)
"tkW" = (
/obj/machinery/light/small{
dir = 1
@@ -83987,7 +83872,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"tue" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/landmark/damageturf,
/turf/simulated/floor/wood,
/area/station/maintenance/asmaint)
@@ -84567,7 +84452,7 @@
/area/station/science/toxins/mixing)
"tHO" = (
/obj/structure/chair/sofa/bench/right,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
@@ -85144,7 +85029,7 @@
/obj/item/crowbar,
/obj/effect/landmark/spawner/nukedisc_respawn,
/obj/effect/spawner/random_spawners/cobweb_left_frequent,
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/wood,
/area/station/maintenance/apmaint)
"tUH" = (
@@ -85177,10 +85062,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/aft)
-"tVF" = (
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"tVK" = (
/obj/structure/cable{
d2 = 4;
@@ -85462,7 +85343,7 @@
/obj/structure/bed,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/body_bag,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -85519,7 +85400,7 @@
/area/station/command/bridge)
"ucE" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"ucL" = (
@@ -85602,7 +85483,7 @@
/area/station/maintenance/fsmaint)
"ueT" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/storage/toolbox/mechanical,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
@@ -85630,7 +85511,7 @@
"ufC" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"ugC" = (
@@ -85748,7 +85629,7 @@
/area/station/maintenance/asmaint2)
"ukQ" = (
/obj/structure/closet/body_bag,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"ukV" = (
@@ -86028,7 +85909,7 @@
},
/area/station/engineering/smes)
"urU" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/disposalpipe/segment/corner{
dir = 2
},
@@ -86556,7 +86437,7 @@
dir = 1
},
/obj/item/storage/toolbox/mechanical,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
@@ -87459,7 +87340,7 @@
/area/station/supply/sorting)
"vic" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 1
},
@@ -88123,7 +88004,7 @@
/area/station/security/permabrig)
"vxz" = (
/obj/structure/closet/crate/can,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/item/reagent_containers/syringe/insulin,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/syringe,
@@ -88266,7 +88147,7 @@
"vBC" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"vBG" = (
@@ -88757,7 +88638,7 @@
/area/station/science/lobby)
"vOy" = (
/obj/effect/spawner/random_spawners/blood_maybe,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
@@ -89113,7 +88994,7 @@
},
/area/station/science/genetics)
"vZV" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/table,
/obj/item/cartridge/signal/toxins,
/turf/simulated/floor/plating,
@@ -89467,7 +89348,7 @@
/obj/structure/rack{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/disposalpipe/segment/corner{
dir = 2
},
@@ -89574,7 +89455,7 @@
/area/station/security/permabrig)
"wkQ" = (
/obj/effect/spawner/random_spawners/blood_maybe,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
@@ -90006,7 +89887,7 @@
"wvD" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/landmark/burnturf,
/obj/effect/landmark/spawner/nukedisc_respawn,
/turf/simulated/floor/plating,
@@ -90170,6 +90051,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
+"wBd" = (
+/obj/machinery/requests_console/directional/north,
+/turf/simulated/floor/bluegrid,
+/area/station/turret_protected/ai)
"wBy" = (
/obj/machinery/light{
dir = 4
@@ -90204,7 +90089,7 @@
"wCk" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whitegreen"
@@ -90615,7 +90500,7 @@
/area/station/maintenance/asmaint)
"wLu" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/restroom{
pixel_y = 31
},
@@ -90811,7 +90696,7 @@
/area/station/aisat/service)
"wQI" = (
/obj/structure/closet/crate/internals,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint2)
"wQK" = (
@@ -90968,7 +90853,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"wXg" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
@@ -91003,7 +90888,7 @@
},
/area/station/medical/chemistry)
"wYs" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
},
@@ -91381,7 +91266,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
/obj/item/clothing/gloves/color/latex,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"xig" = (
@@ -91600,7 +91485,7 @@
/area/station/maintenance/assembly_line)
"xmq" = (
/obj/structure/closet/crate/internals,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"xmr" = (
@@ -92229,7 +92114,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
"xBC" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/engineering{
pixel_x = -27
},
@@ -93582,7 +93467,7 @@
/area/station/maintenance/aft)
"ygC" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"ygM" = (
@@ -93674,7 +93559,7 @@
/area/station/engineering/hardsuitstorage)
"yhY" = (
/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/effect/landmark/damageturf,
/turf/simulated/floor/wood,
/area/station/maintenance/apmaint2)
@@ -93737,11 +93622,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
-"yjF" = (
-/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"yjH" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -106399,7 +106279,7 @@ aaa
aaa
aaa
loS
-aNA
+aLB
aKN
aGn
oan
@@ -108194,7 +108074,7 @@ aED
aFR
aHg
aIw
-aNF
+aKa
aGn
aLu
jwb
@@ -108451,7 +108331,7 @@ uQE
aFT
aHi
aRA
-aNF
+aKa
aGn
fRo
aLj
@@ -108510,7 +108390,7 @@ coL
cgQ
gta
gta
-rrg
+gta
cgQ
bCf
bOd
@@ -108754,7 +108634,7 @@ bET
lRv
aaa
gzN
-tkT
+csw
cwI
cqK
qjC
@@ -110309,7 +110189,7 @@ cgQ
yjC
coL
tGO
-sXJ
+sCW
hoJ
jVv
rqF
@@ -111797,8 +111677,8 @@ blG
aHl
aLu
aHS
-aNA
-aNA
+aLB
+aLB
aGn
aKb
aHl
@@ -115137,7 +115017,7 @@ aMA
aLF
aMT
aOo
-fHs
+aPu
aMA
wnG
hNI
@@ -116416,7 +116296,7 @@ axb
axb
aMA
aGj
-aHs
+aGb
aIT
aJO
aOr
@@ -117784,7 +117664,7 @@ bKD
cLi
cLi
tEU
-ssr
+mAq
kkk
rne
bUv
@@ -119052,7 +118932,7 @@ cwl
wFR
fnV
cwz
-sXJ
+sCW
sCW
cgQ
dCM
@@ -124386,7 +124266,7 @@ aGy
ayV
ayA
axe
-aMj
+aCz
sZa
pVr
mSN
@@ -131337,7 +131217,7 @@ bbw
bdm
bfz
aOI
-aMo
+aMi
bbI
bdT
bdM
@@ -131458,7 +131338,7 @@ drf
drf
drf
drf
-dry
+wBd
drO
drI
dry
@@ -134420,7 +134300,7 @@ mxZ
knB
aMz
aLc
-aNh
+aHb
aQL
mvU
ttT
@@ -135024,7 +134904,7 @@ chf
rmI
cep
cYj
-dmr
+csK
klf
aaa
aaa
@@ -135696,7 +135576,7 @@ aGT
aGT
aGX
aHb
-aNh
+aHb
aOG
aGX
aHb
@@ -136032,7 +135912,7 @@ rAi
xRP
chf
ebS
-nyh
+cTB
jFf
chf
cyJ
@@ -136216,7 +136096,7 @@ aMz
aOF
aOG
aGX
-aUb
+aLc
aGY
aGX
aWb
@@ -136981,7 +136861,7 @@ aGX
aGY
aQI
aGX
-aMo
+aMi
aRJ
aTe
xRy
@@ -137043,8 +136923,8 @@ dHU
sQt
cQk
lbZ
-dfc
-dfc
+bYk
+bYk
bGG
bGG
xBC
@@ -138066,7 +137946,7 @@ dcK
bGG
cuS
qmw
-dfc
+bYk
dcW
cpH
bGG
@@ -138522,8 +138402,8 @@ aGY
aGY
aGY
aKV
-aMo
-aMo
+aMi
+aMi
aGY
aMz
aQO
@@ -140156,7 +140036,7 @@ ioE
rHJ
yfJ
oJr
-cQC
+cKF
dhR
csL
ciY
@@ -140935,7 +140815,7 @@ ciY
ciY
ciY
ciY
-tVF
+eNn
csL
ciY
ciY
@@ -141188,7 +141068,7 @@ kMc
kdc
csL
djP
-cQC
+cKF
fof
dlz
dSu
@@ -142211,7 +142091,7 @@ uXA
uXA
wUT
ciY
-cQC
+cKF
csL
qdO
ycI
@@ -142468,7 +142348,7 @@ ciY
ciY
oUq
ciY
-cQC
+cKF
csL
dhR
ycI
@@ -144258,7 +144138,7 @@ ciY
dHc
pOY
ciY
-yjF
+cDo
ePu
ugC
ciY
@@ -144483,7 +144363,7 @@ oUq
ciY
ciY
cKF
-tVF
+eNn
csL
ciY
hdW
@@ -144510,7 +144390,7 @@ iDg
cga
fGT
nBI
-tVF
+eNn
ciY
ylP
ciY
@@ -144733,7 +144613,7 @@ gww
csL
rng
csL
-tVF
+eNn
ciY
fVy
dbX
@@ -144748,7 +144628,7 @@ qQj
fUW
cgs
cgs
-tVF
+eNn
csL
uzh
rSS
@@ -145249,7 +145129,7 @@ mZs
oUq
csL
dbX
-tVF
+eNn
ciY
ciY
cgs
@@ -145803,7 +145683,7 @@ csL
ciY
dbi
csL
-tVF
+eNn
ciY
ciY
faP
@@ -147084,7 +146964,7 @@ cpE
cQw
ciY
ePu
-tVF
+eNn
ciY
ciY
vMe
@@ -147849,7 +147729,7 @@ cga
ciY
pbc
ctq
-tVF
+eNn
kpR
raH
eba
@@ -148101,7 +147981,7 @@ ece
kBI
eNn
ciY
-tVF
+eNn
iZV
ciY
mQX
@@ -148361,7 +148241,7 @@ ciY
euQ
ePu
jgA
-tVF
+eNn
gmU
jPx
gmU
@@ -148881,7 +148761,7 @@ ciY
ciY
ciY
ciY
-cQC
+cKF
meB
ciY
aab
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index d159c958bb5f..79ee60ed51b7 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -240,7 +240,7 @@
/area/station/maintenance/disposal/external/north)
"abH" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/starboard)
"abJ" = (
@@ -435,7 +435,7 @@
/area/station/turret_protected/ai)
"acK" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -1925,7 +1925,7 @@
dir = 1
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/north)
"alW" = (
@@ -2108,7 +2108,7 @@
dir = 8
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/north)
"ang" = (
@@ -2328,7 +2328,7 @@
/area/station/security/permabrig)
"aoE" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/northeast)
"aoF" = (
@@ -2507,7 +2507,7 @@
/area/station/turret_protected/aisat/interior)
"apu" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -2689,9 +2689,9 @@
/area/station/security/prisonlockers)
"arc" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fpmaint)
"ard" = (
@@ -2806,7 +2806,7 @@
/area/station/maintenance/disposal/northeast)
"arQ" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/structure/cable/orange{
d1 = 4;
d2 = 8;
@@ -3009,8 +3009,8 @@
/area/station/security/prisonlockers)
"atB" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fore2)
"atC" = (
@@ -3409,7 +3409,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"avS" = (
@@ -3422,7 +3422,7 @@
},
/area/station/maintenance/fore2)
"awc" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fore2)
"awd" = (
@@ -4233,7 +4233,7 @@
/area/station/science/rnd)
"aCb" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
@@ -5907,7 +5907,7 @@
/area/station/telecomms/computer)
"aPc" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"aPd" = (
@@ -6210,7 +6210,7 @@
/area/station/security/permabrig)
"aQR" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
"aQS" = (
@@ -6676,7 +6676,7 @@
/area/station/public/arcade)
"aUi" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/camera{
c_tag = "Fore Asteroid Maintenance APCs 2";
dir = 5
@@ -6828,7 +6828,7 @@
/area/station/maintenance/disposal/north)
"aUU" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -7432,7 +7432,7 @@
/area/station/turret_protected/aisat/interior)
"aYC" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port2)
"aYD" = (
@@ -7916,7 +7916,7 @@
/area/station/hallway/primary/central/north)
"bbv" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/hallway/primary/central/north)
"bbw" = (
@@ -7926,7 +7926,7 @@
/area/station/maintenance/disposal/south)
"bbC" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/hallway/primary/port/north)
"bbH" = (
@@ -8011,7 +8011,7 @@
"bcf" = (
/obj/structure/closet/crate,
/obj/item/pickaxe/mini,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"bck" = (
@@ -10670,7 +10670,7 @@
dir = 4
},
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fore)
"bqR" = (
@@ -11086,7 +11086,7 @@
/area/station/medical/medbay)
"bsA" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fpmaint)
"bsB" = (
@@ -12630,7 +12630,7 @@
/area/station/security/processing)
"bzh" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fpmaint)
"bzj" = (
@@ -12640,7 +12640,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/east)
"bzq" = (
@@ -15747,7 +15747,7 @@
/area/station/command/bridge)
"bMX" = (
/obj/structure/closet/wardrobe/mixed,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bMY" = (
@@ -15927,13 +15927,8 @@
},
/turf/simulated/floor/plating,
/area/station/hallway/primary/starboard/south)
-"bNL" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating/asteroid/ancient,
-/area/station/maintenance/starboard)
"bNM" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fore)
"bNT" = (
@@ -16038,7 +16033,7 @@
dir = 4
},
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -18148,7 +18143,7 @@
},
/obj/effect/decal/cleanable/cobweb,
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"bWl" = (
@@ -18219,7 +18214,7 @@
/area/station/maintenance/port)
"bWG" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port)
"bWJ" = (
@@ -18438,7 +18433,7 @@
"bXu" = (
/obj/structure/rack,
/obj/item/pickaxe/emergency,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"bXv" = (
@@ -18521,7 +18516,7 @@
dir = 1
},
/obj/effect/spawner/random_spawners/dirt_frequent,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/item/paper/crumpled,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -18759,11 +18754,11 @@
/area/station/maintenance/gambling_den)
"bZt" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/gambling_den)
"bZv" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/closet/crate,
/turf/simulated/floor/plating,
/area/station/maintenance/storage)
@@ -19074,7 +19069,7 @@
/area/station/maintenance/fore2)
"ccV" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fore2)
"ccW" = (
@@ -19210,7 +19205,7 @@
/area/station/security/prisonershuttle)
"cdO" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"cdP" = (
@@ -19507,8 +19502,8 @@
/area/station/public/quantum/docking)
"cfH" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/asmaint)
"cfN" = (
@@ -20307,11 +20302,8 @@
"ckQ" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=ArrivalsMiddle";
- location = "ArrivalsWest2";
- name = "navigation beacon (Arrivals-West2)"
- },
-/obj/structure/disposalpipe/segment{
- dir = 4
+ location = "ArrivalsWest";
+ name = "navigation beacon (Arrivals-West)"
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -20789,7 +20781,7 @@
/obj/structure/closet/emcloset,
/obj/machinery/light/small,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"coO" = (
@@ -20825,7 +20817,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"coX" = (
@@ -20882,7 +20874,7 @@
"cpo" = (
/obj/structure/table,
/obj/effect/spawner/random_spawners/dirt_frequent,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -20992,7 +20984,7 @@
/area/station/maintenance/port)
"cpQ" = (
/obj/structure/closet/firecloset/full,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -21190,7 +21182,7 @@
/area/station/hallway/secondary/exit)
"crC" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 10;
@@ -21401,7 +21393,7 @@
"ctC" = (
/obj/structure/rack,
/obj/item/pickaxe,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -21790,7 +21782,7 @@
/area/station/security/prison/cell_block/A)
"cxd" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
@@ -21861,8 +21853,8 @@
/area/station/science/toxins/mixing)
"cxU" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -22089,7 +22081,7 @@
"czP" = (
/obj/structure/closet/crate,
/obj/item/pickaxe,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/apmaint)
"czV" = (
@@ -22142,9 +22134,7 @@
},
/area/station/science/xenobiology)
"cAn" = (
-/obj/machinery/requests_console{
- pixel_y = 30
- },
+/obj/machinery/requests_console/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkbrown"
@@ -22690,7 +22680,7 @@
icon_state = "1-4"
},
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"cDW" = (
@@ -23889,7 +23879,7 @@
/area/shuttle/arrival/station)
"cJN" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/hallway/primary/central/west)
"cJO" = (
@@ -24286,8 +24276,8 @@
/area/station/maintenance/disposal/external/southeast)
"cMw" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port)
"cMx" = (
@@ -25326,7 +25316,7 @@
/area/station/command/bridge)
"cQU" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/storage)
"cQW" = (
@@ -25341,7 +25331,7 @@
/area/station/maintenance/storage)
"cRa" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
"cRh" = (
@@ -25470,7 +25460,7 @@
/area/station/hallway/primary/aft/west)
"cRZ" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/pickaxe,
/turf/simulated/floor/plating,
/area/station/maintenance/storage)
@@ -25526,12 +25516,12 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/hallway/primary/fore/north)
"cSj" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/hallway/primary/fore/north)
"cSk" = (
@@ -28746,7 +28736,7 @@
/area/station/maintenance/disposal/west)
"doo" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fpmaint)
"dos" = (
@@ -29397,7 +29387,7 @@
dir = 1
},
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"dsc" = (
@@ -31423,7 +31413,7 @@
/area/station/hallway/primary/fore/west)
"dCU" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/starboard)
"dCV" = (
@@ -32626,15 +32616,16 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"dTC" = (
+/obj/machinery/hologram/holopad,
/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=Security";
- location = "CommandMiddle2";
- name = "navigation beacon (Command-Middle 2)"
+ codes_txt = "patrol;next_patrol=CargoWest";
+ location = "MedbayWest";
+ name = "navigation beacon (Medbay-West)"
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
-/area/station/hallway/primary/fore/north)
+/area/station/hallway/primary/starboard/south)
"dTI" = (
/obj/machinery/navbeacon{
codes_txt = "patrol;next_patrol=EngineeringMiddle";
@@ -33222,7 +33213,7 @@
/area/station/medical/morgue)
"eeN" = (
/obj/effect/spawner/random_spawners/blood_maybe,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -33230,7 +33221,7 @@
"eeZ" = (
/obj/structure/closet/crate,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"efa" = (
@@ -33820,7 +33811,7 @@
dir = 1
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/structure/window/basic{
dir = 8
},
@@ -33828,7 +33819,7 @@
/area/station/maintenance/disposal)
"eot" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
"eoz" = (
@@ -34046,7 +34037,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/storage)
"etG" = (
@@ -34127,7 +34118,7 @@
/area/station/science/xenobiology)
"eux" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/maintcentral)
"euD" = (
@@ -34519,7 +34510,7 @@
/obj/structure/closet/crate{
name = "top secret mime supplies"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -35493,7 +35484,7 @@
/turf/simulated/floor/carpet/green,
/area/station/service/library)
"eOu" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
@@ -35747,7 +35738,7 @@
/area/station/hallway/spacebridge/scidock)
"eTI" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port)
"eTJ" = (
@@ -36235,19 +36226,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
-"fbA" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "1-8"
- },
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/maintenance/asmaint)
"fcm" = (
/obj/structure/chair/office/dark{
dir = 1
@@ -36289,7 +36267,7 @@
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -36644,17 +36622,6 @@
icon_state = "browncorner"
},
/area/station/supply/lobby)
-"fka" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/disposalpipe/segment/corner,
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"fkc" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/area_atmos{
@@ -37775,7 +37742,7 @@
icon_state = "4-8"
},
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"fFz" = (
@@ -38820,7 +38787,7 @@
/area/station/hallway/primary/fore/west)
"fVg" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"fVo" = (
@@ -39166,6 +39133,17 @@
icon_state = "redyellowfull"
},
/area/station/service/bar)
+"gah" = (
+/obj/effect/spawner/random/maintenance,
+/obj/structure/closet/crate,
+/obj/structure/disposalpipe/segment/corner,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plating,
+/area/station/maintenance/asmaint)
"gaj" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 10
@@ -39436,7 +39414,7 @@
/area/station/security/range)
"gge" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/asmaint)
"ggt" = (
@@ -39862,7 +39840,7 @@
/area/station/maintenance/disposal/west)
"goE" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
@@ -40352,7 +40330,7 @@
},
/area/station/hallway/primary/port/south)
"gxp" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/service/clown/secret)
@@ -41162,7 +41140,7 @@
/area/station/maintenance/fsmaint)
"gLj" = (
/obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -41830,7 +41808,7 @@
/area/station/service/bar)
"gWd" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/maintcentral)
"gXb" = (
@@ -42240,7 +42218,7 @@
"hcK" = (
/obj/effect/decal/cleanable/cobweb,
/obj/structure/closet/wardrobe/black,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"hcL" = (
@@ -42248,7 +42226,7 @@
/obj/effect/decal/cleanable/cobweb,
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/fancy/cigarettes/cigpack_random,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -42381,7 +42359,7 @@
/area/station/command/office/ntrep)
"heH" = (
/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=Medbay";
+ codes_txt = "patrol;next_patrol=MedbayWest";
location = "ArrivalsMiddle";
name = "navigation beacon (Arrivals-Middle)"
},
@@ -42814,7 +42792,7 @@
/area/station/maintenance/storage)
"hmo" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"hmp" = (
@@ -43288,7 +43266,7 @@
/area/station/hallway/primary/fore/east)
"huF" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/west)
"huM" = (
@@ -43413,7 +43391,7 @@
/area/station/maintenance/disposal/west)
"hxc" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -43462,7 +43440,7 @@
/area/station/maintenance/storage)
"hxO" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"hxR" = (
@@ -43551,7 +43529,7 @@
/area/station/security/lobby)
"hzj" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
@@ -43663,7 +43641,7 @@
},
/obj/effect/decal/cleanable/cobweb,
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/north)
"hAX" = (
@@ -44038,7 +44016,7 @@
/area/station/science/hallway)
"hHb" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/gambling_den)
"hHu" = (
@@ -44151,7 +44129,7 @@
icon_state = "1-2"
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"hIo" = (
@@ -44583,7 +44561,7 @@
/area/station/public/quantum/security)
"hPG" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/roller,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -44919,7 +44897,7 @@
"hSU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/hallway/primary/fore/north)
"hSY" = (
@@ -45467,7 +45445,7 @@
/area/station/command/office/ntrep)
"ibf" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
"ibJ" = (
@@ -46256,8 +46234,8 @@
pixel_x = 1;
pixel_y = 5
},
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/west)
"imU" = (
@@ -46315,7 +46293,7 @@
/area/station/hallway/primary/fore/east)
"inP" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -47531,11 +47509,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/primary/fore/east)
-"iEW" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"iEY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
@@ -47761,7 +47734,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/hallway/primary/fore/north)
"iIW" = (
@@ -47864,14 +47837,14 @@
/area/station/hallway/primary/port/north)
"iJJ" = (
/obj/machinery/navbeacon{
- codes_txt = "patrol;next_patrol=ArrivalsWest2";
- location = "ArrivalsWest";
- name = "navigation beacon (Arrivals-West)"
+ codes_txt = "patrol;next_patrol=CommandMiddle";
+ location = "CargoWest";
+ name = "navigation beacon (Cargo-West)"
},
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
-/area/station/hallway/secondary/entry/west)
+/area/station/hallway/primary/fore/east)
"iJM" = (
/obj/effect/spawner/random_spawners/dirt_frequent,
/obj/effect/spawner/random_spawners/grille_maybe,
@@ -48032,7 +48005,7 @@
/area/station/science/toxins/launch)
"iNd" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"iNj" = (
@@ -48175,7 +48148,7 @@
/area/station/maintenance/fore)
"iOU" = (
/obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/wood,
/area/station/maintenance/starboard)
"iPa" = (
@@ -48882,13 +48855,13 @@
"iYY" = (
/obj/structure/closet,
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/mine/unexplored/cere/orbiting)
"iZd" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/hallway/primary/fore/west)
"iZr" = (
@@ -49160,7 +49133,7 @@
/area/station/engineering/atmos)
"jbp" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/flashlight,
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/starboard)
@@ -50029,7 +50002,7 @@
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/east)
"jpP" = (
@@ -50750,7 +50723,7 @@
/area/station/command/office/rd)
"jyk" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"jyx" = (
@@ -50954,7 +50927,7 @@
/turf/space,
/area/station/hallway/spacebridge/cargocom)
"jAx" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/table,
/obj/effect/landmark/burnturf,
/obj/item/robotanalyzer,
@@ -51335,7 +51308,7 @@
/area/station/maintenance/port)
"jFd" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/hallway/primary/fore/north)
"jFg" = (
@@ -51836,10 +51809,7 @@
/area/station/maintenance/port)
"jMh" = (
/obj/item/kirbyplants,
-/obj/machinery/requests_console{
- department = "Psychiatrist";
- pixel_x = -30
- },
+/obj/machinery/requests_console/directional/west,
/turf/simulated/floor/carpet,
/area/station/medical/psych)
"jMr" = (
@@ -52360,7 +52330,7 @@
/area/station/hallway/secondary/entry/east)
"jUd" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -52383,7 +52353,7 @@
pixel_x = 5;
pixel_y = -2
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/starboard)
"jUz" = (
@@ -52529,7 +52499,7 @@
/area/station/hallway/primary/starboard/south)
"jXm" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"jXt" = (
@@ -53170,7 +53140,7 @@
pixel_y = -3;
pixel_x = 3
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkpurple"
@@ -53245,8 +53215,8 @@
dir = 8
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/storage)
"kjT" = (
@@ -53872,7 +53842,7 @@
icon_state = "1-2"
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"kuj" = (
@@ -54015,7 +53985,7 @@
/area/station/command/office/ntrep)
"kwQ" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
@@ -54169,7 +54139,7 @@
/area/station/hallway/secondary/entry/south)
"kyo" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/storage)
"kyp" = (
@@ -54660,7 +54630,7 @@
"kIn" = (
/obj/structure/table,
/obj/item/storage/fancy/cigarettes,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/south)
"kIo" = (
@@ -55874,7 +55844,7 @@
"kZw" = (
/obj/structure/table,
/obj/item/storage/fancy/cigarettes,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/disposalpipe/sortjunction/reversed{
dir = 4;
sort_type_txt = "25"
@@ -56618,11 +56588,6 @@
icon_state = "neutralfull"
},
/area/station/hallway/primary/central/east)
-"ljR" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"ljV" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -56693,7 +56658,7 @@
/area/station/supply/expedition)
"lkL" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"llc" = (
@@ -58387,7 +58352,7 @@
/area/station/maintenance/apmaint)
"lJM" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/external/southeast)
"lJN" = (
@@ -60111,7 +60076,7 @@
"mkA" = (
/obj/item/storage/toolbox/mechanical,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/south)
"mkS" = (
@@ -60149,7 +60114,7 @@
dir = 4
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/east)
"mlM" = (
@@ -60188,7 +60153,7 @@
/area/station/maintenance/fsmaint)
"mmx" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port)
"mmz" = (
@@ -60339,7 +60304,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/external/southwest)
"moQ" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
@@ -61213,7 +61178,7 @@
/area/station/security/main)
"mCE" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/pickaxe,
/turf/simulated/floor/plating,
/area/station/maintenance/storage)
@@ -61443,7 +61408,7 @@
"mGY" = (
/obj/item/storage/box/bodybags,
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"mHg" = (
@@ -61597,8 +61562,8 @@
/area/station/hallway/primary/port/north)
"mJn" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
@@ -61922,7 +61887,7 @@
/area/station/maintenance/electrical_shop)
"mPu" = (
/obj/structure/table/wood/poker,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/barsign{
pixel_y = 32
},
@@ -62304,8 +62269,8 @@
/area/station/hallway/secondary/entry/north)
"mUe" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port)
"mUu" = (
@@ -63194,7 +63159,7 @@
/area/station/hallway/secondary/exit)
"njs" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/pickaxe,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
@@ -63218,7 +63183,7 @@
/area/station/hallway/spacebridge/engmed)
"njx" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/maintcentral)
"njB" = (
@@ -63778,7 +63743,7 @@
/area/station/turret_protected/ai_upload)
"ntf" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port)
"nto" = (
@@ -63982,7 +63947,7 @@
/area/station/engineering/control)
"nvA" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -64174,7 +64139,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"nyX" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -64659,7 +64624,7 @@
/area/station/security/detective)
"nHK" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/hallway/primary/port/north)
"nHR" = (
@@ -65426,7 +65391,7 @@
path_to_spawn = /mob/living/simple_animal/hostile/scarybat;
total_amount = 20
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -65788,7 +65753,7 @@
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/port)
"oci" = (
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/hallway/spacebridge/scidock)
"ocw" = (
@@ -66586,14 +66551,10 @@
},
/area/station/service/bar)
"onW" = (
-/obj/machinery/requests_console{
- department = "Janitorial";
- departmentType = 1;
- pixel_y = 30
- },
/obj/effect/turf_decal/loading_area{
dir = 4
},
+/obj/machinery/requests_console/directional/north,
/turf/simulated/floor/plasteel,
/area/station/service/janitor)
"ooj" = (
@@ -67770,7 +67731,7 @@
pixel_x = -13;
pixel_y = 2
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -67854,7 +67815,7 @@
"oJH" = (
/obj/structure/closet/crate,
/obj/item/pickaxe/emergency,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/apmaint)
"oJY" = (
@@ -70380,12 +70341,6 @@
icon_state = "whitepurplecorner"
},
/area/station/science/misc_lab)
-"pvo" = (
-/obj/effect/spawner/lootdrop/maintenance/three,
-/turf/simulated/floor/plating{
- icon_state = "asteroidplating"
- },
-/area/station/hallway/spacebridge/scidock)
"pvH" = (
/obj/structure/chair/sofa/pew/right{
dir = 8
@@ -70610,7 +70565,7 @@
"pzK" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"pzS" = (
@@ -71153,7 +71108,7 @@
/turf/simulated/floor/wood,
/area/station/service/bar)
"pIc" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/structure/closet,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -71245,7 +71200,7 @@
"pKj" = (
/obj/structure/table,
/obj/machinery/light,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
@@ -71663,7 +71618,7 @@
/area/station/supply/storage)
"pPI" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"pPM" = (
@@ -72212,7 +72167,7 @@
/area/station/maintenance/apmaint)
"pWH" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/starboard)
"pWQ" = (
@@ -72251,7 +72206,7 @@
/area/station/service/theatre)
"pXp" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/food/donkpocket,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -72681,7 +72636,7 @@
dir = 8
},
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"qcS" = (
@@ -72869,7 +72824,7 @@
/area/station/service/library)
"qfv" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -73066,6 +73021,18 @@
icon_state = "dark"
},
/area/station/service/chapel)
+"qhZ" = (
+/obj/effect/spawner/random/maintenance,
+/obj/structure/closet/crate,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plating{
+ icon_state = "asteroidplating"
+ },
+/area/station/maintenance/asmaint)
"qii" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -73483,7 +73450,7 @@
/area/station/hallway/secondary/exit)
"qov" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/pickaxe/emergency,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -73593,7 +73560,7 @@
/area/station/maintenance/apmaint)
"qpM" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/maintcentral)
@@ -75460,7 +75427,7 @@
pixel_x = 1
},
/obj/item/storage/toolbox/mechanical,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/hallway/primary/aft/west)
"qUu" = (
@@ -77395,7 +77362,7 @@
/area/station/maintenance/disposal/external/southwest)
"rFq" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/hallway/primary/aft/west)
"rFJ" = (
@@ -77891,7 +77858,7 @@
/area/station/command/bridge)
"rMP" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/southwest)
"rMT" = (
@@ -79260,8 +79227,8 @@
"shB" = (
/obj/structure/rack,
/obj/item/pickaxe/emergency,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
@@ -79849,7 +79816,7 @@
"srv" = (
/obj/structure/table,
/obj/machinery/cell_charger,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/maintenance/starboard)
"srN" = (
@@ -80377,16 +80344,6 @@
icon_state = "darkblue"
},
/area/station/command/office/cmo)
-"swR" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/structure/cable/orange{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/starboard)
"sxa" = (
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall,
@@ -82130,7 +82087,7 @@
/area/station/security/warden)
"sWZ" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/southwest)
"sXj" = (
@@ -82348,11 +82305,6 @@
icon_state = "white"
},
/area/station/medical/virology)
-"taQ" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating/asteroid/ancient,
-/area/station/maintenance/port)
"taW" = (
/obj/machinery/light/small{
dir = 1
@@ -82487,7 +82439,7 @@
/area/station/public/vacant_office)
"tcw" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/gambling_den)
"tcx" = (
@@ -82754,9 +82706,9 @@
/area/station/maintenance/disposal/external/southwest)
"thz" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/disposalpipe/segment/corner{
dir = 1
},
@@ -83177,7 +83129,7 @@
/area/station/hallway/spacebridge/scidock)
"tnj" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/apmaint)
"tnA" = (
@@ -83434,8 +83386,8 @@
/area/station/supply/sorting)
"tsc" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/maintcentral)
"tsf" = (
@@ -83806,8 +83758,8 @@
/area/station/engineering/tech_storage)
"twx" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/fpmaint)
"twF" = (
@@ -84382,7 +84334,7 @@
/area/station/hallway/spacebridge/dockmed)
"tFK" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -85392,8 +85344,8 @@
/area/station/maintenance/starboard)
"tXA" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"tXE" = (
@@ -88196,11 +88148,6 @@
"uMr" = (
/turf/simulated/wall/r_wall,
/area/station/science/rnd)
-"uMu" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/maintcentral)
"uMC" = (
/obj/machinery/door/airlock/public/glass{
name = "Rehabilitation Dome"
@@ -88475,7 +88422,7 @@
"uQh" = (
/obj/effect/decal/cleanable/cobweb,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/disposalpipe/segment/corner,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
@@ -88944,14 +88891,8 @@
/turf/simulated/floor/plating,
/area/station/hallway/primary/starboard/south)
"uVC" = (
-/obj/structure/closet/secure_closet/personal/patient,
-/obj/item/storage/box/monkeycubes,
-/obj/item/storage/box/monkeycubes/farwacubes,
-/obj/item/storage/box/monkeycubes/neaeracubes,
-/obj/item/storage/box/monkeycubes/stokcubes,
-/obj/item/storage/box/monkeycubes/wolpincubes,
-/obj/item/storage/box/monkeycubes/nian_worme_cubes,
/obj/machinery/requests_console/directional/west,
+/obj/structure/closet/secure_closet/genetics,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whitepurple"
@@ -90029,11 +89970,6 @@
icon_state = "tranquillite"
},
/area/station/service/mime)
-"vok" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/maintcentral)
"vos" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -90098,7 +90034,7 @@
pixel_y = 5
},
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whitepurple"
@@ -90527,8 +90463,8 @@
/area/station/medical/cloning)
"vun" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -90891,7 +90827,7 @@
/obj/item/coin/silver,
/obj/item/coin/silver,
/obj/item/pickaxe,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port)
"vzj" = (
@@ -91871,11 +91807,6 @@
icon_state = "darkred"
},
/area/station/security/checkpoint/secondary)
-"vOv" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating/asteroid/ancient,
-/area/station/maintenance/starboard)
"vOI" = (
/turf/simulated/floor/carpet/cyan,
/area/station/public/fitness)
@@ -91956,6 +91887,19 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/floor/plating,
/area/station/maintenance/electrical_shop)
+"vQu" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/navbeacon{
+ codes_txt = "patrol;next_patrol=Security";
+ location = "CommandMiddle2";
+ name = "navigation beacon (Command-Middle 2)"
+ },
+/turf/simulated/floor/plasteel{
+ icon_state = "neutralfull"
+ },
+/area/station/hallway/primary/fore/north)
"vQv" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -94156,7 +94100,7 @@
/area/station/hallway/primary/starboard/south)
"wuY" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/public/storefront)
@@ -95378,7 +95322,7 @@
/area/station/maintenance/fsmaint)
"wJY" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
@@ -96303,7 +96247,7 @@
/area/station/maintenance/gambling_den)
"wZl" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/station/hallway/primary/central/north)
@@ -96495,7 +96439,7 @@
/area/station/maintenance/port)
"xaU" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"xbh" = (
@@ -96603,7 +96547,7 @@
/obj/structure/rack,
/obj/item/storage/toolbox/mechanical,
/obj/item/weldingtool/hugetank,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/east)
"xcH" = (
@@ -96960,7 +96904,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -96971,7 +96915,7 @@
"xiV" = (
/obj/structure/closet/emcloset,
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port)
"xja" = (
@@ -97533,7 +97477,7 @@
/area/station/legal/courtroom)
"xtR" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/gambling_den)
"xtS" = (
@@ -98586,7 +98530,7 @@
/area/station/engineering/control)
"xGC" = (
/obj/structure/closet/crate/internals,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/dirt_frequent,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -98667,7 +98611,7 @@
pixel_x = 3;
pixel_y = 3
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/electrical_shop)
"xHO" = (
@@ -98762,7 +98706,7 @@
/area/station/public/quantum/science)
"xIU" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating{
icon_state = "asteroidplating"
},
@@ -99859,7 +99803,7 @@
/area/station/maintenance/port)
"xZC" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/airlock_electronics,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
@@ -100158,7 +100102,7 @@
dir = 1
},
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"yeW" = (
@@ -114771,7 +114715,7 @@ rzu
mHH
ijL
ccx
-taQ
+mmx
vtY
vtY
usD
@@ -132979,7 +132923,7 @@ bAK
mZB
bEi
bUO
-ugQ
+vQu
sGY
npV
abW
@@ -135107,7 +135051,7 @@ mkk
fLT
fLT
dkk
-uMu
+aQR
cUr
rgm
rgm
@@ -135383,7 +135327,7 @@ cYC
cYM
wzj
cYC
-pvo
+nyX
cYC
cYC
jGj
@@ -136320,7 +136264,7 @@ abW
abW
aKp
dwg
-dTC
+vuY
qtB
aKp
npV
@@ -139192,7 +139136,7 @@ oLP
iuC
bvj
fLT
-uMu
+aQR
nVW
nVW
nVW
@@ -140540,7 +140484,7 @@ mIS
vLT
vaz
eSb
-dbg
+ckQ
eWu
rFJ
qHn
@@ -140754,7 +140698,7 @@ wJC
vUQ
wJC
mkk
-vok
+eot
hxE
aXR
aXR
@@ -141052,10 +140996,10 @@ gge
vWF
vWF
uDW
-iJJ
+dbg
sFj
dbg
-ckQ
+eWu
vjb
qHn
rNK
@@ -141561,7 +141505,7 @@ mpB
mpB
ixC
bKg
-fbA
+qhZ
vWF
vWF
vWF
@@ -144644,7 +144588,7 @@ aXn
aXn
aXn
wLr
-fka
+gah
pXf
yep
xSo
@@ -145869,7 +145813,7 @@ kxJ
bvt
was
bvt
-ljp
+dTC
xcW
qcS
qcS
@@ -148930,7 +148874,7 @@ fmI
fmI
fmI
fmI
-fmI
+iJJ
fmI
fmI
fmI
@@ -154368,7 +154312,7 @@ gbJ
gbJ
bLk
cFA
-bNL
+abH
tvJ
xjx
vbn
@@ -156163,7 +156107,7 @@ uyn
bkH
biN
wyL
-iEW
+fVg
itf
qIV
xAV
@@ -157182,7 +157126,7 @@ oXg
bil
gFg
gSQ
-vOv
+pWH
biN
eEd
bkH
@@ -157942,7 +157886,7 @@ alc
gSQ
xAV
qWh
-swR
+arQ
bil
dzF
dzP
@@ -159986,7 +159930,7 @@ rNK
rNK
lCC
alc
-ljR
+jXm
yhg
umz
gSQ
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index 90ba1744be31..444e36e09a4f 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -1703,7 +1703,7 @@
/area/station/maintenance/fore2)
"amV" = (
/obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "redyellowfull"
},
@@ -1851,7 +1851,7 @@
/area/station/maintenance/fore2)
"anC" = (
/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fore2)
@@ -2799,7 +2799,7 @@
/area/station/maintenance/fore2)
"aqm" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
@@ -2807,7 +2807,7 @@
"aqn" = (
/obj/structure/rack,
/obj/item/crowbar,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
@@ -2816,7 +2816,7 @@
"aqo" = (
/obj/structure/closet/crate,
/obj/item/flashlight,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fore2)
@@ -3996,7 +3996,7 @@
name = "booze cabinet"
},
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/landmark/damageturf,
/turf/simulated/floor/wood,
/area/station/maintenance/fore)
@@ -4569,7 +4569,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"auQ" = (
@@ -4700,7 +4700,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"avl" = (
@@ -5859,12 +5859,12 @@
/area/station/maintenance/fore)
"axZ" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"aya" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutral"
@@ -6158,7 +6158,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/disposal)
"azh" = (
@@ -6553,7 +6553,7 @@
"aAk" = (
/obj/structure/rack,
/obj/item/reagent_containers/drinks/bottle/whiskey,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"aAl" = (
@@ -6775,7 +6775,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/delivery/hollow,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -6789,7 +6789,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/delivery,
/obj/structure/disposalpipe/segment{
dir = 4
@@ -7066,7 +7066,7 @@
/area/station/supply/storage)
"aBo" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"aBp" = (
@@ -7081,7 +7081,7 @@
/obj/structure/table/wood,
/obj/item/clothing/shoes/jackboots,
/obj/effect/landmark/costume/random,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -7702,7 +7702,7 @@
/area/station/supply/storage)
"aDj" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
@@ -7924,7 +7924,7 @@
/area/station/supply/storage)
"aDN" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/supply/sorting)
"aDO" = (
@@ -8290,7 +8290,7 @@
},
/area/station/supply/storage)
"aEX" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -8298,7 +8298,7 @@
/area/station/supply/storage)
"aEY" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -8541,7 +8541,7 @@
"aFG" = (
/obj/structure/closet/crate,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -9242,7 +9242,7 @@
/area/station/maintenance/abandoned_garden)
"aHz" = (
/obj/structure/closet/cardboard,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
@@ -10389,7 +10389,7 @@
/obj/machinery/conveyor{
id = "cargodisposals"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/supply/sorting)
"aKB" = (
@@ -10437,7 +10437,7 @@
/area/station/supply/storage)
"aKL" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel{
@@ -10758,7 +10758,7 @@
/area/station/engineering/controlroom)
"aLx" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
@@ -10815,7 +10815,7 @@
/area/station/service/barber)
"aLH" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutral"
@@ -11385,7 +11385,7 @@
},
/area/station/supply/storage)
"aNw" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -12411,7 +12411,7 @@
/turf/simulated/floor/wood,
/area/station/maintenance/gambling_den)
"aQr" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
@@ -12866,7 +12866,7 @@
/area/station/service/bar)
"aRu" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance,
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plasteel/airless{
dir = 10;
@@ -18563,7 +18563,7 @@
/area/station/maintenance/fore)
"bgo" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fore)
"bgp" = (
@@ -19707,7 +19707,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fore)
"bjd" = (
@@ -19880,7 +19880,7 @@
/area/station/service/kitchen)
"bjy" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"bjz" = (
@@ -21183,7 +21183,7 @@
"bmP" = (
/obj/structure/rack,
/obj/effect/landmark/costume/random,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fore)
"bmQ" = (
@@ -23831,7 +23831,7 @@
pixel_y = -32
},
/obj/machinery/flasher{
- id = "Cell 5";
+ id = "Cell 2";
pixel_x = -28
},
/obj/structure/cable,
@@ -26841,7 +26841,7 @@
/obj/item/assembly/igniter,
/obj/item/assembly/igniter,
/obj/item/assembly/igniter,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel,
/area/station/public/storage/tools)
@@ -27348,9 +27348,6 @@
/obj/item/radio/intercom/custom{
pixel_y = 25
},
-/obj/machinery/requests_console/directional/north{
- pixel_x = 30
- },
/turf/simulated/floor/plasteel/dark,
/area/station/turret_protected/ai)
"bCY" = (
@@ -30757,7 +30754,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "cautioncorner"
@@ -30765,7 +30762,7 @@
/area/station/public/storage/tools/auxiliary)
"bLm" = (
/obj/structure/closet/toolcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "yellow"
@@ -31677,7 +31674,7 @@
dir = 1
},
/obj/machinery/flasher{
- id = "Cell 3";
+ id = "Cell 4";
pixel_x = -26;
pixel_y = -26
},
@@ -32205,7 +32202,7 @@
/obj/structure/rack,
/obj/item/storage/toolbox/emergency,
/obj/item/storage/toolbox/emergency,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "yellow"
@@ -35679,7 +35676,7 @@
/area/station/legal/magistrate)
"bYU" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/railing{
dir = 1
},
@@ -35977,7 +35974,7 @@
/area/station/maintenance/port)
"bZI" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bZJ" = (
@@ -36742,7 +36739,7 @@
/area/station/engineering/smes)
"cby" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "neutral"
@@ -37555,7 +37552,7 @@
/area/station/engineering/smes)
"cdr" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
@@ -38184,12 +38181,6 @@
/obj/machinery/power/apc/critical/directional/south,
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/smes)
-"cfk" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
"cfn" = (
/obj/effect/decal/cleanable/fungus,
/turf/simulated/wall,
@@ -39481,7 +39472,7 @@
/area/station/public/locker)
"cjm" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"cjn" = (
@@ -39491,7 +39482,7 @@
"cjo" = (
/obj/structure/rack,
/obj/item/book/manual/wiki/security_space_law,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"cjp" = (
@@ -40653,7 +40644,7 @@
/area/station/legal/lawoffice)
"cmq" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard2)
"cmr" = (
@@ -41524,7 +41515,7 @@
"coU" = (
/obj/structure/closet,
/obj/effect/decal/cleanable/cobweb,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "neutral"
@@ -42781,7 +42772,7 @@
"csd" = (
/obj/structure/table,
/obj/item/storage/box/bodybags,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"cse" = (
@@ -42793,7 +42784,7 @@
"csf" = (
/obj/structure/closet/crate,
/obj/item/clothing/shoes/jackboots,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"csh" = (
@@ -45345,7 +45336,7 @@
},
/obj/item/clothing/gloves/color/black,
/obj/item/wrench,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel,
/area/station/maintenance/port)
@@ -46007,7 +45998,7 @@
/area/station/maintenance/port)
"cBd" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutral"
@@ -46972,7 +46963,7 @@
/area/station/maintenance/port)
"cEa" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 4;
@@ -47263,7 +47254,7 @@
"cFk" = (
/obj/structure/table,
/obj/effect/decal/cleanable/cobweb2,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cFl" = (
@@ -47540,7 +47531,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutral"
@@ -48247,7 +48238,7 @@
/area/station/maintenance/port)
"cHo" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
@@ -48255,7 +48246,7 @@
"cHp" = (
/obj/structure/rack,
/obj/item/clothing/gloves/color/fyellow,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
@@ -48820,7 +48811,7 @@
/area/station/engineering/equipmentstorage)
"cIS" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"cIT" = (
@@ -49151,13 +49142,13 @@
/area/station/maintenance/port)
"cKf" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/port)
"cKg" = (
/obj/structure/rack,
/obj/item/book/manual/wiki/engineering_guide,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/port)
"cKi" = (
@@ -49812,11 +49803,6 @@
icon_state = "neutralcorner"
},
/area/station/public/fitness)
-"cMS" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
"cMU" = (
/obj/machinery/atmospherics/binary/valve,
/obj/effect/turf_decal/stripes/line{
@@ -50727,7 +50713,7 @@
/obj/structure/closet,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/structure/cable{
d1 = 1;
d2 = 2;
@@ -51602,7 +51588,7 @@
/area/station/maintenance/starboard)
"cTc" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutral"
@@ -51937,7 +51923,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cUA" = (
@@ -52904,7 +52890,7 @@
/area/station/maintenance/port)
"cXY" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
@@ -53086,7 +53072,7 @@
"cZc" = (
/obj/structure/rack,
/obj/item/clothing/accessory/stethoscope,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutral"
@@ -54691,7 +54677,7 @@
/area/station/maintenance/starboard)
"dey" = (
/obj/structure/table/wood,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/wood,
/area/station/maintenance/starboard)
"deA" = (
@@ -55364,7 +55350,7 @@
/area/station/public/construction)
"dhq" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutral"
@@ -55757,7 +55743,7 @@
},
/obj/item/crowbar/red,
/obj/item/wrench,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "yellowcorner"
@@ -57100,7 +57086,7 @@
"dot" = (
/obj/effect/decal/cleanable/cobweb2,
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"dou" = (
@@ -57841,15 +57827,11 @@
},
/area/station/science/genetics)
"drR" = (
-/obj/structure/table/glass,
-/obj/item/storage/box/monkeycubes{
- pixel_x = -3
- },
-/obj/item/reagent_containers/spray/cleaner,
/obj/machinery/light{
dir = 4
},
/obj/structure/disposalpipe/segment,
+/obj/structure/closet/secure_closet/genetics,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
@@ -58394,7 +58376,7 @@
/area/station/maintenance/starboard)
"duK" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
@@ -59133,7 +59115,7 @@
/area/station/maintenance/library)
"dzo" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/landmark/costume/random,
/obj/effect/landmark/costume/random,
/turf/simulated/floor/plasteel{
@@ -60267,7 +60249,7 @@
/area/station/science/toxins/test)
"dES" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
@@ -60916,11 +60898,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
-"dIA" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/apmaint)
"dID" = (
/turf/simulated/floor/plasteel{
icon_state = "neutral"
@@ -61206,7 +61183,7 @@
"dKH" = (
/obj/structure/closet/crate,
/obj/item/flashlight,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"dKI" = (
@@ -62692,7 +62669,7 @@
/area/station/maintenance/apmaint)
"dRL" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"dRM" = (
@@ -62814,7 +62791,7 @@
/area/station/service/chapel)
"dSn" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -64056,6 +64033,7 @@
pixel_y = 10
},
/obj/structure/disposalpipe/segment,
+/obj/item/reagent_containers/spray/cleaner,
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
@@ -64562,7 +64540,7 @@
/area/station/maintenance/starboard2)
"eeX" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/storage/box/bodybags,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
@@ -67581,7 +67559,7 @@
/obj/machinery/fishtank/bowl,
/obj/machinery/fishtank/bowl,
/obj/machinery/fishtank/bowl,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/beach/sand,
/area/station/maintenance/fsmaint)
"fMc" = (
@@ -68162,7 +68140,7 @@
/area/station/aisat)
"gbO" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small,
/turf/simulated/floor/plasteel{
icon_state = "bar"
@@ -68780,7 +68758,7 @@
/area/station/security/armory/secure)
"gwu" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"gwZ" = (
@@ -69521,7 +69499,7 @@
/obj/structure/table/wood,
/obj/item/folder/white,
/obj/item/folder/red,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -70020,7 +69998,7 @@
"hjo" = (
/obj/structure/closet/crate,
/obj/effect/landmark/costume/random,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"hjK" = (
@@ -70037,7 +70015,7 @@
name = "north bump";
pixel_y = 28
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/fore2)
"hkM" = (
@@ -71805,7 +71783,7 @@
/area/station/public/pet_store)
"iny" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"inH" = (
@@ -72257,7 +72235,7 @@
/area/station/medical/reception)
"iBK" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutral"
@@ -72689,7 +72667,7 @@
dir = 1
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"iQb" = (
@@ -73016,7 +72994,7 @@
/area/station/hallway/primary/central/nw)
"iXL" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"iXM" = (
@@ -74053,7 +74031,7 @@
/area/station/engineering/atmos)
"jJj" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"jJl" = (
@@ -75085,7 +75063,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"kkB" = (
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurple"
@@ -75144,7 +75122,7 @@
/area/station/hallway/primary/central/north)
"klS" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"kmr" = (
@@ -76162,7 +76140,7 @@
"kSX" = (
/obj/structure/closet/crate,
/obj/item/flashlight,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
@@ -77105,7 +77083,7 @@
dir = 4
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
@@ -77188,7 +77166,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"lxC" = (
@@ -79728,7 +79706,7 @@
/area/station/hallway/primary/central/east)
"mWO" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
@@ -79879,7 +79857,7 @@
/obj/structure/rack,
/obj/item/storage/fancy/matches,
/obj/item/storage/fancy/cigarettes/cigpack_robust,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"naB" = (
@@ -80723,7 +80701,7 @@
/area/station/maintenance/abandoned_garden)
"nyK" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"nzB" = (
@@ -81533,6 +81511,10 @@
icon_state = "darkred"
},
/area/station/security/brig)
+"nYK" = (
+/obj/machinery/requests_console/directional/south,
+/turf/simulated/floor/plasteel/dark,
+/area/station/turret_protected/ai)
"nYW" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -81883,7 +81865,7 @@
/area/station/turret_protected/aisat)
"okf" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 1
},
@@ -82537,7 +82519,7 @@
/area/station/aisat)
"oBE" = (
/obj/item/vending_refill/coffee,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"oBK" = (
@@ -83226,7 +83208,7 @@
/obj/structure/closet/crate{
opened = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
@@ -83831,7 +83813,7 @@
"pmA" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"pmI" = (
@@ -84949,7 +84931,7 @@
/obj/structure/rack,
/obj/item/multitool,
/obj/item/wrench,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/landmark/damageturf,
/turf/simulated/floor/wood,
/area/station/maintenance/apmaint)
@@ -85087,7 +85069,7 @@
"pWt" = (
/obj/effect/spawner/random_spawners/cobweb_right_frequent,
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"pWw" = (
@@ -85187,7 +85169,7 @@
/area/station/medical/cryo)
"qaf" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/retractor,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -86286,7 +86268,7 @@
/area/station/engineering/controlroom)
"qOd" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 1
},
@@ -86796,7 +86778,7 @@
},
/area/station/hallway/primary/central/south)
"qZI" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"qZV" = (
@@ -87190,11 +87172,6 @@
temperature = 80
},
/area/station/science/xenobiology)
-"rkv" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
"rkA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -87243,7 +87220,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"rly" = (
@@ -88064,7 +88041,7 @@
/obj/effect/decal/cleanable/cobweb2,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"rJk" = (
@@ -88225,7 +88202,7 @@
"rOe" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutral"
@@ -89844,7 +89821,7 @@
/area/station/maintenance/apmaint)
"szf" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"szk" = (
@@ -90144,7 +90121,7 @@
/area/space/nearstation)
"sHd" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -90243,7 +90220,7 @@
"sJD" = (
/obj/structure/table,
/obj/item/hand_labeler,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -90497,7 +90474,7 @@
"sQa" = (
/obj/structure/closet,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"sQr" = (
@@ -92151,7 +92128,7 @@
icon_state = "2-8"
},
/obj/machinery/flasher{
- id = "Cell 6";
+ id = "Cell 5";
pixel_x = 27;
pixel_y = 28
},
@@ -92398,7 +92375,7 @@
"tVb" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutral"
@@ -93004,7 +92981,7 @@
},
/area/station/public/fitness)
"ujH" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
@@ -93352,7 +93329,7 @@
/area/station/maintenance/apmaint)
"uud" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/item/clothing/accessory/stethoscope,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
@@ -93374,7 +93351,7 @@
/area/station/maintenance/apmaint)
"uvD" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "redyellowfull"
@@ -94503,7 +94480,7 @@
/area/station/engineering/controlroom)
"vhF" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"vhS" = (
@@ -96431,7 +96408,7 @@
/area/station/maintenance/starboard)
"wnt" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/delivery/hollow,
/obj/structure/cable{
d1 = 1;
@@ -99297,7 +99274,7 @@
"xRD" = (
/obj/effect/spawner/random_spawners/cobweb_right_frequent,
/obj/structure/closet/firecloset,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"xRM" = (
@@ -109468,7 +109445,7 @@ bBf
bBf
bIl
bip
-bBf
+nYK
bNM
bPJ
bRD
@@ -119776,7 +119753,7 @@ cie
cie
cie
bXU
-rkv
+jJj
drn
dhG
cHA
@@ -120553,7 +120530,7 @@ drn
cIv
dhG
cLA
-cMS
+cIS
cLA
cQu
cLA
@@ -128753,7 +128730,7 @@ bYe
cHA
cby
cdr
-cfk
+cdr
drn
cLA
cQu
@@ -134983,7 +134960,7 @@ jLf
gNm
iqc
dHL
-dIA
+bjy
dJx
dKh
dOr
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index a4ec0e7aaed7..9bc2a5c6c9ff 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -72,10 +72,7 @@
/turf/simulated/wall/r_wall,
/area/station/security/permabrig)
"abX" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"abZ" = (
@@ -97,15 +94,12 @@
pixel_y = 2
},
/obj/item/taperecorder,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"acv" = (
@@ -518,7 +512,7 @@
/obj/structure/table,
/obj/item/multitool,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"agi" = (
@@ -574,7 +568,7 @@
/area/space)
"agG" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"agH" = (
@@ -1221,7 +1215,7 @@
/area/station/maintenance/disposal)
"alt" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
"alv" = (
@@ -1275,7 +1269,7 @@
/obj/item/clothing/suit/monkeysuit,
/obj/item/clothing/head/xenos,
/obj/item/clothing/mask/gas/monkeymask,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"alz" = (
@@ -1429,7 +1423,7 @@
/obj/item/clothing/gloves/color/yellow,
/obj/item/mop,
/obj/item/bikehorn/rubberducky,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"amv" = (
@@ -1568,7 +1562,7 @@
/area/station/engineering/gravitygenerator)
"ano" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"anv" = (
@@ -1585,7 +1579,7 @@
/obj/structure/closet,
/obj/item/poster/random_contraband,
/obj/item/storage/box/lights/mixed,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"anA" = (
@@ -1668,7 +1662,7 @@
},
/obj/item/dice/d8,
/obj/item/healthanalyzer,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"anK" = (
@@ -1871,10 +1865,7 @@
/obj/machinery/conveyor/north{
id = "garbage"
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
"aoU" = (
@@ -1936,7 +1927,7 @@
/obj/item/storage/secure/briefcase,
/obj/item/disk/data,
/obj/item/grenade/flashbang,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"api" = (
@@ -2190,21 +2181,21 @@
/obj/structure/closet/crate,
/obj/item/bodybag,
/obj/item/radio,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aqz" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced,
/obj/item/stock_parts/cell/crap,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aqA" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced,
/obj/item/firealarm_electronics,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aqB" = (
@@ -2220,7 +2211,7 @@
pixel_x = 4;
pixel_y = -3
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 10
},
@@ -2300,7 +2291,7 @@
"arn" = (
/obj/structure/rack,
/obj/item/extinguisher,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random_spawners/cobweb_left_frequent,
/turf/simulated/floor/plasteel,
@@ -2633,7 +2624,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"ata" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"atc" = (
@@ -2791,7 +2782,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"atJ" = (
@@ -3090,7 +3081,7 @@
/obj/structure/rack,
/obj/item/storage/toolbox/emergency,
/obj/effect/decal/cleanable/cobweb2,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"auB" = (
@@ -3115,7 +3106,7 @@
"auG" = (
/obj/structure/closet/crate,
/obj/item/clothing/gloves/color/fyellow,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"auH" = (
@@ -3650,7 +3641,7 @@
/area/station/maintenance/fpmaint)
"awM" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_frequent,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
@@ -3769,7 +3760,7 @@
/area/station/public/locker)
"axb" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"axc" = (
@@ -3850,7 +3841,7 @@
/turf/simulated/floor/plating,
/area/station/public/storage/emergency/port)
"axt" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/landmark/damageturf,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
@@ -4362,7 +4353,7 @@
/area/station/maintenance/fsmaint)
"azu" = (
/obj/structure/closet/firecloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"azy" = (
@@ -4493,10 +4484,7 @@
/area/station/maintenance/port)
"azQ" = (
/obj/item/stack/sheet/cardboard,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs);
- name = "Janitor Supplies Spawner"
- },
+/obj/effect/spawner/random/janitor/supplies,
/turf/simulated/floor/plating,
/area/station/maintenance/port2)
"azR" = (
@@ -4575,7 +4563,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"aAm" = (
@@ -4675,12 +4663,12 @@
/area/station/legal/courtroom/gallery)
"aAO" = (
/obj/structure/closet/crate/freezer,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"aAP" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aAU" = (
@@ -4881,7 +4869,7 @@
/area/station/public/mrchangs)
"aBT" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"aBV" = (
@@ -4922,7 +4910,7 @@
/turf/simulated/wall/r_wall,
/area/station/maintenance/fsmaint)
"aCa" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -5279,7 +5267,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aDD" = (
@@ -5650,10 +5638,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"aEQ" = (
@@ -6012,16 +5997,13 @@
/area/station/maintenance/fore)
"aGH" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"aGJ" = (
@@ -6046,10 +6028,7 @@
/obj/machinery/conveyor/west{
id = "garbage"
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
"aGO" = (
@@ -6185,7 +6164,7 @@
"aHm" = (
/obj/structure/closet/crate,
/obj/item/coin/silver,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aHn" = (
@@ -7566,7 +7545,7 @@
/area/station/service/bar)
"aLD" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/public/construction)
"aLE" = (
@@ -7753,11 +7732,8 @@
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"aMe" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aMf" = (
@@ -9148,7 +9124,7 @@
/area/station/command/office/hos)
"aQQ" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 8
},
@@ -10230,7 +10206,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/fore/east)
"aUx" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -11245,7 +11221,7 @@
"aXr" = (
/obj/structure/table,
/obj/item/storage/belt/utility,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
@@ -11476,7 +11452,7 @@
/area/station/hallway/secondary/entry/north)
"aXT" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/public/construction)
"aXU" = (
@@ -11537,7 +11513,7 @@
/area/station/hallway/secondary/entry/north)
"aYb" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"aYh" = (
@@ -13190,7 +13166,7 @@
/area/station/security/permabrig)
"bdl" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"bdm" = (
@@ -15453,10 +15429,7 @@
id = "packageSort2"
},
/obj/effect/turf_decal/stripes/line,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/supply/office)
"biG" = (
@@ -15519,7 +15492,7 @@
/area/station/hallway/primary/central/north)
"biO" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"biS" = (
@@ -15727,7 +15700,7 @@
/obj/structure/rack,
/obj/item/apc_electronics,
/obj/item/airlock_electronics,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "yellow"
},
@@ -16646,7 +16619,7 @@
/obj/item/clothing/gloves/color/fyellow,
/obj/item/clothing/suit/storage/hazardvest,
/obj/item/multitool,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light_switch{
dir = 4;
name = "west bump";
@@ -16964,7 +16937,7 @@
/obj/structure/rack{
dir = 1
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"bmA" = (
@@ -19784,7 +19757,7 @@
/area/station/command/bridge)
"buy" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 4
},
@@ -22400,7 +22373,7 @@
/obj/structure/closet,
/obj/item/poster/random_contraband,
/obj/effect/decal/cleanable/cobweb2,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bBO" = (
@@ -23690,11 +23663,8 @@
d2 = 4;
icon_state = "0-4"
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/machinery/power/apc/directional/south,
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bGd" = (
@@ -23886,7 +23856,7 @@
"bHp" = (
/obj/structure/rack,
/obj/item/flashlight,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bHq" = (
@@ -24150,11 +24120,8 @@
/area/station/maintenance/starboard)
"bHX" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/item/shard,
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/bluegrid,
/area/station/maintenance/starboard)
"bHY" = (
@@ -26619,18 +26586,18 @@
/area/station/public/vacant_office)
"bRD" = (
/obj/structure/table,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bRE" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bRF" = (
/obj/structure/closet,
/obj/item/clothing/shoes/jackboots,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bRG" = (
@@ -27045,14 +27012,6 @@
icon_state = "dark"
},
/area/station/medical/morgue)
-"bTb" = (
-/obj/effect/landmark/damageturf,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs);
- name = "Janitor Supplies Spawner"
- },
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
"bTd" = (
/obj/machinery/light_switch{
dir = 8;
@@ -27171,7 +27130,7 @@
"bTr" = (
/obj/structure/closet/crate,
/obj/item/rack_parts,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bTs" = (
@@ -27463,7 +27422,7 @@
/area/station/public/vacant_office)
"bUG" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/light/small{
dir = 8
@@ -27899,10 +27858,7 @@
/turf/simulated/floor/carpet/blue,
/area/station/command/office/blueshield)
"bWi" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"bWj" = (
@@ -28929,7 +28885,7 @@
dir = 4
},
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -29042,11 +28998,9 @@
/area/station/maintenance/port)
"caj" = (
/obj/structure/closet/crate/can,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/obj/item/trash/pistachios,
-/obj/item/trash/raisins,
-/obj/item/trash/gum,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"cam" = (
@@ -29381,7 +29335,7 @@
/area/station/service/hydroponics)
"cbq" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
@@ -29929,7 +29883,7 @@
"cdm" = (
/obj/structure/rack,
/obj/item/clothing/mask/gas,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "caution"
@@ -30016,7 +29970,7 @@
/area/station/maintenance/port)
"cdG" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"cdH" = (
@@ -30371,7 +30325,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cfb" = (
@@ -31593,7 +31547,7 @@
/obj/item/stack/rods{
amount = 23
},
-/obj/effect/spawner/lootdrop/maintenance/eight,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cjq" = (
@@ -31990,7 +31944,7 @@
/area/station/engineering/solar/aft_port)
"ckN" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
},
@@ -32077,7 +32031,7 @@
/obj/structure/sign/poster/random{
pixel_y = -32
},
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "greenblue"
},
@@ -32113,7 +32067,7 @@
"clv" = (
/obj/item/food/monkeycube,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"cly" = (
@@ -32171,7 +32125,7 @@
"clK" = (
/obj/structure/closet,
/obj/item/extinguisher,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"clL" = (
@@ -32280,7 +32234,7 @@
"cmg" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/firecloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -32722,12 +32676,6 @@
icon_state = "chapel"
},
/area/station/service/chapel)
-"coj" = (
-/obj/structure/closet,
-/obj/item/extinguisher,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/apmaint)
"cok" = (
/obj/structure/chair/wheelchair,
/obj/item/radio/intercom{
@@ -33648,14 +33596,14 @@
"crQ" = (
/obj/effect/turf_decal/stripes/white/line,
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_left_frequent,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"crR" = (
/obj/structure/closet/crate,
/obj/item/assembly/infra,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/stripes/white/line,
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/plating,
@@ -33814,7 +33762,7 @@
pixel_x = 7;
pixel_y = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"csG" = (
@@ -33872,7 +33820,7 @@
amount = 34
},
/obj/item/extinguisher/mini,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"csT" = (
@@ -33940,16 +33888,13 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cta" = (
@@ -34207,11 +34152,8 @@
d2 = 4;
icon_state = "1-4"
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs);
- name = "Janitor Supplies Spawner"
- },
/obj/effect/turf_decal/stripes/line,
+/obj/effect/spawner/random/janitor/supplies,
/turf/simulated/floor/plating,
/area/station/public/storage/emergency/port)
"cuc" = (
@@ -34857,7 +34799,7 @@
/area/station/maintenance/turbine)
"cwC" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cwD" = (
@@ -34909,7 +34851,7 @@
/area/station/maintenance/aft)
"cwQ" = (
/obj/structure/closet/firecloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_frequent,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -35090,7 +35032,7 @@
/obj/structure/rack,
/obj/item/reagent_containers/glass/bucket,
/obj/item/mop,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cxE" = (
@@ -35251,7 +35193,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -35433,7 +35375,7 @@
/area/station/science/server/coldroom)
"cyT" = (
/obj/item/toy/plushie/shark,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/effect/landmark/spawner/rev,
/obj/effect/decal/cleanable/blood/old,
/obj/structure/closet/crate,
@@ -35447,7 +35389,7 @@
/area/station/engineering/atmos)
"cze" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"czg" = (
@@ -35561,10 +35503,7 @@
},
/area/station/medical/storage)
"czw" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"czx" = (
@@ -35724,7 +35663,7 @@
/area/station/medical/virology)
"cAu" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"cAw" = (
@@ -36221,13 +36160,13 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cCp" = (
/obj/structure/closet/crate,
/obj/effect/landmark/damageturf,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cCr" = (
@@ -36719,7 +36658,7 @@
/area/station/command/office/captain/bedroom)
"cEh" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cEj" = (
@@ -36777,7 +36716,7 @@
},
/area/station/science/xenobiology)
"cEr" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"cEu" = (
@@ -37005,7 +36944,7 @@
dir = 4
},
/obj/structure/closet/firecloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -37109,13 +37048,10 @@
},
/area/station/medical/virology)
"cFG" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/bluegrid,
/area/station/maintenance/starboard)
"cFH" = (
@@ -37146,7 +37082,7 @@
"cFU" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/delivery/hollow,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"cFY" = (
@@ -38056,15 +37992,12 @@
},
/area/station/medical/cloning)
"cIS" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/structure/sink{
dir = 8;
pixel_x = -12;
pixel_y = 2
},
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cIT" = (
@@ -38497,7 +38430,7 @@
/area/station/medical/surgery/observation)
"cKB" = (
/obj/structure/closet/crate/plastic,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"cKC" = (
@@ -38721,7 +38654,7 @@
"cLr" = (
/obj/structure/closet/firecloset,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "caution"
@@ -38810,7 +38743,7 @@
/area/station/service/chapel)
"cLN" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"cLO" = (
@@ -39190,7 +39123,7 @@
/area/station/maintenance/solar_maintenance/aft_port)
"cNw" = (
/obj/structure/closet/wardrobe/white,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
"cNz" = (
@@ -39401,7 +39334,7 @@
/area/station/hallway/primary/aft/south)
"cOh" = (
/obj/structure/closet/crate/freezer,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -39668,11 +39601,8 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cPq" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs);
- name = "Janitor Supplies Spawner"
- },
/obj/effect/landmark/damageturf,
+/obj/effect/spawner/random/janitor/supplies,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"cPr" = (
@@ -39751,7 +39681,7 @@
pixel_x = 32
},
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cPL" = (
@@ -39849,11 +39779,6 @@
},
/turf/simulated/floor/plating/airless,
/area/station/science/toxins/test)
-"cQb" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
"cQc" = (
/obj/structure/window/reinforced{
dir = 1
@@ -39968,7 +39893,7 @@
/obj/item/stack/cable_coil,
/obj/item/wrench,
/obj/item/flashlight/seclite,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cQI" = (
@@ -40065,7 +39990,7 @@
/area/station/maintenance/solar_maintenance/aft_starboard)
"cRc" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cRe" = (
@@ -40449,12 +40374,6 @@
},
/turf/simulated/floor/wood,
/area/station/command/office/ntrep)
-"cSK" = (
-/obj/structure/closet/crate,
-/obj/effect/turf_decal/delivery/hollow,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/apmaint)
"cSL" = (
/obj/structure/table/wood,
/obj/item/clothing/under/misc/burial,
@@ -40691,7 +40610,7 @@
"cTD" = (
/obj/effect/landmark/burnturf,
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cTH" = (
@@ -40966,7 +40885,7 @@
/area/station/service/chapel)
"cUL" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"cUM" = (
@@ -41355,7 +41274,7 @@
/area/station/hallway/secondary/exit)
"cWF" = (
/obj/structure/closet/secure_closet/personal,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/clothing/suit/storage/labcoat/science,
/obj/item/clothing/under/rank/rnd/scientist,
/obj/effect/decal/cleanable/dirt,
@@ -41524,7 +41443,7 @@
/area/station/maintenance/port2)
"cXu" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
@@ -41747,7 +41666,7 @@
},
/area/station/medical/exam_room)
"cYF" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"cYG" = (
@@ -41849,10 +41768,7 @@
/area/station/medical/surgery/primary)
"cZi" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"cZl" = (
@@ -41934,7 +41850,7 @@
"cZD" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cZI" = (
@@ -42085,7 +42001,7 @@
/area/station/maintenance/asmaint)
"das" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"dat" = (
@@ -42407,7 +42323,7 @@
/area/station/engineering/solar/fore_starboard)
"dcj" = (
/obj/structure/chair/sofa/left,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
@@ -42646,7 +42562,7 @@
/area/space)
"ddR" = (
/obj/structure/closet/secure_closet/personal,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/clothing/suit/storage/labcoat/science,
/obj/item/clothing/under/rank/rnd/scientist,
/obj/effect/decal/cleanable/dirt,
@@ -42663,10 +42579,6 @@
},
/obj/item/restraints/handcuffs,
/obj/item/radio/off,
-/obj/machinery/requests_console/directional/east{
- department = "Security";
- departmentType = 5
- },
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
@@ -43077,10 +42989,7 @@
/area/station/hallway/secondary/entry/south)
"dgg" = (
/obj/effect/landmark/burnturf,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"dgj" = (
@@ -43196,7 +43105,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -43206,7 +43115,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"dhl" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/rack,
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
@@ -44372,10 +44281,7 @@
/area/station/hallway/primary/central/se)
"dCJ" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"dCQ" = (
@@ -44654,7 +44560,7 @@
/area/station/service/hydroponics)
"dLg" = (
/obj/item/rack_parts,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"dLF" = (
@@ -45384,7 +45290,7 @@
},
/area/station/public/toilet/lockerroom)
"ech" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/table,
/obj/effect/spawner/random_spawners/cobweb_left_rare,
/turf/simulated/floor/plating,
@@ -45985,7 +45891,7 @@
"erF" = (
/obj/structure/closet/crate/radiation,
/obj/effect/turf_decal/delivery,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"erM" = (
@@ -46311,7 +46217,7 @@
/area/station/engineering/atmos)
"eyo" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"eyP" = (
@@ -47992,7 +47898,7 @@
/turf/space,
/area/space/nearstation)
"fiU" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 8
},
@@ -48191,7 +48097,7 @@
"fmm" = (
/obj/structure/table,
/obj/item/clothing/glasses/meson,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "caution"
@@ -48916,13 +48822,13 @@
},
/obj/item/book/manual/wiki/hacking,
/obj/item/tape/random,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"fAs" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"fAH" = (
@@ -49759,7 +49665,7 @@
/area/station/science/xenobiology)
"fRm" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_left_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
@@ -49898,7 +49804,7 @@
/area/station/maintenance/starboard)
"fUf" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "caution"
@@ -50887,7 +50793,7 @@
/area/station/engineering/ai_transit_tube)
"gqi" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 8
},
@@ -51104,7 +51010,7 @@
"gwG" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/cardboard,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/toy/plushie/lizardplushie,
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -51627,18 +51533,11 @@
/area/station/engineering/control)
"gHN" = (
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/screwdriver,
/obj/item/wirecutters,
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"gHV" = (
@@ -53010,7 +52909,7 @@
/area/station/supply/lobby)
"hjE" = (
/obj/effect/spawner/random_spawners/oil_maybe,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"hka" = (
@@ -53359,7 +53258,7 @@
/area/station/engineering/atmos/control)
"hqx" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"hqL" = (
@@ -53447,7 +53346,7 @@
/area/station/medical/virology)
"hts" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 1
},
@@ -53746,10 +53645,6 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"hAK" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable{
@@ -53757,6 +53652,7 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"hAL" = (
@@ -53854,11 +53750,8 @@
/obj/structure/closet/crate/secure/bin,
/obj/item/paper/crumpled,
/obj/item/paper/crumpled,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"hCM" = (
@@ -53902,11 +53795,6 @@
icon_state = "neutralcorner"
},
/area/station/hallway/secondary/bridge)
-"hDE" = (
-/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/two,
-/turf/simulated/floor/plating,
-/area/station/maintenance/asmaint)
"hDK" = (
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
@@ -53946,7 +53834,7 @@
/area/station/science/robotics)
"hEj" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_north)
"hEo" = (
@@ -54111,7 +53999,7 @@
/area/station/engineering/control)
"hFY" = (
/obj/structure/closet/firecloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"hGj" = (
@@ -55345,20 +55233,17 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_north)
"igJ" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_left_frequent,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
@@ -55423,11 +55308,6 @@
},
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
-"iip" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
"iiB" = (
/obj/docking_port/stationary{
dir = 8;
@@ -56348,7 +56228,7 @@
/area/station/security/execution)
"iBb" = (
/obj/structure/closet/secure_closet/personal,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/clothing/under/plasmaman/science,
/obj/item/clothing/head/helmet/space/plasmaman/science,
/obj/effect/spawner/random_spawners/cobweb_left_rare,
@@ -56419,11 +56299,8 @@
/obj/structure/disposalpipe/broken{
dir = 1
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"iBR" = (
@@ -56545,7 +56422,7 @@
/obj/structure/closet/crate{
name = "Silver Crate"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"iGV" = (
@@ -57715,7 +57592,7 @@
/area/station/engineering/control)
"jiR" = (
/obj/structure/closet/firecloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_left_frequent,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
@@ -57733,7 +57610,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
/obj/item/tank/internals/anesthetic,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
},
@@ -58131,7 +58008,7 @@
"juY" = (
/obj/structure/rack,
/obj/item/poster/random_contraband,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"jvf" = (
@@ -58658,7 +58535,7 @@
/area/station/security/armory)
"jGq" = (
/obj/structure/closet/crate/engineering/electrical,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"jGr" = (
@@ -59664,7 +59541,7 @@
/obj/item/stack/sheet/glass{
amount = 12
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"jXC" = (
@@ -59726,7 +59603,7 @@
/area/station/science/xenobiology)
"jYH" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/cable{
d1 = 1;
d2 = 8;
@@ -59903,7 +59780,7 @@
/area/station/maintenance/aft2)
"ken" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 1
},
@@ -60311,10 +60188,7 @@
/area/station/engineering/atmos)
"kol" = (
/obj/effect/landmark/burnturf,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"kpl" = (
@@ -60484,7 +60358,7 @@
/area/station/maintenance/engimaint)
"ksa" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"ksb" = (
@@ -60827,22 +60701,10 @@
"kAP" = (
/obj/structure/closet/crate/trashcart,
/obj/effect/turf_decal/delivery,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"kBa" = (
@@ -61196,10 +61058,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
"kGN" = (
@@ -61238,7 +61097,7 @@
"kIc" = (
/obj/structure/rack,
/obj/item/hand_labeler,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"kIi" = (
@@ -61509,7 +61368,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"kOw" = (
@@ -61763,7 +61622,7 @@
/area/station/security/permabrig)
"kUz" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
"kUA" = (
@@ -62595,7 +62454,7 @@
/area/station/science/rnd)
"ljT" = (
/obj/item/rack_parts,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
@@ -63164,7 +63023,7 @@
/area/station/maintenance/port)
"lvJ" = (
/obj/structure/closet/secure_closet/personal,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/item/clothing/under/rank/rnd/scientist/skirt,
/obj/item/clothing/suit/hooded/wintercoat/science,
/obj/item/clothing/head/hooded/winterhood/science,
@@ -63277,7 +63136,7 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 9
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_north)
"lAl" = (
@@ -63434,7 +63293,7 @@
/area/station/maintenance/fpmaint)
"lCO" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"lCQ" = (
@@ -63532,7 +63391,7 @@
/area/station/science/toxins/mixing)
"lEM" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"lEN" = (
@@ -63593,7 +63452,7 @@
"lFM" = (
/obj/structure/closet/crate,
/obj/item/cane,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"lGh" = (
@@ -63697,7 +63556,7 @@
/area/station/maintenance/fore)
"lHy" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/item/clothing/gloves/color/white,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
@@ -63819,7 +63678,7 @@
/area/station/security/brig)
"lJt" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"lJA" = (
@@ -64411,7 +64270,7 @@
/area/station/science/xenobiology)
"lXi" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_left_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
@@ -64422,7 +64281,7 @@
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/suit/storage/hazardvest,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "caution"
},
@@ -65390,7 +65249,7 @@
/area/station/maintenance/fore2)
"mtr" = (
/obj/structure/closet/firecloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
@@ -65539,7 +65398,7 @@
"mxp" = (
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"mxw" = (
@@ -67336,7 +67195,7 @@
desc = "Takes you to a whole new level of thinking.";
name = "Meta-Cider"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
@@ -67468,7 +67327,7 @@
"nhR" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/firecloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/fsmaint)
"nia" = (
@@ -68130,7 +67989,7 @@
/area/station/service/clown)
"nwY" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/stripes/white/line{
dir = 10
},
@@ -68358,7 +68217,7 @@
/area/station/maintenance/fore)
"nBf" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
@@ -68392,7 +68251,7 @@
/area/station/medical/reception)
"nBW" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
@@ -68405,7 +68264,7 @@
/area/station/maintenance/apmaint)
"nCh" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "whitepurple"
@@ -68463,7 +68322,7 @@
/area/station/security/brig)
"nDd" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
"nDi" = (
@@ -69001,7 +68860,7 @@
/area/station/supply/lobby)
"nPD" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_left_frequent,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
@@ -69443,11 +69302,6 @@
/obj/item/toy/plushie/carpplushie,
/turf/space,
/area/space/nearstation)
-"oai" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/eight,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint)
"oaj" = (
/obj/structure/table/glass,
/obj/structure/cable{
@@ -69613,10 +69467,6 @@
/turf/simulated/floor/bluegrid,
/area/station/telecomms/chamber)
"odT" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -69625,6 +69475,7 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_north)
"odW" = (
@@ -70250,7 +70101,7 @@
},
/area/station/service/chapel/office)
"oyN" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"oyP" = (
@@ -70562,15 +70413,12 @@
},
/area/station/engineering/gravitygenerator)
"oFf" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
"oFn" = (
@@ -70709,7 +70557,7 @@
/area/station/engineering/controlroom)
"oIs" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"oIT" = (
@@ -71032,7 +70880,7 @@
dir = 4
},
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whitepurple"
@@ -71258,7 +71106,7 @@
/area/station/legal/lawoffice)
"oUa" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
},
@@ -71613,7 +71461,7 @@
"pcb" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"pcd" = (
@@ -71787,15 +71635,12 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"pes" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_south)
"peF" = (
@@ -71811,7 +71656,7 @@
/obj/structure/table,
/obj/item/storage/belt/utility,
/obj/item/robotanalyzer,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard2)
"pfp" = (
@@ -72519,7 +72364,7 @@
/area/station/hallway/secondary/exit)
"pvb" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard2)
"pvo" = (
@@ -73056,11 +72901,6 @@
icon_state = "darkred"
},
/area/station/security/storage)
-"pGU" = (
-/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint)
"pHq" = (
/obj/structure/rack,
/obj/item/clothing/head/helmet/riot{
@@ -73768,13 +73608,7 @@
},
/area/station/medical/chemistry)
"pUh" = (
-/obj/item/storage/box/monkeycubes,
-/obj/item/storage/box/monkeycubes/stokcubes,
-/obj/item/storage/box/monkeycubes/neaeracubes,
-/obj/structure/table/glass,
-/obj/item/storage/box/monkeycubes/wolpincubes,
-/obj/item/storage/box/monkeycubes/nian_worme_cubes,
-/obj/item/storage/box/monkeycubes/farwacubes,
+/obj/structure/closet/secure_closet/genetics,
/turf/simulated/floor/grass/no_creep,
/area/station/science/genetics)
"pUq" = (
@@ -74418,7 +74252,7 @@
/area/station/maintenance/starboard2)
"qiA" = (
/obj/structure/closet/crate/sci,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/xenobio_north)
"qiI" = (
@@ -75201,11 +75035,8 @@
dir = 4
},
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/maintenance,
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"qyo" = (
@@ -75281,7 +75112,7 @@
/area/station/maintenance/aft2)
"qzT" = (
/obj/structure/closet/secure_closet/hydroponics,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"qAb" = (
@@ -75605,10 +75436,7 @@
},
/area/station/security/main)
"qJN" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -75767,7 +75595,7 @@
/obj/structure/cable/cyan{
icon_state = "2-4"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"qNV" = (
@@ -77010,7 +76838,7 @@
"roH" = (
/obj/structure/closet/crate/internals,
/obj/effect/turf_decal/delivery/hollow,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"rpt" = (
@@ -77094,10 +76922,7 @@
/area/station/medical/exam_room)
"rqC" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -77328,7 +77153,7 @@
"ruo" = (
/obj/structure/rack,
/obj/item/stack/cable_coil/random,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"ruH" = (
@@ -77488,10 +77313,7 @@
/area/station/science/storage)
"rxV" = (
/obj/structure/table/reinforced,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "caution"
@@ -77885,7 +77707,7 @@
"rFg" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/medical,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"rFq" = (
@@ -78057,7 +77879,7 @@
"rIT" = (
/obj/structure/table,
/obj/item/geiger_counter,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "caution"
@@ -78532,7 +78354,7 @@
/area/station/maintenance/turbine)
"rRg" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -79966,22 +79788,6 @@
dir = 4
},
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/effect/landmark/burnturf,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -79994,6 +79800,10 @@
d2 = 8;
icon_state = "4-8"
},
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"szY" = (
@@ -81181,7 +80991,7 @@
/area/station/science/xenobiology)
"sZC" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_frequent,
/obj/machinery/light/small{
dir = 1
@@ -81294,7 +81104,7 @@
/area/station/science/research)
"tba" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_left_rare,
/obj/structure/cable{
d1 = 2;
@@ -81342,7 +81152,7 @@
/area/station/science/xenobiology)
"tca" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
@@ -81696,7 +81506,7 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"tjd" = (
@@ -82007,11 +81817,6 @@
},
/turf/space,
/area/space/nearstation)
-"tpw" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/turf/simulated/floor/plating,
-/area/station/maintenance/port)
"tpD" = (
/obj/effect/spawner/window,
/turf/simulated/floor/plating,
@@ -83065,7 +82870,7 @@
/area/station/service/hydroponics)
"tTK" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance/three,
+/obj/effect/spawner/random/maintenance,
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
@@ -83488,10 +83293,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "caution"
@@ -83662,7 +83464,7 @@
"ufr" = (
/obj/structure/table,
/obj/item/clothing/gloves/color/fyellow,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small{
dir = 8
@@ -83682,7 +83484,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/port2)
"ufD" = (
@@ -84077,10 +83879,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"uoQ" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"upe" = (
@@ -84129,7 +83928,7 @@
"uqN" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/medical,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -84787,7 +84586,7 @@
/area/station/hallway/primary/aft/north)
"uIW" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
@@ -85103,7 +84902,7 @@
/area/station/engineering/break_room)
"uNQ" = (
/obj/structure/closet/crate/medical,
-/obj/effect/spawner/lootdrop/maintenance/two,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"uOg" = (
@@ -86306,7 +86105,7 @@
/area/station/service/hydroponics)
"vmT" = (
/obj/structure/rack,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"vmW" = (
@@ -86357,7 +86156,7 @@
"vnt" = (
/obj/structure/closet/crate,
/obj/effect/turf_decal/delivery,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"vnQ" = (
@@ -86616,7 +86415,7 @@
"vtY" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"vub" = (
@@ -86761,11 +86560,6 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/security/execution)
-"vxi" = (
-/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance/three,
-/turf/simulated/floor/plating,
-/area/station/maintenance/fpmaint)
"vxx" = (
/obj/effect/spawner/random_spawners/grille_often,
/turf/simulated/floor/plating,
@@ -86822,25 +86616,6 @@
icon_state = "green"
},
/area/station/security/permabrig)
-"vzu" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
- dir = 8
- },
-/obj/structure/disposalpipe/segment/corner{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/turf/simulated/floor/plasteel,
-/area/station/maintenance/fsmaint)
"vzD" = (
/obj/machinery/iv_drip,
/obj/structure/cable{
@@ -87061,7 +86836,7 @@
/area/station/security/processing)
"vFm" = (
/obj/structure/closet/emcloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_left_rare,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
@@ -88053,7 +87828,7 @@
},
/obj/structure/table,
/obj/item/storage/toolbox/electrical,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/effect/spawner/random_spawners/cobweb_right_rare,
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard2)
@@ -88268,22 +88043,10 @@
/area/station/engineering/control)
"wlo" = (
/obj/structure/closet/crate/trashcart,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"wlG" = (
@@ -88312,13 +88075,10 @@
/area/station/engineering/control)
"wlT" = (
/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/structure/disposalpipe/segment/corner{
dir = 2
},
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"wlW" = (
@@ -88425,12 +88185,9 @@
},
/area/station/science/research)
"woK" = (
-/obj/effect/spawner/lootdrop{
- loot = list(/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
- name = "trash spawner"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/item/pen,
+/obj/effect/spawner/random/trash,
/turf/simulated/floor/bluegrid,
/area/station/maintenance/starboard)
"woN" = (
@@ -88511,7 +88268,7 @@
/area/station/aisat)
"wrO" = (
/obj/structure/closet/firecloset,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard2)
"wrW" = (
@@ -88902,7 +88659,7 @@
/area/station/maintenance/fore)
"wzV" = (
/obj/structure/closet/crate,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 1
},
@@ -88979,7 +88736,7 @@
dir = 1
},
/obj/item/radio,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"wBR" = (
@@ -89320,7 +89077,7 @@
/turf/simulated/floor/engine,
/area/station/engineering/control)
"wKQ" = (
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/obj/structure/table,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -90455,7 +90212,7 @@
/area/station/security/permabrig)
"xkc" = (
/obj/structure/closet,
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"xki" = (
@@ -90979,7 +90736,7 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/effect/spawner/lootdrop/maintenance,
+/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"xuG" = (
@@ -92165,6 +91922,22 @@
/obj/machinery/atmospherics/portable/canister/sleeping_agent,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
+"xWu" = (
+/obj/effect/spawner/random/trash,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{
+ dir = 8
+ },
+/obj/structure/disposalpipe/segment/corner{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plasteel,
+/area/station/maintenance/fsmaint)
"xWI" = (
/obj/structure/closet/secure_closet/brig,
/turf/simulated/floor/plasteel{
@@ -105880,7 +105653,7 @@ uWq
bBv
dgb
cdT
-bTb
+cPq
bBz
anE
cdT
@@ -106619,7 +106392,7 @@ adY
cEr
rbU
xgb
-vxi
+aAP
fuy
adY
aYb
@@ -106914,7 +106687,7 @@ rvu
wfa
clT
bTY
-cQb
+cLN
bZP
bcO
bQy
@@ -107160,7 +106933,7 @@ bHd
aUu
ckv
cdT
-tpw
+cLN
bTY
bTY
bTY
@@ -108982,7 +108755,7 @@ xZa
cCy
crG
crG
-cSK
+cFU
crG
jGq
crG
@@ -109245,7 +109018,7 @@ cFU
cpD
crG
bZP
-coj
+clK
gof
crG
bZP
@@ -111230,7 +111003,7 @@ aOB
aKy
jGH
aOB
-oai
+aAP
aOB
bfn
eiR
@@ -112263,7 +112036,7 @@ vyn
vyn
aEM
aDz
-pGU
+aYb
aAP
aVl
aVl
@@ -113339,7 +113112,7 @@ bFw
bTt
cdT
bqQ
-iip
+bRE
bZP
ceu
tVy
@@ -128541,7 +128314,7 @@ bUG
nBW
cPc
rRg
-hDE
+das
rOZ
ljg
fuC
@@ -133074,7 +132847,7 @@ lEo
qvN
iBO
aUx
-vzu
+xWu
jJr
tmq
aBZ
diff --git a/code/__DEFINES/_math.dm b/code/__DEFINES/_math.dm
index 28c03149a60b..cd6c152f06d6 100644
--- a/code/__DEFINES/_math.dm
+++ b/code/__DEFINES/_math.dm
@@ -245,4 +245,8 @@
// Gives you the percent of two inputs
#define PERCENT_OF(val1, val2) (val1 * (val2 / 100))
+///Returns an integer given a hex input, supports negative values "-ff". Skips preceding invalid characters.
+#define hex2num(X) text2num(X, 16)
+
+/// Returns the hex value of a decimal number. len == length of returned string.
#define num2hex(X, len) uppertext(num2text(X, len, 16))
diff --git a/code/__DEFINES/admin_defines.dm b/code/__DEFINES/admin_defines.dm
index fd1ada925ef5..86afe81a3265 100644
--- a/code/__DEFINES/admin_defines.dm
+++ b/code/__DEFINES/admin_defines.dm
@@ -20,7 +20,6 @@
#define BANTYPE_ADMIN_PERMA 7
#define BANTYPE_ADMIN_TEMP 8
-//Please don't edit these values without speaking to Errorage first ~Carn
//Admin Permissions
#define R_BUILDMODE (1<<0)
#define R_ADMIN (1<<1)
@@ -40,11 +39,12 @@
#define R_PROCCALL (1<<15)
#define R_VIEWRUNTIMES (1<<16)
#define R_MAINTAINER (1<<17)
+#define R_DEV_TEAM (1<<18)
// Update the following two defines if you add more
-#define R_MAXPERMISSION (1<<17) //This holds the maximum value for a permission. It is used in iteration, so keep it updated.
+#define R_MAXPERMISSION (1<<18) // This holds the maximum value for a permission. It is used in iteration, so keep it updated.
-#define R_HOST ((1<<18)-1) //17 bit bitmask, update me if we ever add more admin permissions. Sum of all permissions to allow easy setting.
+#define R_HOST (~0) // Sum of all permissions to allow easy setting.
#define ADMIN_QUE(user,display) "[display]"
diff --git a/code/__DEFINES/chat.dm b/code/__DEFINES/chat.dm
index 44bcdcd2a19d..8a0e4b37bf35 100644
--- a/code/__DEFINES/chat.dm
+++ b/code/__DEFINES/chat.dm
@@ -20,6 +20,7 @@
#define MESSAGE_TYPE_COMBAT "combat"
#define MESSAGE_TYPE_ADMINCHAT "adminchat"
#define MESSAGE_TYPE_MENTORCHAT "mentorchat"
+#define MESSAGE_TYPE_DEVCHAT "devchat"
#define MESSAGE_TYPE_EVENTCHAT "eventchat"
#define MESSAGE_TYPE_ADMINLOG "adminlog"
#define MESSAGE_TYPE_ATTACKLOG "attacklog"
diff --git a/code/__DEFINES/mob_defines.dm b/code/__DEFINES/mob_defines.dm
index c9725785dcde..58af2e1bb569 100644
--- a/code/__DEFINES/mob_defines.dm
+++ b/code/__DEFINES/mob_defines.dm
@@ -288,6 +288,8 @@
#define is_admin(user) (check_rights(R_ADMIN, 0, (user)) != 0)
+#define is_developer(user) (check_rights(R_DEV_TEAM, 0, (user)) != 0)
+
#define SLEEP_CHECK_DEATH(X) sleep(X); if(QDELETED(src) || stat == DEAD) return;
// Locations
diff --git a/code/__DEFINES/power_defines.dm b/code/__DEFINES/power_defines.dm
index 15d4e1c1baa9..c7397a99d846 100644
--- a/code/__DEFINES/power_defines.dm
+++ b/code/__DEFINES/power_defines.dm
@@ -39,4 +39,10 @@
/// APC battery is at 100%
#define APC_FULLY_CHARGED 2
-#define KW *1000
+#define KW * 1e3
+#define MW * 1e6
+#define GW * 1e9
+
+#define KJ * 1e3
+#define MJ * 1e6
+#define GJ * 1e9
diff --git a/code/__DEFINES/speech_channels.dm b/code/__DEFINES/speech_channels.dm
index 68067d21aec6..5e637ed7cd89 100644
--- a/code/__DEFINES/speech_channels.dm
+++ b/code/__DEFINES/speech_channels.dm
@@ -8,4 +8,5 @@
#define MENTOR_CHANNEL "Mentor"
#define ADMIN_CHANNEL "Admin"
#define DSAY_CHANNEL "Dsay"
+#define DEV_CHANNEL "Dev"
diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm
index f1b92bdfaa13..7fc2bee5074c 100644
--- a/code/__HELPERS/_logging.dm
+++ b/code/__HELPERS/_logging.dm
@@ -104,6 +104,10 @@ GLOBAL_PROTECT(log_end)
if(GLOB.configuration.logging.adminchat_logging)
rustg_log_write(GLOB.world_game_log, "MENTORSAY: [speaker.simple_info_line()]: [html_decode(text)][GLOB.log_end]")
+/proc/log_devsay(text, mob/speaker)
+ if(GLOB.configuration.logging.adminchat_logging)
+ rustg_log_write(GLOB.world_game_log, "DEVSAY: [speaker.simple_info_line()]: [html_decode(text)][GLOB.log_end]")
+
/proc/log_ghostsay(text, mob/speaker)
if(GLOB.configuration.logging.say_logging)
rustg_log_write(GLOB.world_game_log, "DEADCHAT: [speaker.simple_info_line()]: [html_decode(text)][GLOB.log_end]")
diff --git a/code/__HELPERS/lists.dm b/code/__HELPERS/lists.dm
index 79047dfc6e63..0c172757ce39 100644
--- a/code/__HELPERS/lists.dm
+++ b/code/__HELPERS/lists.dm
@@ -883,3 +883,40 @@
for(var/key in input)
UNTYPED_LIST_ADD(keys, key)
return keys
+
+/**
+ * Given a list, return a copy where values without defined weights are given weight 1.
+ * For example, fill_with_ones(list(A, B=2, C)) = list(A=1, B=2, C=1)
+ * Useful for weighted random choices (loot tables, syllables in languages, etc.)
+ */
+/proc/fill_with_ones(list/list_to_pad)
+ if(!islist(list_to_pad))
+ return list_to_pad
+
+ var/list/final_list = list()
+
+ for(var/key in list_to_pad)
+ if(list_to_pad[key])
+ final_list[key] = list_to_pad[key]
+ else
+ final_list[key] = 1
+
+ return final_list
+
+/**
+ * Like pick_weight, but allowing for nested lists.
+ *
+ * For example, given the following list:
+ * list(A = 1, list(B = 1, C = 1))
+ * A would have a 50% chance of being picked,
+ * and list(B, C) would have a 50% chance of being picked.
+ * If list(B, C) was picked, B and C would then each have a 50% chance of being picked.
+ * So the final probabilities would be 50% for A, 25% for B, and 25% for C.
+ *
+ * Weights should be integers. Entries without weights are assigned weight 1 (so unweighted lists can be used as well)
+ */
+/proc/pick_weight_recursive(list/list_to_pick)
+ var/result = pickweight(fill_with_ones(list_to_pick))
+ while(islist(result))
+ result = pickweight(fill_with_ones(result))
+ return result
diff --git a/code/__HELPERS/trait_helpers.dm b/code/__HELPERS/trait_helpers.dm
index 57e0a7ee4257..a4a017f4518f 100644
--- a/code/__HELPERS/trait_helpers.dm
+++ b/code/__HELPERS/trait_helpers.dm
@@ -236,7 +236,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_NPC_ZOMBIE "npc_zombie" // A trait for checking if a zombie should act like an NPC and attack
#define TRAIT_ABSTRACT_HANDS "abstract_hands" // Mobs with this trait can only pick up abstract items.
#define TRAIT_LANGUAGE_LOCKED "language_locked" // cant add/remove languages until removed (excludes babel because fuck everything i guess)
-#define TRAIT_HAS_IV_BAG "iv_bag" // Used to check if there is an active IV bag. Currently blocks another IV bags from being inserted.
#define TRAIT_PLAYING_CARDS "playing_cards"
//***** MIND TRAITS *****/
diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm
index f883f0cec778..c77e07a55487 100644
--- a/code/__HELPERS/type2type.dm
+++ b/code/__HELPERS/type2type.dm
@@ -1,47 +1,12 @@
/*
* Holds procs designed to change one type of value, into another.
* Contains:
- * hex2num & num2hex
* file2list
* angle2dir
* angle2text
* worldtime2text
*/
-//Returns an integer given a hex input
-/proc/hex2num(hex)
- if(!(istext(hex)))
- return
-
- var/num = 0
- var/power = 0
- var/i = null
- i = length(hex)
- while(i > 0)
- var/char = copytext(hex, i, i + 1)
- switch(char)
- if("0")
- pass() // Do nothing
- if("9", "8", "7", "6", "5", "4", "3", "2", "1")
- num += text2num(char) * 16 ** power
- if("a", "A")
- num += 16 ** power * 10
- if("b", "B")
- num += 16 ** power * 11
- if("c", "C")
- num += 16 ** power * 12
- if("d", "D")
- num += 16 ** power * 13
- if("e", "E")
- num += 16 ** power * 14
- if("f", "F")
- num += 16 ** power * 15
- else
- return
- power++
- i--
- return num
-
//Returns an integer value for R of R/G/B given a hex color input.
/proc/color2R(hex)
if(!(istext(hex)))
@@ -187,6 +152,7 @@
if(rights & R_MENTOR) . += "[seperator]+MENTOR"
if(rights & R_VIEWRUNTIMES) . += "[seperator]+VIEWRUNTIMES"
if(rights & R_MAINTAINER) . += "[seperator]+MAINTAINER"
+ if(rights & R_DEV_TEAM) . += "[seperator]+DEV_TEAM"
/proc/ui_style2icon(ui_style)
switch(ui_style)
diff --git a/code/__HELPERS/unique_ids.dm b/code/__HELPERS/unique_ids.dm
index f0ef03d554f5..0f54d48354e9 100644
--- a/code/__HELPERS/unique_ids.dm
+++ b/code/__HELPERS/unique_ids.dm
@@ -30,11 +30,22 @@ GLOBAL_LIST_EMPTY(uid_log)
var/tag_backup = tag
tag = null // Grab the raw ref, not the tag
// num2text can output 8 significant figures max. If we go above 10 million UIDs in a round, shit breaks
- unique_datum_id = "\ref[src]_[num2text(GLOB.next_unique_datum_id++, 8)]"
+ var/uid_number = num2text(GLOB.next_unique_datum_id++, 8)
+ unique_datum_id = "\ref[src]_[uid_number]"
+ md5_unique_datum_id = "[md5(unique_datum_id)]_[uid_number]" // Avoid ANY collision chance
tag = tag_backup
GLOB.uid_log[type]++
return unique_datum_id
+/**
+ * Safety wrapper for getting MD5 UIDs
+ *
+ * This ensures it exists before reading it
+ */
+/datum/proc/MD5_UID()
+ UID()
+ return md5_unique_datum_id
+
/**
* Locates a datum based off of the UID
*
diff --git a/code/_globalvars/lists/maint_loot_tables.dm b/code/_globalvars/lists/maint_loot_tables.dm
new file mode 100644
index 000000000000..12640e2c35a4
--- /dev/null
+++ b/code/_globalvars/lists/maint_loot_tables.dm
@@ -0,0 +1,206 @@
+GLOBAL_LIST_INIT(maintenance_loot_tier_0, list(
+ list(
+ // Tools
+ /obj/effect/spawner/random/engineering/tools,
+
+ // Materials
+ /obj/effect/spawner/random/engineering/materials,
+ ) = 6,
+
+ list(
+ // Spawners for easily found items
+ /obj/effect/spawner/random/bureaucracy,
+ /obj/effect/spawner/random/dice,
+ /obj/effect/spawner/random/book,
+
+ // Other worthless/easily found items
+ /obj/item/camera_film,
+ /obj/item/camera,
+ /obj/item/caution,
+ /obj/item/clothing/head/cone,
+ /obj/item/light/bulb,
+ /obj/item/light/tube,
+ /obj/item/poster/random_contraband,
+ /obj/item/poster/random_official,
+ /obj/item/reagent_containers/drinks/drinkingglass,
+ /obj/item/reagent_containers/glass/beaker/waterbottle,
+ /obj/item/reagent_containers/glass/beaker/waterbottle/empty,
+ /obj/item/scissors,
+ /obj/item/storage/box,
+ /obj/item/storage/fancy/crayons,
+ /obj/item/storage/fancy/matches,
+ ) = 2,
+
+ list(
+ // Emergency items
+ /obj/item/extinguisher,
+ /obj/item/flashlight,
+ ) = 1,
+))
+
+GLOBAL_LIST_INIT(maintenance_loot_tier_1, list(
+ list(
+ // Sub-spawners
+ /obj/effect/spawner/random/engineering/toolbox,
+ /obj/effect/spawner/random/snacks,
+
+ // Assemblies and cells
+ /obj/item/assembly/prox_sensor,
+ /obj/item/assembly/timer,
+ /obj/item/assembly/signaler,
+ /obj/item/assembly/voice,
+ /obj/item/assembly/voice/noise,
+ /obj/item/stock_parts/cell,
+
+ // Clothing
+ /obj/item/clothing/glasses/sunglasses,
+ /obj/item/clothing/gloves/color/black,
+ /obj/item/clothing/gloves/color/fyellow,
+ /obj/item/clothing/gloves/color/yellow/fake,
+ /obj/item/clothing/head/hardhat,
+ /obj/item/clothing/head/hardhat/red,
+ /obj/item/clothing/head/that,
+ /obj/item/clothing/head/ushanka,
+ /obj/item/clothing/mask/gas,
+ /obj/item/clothing/shoes/black,
+ /obj/item/clothing/suit/storage/hazardvest,
+ /obj/item/clothing/under/color/black,
+ /obj/item/clothing/under/misc/vice,
+
+ // Medical supplies / chemistry items
+ /obj/item/reagent_containers/dropper,
+ /obj/item/reagent_containers/glass/beaker,
+ /obj/item/reagent_containers/glass/beaker/large,
+ /obj/item/reagent_containers/syringe,
+ /obj/item/stack/medical/bruise_pack/advanced,
+ /obj/item/stack/medical/ointment/advanced,
+
+ // Common items
+ /obj/item/bodybag,
+ /obj/item/cultivator,
+ /obj/item/flashlight/pen,
+ /obj/item/radio/off,
+ /obj/item/reagent_containers/drinks/mug,
+ /obj/item/reagent_containers/glass/bucket,
+ /obj/item/reagent_containers/spray/pestspray,
+ /obj/item/relic,
+ /obj/item/restraints/handcuffs/toy,
+ /obj/item/scratch,
+ /obj/item/seeds/ambrosia,
+ /obj/item/seeds/ambrosia/deus,
+ /obj/item/stack/sheet/cardboard,
+ /obj/item/stack/sheet/cloth,
+ /obj/item/storage/bag/plasticbag,
+ /obj/item/storage/box/cups,
+ /obj/item/storage/box/donkpockets,
+ /obj/item/storage/box/lights/mixed,
+ /obj/item/storage/fancy/cigarettes/dromedaryco,
+ /obj/item/tank/internals/emergency_oxygen,
+ /obj/item/tank/internals/emergency_oxygen/engi,
+ /obj/item/vending_refill/cola,
+ ) = 85,
+
+ list(
+ /obj/item/storage/wallet,
+ /obj/item/storage/wallet/random,
+ ) = 5,
+
+ list(
+ // Small chance of tier 1 stock parts
+ /obj/item/stock_parts/capacitor,
+ /obj/item/stock_parts/manipulator,
+ /obj/item/stock_parts/matter_bin,
+ /obj/item/stock_parts/micro_laser,
+ /obj/item/stock_parts/scanning_module,
+
+ // Coins
+ /obj/item/coin/silver,
+ /obj/item/coin/twoheaded,
+ ) = 2,
+))
+
+GLOBAL_LIST_INIT(maintenance_loot_tier_2, list(
+ list(
+ // Rarer items
+ /obj/effect/spawner/random/mod/maint,
+ /obj/item/clothing/glasses/meson,
+ /obj/item/clothing/head/welding,
+ /obj/item/crowbar/red,
+ /obj/item/storage/belt/utility,
+ ) = 45,
+
+ list(
+ // Contraband and Syndicate items
+ /obj/item/ammo_box/magazine/m10mm,
+ /obj/item/clothing/mask/chameleon,
+ /obj/item/clothing/mask/chameleon/voice_change,
+ /obj/item/clothing/mask/gas/voice_modulator,
+ /obj/item/clothing/mask/gas/voice_modulator/chameleon,
+ /obj/item/clothing/shoes/chameleon/noslip,
+ /obj/item/clothing/suit/jacket/bomber/syndicate,
+ /obj/item/clothing/suit/storage/iaa/blackjacket/armored,
+ /obj/item/clothing/under/chameleon,
+ /obj/item/deck/cards/syndicate,
+ /obj/item/grenade/clown_grenade,
+ /obj/item/grenade/smokebomb,
+ /obj/item/gun/syringe/syndicate,
+ /obj/item/melee/knuckleduster/syndie,
+ /obj/item/mod/construction/broken_core,
+ /obj/item/multitool/ai_detect,
+ /obj/item/seeds/ambrosia/cruciatus,
+ /obj/item/soap/syndie,
+ /obj/item/stamp/chameleon,
+ /obj/item/storage/backpack/duffel/syndie/med/surgery_fake,
+ /obj/item/storage/backpack/satchel_flat,
+ /obj/item/storage/belt/military/traitor,
+ /obj/item/storage/fancy/cigarettes/cigpack_syndicate,
+ /obj/item/storage/pill_bottle/fakedeath,
+ /obj/item/storage/secure/briefcase/syndie,
+ /obj/item/storage/toolbox/syndicate,
+ /obj/item/suppressor,
+ /obj/item/weaponcrafting/receiver,
+ ) = 45,
+
+ list(
+ // Health/repair kits
+ /obj/item/storage/firstaid/regular,
+ /obj/item/storage/firstaid/machine,
+
+ // Rarer departmental items
+ /obj/item/reagent_scanner/adv,
+ /obj/item/robotanalyzer,
+ /obj/item/stack/nanopaste,
+ /obj/item/whetstone,
+
+ // Other rare but useful items
+ /obj/item/radio/headset,
+ /obj/item/melee/knuckleduster,
+ ) = 3,
+))
+
+GLOBAL_LIST_INIT(maintenance_loot_tier_3, list(
+ list(
+ // Coveted items
+ /obj/item/clothing/gloves/color/yellow,
+ ) = 7,
+
+ list(
+ // Rare Syndicate items
+ /obj/item/gun/projectile/automatic/pistol,
+ /obj/item/dnascrambler,
+ /obj/item/bio_chip_implanter/storage,
+ /obj/item/reagent_containers/spray/sticky_tar,
+ /obj/item/storage/box/syndie_kit/space,
+ ) = 3,
+))
+
+GLOBAL_LIST_INIT(maintenance_loot_tables, list(
+ list(
+ GLOB.maintenance_loot_tier_0 = 490,
+ GLOB.maintenance_loot_tier_1 = 390,
+ GLOB.maintenance_loot_tier_2 = 114,
+ GLOB.maintenance_loot_tier_3 = 6,
+ ) = 75,
+
+ /obj/effect/spawner/random/trash = 25,
+))
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index e6b68fcbddae..f276bcc25abd 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -97,7 +97,6 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_I_WANT_BRAINS" = TRAIT_I_WANT_BRAINS,
"TRAIT_ABSTRACT_HANDS" = TRAIT_ABSTRACT_HANDS,
"TRAIT_LANGUAGE_LOCKED" = TRAIT_LANGUAGE_LOCKED,
- "TRAIT_HAS_IV_BAG" = TRAIT_HAS_IV_BAG,
"TRAIT_NON_INFECTIOUS_ZOMBIE" = TRAIT_NON_INFECTIOUS_ZOMBIE,
"TRAIT_CANNOT_PULL" = TRAIT_CANNOT_PULL
),
diff --git a/code/_onclick/hud/hud_datum.dm b/code/_onclick/hud/hud_datum.dm
index 6aa1d4e8a8e8..f3e0b770f9a8 100644
--- a/code/_onclick/hud/hud_datum.dm
+++ b/code/_onclick/hud/hud_datum.dm
@@ -134,6 +134,7 @@
mymob.throw_icon = null
mymob.healths = null
mymob.healthdoll = null
+ mymob.staminas = null
mymob.pullin = null
mymob.nutrition_display = null
diff --git a/code/controllers/configuration/sections/discord_configuration.dm b/code/controllers/configuration/sections/discord_configuration.dm
index 4f34a7537070..c2fd17acfd65 100644
--- a/code/controllers/configuration/sections/discord_configuration.dm
+++ b/code/controllers/configuration/sections/discord_configuration.dm
@@ -11,13 +11,12 @@
var/mentor_role_id = ""
/// List of all URLs for the main webhooks
var/list/main_webhook_urls = list()
- /// List of all URLs for the admin webhooks
- var/list/mentor_webhook_urls = list()
/// List of all URLs for the mentor webhooks
+ var/list/mentor_webhook_urls = list()
+ /// List of all URLs for the admin webhooks
var/list/admin_webhook_urls = list()
-
/datum/configuration_section/discord_configuration/load_data(list/data)
// Use the load wrappers here. That way the default isnt made 'null' if you comment out the config line
CONFIG_LOAD_BOOL(webhooks_enabled, data["enable_discord_webhooks"])
diff --git a/code/controllers/subsystem/SSstatpanel.dm b/code/controllers/subsystem/SSstatpanel.dm
index 08840da95412..20804e50b5f2 100644
--- a/code/controllers/subsystem/SSstatpanel.dm
+++ b/code/controllers/subsystem/SSstatpanel.dm
@@ -142,6 +142,7 @@ SUBSYSTEM_DEF(statpanels)
var/list/to_make = obj_window.atoms_to_imagify
var/list/turf_items = list()
var/i = 0
+ var/client_uid = load_from.UID()
for(var/atom/turf_item as anything in obj_window.atoms_to_show)
// Limit what we send to the client's rendered section.
i++
@@ -154,8 +155,13 @@ SUBSYSTEM_DEF(statpanels)
if(existing_image == OBJ_IMAGE_LOADING)
continue
// We already have it. Success!
+
+ // Store the cache the MD5'd UID for safety reasons
+ var/obj_m5_uid = turf_item.MD5_UID()
+ load_from.m5_uid_cache[obj_m5_uid] = turf_item.unique_datum_id
+
if(existing_image)
- turf_items["[i]"] = list("[turf_item.name]", turf_item.UID(), SSassets.transport.get_asset_url(existing_image), existing_image)
+ turf_items["[i]"] = list("[turf_item.name]", obj_m5_uid, SSassets.transport.get_asset_url(existing_image), existing_image, client_uid)
continue
// Now, we're gonna queue image generation out of those refs
to_make += turf_item
diff --git a/code/controllers/subsystem/SSticker.dm b/code/controllers/subsystem/SSticker.dm
index d262c69c6fd6..9defe6791281 100644
--- a/code/controllers/subsystem/SSticker.dm
+++ b/code/controllers/subsystem/SSticker.dm
@@ -819,7 +819,7 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/proc/count_xenomorps()
. = 0
- for(var/datum/mind/xeno_mind as anything in SSticker.mode.xenos)
+ for(var/datum/mind/xeno_mind in SSticker.mode.xenos)
if(xeno_mind.current?.stat == DEAD)
continue
.++
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
index cf1715b7a878..56e35b452ed8 100644
--- a/code/datums/datum.dm
+++ b/code/datums/datum.dm
@@ -8,6 +8,8 @@
var/list/list/datum/callback/signal_procs
var/var_edited = FALSE //Warranty void if seal is broken
var/tmp/unique_datum_id = null
+ /// MD5'd version of the UID. Used for instances where we dont want to make clients aware of UIDs.
+ VAR_PRIVATE/tmp/md5_unique_datum_id = null // using VAR_PRIVATE means it cant be accessed outside of the MD5_UID() proc
/// Used by SSprocessing
var/isprocessing = FALSE
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 280213036183..0d1e158d9baf 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -466,6 +466,8 @@