Merge branch 'master' into toyfix

DeltaV-Station · Sep 26, 2023 · 3a26425 · 3a26425
2 parents b0237e5 + f4e7925
commit 3a26425
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -83,3 +83,9 @@ Entries:
       message: Clown Spiders no longer can squeeze through the vents.
   id: 13
   time: '2023-09-21T20:45:11.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Add
+      message: Added the PSB emergency snack.
+  id: 14
+  time: '2023-09-26T02:57:54.0000000+00:00'
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@@ -11,7 +11,7 @@
       - id: SpaceMedipen
       - id: EmergencyMedipen
       - id: Flare
-      - id: FoodTinMRE
+      - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB
   - type: Sprite
     layers:
       - state: internals
@@ -30,7 +30,7 @@
       - id: SpaceMedipen
       - id: EmergencyMedipen
       - id: Flare
-      - id: FoodTinMRE
+      - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB
   - type: Sprite
     layers:
       - state: internals
@@ -50,7 +50,7 @@
       - id: SpaceMedipen
       - id: EmergencyMedipen
       - id: Flare
-      - id: FoodTinMRE
+      - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB
   - type: Sprite
     layers:
       - state: internals
@@ -70,7 +70,7 @@
       - id: SpaceMedipen
       - id: EmergencyMedipen
       - id: EmergencyMedipen
-      - id: FoodTinMRE
+      - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB
   - type: Sprite
     layers:
       - state: internals
@@ -90,7 +90,7 @@
       - id: SpaceMedipen
       - id: EmergencyMedipen
       - id: Flare
-      - id: FoodTinMRE
+      - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB
   - type: Sprite
     layers:
       - state: internals
@@ -115,7 +115,7 @@
       - id: SpaceMedipen
       - id: EmergencyMedipen
       - id: Flare
-      - id: FoodTinMRE
+      - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB
   - type: Tag
     tags:
       - BoxHug

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/ration.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/ration.yml
@@ -72,6 +72,9 @@
         reagents:
         - ReagentId: Nutriment
           Quantity: 15
+  - type: Tag
+    tags:
+    - ClothMade # DeltaV - A dirty fix to allow Moths to eat it.
 
 - type: entity
   name: soy sustenance bar