cherry pick

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,62 +1,27 @@
-<!--
-This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same
-Remove these comments before submitting
--->
-
-# Description
-
-<!--
-Explain this PR in as much detail as applicable
-
-Some example prompts to consider:
-How might this affect the game? The codebase?
-What might be some alternatives to this?
-How/Who does this benefit/hurt [the game/codebase]?
--->
-
-Description.
+## Deep Station 14 Pull Request
+<!-- The text between the arrows are comments - they will not be visible on your PR. -->
 
----
 
-# TODO
+## About the PR
+<!-- What did you change in this PR? -->
 
-<!--
-A list of everything you have to do before this PR is "complete"
-You probably won't have to complete everything before merging but it's good to leave future references
--->
-
-- [ ] Task
-- [x] Completed Task
-
----
-
-<!--
-This is default collapsed, readers click to expand it and see all your media
-The PR media section can get very large at times, so this is a good way to keep it clean
-The title is written using HTML tags
-The title must be within the <summary> tags or you won't see it
--->
 
-<details><summary><h1>Media</h1></summary>
-<p>
+## Why / Balance
+<!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. -->
 
-![Example Media Embed](https://example.com/thisimageisntreal.png)
 
-</p>
-</details>
+## Technical details
+<!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. -->
 
----
+## Media
+<!-- 
+PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes.
+Small fixes/refactors are exempt.
+Any media may be used in SS14 progress reports, with clear credit given.
 
-# Changelog
+If you're unsure whether your PR will require media, ask a maintainer.
 
-<!--
-You can add an author after the `:cl:` to change the name that appears in the changelog (ex: `:cl: Death`)
-Leaving it blank will default to your GitHub display name
-This includes all available types for the changelog
+Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]):
 -->
 
-:cl:
-- add: Added fun :D
-- tweak: Tweaked fun
-- fix: Fixed fun!
-- remove: Removed fun :(
+- [ ] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase

Content.Shared/CCVar/CCVars.cs

@@ -1203,7 +1203,7 @@ public static readonly CVarDef<bool>
         /// Whether or not OOC chat should be enabled during a round.
         /// </summary>
         public static readonly CVarDef<bool> OocEnableDuringRound =
-            CVarDef.Create("ooc.enable_during_round", false, CVar.NOTIFY | CVar.REPLICATED | CVar.SERVER);
+            CVarDef.Create("ooc.enable_during_round", true, CVar.NOTIFY | CVar.REPLICATED | CVar.SERVER);
 
         /*
          * LOOC

README.md

@@ -1,3 +1,9 @@
+# Deep Station 14
+Deep Station 14 is a fork of SS14 with a focus on a more "classic" space station experience, respecting our contributors efforts and a more open administrative and project management approach. Check out our [Discord](https://discord.gg/4gGSWyNbQF) to get involved in the conversation and development.
+
+All information below this point refers to upstream which we are forked from.
+___
+
 # Einstein Engines
 
 <p align="center"><img src="https://raw.githubusercontent.com/Simple-Station/Einstein-Engines/master/Resources/Textures/Logo/splashlogo.png" width="512px" /></p>

Resources/Audio/Voice/IPC/attributions.yml

@@ -0,0 +1,9 @@
+- files: ["beep_500.ogg", "beep_2000.ogg"]
+  license: "CC0-1.0"
+  copyright: "Synthesized in Audacity by BasedUser."
+  source: "https://github.com/ekrixi-14/ekrixi"
+
+- files: ["whirr1.ogg", "whirr2.ogg", "whirr3.ogg"]
+  license: "CC0-1.0"
+  copyright: "Taken from source, spectrally modified and clipped"
+  source: "https://freesound.org/people/sad3d/sounds/500168/"

Resources/Locale/en-US/_ds14/advertisements.ftl

@@ -0,0 +1,23 @@
+advertisement-solsnack-1 = We cut all the red-tape so that you can have diarrhea!
+advertisement-solsnack-2 = Food safety standards are merely a suggestion if you know the right people!
+advertisement-solsnack-3 = Snacks from home, corruption included!
+advertisement-solsnack-4 = A taste of home!
+
+advertisement-weebvend-1 = Konnichiwa gaijin senpai!
+advertisement-weebvend-2 = Notice me senpai!
+advertisement-weebvend-3 = Kawaii-desu!
+
+advertisement-hotfood-1 = Get your stale, crumbling food here! Sol's national dish has never tasted better!
+advertisement-hotfood-2 = If this is the food waiting for you at home, it's no wonder you're hiding here.
+advertisement-hotfood-3 = Solarian food products, served with a side of diarrhea as always!
+advertisement-hotfood-4 = Revenge is a dish best served warm.
+
+advertisement-fitness-1 = SweatMAX, get robust!
+advertisement-fitness-2 = Pain is just weakness leaving the body!
+advertisement-fitness-3 = Run! Your fat is catching up to you!
+advertisement-fitness-4 = Never forget leg day!
+advertisement-fitness-5 = Push out!
+advertisement-fitness-6 = This is the only break you get today.
+advertisement-fitness-7 = Don't cry, sweat!
+advertisement-fitness-8 = Healthy is an outfit that looks good on everybody.
+advertisement-fitness-9 = Want to hide from the Solarian authorities? Don't worry, they don't know what the inside of a gym looks like.

Resources/Locale/en-US/_ds14/markings.ftl

@@ -0,0 +1,164 @@
+marking-IPCScreenStatic = Static
+marking-IPCScreenStatic-static = Screen
+
+marking-IPCScreenBlue = Blue
+marking-IPCScreenBlue-blue = Screen
+
+marking-IPCScreenBreakout = Breakout
+marking-IPCScreenBreakout-breakout = Screen
+
+marking-IPCScreenEight = Eight
+marking-IPCScreenEight-eight = Screen
+
+marking-IPCScreenGoggles = Goggles
+marking-IPCScreenGoggles-goggles = Screen
+
+marking-IPCScreenExcla = Excla
+marking-IPCScreenExcla-excla = Screen
+
+marking-IPCScreenHeart = Heart
+marking-IPCScreenHeart-heart = Screen
+
+marking-IPCScreenMonoeye = Monoeye
+marking-IPCScreenMonoeye-monoeye = Screen
+
+marking-IPCScreenNature = Nature
+marking-IPCScreenNature-nature = Screen
+
+marking-IPCScreenOrange = Orange
+marking-IPCScreenOrange-orange = Screen
+
+marking-IPCScreenPink = Pink
+marking-IPCScreenPink-pink = Screen
+
+marking-IPCScreenQuestion = Question
+marking-IPCScreenQuestion-question = Screen
+
+marking-IPCScreenShower = Shower
+marking-IPCScreenShower-shower = Screen
+
+marking-IPCScreenYellow = Yellow
+marking-IPCScreenYellow-yellow = Screen
+
+marking-IPCScreenScroll = Scroll
+marking-IPCScreenScroll-scroll = Screen
+
+marking-IPCScreenConsole = Console
+marking-IPCScreenConsole-console = Screen
+
+marking-IPCScreenRgb = Rgb
+marking-IPCScreenRgb-rgb = Screen
+
+marking-IPCScreenGlider = Glider
+marking-IPCScreenGlider-glider = Screen
+
+marking-IPCScreenRainbow = Rainbow
+marking-IPCScreenRainbow-rainbow = Screen
+
+marking-IPCScreenBsod = Bsod
+marking-IPCScreenBsod-bsod = Screen
+
+marking-IPCScreenRedtext = Redtext
+marking-IPCScreenRedtext-redtext = Screen
+
+marking-IPCScreenSinewave = Sinewave
+marking-IPCScreenSinewave-sinewave = Screen
+
+marking-IPCScreenScreenwave = Screenwave
+marking-IPCScreenScreenwave-screenwave = Screen
+
+marking-IPCScreenEcgwave = Ecgwave
+marking-IPCScreenEcgwave-ecgwave = Screen
+
+marking-IPCScreenEyes = Eyes
+marking-IPCScreenEyes-eyes = Screen
+
+marking-IPCScreenEyesstall = Eyesstall
+marking-IPCScreenEyesstall-eyesstall = Screen
+
+marking-IPCScreenEyesangry = Eyesangry
+marking-IPCScreenEyesangry-eyesangry = Screen
+
+marking-IPCScreenLoading = Loading
+marking-IPCScreenLoading-loading = Screen
+
+marking-IPCScreenWindowsxp = Windowsxp
+marking-IPCScreenWindowsxp-windowsxp = Screen
+
+marking-IPCScreenTetris = Tetris
+marking-IPCScreenTetris-tetris = Screen
+
+marking-IPCScreenTv = TV
+marking-IPCScreenTv-tv = Screen
+
+marking-IPCScreenTextdrop = Textdrop
+marking-IPCScreenTextdrop-textdrop = Screen
+
+marking-IPCScreenStars = Stars
+marking-IPCScreenStars-stars = Screen
+
+marking-IPCScreenRainbowdiag = Rainbowdiag
+marking-IPCScreenRainbowdiag-rainbowdiag = Screen
+
+marking-IPCScreenBlank = Blank
+marking-IPCScreenBlank-blank = Screen
+
+marking-IPCScreenSmile = Smile
+marking-IPCScreenSmile-smile = Screen
+
+marking-IPCScreenSad = Sad
+marking-IPCScreenSad-sad = Screen
+
+marking-IPCScreenRing = Ring
+marking-IPCScreenRing-ring = Screen
+
+marking-IPCScreenL = L
+marking-IPCScreenL-l = Screen
+
+marking-IPCScreenTvantenna = Tvantenna
+marking-IPCScreenTvantenna-tvantenna = Screen
+
+marking-IPCScreenTesla = Tesla
+marking-IPCScreenTesla-tesla = Screen
+
+marking-IPCScreenCyberheadantenna = Cyberhead Antenna
+marking-IPCScreenCyberheadantenna-cyberheadantenna = Screen
+
+marking-IPCScreenSidelights = Sidelights
+marking-IPCScreenSidelights-sidelights = Screen
+
+marking-IPCScreenAntlers = Antlers
+marking-IPCScreenAntlers-antlers = Screen
+
+marking-IPCScreenDrone = Drone
+marking-IPCScreenDrone-drone = Screen
+
+marking-IPCScreenCrowned = Crowned
+marking-IPCScreenCrowned-crowned = Screen
+
+marking-IPCScreenAntennae = Antennae
+marking-IPCScreenAntennae-antennae = Screen
+
+marking-IPCScreenTvAntenna = TV Antenna
+marking-IPCScreenTvAntenna-tvantenna = Screen
+
+marking-IPCScreenTesla = Tesla
+marking-IPCScreenTesla-tesla = Screen
+
+marking-IPCScreenCyberheadantenna = Cyberhead Antenna
+marking-IPCScreenCyberheadantenna-cyberheadantenna = Screen
+
+marking-IPCScreenSidelights = Sidelights
+marking-IPCScreenSidelights-sidelights = Screen
+
+marking-IPCScreenAntlers = Antlers
+marking-IPCScreenAntlers-antlers = Screen
+
+marking-IPCScreenDrone = Drone
+marking-IPCScreenDrone-drone = Screen
+
+marking-IPCScreenCrowned = Crowned
+marking-IPCScreenCrowned-crowned = Screen
+
+marking-IPCScreenAntennae = Antennae
+marking-IPCScreenAntennae-antennae = Screen

Resources/Locale/en-US/_ds14/reagents.ftl

@@ -0,0 +1,2 @@
+reagent-name-milk-choco = chocolate milk
+reagent-desc-milk-choco = A milk drink flavored with chocolate.

Resources/Locale/en-US/_ds14/species.ftl

@@ -0,0 +1 @@
+species-name-ipc = IPC