Merge branch 'master-github'

Content.Server/Mood/MoodSystem.cs

@@ -250,7 +250,8 @@ private void OnInit(EntityUid uid, MoodComponent component, ComponentStartup arg
         if (_debugMode)
             return;
 
-        if (TryComp<MobThresholdsComponent>(uid, out var mobThresholdsComponent)
+        if (_config.GetCVar(CCVars.MoodModifiesThresholds)
+            && TryComp<MobThresholdsComponent>(uid, out var mobThresholdsComponent)
             && _mobThreshold.TryGetThresholdForState(uid, MobState.Critical, out var critThreshold, mobThresholdsComponent))
             component.CritThresholdBeforeModify = critThreshold.Value;
 
@@ -343,7 +344,8 @@ private void RefreshShaders(EntityUid uid, int modifier)
 
     private void SetCritThreshold(EntityUid uid, MoodComponent component, int modifier)
     {
-        if (!TryComp<MobThresholdsComponent>(uid, out var mobThresholds)
+        if (!_config.GetCVar(CCVars.MoodModifiesThresholds)
+            || !TryComp<MobThresholdsComponent>(uid, out var mobThresholds)
             || !_mobThreshold.TryGetThresholdForState(uid, MobState.Critical, out var key))
             return;
 

Content.Shared/CCVar/CCVars.cs

@@ -214,7 +214,7 @@ public static readonly CVarDef<int> // 20 Minutes - which constitutes a minimum
         ///     Controls the maximum number of character slots a player is allowed to have.
         /// </summary>
         public static readonly CVarDef<int>
-            GameMaxCharacterSlots = CVarDef.Create("game.maxcharacterslots", 10, CVar.ARCHIVE | CVar.SERVERONLY);
+            GameMaxCharacterSlots = CVarDef.Create("game.maxcharacterslots", 15, CVar.ARCHIVE | CVar.SERVERONLY);
 
         /// <summary>
         ///     Controls the game map prototype to load. SS14 stores these prototypes in Prototypes/Maps.
@@ -1492,13 +1492,13 @@ public static readonly CVarDef<int>
         /// Whether the arrivals terminal should be on a planet map.
         /// </summary>
         public static readonly CVarDef<bool> ArrivalsPlanet =
-            CVarDef.Create("shuttle.arrivals_planet", true, CVar.SERVERONLY);
+            CVarDef.Create("shuttle.arrivals_planet", false, CVar.SERVERONLY);
 
         /// <summary>
         /// Whether the arrivals shuttle is enabled.
         /// </summary>
         public static readonly CVarDef<bool> ArrivalsShuttles =
-            CVarDef.Create("shuttle.arrivals", true, CVar.SERVERONLY);
+            CVarDef.Create("shuttle.arrivals", false, CVar.SERVERONLY);
 
         /// <summary>
         /// The map to use for the arrivals station.
@@ -2002,7 +2002,7 @@ public static readonly CVarDef<string>
         /// Whether the player mob is walking by default instead of running.
         /// </summary>
         public static readonly CVarDef<bool> DefaultWalk =
-            CVarDef.Create("control.default_walk", true, CVar.CLIENT | CVar.REPLICATED | CVar.ARCHIVE);
+            CVarDef.Create("control.default_walk", false, CVar.CLIENT | CVar.REPLICATED | CVar.ARCHIVE);
 
         /*
          * STORAGE
@@ -2454,6 +2454,9 @@ public static readonly CVarDef<float>
         public static readonly CVarDef<bool> MoodDecreasesSpeed =
             CVarDef.Create("mood.decreases_speed", true, CVar.SERVER);
 
+        public static readonly CVarDef<bool> MoodModifiesThresholds =
+            CVarDef.Create("mood.modify_thresholds", false, CVar.SERVER);
+
         #endregion
 
         #region Material Reclaimer

Content.Shared/Storage/Components/SharedEntityStorageComponent.cs

@@ -92,7 +92,7 @@ public abstract partial class SharedEntityStorageComponent : Component
     /// Whether or not the container is sealed and traps air inside of it
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public bool Airtight = true;
+    public bool Airtight = false;
 
     /// <summary>
     /// Whether or not the entitystorage is open or closed

Resources/Audio/Lobby/attributions.yml

@@ -67,15 +67,4 @@
 - files: ["every_light_is_blinking_at_once.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "every light is blinking at once by Alexander Divine."
-  source: "https://soundcloud.com/alexanderdivine/every-light-is-blinking-at-once"
-
-# Nuclear 14
-- files: ["a_kiss_to_build_a_dream_on.ogg"]
-  license: "CC-BY-NC-SA-4.0"
-  copyright: "A kiss to build a dream on by Louis Armstrong."
-  source: "https://archive.org/details/fallout_2_soundtrack/00+(Intro)+A+Kiss+To+Build+A+Dream+On.mp3"
-
-- files: ["fallout_3_title.ogg", "fallout_4_title.ogg", "fallout_4_commonwealth.ogg"]
-  license: "CC-BY-NC-SA-4.0"
-  copyright: "Main Title and Commonwealth by Inon Zur."
-  source: "https://archive.org/details/fallout3_gamestop_preorder_ost" # and https://archive.org/details/fallout_4_soundtrack_score/01+Fallout+4+Main+Theme.mp3
+  source: "https://soundcloud.com/alexanderdivine/every-light-is-blinking-at-once"

Resources/Audio/_Nuclear14/Lobby/attributions.yml

@@ -0,0 +1,16 @@
+# Nuclear 14
+# Ignore  the licensing on these files, its set that way to pass linter. All tracks belong to their respective owners and were licensed to Bethesda Softworks for their respective titles.
+- files: ["a_kiss_to_build_a_dream_on.ogg"]
+  license: "CC-BY-NC-SA-4.0"
+  copyright: "A kiss to build a dream on by Louis Armstrong."
+  source: "https://archive.org/details/fallout_2_soundtrack/00+(Intro)+A+Kiss+To+Build+A+Dream+On.mp3"
+
+- files: ["fallout_3_title.ogg", "fallout_4_title.ogg", "fallout_4_commonwealth.ogg", "maintitle.ogg"]
+  license: "CC-BY-NC-SA-4.0"
+  copyright: "Main Title and Commonwealth by Inon Zur."
+  source: "https://archive.org/details/fallout3_gamestop_preorder_ost" # and https://archive.org/details/fallout_4_soundtrack_score/01+Fallout+4+Main+Theme.mp3
+
+- files: ["MUS_Aint_That_A_Kick_In_the_Head.ogg", "MUS_American_Swing.ogg", "MUS_Big_Iron.ogg", "MUS_Jingle_Jangle_Jingle.ogg", "MUS_Joe_Cool_CAS.ogg", "MUS_Johnny_Guitar.ogg", "MUS_Somethings_Gotta_Give.ogg"]
+  license: "CC-BY-NC-SA-4.0"
+  copyright: "Copyright owned by respective artists, see source link for details."
+  source: "https://fallout.fandom.com/wiki/Fallout:_New_Vegas_soundtrack" 

Resources/Audio/_Nuclear14/Music/Fallout3/attributions.yml

@@ -0,0 +1,4 @@
+- files: ["mus_billieholiday_crazy_mono.ogg", "mus_billieholiday_easy_mono.ogg", "mus_bobcrosby_happy_mono.ogg", "mus_bobcrosby_way_mono.ogg", "mus_coleporter_anything_mono.ogg", "mus_dannykaye_civilization_mono.ogg", "mus_generic_boogie_mono.ogg", "mus_generic_fox_mono.ogg", "mus_generic_jazzy_mono.ogg", "mus_generic_sunning_mono.ogg", "mus_generic_swing_mono.ogg", "mus_inkspots_idont_mono.ogg", "mus_roybrown_butcher_mono.ogg", "mus_roybrown_mighty_mono.ogg", "mus_texbeneke_guy_mono.ogg" ]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Bethesda Softworks, from fallout 3. Converted from MP3 to OGG. License not confirmed or guaranteed."
+  source: "https://www.myinstants.com/en/instant/war-never-changes-fallouts-narrator-15365/"

Resources/Audio/_Nuclear14/Music/attributions.yml

@@ -1,4 +1,4 @@
-- files: ["MUS_Patriotic_America.ogg", "MUS_Patriotic_BattleHymn.ogg", "MUS_Patriotic_BattleHymn_mono.ogg", "MUS_Patriotic_Dixie.ogg", "MUS_Patriotic_Montezuma.ogg", "MUS_Patriotic_Presidential.ogg", "MUS_Patriotic_Stars.ogg", "MUS_Patriotic_Washington.ogg", "MUS_Patriotic_Yankee.ogg" ]
+- files: ["MUS_Patriotic_America.ogg", "MUS_Patriotic_BattleHymn.ogg", "MUS_Patriotic_BattleHymn_mono.ogg", "MUS_Patriotic_Dixie.ogg", "MUS_Patriotic_Montezuma.ogg", "MUS_Patriotic_Presidential.ogg", "MUS_Patriotic_Stars.ogg", "MUS_Patriotic_Washington.ogg", "MUS_Patriotic_Yankee.ogg", "mus_hailchief.ogg" ]
   license: "CC-BY-NC-SA-3.0"
-  copyright: "Bethesda Softworks, from fallout 4. Converted from MP3 to OGG. Should be free use like the other audio, not confirmed."
+  copyright: "Bethesda Softworks, from fallout 4 and new vegas. Converted from MP3 to OGG. Should be free use like the other audio, not confirmed."
   source: "https://www.myinstants.com/en/instant/war-never-changes-fallouts-narrator-15365/"

Resources/IgnoredPrototypes/ignoredPrototypes.yml

@@ -24,6 +24,9 @@
 - /Prototypes/GameRules/midround.yml
 - /Prototypes/DeltaV/GameRules
 - /Prototypes/Nyanotrasen/GameRules
+- /Prototypes/Procedular
+- /Prototypes/Catalog/Jukebox
+- /Prototypes/DeltaV/Catalog/Jukebox
 # Loadouts
 - /Prototypes/Loadouts/eyes.yml
 - /Prototypes/Loadouts/hands.yml

Resources/Locale/en-US/_Nuclear14/access.ftl

@@ -0,0 +1,6 @@
+id-card-access-level-washington-commander = Washington Commander
+id-card-access-level-washington-paladin = Washington Paladin
+id-card-access-level-washington-knight = Washington Knight
+id-card-access-level-washington-scribe = Washington Scribe
+id-card-access-level-washington-initiate = Washington Initiate
+id-card-access-level-washington = Washington Brotherhood

Resources/Locale/en-US/_Nuclear14/department.ftl

@@ -3,6 +3,7 @@ department-BrotherhoodMidwest = Midwest Brotherhood of Steel
 department-BrotherhoodWashington = Washington Brotherhood of Steel
 department-CaravanCompany = Caravan Company
 department-NCR = New California Republic
+department-Ranger = Desert Rangers
 department-Tribe = Tribal
 department-Vault = Vault Dwellers
 department-Wastelander = Wastelander

Resources/Locale/en-US/_Nuclear14/job-names.ftl

@@ -13,14 +13,14 @@ job-description-bos-mid-squire = Follow your Knight into battle and do their bid
 # Washington Brotherhood
 job-name-bos-washington-commander = Washington Brotherhood Commander
 job-description-bos-washington-commander = Lead the Washington Brotherhood of Steel to glory in their mission.
-job-name-bos-washington-recruit = Washington Brotherhood Initiate
-job-description-bos-washington-recruit = Prove yourself to your chapter to progress through the ranks.
-job-name-bos-washington-soldier = Washington Brotherhood Knight
-job-description-bos-washington-soldier = The military arm of the Brotherhood. Defend your chapter in their objectives and manufacture equipment.
-job-name-bos-washington-captain = Washington Brotherhood Captain
-job-description-bos-washington-captain = Protect the Brotherhood at all costs. Take the Commanders will out into the wasteland.
-job-name-bos-washington-researcher = Washington Brotherhood Scribe
-job-description-bos-washington-researcher = Conduct scientific missions and research for your brotherhood chapter.
+job-name-bos-washington-initiate = Washington Brotherhood Initiate
+job-description-bos-washington-initiate = Prove yourself to your chapter to progress through the ranks.
+job-name-bos-washington-knight = Washington Brotherhood Knight
+job-description-bos-washington-knight = The military arm of the Brotherhood. Defend your chapter in their objectives and manufacture equipment.
+job-name-bos-washington-paladin = Washington Brotherhood Captain
+job-description-bos-washington-paladin = Protect the Brotherhood at all costs. Take the Commanders will out into the wasteland.
+job-name-bos-washington-scribe = Washington Brotherhood Scribe
+job-description-bos-washington-scribe = Conduct scientific missions and research for your brotherhood chapter.
 
 # Caravan
 job-name-caravan-leader = Caravan Leader

Resources/Locale/en-US/_Nuclear14/job-supervisors.ftl

@@ -1,7 +1,7 @@
 job-supervisors-bos-mid = the midwest brotherhood knight commander
-job-supervisors-bos-washington-elder = lead your faction to victory!
+job-supervisors-bos-washington-commander = lead your faction to victory!
 job-supervisors-bos-washington = follow your elder to victory!
-job-supervisors-bos-washington-recruit = follow orders from all other roles within the chapter
+job-supervisors-bos-washington-initiate = follow orders from all other roles within the chapter
 job-supervisors-caravan = the caravan leader
 job-supervisors-caravan-leader = lead your caravan company to riches through trade
 job-supervisors-ncr = the NCR officer

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

@@ -13,7 +13,7 @@ reagent-desc-water-irradiated = That'll put arms on your chest.
 reagent-name-water-filtered = filtered water
 reagent-desc-water-filtered = almost as good as it gets.
 reagent-name-water-salt = salt water
-reagent-desc-water-salt = salty water. Maybe I can boil it for salt. 
+reagent-desc-water-salt = salty water. Maybe I can boil it for salt.
 
 ## Soda
 reagent-name-nuka-cola = Nuka-Cola
@@ -280,8 +280,25 @@ materials-exoskeleton = exoskeleton
 materials-gunpowder = gunpowder
 materials-leather = leather
 materials-lead = lead
+materials-lead-scrap = scrap lead
 materials-raw-lead = raw lead
 materials-raw-leather = raw leather
+materials-thread = thread
+materials-scrap-electronic = scrap electronic
+materials-N14iron = iron
+materials-raw-N14iron = raw iron
+materials-scrap-steel = scrap steel
+materials-copper = copper
+materials-scrap-copper = scrap copper
+materials-raw-N14copper = raw copper
+materials-N14gold = gold
+materials-scrap-gold = scrap gold
+materials-raw-N14gold = raw gold
+materials-N14brass = brass
+materials-scrap-brass = scrap brass
+materials-N14silver = silver
+materials-raw-N14silver = raw silver
+materials-scrap = scrap
 materials-raw-aluminum = raw aluminum
 materials-raw-sulfur = raw sulfur
 materials-sulfur = sulfur

Resources/Locale/en-US/_Nuclear14/seeds.ftl

@@ -1,97 +1,92 @@
 # Seeds
 clipping-wild-agave-name = wild agave clipping
 clipping-wild-agave-noun = wild agaves clippings
-clipping-wild-agave-display-name = wild agave clipping
+clipping-wild-agave-display-name = wild agave
 
 clipping-wild-banana-yucca-name = wild banana yucca clipping
 clipping-wild-banana-yucca-noun = wild banana yucca clippings
-clipping-wild-banana-yucca-display-name = wild banana yucca clipping
+clipping-wild-banana-yucca-display-name = wild banana yucca
 
 clipping-wild-barrel-cactus-name = wild barrel cactus clipping
 clipping-wild-barrel-cactus-noun = wild barrel cactus clippings
 clipping-wild-barrel-cactus-display-name = wild barrel cactus
 
 clipping-wild-blackberry-name = wild blackberry clipping
 clipping-wild-blackberry-noun = wild blackberry clippings
-clipping-wild-blackberry-display-name = wild blackberry clipping
+clipping-wild-blackberry-display-name = wild blackberry
 
 clipping-wild-broc-name = wild broc clipping
 clipping-wild-broc-noun = wild broc clippings
-clipping-wild-broc-display-name = wild broc clipping
+clipping-wild-broc-display-name = wild broc
 
 clipping-wild-buffalo-gourd-name = wild buffalo bgourd clipping
 clipping-wild-buffalo-gourd-noun = wild buffalo ngourd clippings
-clipping-wild-buffalo-gourd-display-name = wild buffalo gourd clipping
+clipping-wild-buffalo-gourd-display-name = wild buffalo gourd
 
 clipping-wild-cabbage-name = wild cabbage clipping
 clipping-wild-cabbage-noun = wild cabbage clippings
-clipping-wild-cabbage-display-name = wild cabbage clipping
+clipping-wild-cabbage-display-name = wild cabbage
 
 clipping-wild-carrot-name = wild carrot clipping
 clipping-wild-carrot-noun = wild carrot clippings
-clipping-wild-carrot-display-name = wild carrot clipping
+clipping-wild-carrot-display-name = wild carrot
 
 clipping-coyote-tobacco-name = coyote tobacco clipping
 clipping-coyote-tobacco-noun = coyote tobacco clippings
-clipping-coyote-tobacco-display-name = coyote tobacco clipping
+clipping-coyote-tobacco-display-name = coyote tobacco
 
 clipping-datura-name = datura clipping
 clipping-datura-noun = datura clippings
-clipping-datura-display-name = datura clipping
+clipping-datura-display-name = datura
 
 clipping-jalapeno-name = jalapeno clipping
 clipping-jalapeno-noun = jalapeno clippings
-clipping-jalapeno-display-name = jalapeno clipping
+clipping-jalapeno-display-name = jalapeno
 
 clipping-maize-name = maize clipping
 clipping-maize-noun = maize clippings
-clipping-maize-display-name = maize clipping
+clipping-maize-display-name = maize
 
 clipping-mesquite-name = mesquite clipping
 clipping-mesquite-noun = mesquite clippings
-clipping-mesquite-display-name = mesquite clipping
+clipping-mesquite-display-name = mesquite
 
 clipping-mutfruit-name = mutfruit clipping
 clipping-mutfruit-noun = mutfruit clippings
-clipping-mutfruit-display-name = mutfruit clipping
+clipping-mutfruit-display-name = mutfruit
 
 clipping-wild-onion-name = wild onion clipping
 clipping-wild-onion-noun = wild onion clippings
-clipping-wild-onion-display-name = wild onion clipping
+clipping-wild-onion-display-name = wild onion
 
 clipping-pinyon-name = pinyon clipping
 clipping-pinyon-noun = pinyon clippings
-clipping-pinyon-display-name = pinyon clipping
+clipping-pinyon-display-name = pinyon
 
 clipping-pricky-pear-name = pricky pear clipping
 clipping-pricky-pear-noun = pricky pear clippings
-clipping-pricky-pear-display-name = pricky pear clipping
+clipping-pricky-pear-display-name = pricky pear
 
 clipping-wild-razorgrain-name = wild razorgrain clipping
 clipping-wild-razorgrain-noun = wild razorgrain clippings
-clipping-wild-razorgrain-display-name = wild razorgrain clipping
+clipping-wild-razorgrain-display-name = wild razorgrain
 
 clipping-starlight-name = starlight berry clipping
 clipping-starlight-seeds = starlight berry clipping
-clipping-starlight-display-name = starlight berry clipping
-
-
-clipping-starlight-name = starlight berry clipping
-clipping-starlight-seeds = starlight berry clipping
-clipping-starlight-display-name = starlight berries clipping
+clipping-starlight-display-name = starlight berries
 
 clipping-tarberry-name = tarberry clipping
 clipping-tarberry-seeds = tarberry clipping
-clipping-tarberry-display-name = tarberries clipping
+clipping-tarberry-display-name = tarberries
 
 clipping-wild-tato-name = wild tato clipping
 clipping-wild-tato-noun = wild tato clippings
-clipping-wild-tato-display-name = wild tato clipping
+clipping-wild-tato-display-name = wild tato
 
 clipping-wild-white-horsenettle-name = wild white horsenettle clipping
 clipping-wild-white-horsenettle-noun = wild white horsenettle clippings
-clipping-wild-white-horsenettle-display-name = wild white horsenettle clipping
+clipping-wild-white-horsenettle-display-name = wild white horsenettle
 
 clipping-wild-xander-name = wild xander clipping
 clipping-wild-xander-noun = wild xander clippings
-clipping-wild-xander-display-name = wild xander clipping
+clipping-wild-xander-display-name = wild xander

Resources/Locale/en-US/game-ticking/game-ticker.ftl

@@ -7,8 +7,8 @@ game-ticker-unknown-role = Unknown
 game-ticker-delay-start = Round start has been delayed for {$seconds} seconds.
 game-ticker-pause-start = Round start has been paused.
 game-ticker-pause-start-resumed = Round start countdown is now resumed.
-game-ticker-player-join-game-message = Welcome to Space Station 14! If this is your first time playing, be sure to read the game rules, and don't be afraid to ask for help in LOOC (local OOC) or OOC (usually available only between rounds).
-game-ticker-get-info-text = Hi and welcome to [color=white]Space Station 14![/color]
+game-ticker-player-join-game-message = Welcome to Nuclear 14! If this is your first time playing, be sure to read the game rules, and don't be afraid to ask for help in LOOC (local OOC) or OOC (usually available only between rounds).
+game-ticker-get-info-text = Hi and welcome to [color=white]Nuclear 14![/color]
                             The current round is: [color=white]#{$roundId}[/color]
                             The current player count is: [color=white]{$playerCount}[/color]
                             The current map is: [color=white]{$mapName}[/color]
@@ -25,7 +25,7 @@ game-ticker-get-info-preround-text = Hi and welcome to [color=white]Space Statio
                             >[color=yellow]{$desc}[/color]
 game-ticker-no-map-selected = [color=yellow]Map not yet selected![/color]
 game-ticker-player-no-jobs-available-when-joining = When attempting to join to the game, no jobs were available.
-game-ticker-welcome-to-the-station = Welcome to the station crew, enjoy your stay!
+game-ticker-welcome-to-the-station = The world is a dark and gloomy place. Survive and thrive.
 
 # Displayed in chat to admins when a player joins
 player-join-message = Player {$name} joined.

Resources/Maps/N14/MercerIslandSewers.yml

@@ -8491,7 +8491,7 @@ entities:
     - type: Transform
       pos: 46.015804,119.67076
       parent: 2
-- proto: IngotAluminum1
+- proto: N14IngotAluminum1
   entities:
   - uid: 1275
     components:
@@ -8520,7 +8520,7 @@ entities:
       linearDamping: 0
       canCollide: False
     - type: InsideEntityStorage
-- proto: IngotLead1
+- proto: N14IngotLead1
   entities:
   - uid: 1278
     components: