Cave

Resources/Locale/en-US/_NF/ghost/roles/ghost-role-component.ftl

@@ -8,6 +8,9 @@ ghost-role-information-emotional-support-rules = You are an [color=lightpink][bo
 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-clarpy-name = Clarpy
 ghost-role-information-clarpy-description = Avast ye mail! wanted by Nanotrasen for crimes against mice.
 ghost-role-information-clarpy-rules = You are a [color=red][bold]Team Antagonist[/bold][/color] with all other pirates.

Resources/Prototypes/_NF/Catalog/Fills/Crates/npc.yml

@@ -80,6 +80,14 @@
   id: PetCarrierNPCEmotionalSupportSafe
   parent: [PetCarrier, FillNPCEmotionalSupportSafe]
 
+- type: entity
+  id: CrateWoodCageClugg
+  parent: CrateWoodCage
+  components:
+  - type: StorageFill
+    contents:
+      - id: MobCatClugg
+
 - type: entity
   id: CrateNPCPoultryCube
   parent: CrateGenericSteel

Resources/Prototypes/_NF/Datasets/Names/cat_clugg.yml

@@ -0,0 +1,4 @@
+- type: dataset
+  id: names_cat_clugg
+  values:
+  - Clugg

Resources/Prototypes/_NF/Entities/Markers/warp_point.yml

@@ -162,4 +162,11 @@
     location: Edison Power Plant
 
 # Events
-
+- type: entity
+  id: WarpPointNFCave
+  parent: WarpPoint
+  suffix: Event, Cave
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: WarpPoint
+    location: Cave

Resources/Prototypes/_NF/Entities/Mobs/NPCs/pets.yml

@@ -147,6 +147,36 @@
     interactSuccessSound:
       path: /Audio/_NF/Animals/nfsdcat_meow.ogg
 
+- type: entity
+  name: Clugg
+  parent: [NFMobPet, MobCatCaracalGhost]
+  id: MobCatClugg
+  description: 
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: _NF/Mobs/Pets/cat.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: cavecat
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: cavecat
+  - type: GhostRole
+    name: ghost-role-information-clugg-name
+    description: ghost-role-information-clugg-description
+    rules: ghost-role-information-nonantagonist-rules
+    prototype: CatClugg
+  - type: RandomMetadata
+    nameSegments: [names_cat_clugg] # Its needed to fix the names since it was using the MobCatGhost list.
+  - type: NpcFactionMember
+    factions:
+      - Cat
+      - DinosaursNF
+  - type: NFSalvageMobRestrictions
+    despawnIfOffLinkedGrid: false
+
 - type: entity
   name: Mistake
   parent: MobCatGhost

Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml

@@ -296,3 +296,25 @@
     sprite: _NF/Structures/Storage/Crates/secure_firearms.rsi
   - type: Sprite
     sprite: _NF/Structures/Storage/Crates/secure_firearms.rsi
+
+- type: entity
+  parent: CrateLivestock
+  id: CrateWoodCage
+  name: wood cage
+  description: Looks like somebody made this in a cave, with a box of scraps.
+  components:
+  - type: EntityStorage
+    airtight: false
+  - 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

Resources/Prototypes/_NF/Events/nf_events_bluespace.yml

@@ -59,60 +59,6 @@
       - /Maps/_NF/Bluespace/vaultsmall.yml
     rewardFactor: 1
 
-# - type: entity # Need rework
-  # id: BluespaceAsteroid
-  # parent: BaseStationEventShortDelay
-  # components:
-  # - type: StationEvent
-    # startAnnouncement: station-event-bluespace-asteroid-start-announcement
-    # startAudio:
-      # path: /Audio/Announcements/attention.ogg
-    # endAnnouncement: station-event-bluespace-asteroid-end-announcement
-    # earliestStart: 100
-    # minimumPlayers: 25
-    # weight: 2
-    # duration: 1500
-    # maxDuration: 1800
-    # reoccurrenceDelay: 480 # 8 hours
-  # - type: BluespaceErrorRule
-    # gridPath: /Maps/_NF/Bluespace/asteroidvault.yml
-
-# - type: entity # Need rework
-  # id: BluespaceAsteroidBunker
-  # parent: BaseStationEventShortDelay
-  # components:
-  # - type: StationEvent
-    # startAnnouncement: station-event-bluespace-asteroid-start-announcement
-    # startAudio:
-      # path: /Audio/Announcements/attention.ogg
-    # endAnnouncement: station-event-bluespace-asteroid-end-announcement
-    # earliestStart: 100
-    # minimumPlayers: 25
-    # weight: 2
-    # duration: 2100
-    # maxDuration: 2400
-    # reoccurrenceDelay: 480 # 8 hours
-  # - type: BluespaceErrorRule
-    # gridPath: /Maps/_NF/Bluespace/asteroidbunker.yml
-
-# - type: entity # Need rework
-  # id: BluespaceCargoniaShip
-  # parent: BaseStationEventShortDelay
-  # components:
-  # - type: StationEvent
-    # startAnnouncement: station-event-bluespace-generic-ftl-start-announcement
-    # startAudio:
-      # path: /Audio/Misc/notice1.ogg
-    # endAnnouncement: station-event-bluespace-generic-ftl-end-announcement
-    # earliestStart: 100
-    # minimumPlayers: 15
-    # weight: 2
-    # duration: 900
-    # maxDuration: 1200
-    # reoccurrenceDelay: 480 # 8 hours
-  # - type: BluespaceErrorRule
-    # gridPath: /Maps/_NF/Bluespace/cargoniaship.yml
-
 - type: entity
   id: BluespaceDataCarrier
   parent: BaseStationEventShortDelay
@@ -189,6 +135,24 @@
     gridPaths:
       - /Maps/_NF/Bluespace/bloodmoon.yml
 
+- type: entity
+  id: BluespaceCave
+  parent: BaseStationEventShortDelay
+  components:
+  - type: StationEvent
+    startAnnouncement: station-event-bluespace-generic-ftl-start-announcement
+    startAudio:
+      path: /Audio/Misc/notice1.ogg
+    endAnnouncement: station-event-bluespace-generic-ftl-end-announcement
+    earliestStart: 20
+    weight: 1
+    duration: 1800
+    maxDuration: 2400
+    maxOccurrences: 1
+  - type: BluespaceErrorRule
+    gridPaths:
+      - /Maps/_NF/Bluespace/cave.yml
+
 - type: entity
   id: BluespaceBrokenMcDelivery
   parent: BaseStationEventShortDelay

Resources/Textures/_NF/Mobs/Pets/cat.rsi/meta.json

@@ -43,6 +43,24 @@
         ]
       ]
     },
+    {
+      "name": "cavecat",
+      "directions": 4,
+      "delays": [
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ],
+        [
+          1
+        ]
+      ]
+    },
     {
       "name": "mistakecat",
       "directions": 4,

Resources/Textures/_NF/Structures/Storage/Crates/woodcage.rsi/meta.json

@@ -0,0 +1,20 @@
+{
+  "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",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}