Merge branch 'master' into 2024-10-FoldingTable-Price-Fix

new-frontiers-14 · Oct 19, 2024 · 9a50508 · 9a50508
2 parents d5225d2 + b3635ef
commit 9a50508
Show file tree

Hide file tree

Showing 22 changed files with 335 additions and 42 deletions.
diff --git a/Content.Server/Holiday/HolidaySystem.cs b/Content.Server/Holiday/HolidaySystem.cs
@@ -118,6 +118,7 @@ private void OnVisualsInit(Entity<HolidayVisualsComponent> ent, ref ComponentIni
             }
         }
 
+        // Frontier: holiday-themed entity replacement
         private void OnBeforeRead(BeforeEntityReadEvent ev)
         {
             foreach (var holiday in _currentHolidays)
@@ -131,6 +132,7 @@ private void OnBeforeRead(BeforeEntityReadEvent ev)
                 }
             }
         }
+        // End Frontier
     }
 
     /// <summary>

diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
@@ -4769,3 +4769,23 @@ Entries:
       message: 'You can now print some empty cardboard boxes in service techfab. '
   id: 5432
   time: '2024-10-18T22:47:58.0000000+00:00'
+- author: dustylens
+  changes:
+    - type: Add
+      message: Seasonal decorations. What fun.
+  id: 5433
+  time: '2024-10-19T13:11:46.0000000+00:00'
+- author: rcoi
+  changes:
+    - type: Add
+      message: Added new lobby art cattrio
+  id: 5434
+  time: '2024-10-19T13:36:41.0000000+00:00'
+- author: KieueCaprie
+  changes:
+    - type: Fix
+      message: >-
+        Station anchors, biogenerators and cutters can now be assembled
+        properly.
+  id: 5435
+  time: '2024-10-19T16:04:02.0000000+00:00'
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -1764,10 +1764,10 @@
       food:
         maxVol: 10
         reagents:
-        - ReagentId: Nutriment
-          Quantity: 5
+#        - ReagentId: Nutriment # Frontier
+#          Quantity: 5 # Frontier
         - ReagentId: Sulfur
-          Quantity: 5
+          Quantity: 10 # Frontier: 5<10
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/gatfruit.rsi
   - type: Produce
@@ -1782,6 +1782,7 @@
     entries:
       Taco: Gatfruit
       Burger: GatfruitBurger
+  - type: BadFood # Frontier: Nope
 
 - type: entity
   name: capfruit
@@ -1797,10 +1798,10 @@
       food:
         maxVol: 10
         reagents:
-        - ReagentId: Nutriment
-          Quantity: 5
+#        - ReagentId: Nutriment # Frontier
+#          Quantity: 5 # Frontier
         - ReagentId: Sulfur
-          Quantity: 5
+          Quantity: 10 # Frontier: 5<10
   - type: Sprite
     sprite: Objects/Specific/Hydroponics/capfruit.rsi
   - type: Produce
@@ -1815,6 +1816,7 @@
     entries:
       Taco: Capfruit
       Burger: CapfruitBurger
+  - type: BadFood # Frontier: Nope
 
 - type: entity
   name: capfruit

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml
@@ -208,8 +208,8 @@
     state: service
   - type: MachineBoard
     prototype: Biogenerator
-    stackRequirements:
-      MatterBin: 2
+    requirements: # Frontier
+      MatterBin: 2 # Frontier stackRequirements<requirements
     tagRequirements:
       GlassBeaker:
         amount: 1
@@ -1287,9 +1287,10 @@
   components:
   - type: MachineBoard
     prototype: StationAnchor
+    requirements: # Frontier
+      Capacitor: 4 # Frontier stackRequirements<requirements
+      MatterBin: 3 # Frontier stackRequirements<requirements
     stackRequirements:
-      Capacitor: 4
-      MatterBin: 3
       Steel: 10
       Glass: 5
       CableHV: 8
@@ -1329,8 +1330,9 @@
   components:
   - type: MachineBoard
     prototype: CutterMachine
+    requirements: # Frontier
+      Capacitor: 1 # Frontier stackRequirements<requirements
+      Manipulator: 1 # Frontier stackRequirements<requirements
     stackRequirements:
       Steel: 2
-      Capacitor: 1
-      Manipulator: 1
       Cable: 1
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml
@@ -502,7 +502,7 @@
       sprite: Objects/Specific/Hydroponics/fly_amanita.rsi
 
 - type: entity
-  parent: [SeedBase, BaseC3SyndicateContraband] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContraband
+  parent: [SeedBase, BaseC3SyndicateContrabandUnredeemable] # Frontier: BaseSyndicateContraband<BaseC3SyndicateContrabandUnredeemable
   name: packet of gatfruit seeds
   description: "These are no peashooters."
   id: GatfruitSeeds

diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/paintings.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/paintings.yml
@@ -0,0 +1,34 @@
+- type: entity
+  parent: RandomPainting
+  id: RandomPaintingHalloween
+  suffix: Halloween
+  components:
+  - type: RandomSpawner
+    offset: 0
+    prototypes:
+      - PaintingPersistenceOfMemory
+      - PaintingTheSonOfMan
+      - PaintingTheKiss
+      - PaintingTheScream
+      - PaintingTheGreatWave
+      - PaintingCafeTerraceAtNight
+      - PaintingNightHawks
+      - PaintingSkeletonCigarette
+      - PaintingPrayerHands
+      - PaintingOldGuitarist
+      - PaintingOlympia
+      - PaintingSaturn
+      - PaintingSleepingGypsy
+      - PaintingRedBlueYellow
+      - PaintingHelloWorld
+      - PaintingNightOfThePostGoblin
+      # Special halloween posters
+      - PaintingSpookyIan
+      - PaintingSpookyLady
+    chance: 1
+    rarePrototypes:
+      - PaintingSkeletonBoof
+      - PaintingEmpty
+      - PaintingMoony
+      - PaintingAmogusTriptych
+    rareChance: 0.01
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings.yml
@@ -7,3 +7,23 @@
   - type: Sprite
     sprite: _NF/Structures/Wallmounts/paintings.rsi
     state: painting0
+
+- type: entity
+  parent: PaintingBase
+  id: PaintingSpookyIan
+  name: Duty Without End
+  description: Their vigil is eternal.
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Wallmounts/paintings.rsi
+    state: painting1
+
+- type: entity
+  parent: PaintingBase
+  id: PaintingSpookyLady
+  name: The Lady and the Banners
+  description: A woman stands invitingly before a castle of ominous portent. How the windows beckon! How your gaze is arrested!
+  components:
+  - type: Sprite
+    sprite: _NF/Structures/Wallmounts/paintings.rsi
+    state: painting2
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings_directional.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/paintings_directional.yml
@@ -10,7 +10,46 @@
   parent: PaintingDirectionalBase
   id: PaintingFireaxeCabinet
   name: The Fireaxe Cabinet
-  description: "Painting is a masterfully designed image of a fireaxe cabinet. The artwork relates to the loss of the masterwork ☼fireaxe☼ in the early winter of 2523. Oil. Canvas. Tears."
+  description: "This painting is a masterfully designed image of a fireaxe cabinet. The artwork relates to the loss of the masterwork ☼fireaxe☼ in the early winter of 2523. Oil. Canvas. Tears."
   components:
   - type: Sprite
-    state: painting_fireaxe
+    state: painting_fireaxe
+
+- type: entity
+  parent: PaintingDirectionalBase
+  id: PaintingGhostHanging
+  name: festive ghost streamers
+  description: "Decorative wall streamers! They look like the people you've lost to the void!"
+  components:
+  - type: Sprite
+    drawdepth: Overdoors
+    state: painting_ghost
+  - type: Construction
+    graph: PaintingGhostHangingGraph
+    node: PaintingGhostHangingNode
+
+- type: entity
+  parent: PaintingDirectionalBase
+  id: PaintingBatHanging
+  name: festive bat streamers
+  description: "Decorative wall streamers! Bats are scary and also important pollinators!"
+  components:
+  - type: Sprite
+    drawdepth: Overdoors
+    state: painting_bat
+  - type: Construction
+    graph: PaintingBatHangingGraph
+    node: PaintingBatHangingNode
+
+- type: entity
+  parent: PaintingDirectionalBase
+  id: PaintingPumpkinHanging
+  name: festive pumpkin streamers
+  description: "Decorative wall streamers! It's decorative gourd season!"
+  components:
+  - type: Sprite
+    drawdepth: Overdoors
+    state: painting_pumpkin
+  - type: Construction
+    graph: PaintingPumpkinHangingGraph
+    node: PaintingPumpkinHangingNode
diff --git a/...ces/Prototypes/_NF/Recipes/Construction/Graphs/furniture/wallmount_decorations_graphs.yml b/...ces/Prototypes/_NF/Recipes/Construction/Graphs/furniture/wallmount_decorations_graphs.yml
@@ -0,0 +1,71 @@
+- type: constructionGraph
+  id: PaintingGhostHangingGraph
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity { }
+      edges:
+        - to: PaintingGhostHangingNode
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - material: Paper
+              amount: 1
+              doAfter: 2
+
+    - node: PaintingGhostHangingNode
+      entity: PaintingGhostHanging
+      edges:
+        - to: start
+          steps:
+            - tool: Cutting
+              doAfter: 2
+
+- type: constructionGraph
+  id: PaintingBatHangingGraph
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity { }
+      edges:
+        - to: PaintingBatHangingNode
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - material: Paper
+              amount: 1
+              doAfter: 2
+
+    - node: PaintingBatHangingNode
+      entity: PaintingBatHanging
+      edges:
+        - to: start
+          steps:
+            - tool: Cutting
+              doAfter: 2
+
+- type: constructionGraph
+  id: PaintingPumpkinHangingGraph
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DestroyEntity { }
+      edges:
+        - to: PaintingPumpkinHangingNode
+          completed:
+            - !type:SnapToGrid { }
+          steps:
+            - material: Paper
+              amount: 1
+              doAfter: 2
+
+    - node: PaintingPumpkinHangingNode
+      entity: PaintingPumpkinHanging
+      edges:
+        - to: start
+          steps:
+            - tool: Cutting
+              doAfter: 2
diff --git a/Resources/Prototypes/_NF/Recipes/Construction/wallmount_decorations.yml b/Resources/Prototypes/_NF/Recipes/Construction/wallmount_decorations.yml
@@ -0,0 +1,45 @@
+- type: construction
+  name: festive ghost streamers
+  id: PaintingGhostHangingConstruction
+  graph: PaintingGhostHangingGraph
+  startNode: start
+  targetNode: PaintingGhostHangingNode
+  category: construction-category-misc
+  description: Decorative wall streamers! They look like the people you've lost to the void!
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  icon:
+    sprite: _NF/Structures/Wallmounts/paintings_directional.rsi
+    state: painting_ghost
+
+- type: construction
+  name: festive bat streamers
+  id: PaintingBatHangingConstruction
+  graph: PaintingBatHangingGraph
+  startNode: start
+  targetNode: PaintingBatHangingNode
+  category: construction-category-misc
+  description: Decorative wall streamers! Bats are scary and also important pollinators!
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  icon:
+    sprite: _NF/Structures/Wallmounts/paintings_directional.rsi
+    state: painting_bat
+
+- type: construction
+  name: festive pumpkin streamers
+  id: PaintingPumpkinHangingConstruction
+  graph: PaintingPumpkinHangingGraph
+  startNode: start
+  targetNode: PaintingPumpkinHangingNode
+  category: construction-category-misc
+  description: Decorative wall streamers! It's decorative gourd season!
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  icon:
+    sprite: _NF/Structures/Wallmounts/paintings_directional.rsi
+    state: painting_pumpkin
+
diff --git a/Resources/Prototypes/_NF/lobbyscreens.yml b/Resources/Prototypes/_NF/lobbyscreens.yml
@@ -32,4 +32,8 @@
 
 - type: lobbyBackground
   id: BrownPants
-  background: /Textures/_NF/LobbyScreens/brownpants.png
+  background: /Textures/_NF/LobbyScreens/brownpants.png
+
+- type: lobbyBackground
+  id: Cattrio
+  background: /Textures/_NF/LobbyScreens/cattrio.png
diff --git a/Resources/Prototypes/holidays.yml b/Resources/Prototypes/holidays.yml
@@ -332,6 +332,7 @@
   entityReplacements: # Frontier
     KitchenDeepFryer: KitchenDeepFryerCauldron # Frontier
     KitchenDeepFryerPOI: KitchenDeepFryerCauldronPOI # Frontier
+    RandomPainting: RandomPaintingHalloween # Frontier
 
 - type: holiday
   id: VeganDay

diff --git a/Resources/Textures/_NF/LobbyScreens/attributions.yml b/Resources/Textures/_NF/LobbyScreens/attributions.yml
@@ -41,4 +41,9 @@
 - files: ["brownpants.png"]
   license: "CC-BY-NC-SA-4.0"
   copyright: "gentlebutter (588410099190726656) on Discord"
-  source: "https://discord.com/channels/1123826877245694004/1245127769847762954/1261463547263844352"
+  source: "https://discord.com/channels/1123826877245694004/1245127769847762954/1261463547263844352"
+
+- files: ["cattrio.png"]
+  license: "CC-BY-NC-SA-4.0"
+  copyright: "rcoi (245738467995156481) on Discord"
+  source: "https://discord.com/channels/1123826877245694004/1245127769847762954/1296381647348043866"
diff --git a/Resources/Textures/_NF/LobbyScreens/cattrio.png b/Resources/Textures/_NF/LobbyScreens/cattrio.png
diff --git a/Resources/Textures/_NF/LobbyScreens/cattrio.png.yml b/Resources/Textures/_NF/LobbyScreens/cattrio.png.yml
@@ -0,0 +1,2 @@
+sample:
+  filter: false