Merge branch '2024-09-21-CaveEvent-suggestions' of https://github.com…

…/whatston3/frontier-station-14 into 2024-09-21-CaveEvent
whatston3 · Sep 25, 2024 · f1d549a · f1d549a
2 parents 55bf05f + 440cf20
commit f1d549a
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 164 deletions.
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
@@ -9,7 +9,7 @@ ghost-role-information-clippy-name = Clippy
 ghost-role-information-clippy-description = The Station Representative's loyal worker, smells like cardboard and papers.
 
 ghost-role-information-clugg-name = Clugg
-ghost-role-information-clugg-description = Ug! Me hungry for big rock! Where mammoth burger?
+ghost-role-information-clugg-description = Ugg! Clugg love eat meat. Find new home off space rock, make big hunt.
 
 ghost-role-information-clarpy-name = Clarpy
 ghost-role-information-clarpy-description = Avast ye mail! wanted by Nanotrasen for crimes against mice.

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml
@@ -83,6 +83,7 @@
 - type: entity
   id: CrateWoodCageClugg
   parent: CrateWoodCage
+  suffix: Filled, Clugg
   components:
   - type: StorageFill
     contents:

diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml
@@ -19,7 +19,7 @@
   - type: Loadout
     prototypes: [ MobClippyGear ]
   - type: RandomMetadata
-    nameSegments: [names_cat_clippy] # Its needed to fix the names since it was using the MobCatGhost list.
+    nameSegments: [names_cat_clippy]
   - type: AutoImplant
     implants:
     - MindShieldImplant
@@ -71,7 +71,7 @@
   - type: ReplacementAccent
     accent: pirateCat
   - type: RandomMetadata
-    nameSegments: [names_cat_clarpy] # Its needed to fix the names since it was using the MobCatGhost list.
+    nameSegments: [names_cat_clarpy]
   - type: AutoImplant
     implants:
     - FreelanceTrackingImplant
@@ -112,7 +112,7 @@
   - type: ReplacementAccent
     accent: nfsdCat
   - type: RandomMetadata
-    nameSegments: [names_cat_cappy] # Its needed to fix the names since it was using the MobCatGhost list.
+    nameSegments: [names_cat_cappy]
   - type: AutoImplant
     implants:
     - MindShieldImplant
@@ -168,7 +168,7 @@
     description: ghost-role-information-clugg-description
     rules: ghost-role-information-nonantagonist-rules
   - type: RandomMetadata
-    nameSegments: [names_cat_clugg] # Its needed to fix the names since it was using the MobCatGhost list.
+    nameSegments: [names_cat_clugg]
   - type: NpcFactionMember
     factions:
       - Cat
@@ -200,7 +200,7 @@
   - type: ReplacementAccent
     accent: mistakeCat
   - type: RandomMetadata
-    nameSegments: [names_cat_mistake] # Its needed to fix the names since it was using the MobCatGhost list.
+    nameSegments: [names_cat_mistake]
   - type: Vocal
     sounds:
       Male: CatMistake

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
@@ -315,21 +315,17 @@
 - type: entity
   parent: CrateLivestock
   id: CrateWoodCage
-  name: wood cage
+  name: wooden cage
   description: Looks like somebody made this in a cave, with a box of scraps.
   components:
   - type: EntityStorage
-    airtight: false
+    airtight: false # Keep this explicit in case the parent changes.
   - type: Sprite
     sprite: _NF/Structures/Storage/Crates/woodcage.rsi
     layers:
     - state: base
     - state: closed
       map: ["enum.StorageVisualLayers.Door"]
-    - state: paper
-      sprite: Structures/Storage/Crates/labels.rsi
-      offset: "-0.25,0.625"
-      map: ["enum.PaperLabelVisuals.Layer"]
   - type: Icon
     sprite: _NF/Structures/Storage/Crates/woodcage.rsi
     state: base
diff --git a/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json b/Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json
@@ -5,119 +5,38 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Modified from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, Clarpy and Mistake edited by Dvir001, Cappy edited by ghostprince",
+  "copyright": "Modified from https://github.com/tgstation/tgstation/commit/53d1f1477d22a11a99c6c6924977cd431075761b, piratecat and mistakecat edited by Dvir001, nfsdcat and cavecat edited by ghostprince",
   "states": [
     {
       "name": "piratecat",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "nfsdcat",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "cavecat",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "mistakecat",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
-      "name": "piratecat_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "piratecat_dead"
     },
     {
-      "name": "nfsdcat_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "nfsdcat_dead"
     },
     {
-      "name": "mistakecat_dead",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "mistakecat_dead"
     },
     {
-      "name": "cat_deadcollar",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "cat_deadcollar"
     },
     {
-      "name": "cat_deadtag",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "cat_deadtag"
     },
     {
       "name": "piratecat_rest",
@@ -153,80 +72,27 @@
       ]
     },
     {
-      "name": "cat_restcollar",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "cat_restcollar"
     },
     {
-      "name": "cat_resttag",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "cat_resttag"
     },
     {
-      "name": "piratecat_sit",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "piratecat_sit"
     },
     {
-      "name": "nfsdcat_sit",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "nfsdcat_sit"
     },
     {
-      "name": "mistakecat_sit",
-      "delays": [
-        [
-          1
-        ]
-      ]
+      "name": "mistakecat_sit"
     },
     {
       "name": "catcollar",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     },
     {
       "name": "cattag",
-      "directions": 4,
-      "delays": [
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ],
-        [
-          1
-        ]
-      ]
+      "directions": 4
     }
   ]
 }
diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/woodcage.rsi/base.png b/Resources/Textures/_NF/Structures/Storage/Crates/woodcage.rsi/base.png
diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/woodcage.rsi/meta.json b/Resources/Textures/_NF/Structures/Storage/Crates/woodcage.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from YogStation at commit https://github.com/yogstation13/Yogstation/commit/fa832b902f5130c41b21973e7e8b60b4d7a795b4 and modified by potato1234x (github) for ss14",
+  "copyright": "Taken from YogStation at commit https://github.com/yogstation13/Yogstation/commit/fa832b902f5130c41b21973e7e8b60b4d7a795b4 and modified by potato1234x (github) and Whatstone (Discord)",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/_NF/Structures/Storage/Crates/woodcage.rsi/open.png b/Resources/Textures/_NF/Structures/Storage/Crates/woodcage.rsi/open.png