123

Content.Shared/CCVar/CCVars.cs

@@ -153,7 +153,7 @@ public static readonly CVarDef<bool>
         ///     Controls the default game preset.
         /// </summary>
         public static readonly CVarDef<string>
-            GameLobbyDefaultPreset = CVarDef.Create("game.defaultpreset", "secret", CVar.ARCHIVE);
+            GameLobbyDefaultPreset = CVarDef.Create("game.defaultpreset", "Waves", CVar.ARCHIVE);
 
         /// <summary>
         ///     Controls if the game can force a different preset if the current preset's criteria are not met.
@@ -2070,7 +2070,7 @@ public static readonly CVarDef<float>
          */
 
         public static readonly CVarDef<bool> GatewayGeneratorEnabled =
-            CVarDef.Create("gateway.generator_enabled", true);
+            CVarDef.Create("gateway.generator_enabled", false);
 
         /*
          * DEBUG
@@ -2091,7 +2091,7 @@ public static readonly CVarDef<float>
         ///    Whether glimmer is enabled.
         /// </summary>
         public static readonly CVarDef<bool> GlimmerEnabled =
-            CVarDef.Create("glimmer.enabled", true, CVar.REPLICATED);
+            CVarDef.Create("glimmer.enabled", false, CVar.REPLICATED);
 
         /// <summary>
         ///     Passive glimmer drain per second.
@@ -2105,6 +2105,6 @@ public static readonly CVarDef<float>
         ///     Guaranteed psionics will still go through.
         /// </summary>
         public static readonly CVarDef<bool> PsionicRollsEnabled =
-            CVarDef.Create("psionics.rolls_enabled", true, CVar.SERVERONLY);
+            CVarDef.Create("psionics.rolls_enabled", false, CVar.SERVERONLY);
     }
 }

Resources/Credits/Patrons.yml

@@ -1,58 +1,4 @@
-- Name: "weirdrock"
-  Tier: Captain
-- Name: "Drifter Drifter"
-  Tier: Captain
-- Name: "Bikowu"
-  Tier: Assistant
-- Name: "Hasan al-Binabi"
-  Tier: Central Commander
-- Name: "lleft The Dragon"
-  Tier: Central Commander
-- Name: "Pandaconda"
-  Tier: Assistant
-- Name: "Lazhannya"
-  Tier: Captain
-- Name: "Bonktrauma"
-  Tier: Captain
-- Name: "Haltell"
-  Tier: Captain
-- Name: "Delta.Pizza"
-  Tier: Captain
-- Name: "steph kaus"
-  Tier: Captain
-- Name: "HyperionGM"
-  Tier: Central Commander
-- Name: "MikeAndIkes"
-  Tier: Assistant
-- Name: "Ashley"
-  Tier: Central Commander
-- Name: "mura"
-  Tier: Captain
-- Name: "Adeinitas"
-  Tier: Captain
-- Name: "Shock"
-  Tier: Captain
-- Name: "Dead Rabbit"
-  Tier: Captain
-- Name: "T-Dog"
-  Tier: Captain
-- Name: "oBerry"
-  Tier: Central Commander
-- Name: "Wakefield"
-  Tier: Captain
-- Name: "Hûvy"
-  Tier: Assistant
+- Name: "mocho"
+  Tier: Nuclear
 - Name: "TheGungeonologist"
-  Tier: Central Commander
-- Name: "Ethan"
-  Tier: Captain
-- Name: "TeeJay Neuroth"
-  Tier: Captain
-- Name: "Neptunia_Counseling"
-  Tier: Central Commander
-- Name: "rosysyntax"
-  Tier: Assistant
-- Name: "Kurzaen"
-  Tier: Captain
-- Name: "tokie"
-  Tier: Central Commander
+  Tier: Nuclear

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

@@ -1,19 +1,25 @@
 # N14
-job-name-bos-mid-knight-comm = Midwest Brotherhood Knight Commander
-job-description-bos-mid-knight-comm = Lead the Midwest Brotherhood of Steel on their mission.
+job-name-bos-mid-paladin-comm = Midwest Brotherhood Paladin Commander
+job-description-bos-mid-paladin-comm = Lead the Midwest Brotherhood of Steel on their mission.
+job-name-bos-mid-paladin = Midwest Brotherhood Paladin
+job-description-bos-mid-paladin = Follow the Paladin Commander on their mission.
+job-name-bos-mid-knight = Midwest Brotherhood Knight
+jb-description-bos-mid-knight = Follow the Paladin Commander on their mission.
 job-name-bos-mid-scribe = Midwest Brotherhood Scribe
 job-description-bos-mid-scribe = Conduct scientific missions and research for your brotherhood chapter.
+job-name-bos-mid-squire = Midwest Brotherhood Squire
+jb-description-bos-mid-squire = Follow your Knight into battle and do their bidding.
 
-job-name-bos-washington-elder = Washington Brotherhood Elder
-job-description-bos-washington-elder = Lead the Washington Brotherhood of Steel to glory in their mission.
-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 Paladin
-job-description-bos-washington-paladin = Protect the Brotherhood at all costs. Take the elders 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.
+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-caravan-leader = Caravan Leader
 job-description-caravan-leader = Coordinate the caravan company in the area and strike up trade deals with the locals.

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 = follow your elder to victory!
-job-supervisors-bos-washington-initiate = follow orders from all other roles within the chapter
+job-supervisors-bos-washington-recruit = 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

@@ -95,11 +95,13 @@ reagent-desc-extract-starlight-berries = A berry that is yellow and seems to set
 reagent-name-extract-tarberries = tarberry juice
 reagent-desc-extract-tarberries = A water-grown crop that is slightly orange in appearance. Tastes odd, juicy, but with very little flavour, it tingles the tongue.
 reagent-name-extract-tato = tato juice
-reagent-desc-extract-tato = What formerly may have been a tomato. Red and angry. Tastes juicy, slightly firm, would be good on a sandwich. 
+reagent-desc-extract-tato = What formerly may have been a tomato. Red and angry. Tastes juicy, slightly firm, would be good on a sandwich.
 reagent-name-extract-white-horsenettle = white horsenettle extract
 reagent-desc-extract-white-horsenettle = A group of nettles and berries, they don't seem too safe to eat. Tastes of poison, trying to swallow it tastes a lot of effort and makes your stomach hurt.
 reagent-name-extract-xander = xander extract
 reagent-desc-extract-xander = An edible root, it was obviously pulled from the ground at some point. Tastes similar to a potato, very starchy, but good to eat.
+reagent-name-extract-fungusrad = irradiated fungus extract
+reagent-desc-extract-fungusrad = An irradiated and glowing green fungus. Tastes revolting and mushy. It will gladly donate you some of it's green glow.
 
 ## Teas
 reagent-name-tea-agave = agave tea
@@ -145,6 +147,18 @@ reagent-desc-antidote-mixture = An antidote made from radscorpion tail and water
 reagent-name-antidote = antidote
 reagent-desc-antidote = A potent antitoxin manufactured in a lab.
 
+reagent-name-healing-poultice = healing poultice
+reagent-desc-healing-poultice = A powder made from a large mixture of plants.
+
+reagent-name-bitterdrink = bitterdrink
+reagent-desc-bitterdrink = A mixture of crushed plants mixed with water neutralizing poison and radiation from body.
+
+reagent-name-smelling-salts = smelling salts
+reagent-desc-smelling-salts = A grainy mixture of rocks with an insanely potent smell.
+
+reagent-name-mourning-poultice = mournin poultice
+reagent-desc-mourning-poultice = A mixture of poisonous crushed plants used in tribalistic ceremonies said to make you see gods.
+
 # Medicine
 reagent-name-healing-mixture = stimpak
 reagent-desc-healing-mixture = A mixture of reagents that makes you heal.
@@ -154,6 +168,9 @@ reagent-desc-dirty-stimpak = A dirty mixture of reagents that makes you heal.
 reagent-name-robust-healing-mixture = robust healing mixture
 reagent-desc-robust-healing-mixture = A mixture of reagents that makes you heal fast.
 
+reagent-name-ultra-robust-healing-mixture = ultra robust healing mixture
+reagent-desc-ultra-robust-healing-mixture = A mixture of reagents that make you heal faster than you can feel it, however it comes with hefty side effects.
+
 reagent-name-damage-resist-mixture = damage resistant mixture
 reagent-desc-damage-resist-mixture = A mixture of reagents that makes you resistant to damage.
 
@@ -202,6 +219,8 @@ reagent-name-wonderglue = Wonderglue
 reagent-desc-wonderglue = A pre-war adhesive. Don't sniff it.
 reagent-name-turpentine = Turpentine
 reagent-desc-turpentine = A spirit used for cleaning things.
+reagent-name-antiseptic = Antiseptic
+reagent-desc-antiseptic = A cleaning solution made from Abraxo Cleaner and some Rubbing Alcohol.
 
 # Ores, Metals, Materials
 materials-gunpowder = gunpowder
@@ -210,11 +229,13 @@ materials-sulfur = sulfur
 materials-raw-lead = raw lead
 materials-raw-sulfur = raw sulfur
 reagent-name-gunpowder = gunpowder
-reagent-desc-gunpowder = gunpowder
+reagent-desc-gunpowder = Small pellet gunpowder. Now just add lead.
 reagent-name-fertilizer = fertilizer
-reagent-desc-fertilizer = fertilizer
+reagent-desc-fertilizer = Ground fertilizer. Perfect for your plants!
+reagent-name-sulfur = sulfur
+reagent-desc-sulfur = Ground sulfur in a powdery form. You should really wear a gas mask.
 
 
 # Other
 reagent-name-scorpiontail = scorpion tail
-reagent-desc-scorpiontail = scorpion tail. Stingy.
+reagent-desc-scorpiontail = scorpion tail. Stingy.

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

@@ -33,10 +33,10 @@ player-first-join-message = Player {$name} joined for the first time.
 # Displayed in chat to admins when a player leaves
 player-leave-message = Player {$name} left.
 
-latejoin-arrival-announcement = {$character} ({$job}) has arrived at the station!
-latejoin-arrival-sender = Station
-latejoin-arrivals-direction = A shuttle transferring you to your station will arrive shortly.
-latejoin-arrivals-direction-time = A shuttle transferring you to your station will arrive in {$time}.
+latejoin-arrival-announcement = Someone new has been spotted in the area.
+latejoin-arrival-sender = Radio Broadcast
+latejoin-arrivals-direction = An escape transport will arrive shortly.
+latejoin-arrivals-direction-time = An escape transport will arrive in {$time} to take you away.
 
 preset-not-enough-ready-players = Can't start {$presetName}. Requires {$minimumPlayers} players but we have {$readyPlayersCount}.
 preset-no-one-ready = Can't start {$presetName}. No players are ready.

Resources/Locale/en-US/loadouts/categories.ftl

@@ -3,5 +3,6 @@ loadout-category-Accessories = Accessories
 loadout-category-Items = Items
 loadout-category-Jobs = Jobs
 loadout-category-Outer = Outer
+loadout-category-Roles = Roles
 loadout-category-Uncategorized = Uncategorized
 loadout-category-Uniform = Uniform

Resources/Prototypes/Catalog/Fills/Items/belt.yml

@@ -48,8 +48,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: GrenadeFlashBang
-      - id: TearGasGrenade
       - id: Stunbaton
       - id: Handcuffs
       - id: Handcuffs

Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml

@@ -81,8 +81,8 @@
   - type: ZombieImmune # No zombie servant
   - type: RandomMetadata
     nameSegments: [names_golem]
-  - type: PotentialPsionic
-  - type: Psionic
+  #- type: PotentialPsionic
+  #- type: Psionic
     removable: false
   # - type: PyrokinesisPower # Pending psionic rework
   - type: Grammar

Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml

@@ -22,8 +22,8 @@
         reagents:
         - ReagentId: Ectoplasm
           Quantity: 15
-  - type: PotentialPsionic
-  - type: Psionic
+  #- type: PotentialPsionic
+  #- type: Psionic
   - type: GlimmerSource
   - type: AmbientSound
     range: 6

Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml

@@ -26,4 +26,4 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-  - type: PotentialPsionic
+  #- type: PotentialPsionic

Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml

@@ -24,7 +24,7 @@
     - type: NpcFactionMember
       factions:
         - NanoTrasen
-    - type: PotentialPsionic
+    #- type: PotentialPsionic
     - type: Respirator
       damage:
        types:

Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml

@@ -118,7 +118,7 @@
   - type: Grammar
     attributes:
       gender: male
-  - type: PotentialPsionic # Nyano
+  #- type: PotentialPsionic # Nyano
 
 - type: entity
   id: MobRatKingBuff

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -121,10 +121,6 @@
     molsPerSecondPerUnitMass: 0.0005
   - type: Speech
     speechVerb: LargeMob
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
-    chance: -2
-  - type: Psionic #Nyano - Summary: makes psionic by default.
-    removable: false
 
 - type: entity
   name: Praetorian

Resources/Prototypes/Entities/Mobs/Player/arachnid.yml

@@ -11,4 +11,4 @@
     damageRecovery:
       types:
         Asphyxiation: -0.5
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
+  #- type: PotentialPsionic #Nyano - Summary: makes potentially psionic.

Resources/Prototypes/Entities/Mobs/Player/diona.yml

@@ -11,7 +11,7 @@
       damageRecovery:
         types:
           Asphyxiation: -1.0
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
+    #- type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
 
 # Reformed Diona
 - type: entity

Resources/Prototypes/Entities/Mobs/Player/dwarf.yml

@@ -3,5 +3,3 @@
   name: Urist McHands The Dwarf
   parent: BaseMobDwarf
   id: MobDwarf
-  components:
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 

Resources/Prototypes/Entities/Mobs/Player/familiars.yml

@@ -34,7 +34,7 @@
     - PsionicInterloper #Nyano - Summary: makes a part of the psionic faction.
   - type: Alerts
   - type: Familiar
-  - type: Psionic #Nyano - Summary: Makes psionic on creation.
+  #- type: Psionic #Nyano - Summary: Makes psionic on creation.
     removable: false
 
 - type: entity
@@ -90,9 +90,6 @@
   - type: MindContainer
     showExamineInfo: true
   - type: Familiar
-  - type: Dispellable
-  - type: Psionic #Nyano - Summary: makes psionic on creation.
-    removable: false
   - type: Vocal
     sounds:
       Male: Cerberus

Resources/Prototypes/Entities/Mobs/Player/human.yml

@@ -3,8 +3,8 @@
   name: Urist McHands
   parent: BaseMobHuman
   id: MobHuman
-  components:
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
+  #components:
+  #- type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
 
 #Syndie
 - type: entity
@@ -48,9 +48,9 @@
   components:
     - type: NukeOperative
     - type: RandomHumanoidAppearance
-    - type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic.
-      multiplier: 7
-      warn: false
+    #- type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic.
+    #  multiplier: 7
+    #  warn: false
 
 - type: entity
   noSpawn: true
@@ -70,9 +70,9 @@
     - type: NpcFactionMember
       factions:
       - Syndicate
-    - type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic.
-      multiplier: 7
-      warn: false
+    #- type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic.
+    #  multiplier: 7
+    #  warn: false
 
 # Space Ninja
 - type: entity

Resources/Prototypes/Entities/Mobs/Player/humanoid.yml

@@ -468,9 +468,9 @@
   id: NukeOp
   components:
     - type: NukeOperative
-    - type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic. 
-      multiplier: 7
-      warn: false
+    #- type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic.
+    #  multiplier: 7
+    #  warn: false
 
 - type: entity
   id: RandomHumanoidSpawnerCluwne