Merge pull request #539 from Sea-of-Lost-Souls/upstreammaint

[MDB IGNORE][IDB IGNORE] Slimy Maint

.editorconfig

@@ -0,0 +1,22 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = tab
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.py]
+indent_style = space
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Dockerfile]
+indent_style = space

.github/CODEOWNERS

@@ -4,42 +4,42 @@
 # In the event that multiple org members are to be informed of changes
 # to the same file or dir, add them to the end under Multiple Owners
 
-# Jake Park
-/modular_skyrat/modules/apocolypse_of_scythes/ @jjpark-kb
-/modular_skyrat/modules/ash_chemical_centrifuge/ @jjpark-kb
-/modular_skyrat/modules/ash_farming/ @jjpark-kb
-/modular_skyrat/modules/ashwalker_change/ @jjpark-kb
-/modular_skyrat/modules/ashwalker_shaman/ @jjpark-kb
-/modular_skyrat/modules/borg_buffs/ @jjpark-kb
-/modular_skyrat/modules/cargo_teleporter/ @jjpark-kb
-/modular_skyrat/modules/conveyor_sorter/ @jjpark-kb
-/modular_skyrat/modules/cortical_borer/ @jjpark-kb
-/modular_skyrat/modules/connecting_computer/ @jjpark-kb
-/modular_skyrat/modules/fishing/ @jjpark-kb
-/modular_skyrat/modules/positronic_alert_console/ @jjpark-kb
-/modular_skyrat/modules/primitive_production/ @jjpark-kb
-/modular_skyrat/modules/reagent_forging/ @jjpark-kb
-/modular_skyrat/modules/xenoarch/ @jjpark-kb
-
-# Jolly-66
-/modular_skyrat/modules/mapping @Jolly-66
-/tools/UpdatePaths @Jolly-66
-
-# LT3
-/code/modules/transport/ @lessthnthree
-/modular_skyrat/master_files/code/controllers/subsystem/ @lessthnthree
-/modular_skyrat/modules/advanced_engineering/ @lessthnthree
-/modular_skyrat/modules/airlock_override/ @lessthnthree
-/modular_skyrat/modules/alerts/ @lessthnthree
-/modular_skyrat/modules/cme/ @lessthnthree
-/modular_skyrat/modules/events/ @lessthnthree
-/modular_skyrat/modules/ices_events/ @lessthnthree
+
+#Shivurr
+
+
+
+# Mortisduem
+
+
 
 # Multiple Owners
 
-# Maptainers
-/_maps/ @Jolly-66 @KathrinBailey
 
-# Expensive files that touching basically always cause performance problems
-## Init times
-**/*_EXPENSIVE.dm @Useroth
+
+# ORCACommander
+/.github/ @ORCACommander
+
+## Map Maintainence
+/_maps/ @ORCACommander
+/tools/UpdatePaths @ORCACommander
+
+## Map Owner
+
+/_maps/pubbystation.json @Kittayecat
+_maps/map_files/PubbyStation/ @Kittayecat
+
+
+## Hosting Responsibilities
+/code/_compile_options.dm @ORCACommander
+/config/ @ORCACommander
+/SQL/ @ORCACommander
+/code/__DEFINES/subsystems.dm @ORCACommander
+/code/__DEFINES/MC.dm @ORCACommander
+/code/controllers/admin.dm @ORCACommander
+/code/controllers/master.dm @ORCACommander
+/code/controllers/failsafe.dm @ORCACommander
+/code/controllers/subsystem.dm @ORCACommander
+/code/controllers/subsystem/timer.dm @ORCACommander
+/code/controllers/configuration/entries @ORCACommander
+/tools/tgs_scripts/ @ORCACommander

.github/CONTRIBUTING.md

@@ -24,18 +24,18 @@ If you have difficulty, ask for help in the #coding-general channel on our disco
 
 ## Introduction
 
-Hello and welcome to /tg/station's contributing page. You are here because you are curious or interested in contributing - thank you! Everyone is free to contribute to this project as long as they follow the simple guidelines and specifications below; at /tg/station, we strive to maintain code stability and maintainability, and to do that, we need all pull requests to hold up to those specifications. It's in everyone's best interests - including yours! - if the same bug doesn't have to be fixed twice because of duplicated code.
+Hello and welcome to Tannhauser-Gate's contributing page. You are here because you are curious or interested in contributing - thank you! Everyone is free to contribute to this project as long as they follow the simple guidelines and specifications below; at Sea of Lost Souls, we strive to maintain code stability and maintainability, and to do that, we need all pull requests to hold up to those specifications. It's in everyone's best interests - including yours! - if the same bug doesn't have to be fixed twice because of duplicated code.
 
 First things first, we want to make it clear how you can contribute (if you've never contributed before), as well as the kinds of powers the team has over your additions, to avoid any unpleasant surprises if your pull request is closed for a reason you didn't foresee.
 
 ## Getting Started
 
-/tg/station doesn't have a list of goals and features to add; we instead allow freedom for contributors to suggest and create their ideas for the game. That doesn't mean we aren't determined to squash bugs, which unfortunately pop up a lot due to the deep complexity of the game. Here are some useful starting guides, if you want to contribute or if you want to know what challenges you can tackle with zero knowledge about the game's code structure.
+Sea of Lost Souls doesn't have a list of goals and features to add; we instead allow freedom for contributors to suggest and create their ideas for the game. That doesn't mean we aren't determined to squash bugs, which unfortunately pop up a lot due to the deep complexity of the game. Here are some useful starting guides, if you want to contribute or if you want to know what challenges you can tackle with zero knowledge about the game's code structure.
 
 If you want to contribute the first thing you'll need to do is [set up Git](https://hackmd.io/@tgstation/HJ8OdjNBc) so you can download the source code.
 After setting it up, optionally navigate your git commandline to the project folder and run the command: `git config blame.ignoreRevsFile .git-blame-ignore-revs`.
 
-We have a [list of guides on the wiki](http://www.tgstation13.org/wiki/Guides#Development_and_Contribution_Guides) that will help you get started contributing to /tg/station with Git and Dream Maker. For beginners, it is recommended you work on small projects like bugfixes at first. If you need help learning to program in BYOND, check out this [repository of resources](http://www.byond.com/developer/articles/resources).
+We have a [list of guides on the wiki](http://www.tgstation13.org/wiki/Guides#Development_and_Contribution_Guides) that will help you get started contributing to Tannhauser Gate with Git and Dream Maker. For beginners, it is recommended you work on small projects like bugfixes at first. If you need help learning to program in BYOND, check out this [repository of resources](http://www.byond.com/developer/articles/resources).
 
 There is an open list of approachable issues for [your inspiration here](https://github.com/tgstation/tgstation/issues?q=is%3Aopen+is%3Aissue+label%3A%22Good+First+Issue%22).
 

.github/ISSUE_TEMPLATE/bug_report.md

@@ -12,7 +12,7 @@ about: Create a report to help reproduce and fix the issue
 
 <!--- **INCLUDE THE ROUND ID**
 If you discovered this issue from playing tgstation hosted servers:
-[Round ID]: # (It can be found in the Status panel or retrieved from https://sb.atlantaned.space/rounds ! The round id let's us look up valuable information and logs for the round the bug happened.)-->
+[Round ID]: # (It can be found in the Status panel! The round id let's us look up valuable information and logs for the round the bug happened.)-->
 
 <!-- If you are reporting an issue found in another branch or codebase, you MUST link the branch or codebase repo in your issue report or it will be closed. For branches, If you have not pushed your code up, you must either reproduce it on master or push your code up before making an issue report. For other codebases, if you do not have a public code repo you will be refused help unless you can completely reproduce the issue on our code. -->
 

.github/guides/DOWNLOADING.md

@@ -5,17 +5,6 @@ Option 1:
 Follow this: https://www.tgstation13.org/wiki/Setting_up_git
 
 Option 2: Download the source code as a zip by clicking the ZIP button in the
-code tab of https://github.com/tgstation/tgstation
+code tab of https://github.com/Sea-of-Lost-Souls/Tannhauser-Gate
 (note: this will use a lot of bandwidth if you wish to update and is a lot of
 hassle if you want to make any changes at all, so it's not recommended.)
-
-Option 3: Download a pre-compiled nightly at https://tgstation13.download/nightlies/ (same caveats as option 2)
-
-*Warning: option 4 is out of date, and not maintained, use at your own risk*
-
-Option 4: Use our docker image that tracks the master branch (See commits for build status. Again, same caveats as option 2)
-
-```
-docker run -d -p <your port>:1337 -v /path/to/your/config:/tgstation/config -v /path/to/your/data:/tgstation/data tgstation/tgstation <dream daemon options i.e. -public or -params>
-```
-

.github/guides/MAPS_AND_AWAY_MISSIONS.md

@@ -1,6 +1,7 @@
 ## MAPS
 
-/tg/station currently has six station maps in rotation.
+Tannhauser Gate is currently comes equipped with six maps.
+
 * [Birdshot](https://tgstation13.org/wiki/Birdshot)
 * [DeltaStation](https://tgstation13.org/wiki/DeltaStation)
 * [IceBoxStation](https://tgstation13.org/wiki/IceboxStation)
@@ -49,7 +50,7 @@ For a much more comprehensive guide on UpdatePaths, please see the documentation
 
 ## AWAY MISSIONS
 
-/tg/station supports loading away missions however they are disabled by default.
+Tannhauser Gate supports loading away missions however they are disabled by default.
 
 Map files for away missions are located in the `_maps/RandomZLevels` directory. Each away mission includes it's own code definitions located in `/code/modules/awaymissions/mission_code`. These files must be included and compiled with the server beforehand otherwise the server will crash upon trying to load away missions that lack their code.
 

.github/guides/POLICYCONFIG.md

@@ -3,7 +3,7 @@ Welcome to this short guide to the POLICY config mechanism.
 You are probably reading this guide because you have been informed your antagonist or ghost role needs to support policy configuration.
 
 ## Requirements
-It is a requirement of /tg/station development that all ghost roles, antags, minor antags and event mobs of any kind must support the policy system when implemented.
+It is a requirement of Tannhauser Gate development that all ghost roles, antags, minor antags and event mobs of any kind must support the policy system when implemented.
 
 ## What is policy configuration
 Policy configuration is a json file that the administrators of a server can edit, which contains a dictionary of keywords -> string message.

.github/guides/STYLE.md

@@ -474,7 +474,7 @@ deal_damage(10) // Fine! The proc name makes it obvious `10` is the damage...at
 deal_damage(10, FIRE) // Also fine! `FIRE` makes it obvious the second parameter is damage type.
 deal_damage(damage = 10) // Redundant, but not prohibited.
 
-use_power(30) // Fine! `30` is obviously something like watts.
+use_energy(30 JOULES) // Use energy in joules.
 turn_on(30) // Not fine!
 turn_on(power_usage = 30) // Fine!
 

.github/workflows/automerge.yml

@@ -1,15 +1,5 @@
 name: automerge
 on:
-  pull_request:
-    types:
-      - labeled
-      - unlabeled
-      - synchronize
-      - opened
-      - edited
-      - ready_for_review
-      - reopened
-      - unlocked
   pull_request_review:
     types:
       - submitted
@@ -25,10 +15,11 @@ jobs:
         name: automerge
         uses: "pascalgn/[email protected]"
         env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          GITHUB_TOKEN: "${{ secrets.AUTOMERGE }}"
+          MERGE_LABELS: "automerge"
           MERGE_REMOVE_LABELS: ""
-          MERGE_METHOD: "squash"
-          MERGE_COMMIT_MESSAGE: "pull-request-description"
+          MERGE_METHOD: "merge"
+          MERGE_COMMIT_MESSAGE: "pull-request-title"
           MERGE_FORKS: "false"
           MERGE_RETRIES: "12"
           MERGE_RETRY_SLEEP: "180000"

.github/workflows/compile_changelogs.yml

@@ -51,4 +51,4 @@ jobs:
         if: steps.value_holder.outputs.ACTIONS_ENABLED
         uses: ad-m/github-push-action@master
         with:
-          github_token: ${{ secrets.SKYRATBOT_TOKEN }}
+          github_token: ${{ secrets.WORKFLOWS }}

.github/workflows/gbp.yml

@@ -39,4 +39,4 @@ jobs:
       with:
         branch: "gbp-balances"
         directory: ./gbp-balances
-        token: ${{ secrets.GITHUB_TOKEN }}
+        token: ${{ secrets.WORKFLOWS }}

.github/workflows/gbp_collect.yml

@@ -41,4 +41,4 @@ jobs:
       with:
         collect: "true"
         directory: ./gbp-balances
-        token: ${{ secrets.GITHUB_TOKEN }}
+        token: ${{ secrets.WORKFLOWS }}

.github/workflows/generate_documentation.yml

@@ -26,12 +26,12 @@ jobs:
         run: |
           ~/dmdoc
           touch dmdoc/.nojekyll
-          echo codedocs.tgstation13.org > dmdoc/CNAME
+          echo sea-of-lost-souls.github.io/Tannhauser-Gate/ > dmdoc/CNAME
       - name: Deploy
         uses: JamesIves/[email protected]
         with:
           BRANCH: gh-pages
           CLEAN: true
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.WORKFLOWS }}
           SINGLE_COMMIT: true
           FOLDER: dmdoc

.github/workflows/pr_emoji.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: Wayland-Smithy/emoji-stripper-action@de0c1d158edee50700583d6454aa5f5117337599
       with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        repo-token: ${{ secrets.WORKFLOWS }}
         title: true
         body: true
         body-after: ":cl:"

.github/workflows/round_id_linker.yml

@@ -9,4 +9,4 @@ jobs:
     steps:
     - uses: tgstation/round_linker@master
       with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        repo-token: ${{ secrets.WORKFLOWS }}

.github/workflows/stale.yml

@@ -18,11 +18,10 @@ jobs:
     steps:
     - uses: actions/stale@v4
       with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        repo-token: ${{ secrets.WORKFLOWS }}
         stale-pr-message: "This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself."
-        days-before-stale: 7
-        days-before-close: 7
-        stale-pr-label: 'Stale'
+        days-before-stale: 14
+        days-before-close: 21
         days-before-issue-stale: -1
         stale-issue-label: 'Cleanup Flagged'
         remove-issue-stale-when-updated: false

.github/workflows/update_tgs_dmapi.yml

@@ -44,4 +44,4 @@ jobs:
         pr_body: "This pull request updates the TGS DMAPI to the latest version. Please note any changes that may be breaking or unimplemented in your codebase by checking what changes are in the definitions file: code/__DEFINES/tgs.dm before merging."
         pr_label: "Tools"
         pr_allow_empty: false
-        github_token: ${{ secrets.COMFY_ORANGE_PAT }}
+        github_token: ${{ secrets.WORKFLOWS }}

.tgs.yml

@@ -3,7 +3,7 @@
 version: 1
 # The BYOND version to use (kept in sync with dependencies.sh by the "TGS Test Suite" CI job)
 # Must be interpreted as a string, keep quoted
-byond: "515.1630"
+byond: "515.1633"
 # Folders to create in "<instance_path>/Configuration/GameStaticFiles/"
 static_files:
   # Config directory should be static

.vscode/extensions.json

@@ -1,6 +1,7 @@
 {
 	"recommendations": [
 		"platymuus.dm-langclient",
+		"EditorConfig.EditorConfig",
 		"arcanis.vscode-zipfs",
 		"dbaeumer.vscode-eslint",
 		"stylemistake.auto-comment-blocks",

README.md

@@ -1,9 +1,6 @@
-## Skyrat 13 (/tg/station Downstream)
+## Tannhauser Gate by Sea of Lost Souls (Skyrat 13 Downstream)
 
-[![CI Suite](https://github.com/Skyrat-SS13/Skyrat-tg/workflows/CI%20Suite/badge.svg)](https://github.com/Skyrat-SS13/Skyrat-tg/actions?query=workflow%3A%22CI+Suite%22)
-[![Percentage of issues still open](https://isitmaintained.com/badge/open/Skyrat-SS13/Skyrat-tg.svg)](https://isitmaintained.com/project/Skyrat-SS13/Skyrat-tg "Percentage of issues still open")
-[![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/Skyrat-SS13/Skyrat-tg.svg)](https://isitmaintained.com/project/Skyrat-SS13/Skyrat-tg "Average time to resolve an issue")
-![Coverage](https://img.shields.io/codecov/c/github/Skyrat-SS13/Skyrat-tg)
+[![CI Suite](https://github.com/Sea-of-Lost-Souls/Tannhauser-Gate/actions/workflows/ci_suite.yml/badge.svg)](https://github.com/Sea-of-Lost-Souls/Tannhauser-Gate/actions/workflows/ci_suite.yml)
 
 [![resentment](.github/images/badges/built-with-resentment.svg)](.github/images/comics/131-bug-free.png) [![technical debt](.github/images/badges/contains-technical-debt.svg)](.github/images/comics/106-tech-debt-modified.png) [![forinfinityandbyond](.github/images/badges/made-in-byond.gif)](https://www.reddit.com/r/SS13/comments/5oplxp/what_is_the_main_problem_with_byond_as_an_engine/dclbu1a)
 
@@ -12,13 +9,13 @@
 | Git / GitHub cheatsheet   | [https://www.notion.so/Git-GitHub-61bc81766b2e4c7d9a346db3078ce833](https://www.notion.so/Git-GitHub-61bc81766b2e4c7d9a346db3078ce833) |
 | Guide to Modularization   | [./modular_skyrat/readme.md](./modular_skyrat/readme.md)            |
 | Website                   | [https://www.tgstation13.org](https://www.tgstation13.org)          |
-| Code                      | [https://github.com/Skyrat-SS13/Skyrat-tg](https://github.com/Skyrat-SS13/Skyrat-tg)    |
+| Code                      | [https://github.com/Sea-of-Lost-Souls/Tannhauser-Gate](https://github.com/Sea-of-Lost-Souls/Tannhauser-Gate)    |
 | Wiki                      | [https://wiki.skyrat13.space/index.php/Main_Page](https://wiki.skyrat13.space/index.php/Main_Page)   |
-| Codedocs                  | [https://skyrat-ss13.github.io/Skyrat-tg/](https://skyrat-ss13.github.io/Skyrat-tg/)       |
+| Codedocs                  | [https://sea-of-lost-souls.github.io/Tannhauser-Gate/](https://sea-of-lost-souls.github.io/Tannhauser-Gate/)       |
 | Skyrat 13 Discord         | [https://discord.com/invite/hGpZ4Z3](https://discord.com/invite/hGpZ4Z3) |
 | Coderbus Discord          | [https://discord.gg/Vh8TJp9](https://discord.gg/Vh8TJp9)               |
 
-This is Skyrat's downstream fork of /tg/station created in byond.
+This is Sea of Lost Souls' downstream fork of Skyrat 13 created in byond.
 
 **Please note that this repository contains sexually explicit content and is not suitable for those under the age of 18.**
 

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm

@@ -2601,9 +2601,7 @@
 	pixel_x = 15;
 	pixel_y = 14
 	},
-/mob/living/basic/frog{
-	name = "Peter Jr."
-	},
+/mob/living/basic/frog/icemoon_facility,
 /turf/open/floor/plating/icemoon,
 /area/ruin/plasma_facility/operations)
 "TK" = (

_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm

@@ -145,7 +145,7 @@
 	},
 /area/ruin/unpowered/buried_library)
 "aO" = (
-/mob/living/basic/pet/fox,
+/mob/living/basic/pet/fox/icemoon,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -327,7 +327,7 @@
 /area/ruin/unpowered/buried_library)
 "cA" = (
 /obj/effect/decal/cleanable/dirt,
-/mob/living/basic/pet/fox,
+/mob/living/basic/pet/fox/icemoon,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},
@@ -394,7 +394,7 @@
 /obj/structure/fluff/paper{
 	dir = 1
 	},
-/mob/living/basic/pet/fox,
+/mob/living/basic/pet/fox/icemoon,
 /turf/open/floor/wood{
 	initial_gas_mix = "ICEMOON_ATMOS"
 	},

_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm

@@ -208,9 +208,7 @@
 "nq" = (
 /obj/effect/decal/cleanable/cobweb,
 /obj/machinery/light/small/directional/north,
-/mob/living/basic/pet/dog/bullterrier{
-	name = "Saint Nick's Helpful Associate"
-	},
+/mob/living/basic/pet/dog/bullterrier/lavaland_party,
 /turf/open/floor/carpet/blue/lavaland,
 /area/ruin/unpowered)
 "nI" = (