Merge branch 'new-frontiers-14:master' into master

new-frontiers-14 · Nov 5, 2024 · 09c08e9 · 09c08e9
2 parents 94d2550 + 2f45305
commit 09c08e9
Show file tree

Hide file tree

Showing 82 changed files with 1,040 additions and 1,431 deletions.
diff --git a/Content.Server/EntityEffects/Effects/PlantMutateGases.cs b/Content.Server/EntityEffects/Effects/PlantMutateGases.cs
@@ -64,12 +64,28 @@ public override void Effect(EntityEffectBaseArgs args)
         if (plantholder.Seed == null)
             return;
 
+        // Frontier: List of gasses
+        Gas[] GassesList =
+        {
+          Gas.Oxygen,
+          Gas.Nitrogen,
+          Gas.CarbonDioxide,
+          Gas.NitrousOxide,
+          Gas.Ammonia,
+          Gas.Plasma,
+          Gas.WaterVapor,
+          //Gas.Tritium,
+          //Gas.Frezon,
+        };
+        // Frontier: List of gasses
+
         var random = IoCManager.Resolve<IRobustRandom>();
         var gasses = plantholder.Seed.ConsumeGasses;
 
         // Add a random amount of a random gas to this gas dictionary
         float amount = random.NextFloat(MinValue, MaxValue);
-        Gas gas = random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList());
+        //Gas gas = random.Pick(Enum.GetValues(typeof(Gas)).Cast<Gas>().ToList()); // Frontier
+        Gas gas = random.Pick(GassesList); // Frontier
         if (gasses.ContainsKey(gas))
         {
             gasses[gas] += amount;

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -5035,3 +5035,51 @@ Entries:
         crates each.
   id: 5469
   time: '2024-11-01T21:07:34.0000000+00:00'
+- author: DmitriTheDemon
+  changes:
+    - type: Fix
+      message: Goblinebanes can no longer pilot ships
+  id: 5470
+  time: '2024-11-01T23:13:59.0000000+00:00'
+- author: blackknight954
+  changes:
+    - type: Fix
+      message: >-
+        Diagonal grilles and diagonal clockwork grilles no longer block lasers
+        from passing through them.
+  id: 5471
+  time: '2024-11-03T12:01:58.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Remove
+      message: Goblinbane was banished.
+  id: 5472
+  time: '2024-11-04T18:10:35.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Tweak
+      message: >-
+        Tweaked the numbers for explorer dungeon faction - damage went down, mob
+        speeds went up, hauler upon destruction spawns it's pilot and Ripley
+        chassis with boards.
+    - type: Tweak
+      message: >-
+        Explorer Captain (dungeon boss) is now a ghost role. Drop rate of
+        holopickaxe was increased, additionally Explorer Dungeon boss can drop
+        holopickaxe blueprint.
+    - type: Tweak
+      message: >-
+        Punk gang leader is now armed with laser rifle and wears portable
+        recharger. Has a chance of dropping blueprint for portable recharger.
+    - type: Tweak
+      message: >-
+        Punk gang leader is a ghost role now, can throw party 'nades (smoke
+        grenades with drugs).
+  id: 5473
+  time: '2024-11-04T22:19:30.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Fix
+      message: Fixed rosy mothroach cloak recipe error.
+  id: 5474
+  time: '2024-11-05T16:28:26.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/advertisements/mobchatter/goblinbane.ftl b/Resources/Locale/en-US/_NF/advertisements/mobchatter/goblinbane.ftl
diff --git a/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl
@@ -47,6 +47,12 @@ ghost-role-information-yipyip-description = Notorious lounge lizard and bartende
 ghost-role-information-aberrant-flesh-horror-dungeon-name = Aberrant flesh horror
 ghost-role-information-aberrant-flesh-horror-dungeon-description = Defend the expedition dungeon with other flesh monstrosities!
 
+ghost-role-information-explorer-captain-dungeon-name = Explorer Captain
+ghost-role-information-explorer-captain-dungeon-description = You got to this facility first! Defend the expedition dungeon and your loot with other explorers!
+
+ghost-role-information-punk-boss-dungeon-name = Punk gang leader
+ghost-role-information-punk-boss-dungeon-description = Defend the expedition dungeon and your loot with other punks from NT squares!
+
 ghost-role-information-dungeon-boss-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all dungeon mobs.
                                         Fight players within the dungeon, defend your dungeon.
                                         Please note that [color=yellow]all server rules still apply.[/color] Additionally:
@@ -55,15 +61,3 @@ ghost-role-information-dungeon-boss-rules = You are a [color=red][bold]Team Anta
                                         - [color=red]DO NOT[/color] gib players. Once they're dead, leave them be.
                                         - [color=red]DO NOT[/color] destroy or hide valuable loot in the dungeon.
                                         - [color=red]DO NOT[/color] leave the planet.
-
-ghost-role-information-goblinbane-name = The Goblinbane
-ghost-role-information-goblinbane-ghost-name = The Ghost of Goblinbane
-ghost-role-information-goblinbane-description = Look for people who lack personal hygiene and either convince them to change their ways or make them face the consequences.
-ghost-role-information-goblinbane-rules = You are a [color=red][bold]Solo Antagonist[/bold][/color] capable of summoning minions. [color=yellow]Do note[/color], your minions will be hostile to everyone, except you.
-                                        Search and destroy people with poor personal hygiene. [color=yellow]Consider[/color] ignoring players dressed as janitors.
-                                        Please note that [color=yellow]all server rules still apply.[/color]. Additionally:
-                                        - [color=yellow]Reminder[/color] that Frontier Outpost (the station and 200m area around it) is a safe zone.
-                                        - [color=red]DO NOT[/color] attack players on the Outpost.
-                                        - [color=red]DO NOT[/color] use your abilities on the Outpost.
-                                        - [color=red]DO NOT[/color] intentionally damage Frontier Outpost, other POIs, shuttles.
-                                        - [color=red]DO NOT[/color] devour walls and airlocks on Frontier Outpost, other POIs, shuttles.
diff --git a/Resources/Maps/_NF/Dungeon/cave_factory.yml b/Resources/Maps/_NF/Dungeon/cave_factory.yml
@@ -13644,7 +13644,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,43.5
       parent: 1
-- proto: ToiletMemeSpawner
+- proto: ToiletEmpty
   entities:
   - uid: 927
     components:

diff --git a/Resources/Maps/_NF/Dungeon/experiment.yml b/Resources/Maps/_NF/Dungeon/experiment.yml
@@ -10347,7 +10347,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 45.5,1.5
       parent: 1653
-- proto: ToiletMemeSpawner
+- proto: ToiletEmpty
   entities:
   - uid: 799
     components:

diff --git a/Resources/Maps/_NF/Dungeon/haunted.yml b/Resources/Maps/_NF/Dungeon/haunted.yml
@@ -2824,7 +2824,7 @@ entities:
     - type: Transform
       pos: 36.5,31.5
       parent: 1653
-- proto: ToiletMemeSpawner
+- proto: ToiletEmpty
   entities:
   - uid: 406
     components:

diff --git a/Resources/Maps/_NF/Dungeon/lava_brig.yml b/Resources/Maps/_NF/Dungeon/lava_brig.yml
@@ -12152,7 +12152,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,43.5
       parent: 588
-- proto: ToiletMemeSpawner
+- proto: ToiletEmpty
   entities:
   - uid: 932
     components:

diff --git a/Resources/Maps/_NF/Dungeon/lava_mercenary.yml b/Resources/Maps/_NF/Dungeon/lava_mercenary.yml
@@ -12274,7 +12274,7 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,43.5
       parent: 588
-- proto: ToiletMemeSpawner
+- proto: ToiletEmpty
   entities:
   - uid: 932
     components:

diff --git a/Resources/Maps/_NF/Dungeon/salvage_outpost.yml b/Resources/Maps/_NF/Dungeon/salvage_outpost.yml
@@ -14910,7 +14910,7 @@ entities:
     - type: Transform
       pos: 22.5,28.5
       parent: 1653
-- proto: ToiletMemeSpawner
+- proto: ToiletEmpty
   entities:
   - uid: 157
     components:

diff --git a/Resources/Maps/_NF/Dungeon/snowy_labs.yml b/Resources/Maps/_NF/Dungeon/snowy_labs.yml
@@ -13489,7 +13489,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 45.5,1.5
       parent: 1653
-- proto: ToiletMemeSpawner
+- proto: ToiletEmpty
   entities:
   - uid: 889
     components:

diff --git a/Resources/Maps/_NF/Dungeon/virology_lab.yml b/Resources/Maps/_NF/Dungeon/virology_lab.yml
@@ -13497,15 +13497,15 @@ entities:
     - type: Transform
       pos: 20.5,24.5
       parent: 1653
-- proto: ToiletMemeSpawner
+- proto: ToiletEmpty
   entities:
   - uid: 1924
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 52.5,0.5
       parent: 1653
-- proto: ToiletMemeSpawner
+- proto: ToiletEmpty
   entities:
   - uid: 799
     components:

diff --git a/Resources/Maps/_NF/POI/grifty.yml b/Resources/Maps/_NF/POI/grifty.yml
@@ -5424,7 +5424,7 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 6.5,1.5
       parent: 1
-- proto: ToiletMemeSpawner
+- proto: ToiletEmpty
   entities:
   - uid: 326
     components:

diff --git a/Resources/Maps/_NF/POI/mchobo.yml b/Resources/Maps/_NF/POI/mchobo.yml
@@ -5998,7 +5998,7 @@ entities:
     - type: Transform
       pos: -6.5,8.5
       parent: 1
-- proto: ToiletMemeSpawner
+- proto: ToiletEmpty
   entities:
   - uid: 932
     components:

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -201,7 +201,7 @@
   - type: Appearance
 
 - type: entity
-  parent: [ JanitorClothes, NFClothingBeltStorageBase ] # Frontier: added JanitorClothes
+  parent: NFClothingBeltStorageBase
   id: ClothingBeltJanitor
   name: janibelt
   description: A belt used to hold most janitorial supplies.

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
@@ -95,7 +95,7 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: [ ChaplainClothes, ClothingOuterBaseToggleable ] # Frontier: added ChaplainClothes
+  parent: ClothingOuterBaseToggleable
   id: ClothingOuterHoodieChaplain
   name: chaplain's hoodie
   description: Black and strict chaplain hoodie.
@@ -219,7 +219,7 @@
     sprite: Clothing/OuterClothing/Misc/skubbody.rsi
 
 - type: entity
-  parent: [ ChaplainClothes, ClothingOuterBase ] # Frontier: added ChaplainClothes
+  parent: ClothingOuterBase
   id: ClothingOuterPlagueSuit
   name: plague doctor suit
   description: A bad omen.
@@ -230,7 +230,7 @@
     sprite: Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi
 
 - type: entity
-  parent: [ ChaplainClothes, ClothingOuterBase ] # Frontier: added ChaplainClothes
+  parent: ClothingOuterBase
   id: ClothingOuterNunRobe
   name: nun robe
   description: Maximum piety in this star system.

diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
@@ -420,7 +420,7 @@
     clothingPrototype: ClothingHeadHatHoodWinterHydro
 
 - type: entity
-  parent: [ JanitorClothes, ClothingOuterWinterCoatToggleable ] # Frontier: added JanitorClothes
+  parent: ClothingOuterWinterCoatToggleable
   id: ClothingOuterWinterJani
   name: janitorial winter coat
   components:

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -99,7 +99,7 @@
     sprite: Clothing/Shoes/Specific/cult.rsi
 
 - type: entity
-  parent: [ JanitorClothes, ClothingShoesBase ] # Frontier: added JanitorClothes
+  parent: ClothingShoesBase
   id: ClothingShoesGaloshes
   name: galoshes
   description: Rubber boots.

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -233,7 +233,7 @@
     sprite: Clothing/Uniforms/Jumpskirt/hydro.rsi
 
 - type: entity
-  parent: [ JanitorClothes, ClothingUniformSkirtBase ] # Frontier: added JanitorClothes
+  parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtJanitor
   name: janitor jumpskirt
   description: The jumpskirt for the poor sop with a mop.
@@ -869,4 +869,4 @@
   - type: Tag
     tags:
     - ClownSuit
-    - WhitelistChameleon
+    - WhitelistChameleon
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -113,7 +113,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/ce_turtle.rsi
 
 - type: entity
-  parent: [ ChaplainClothes, ClothingUniformBase ] # Frontier: added ChaplainClothes
+  parent: ClothingUniformBase
   id: ClothingUniformJumpsuitChaplain
   name: chaplain's jumpsuit
   description: It's a black jumpsuit, often worn by religious folk.
@@ -408,7 +408,7 @@
     sprite: Clothing/Uniforms/Jumpsuit/hydro.rsi
 
 - type: entity
-  parent: [ JanitorClothes, ClothingUniformBase ] # Frontier: added JanitorClothes
+  parent: ClothingUniformBase
   id: ClothingUniformJumpsuitJanitor
   name: janitor jumpsuit
   description: The jumpsuit for the poor sop with a mop.
@@ -1359,4 +1359,4 @@
   - type: Sprite
     sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
   - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
+    sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
@@ -191,10 +191,10 @@
               - "-0.5,-0.5"
               - "0.5,0.5"
               - "0.5,-0.5"
-          mask:
-          - FullTileMask
+          # mask: # Frontier
+          # - FullTileMask # Frontier
           layer:
-          - WallLayer
+          - GlassLayer # Frontier: WallLayer<GlassLayer
     - type: Construction
       graph: GrilleDiagonal
       node: grilleDiagonal
@@ -226,10 +226,10 @@
               - "-0.5,-0.5"
               - "0.5,0.5"
               - "0.5,-0.5"
-          mask:
-          - FullTileMask
+          # mask: # Frontier
+          # - FullTileMask # Frontier
           layer:
-          - WallLayer
+          - GlassLayer # Frontier: WallLayer<GlassLayer
     - type: Construction
       graph: GrilleDiagonal
       node: clockworkGrilleDiagonal