Add Laika and security dogs (#190)

* Fix warden hat not resprited haha funny * Add Laika and security dogs :3 Adds Laika and security dogs to the codebase * Final edit to capitalisation Should be all good to go * Manual revert attributions and license Floofers unbork what was bork. All happy now * Update animals.yml vulpakin -> vulpkanin Signed-off-by: Tad "Taddy" Johnson <[email protected]> --------- Signed-off-by: Tad "Taddy" Johnson <[email protected]> Co-authored-by: Debug <[email protected]>
DeltaV-Station · Oct 23, 2023 · c83d60f · c83d60f
1 parent a380039
commit c83d60f
Show file tree

Hide file tree

Showing 40 changed files with 368 additions and 15 deletions.
diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-armory.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-armory.ftl
@@ -1,5 +1,5 @@
 ent-ArmoryGrand = { ent-CrateArmoryGrand }
-    .desc = { eng-CraeArmoryGrand.desc }
+    .desc = { ent-CrateArmoryGrand.desc }
 
 ent-ArmoryUniversal = { ent-CrateArmoryUniversal }
     .desc = { ent-CrateArmoryUniversal.desc }

diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-livestock.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-livestock.ftl
@@ -0,0 +1,2 @@
+ent-LivestockSecDog = { ent-CrateNPCSecDog }
+    .desc = { ent-CrateNPCSecDog.desc }
diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/livestock-crates.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/livestock-crates.ftl
@@ -0,0 +1,2 @@
+ent-CrateNPCSecDog = security dog shipment
+    .desc = Contains a single mixed-breed dog, trained for security applications.
diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml
@@ -0,0 +1,9 @@
+- type: cargoProduct
+  id: LivestockSecDog
+  icon:
+    sprite: DeltaV/Mobs/Pets/secdog.rsi
+    state: secdog
+  product: CrateNPCSecDog
+  cost: 3500
+  category: Livestock
+  group: market
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/npc.yml
@@ -0,0 +1,8 @@
+- type: entity
+  id: CrateNPCSecDog
+  parent: CrateLivestock
+  components:
+  - type: StorageFill
+    contents:
+      - id: MobSecDog
+        amount: 1
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml
@@ -48,6 +48,7 @@
     successChance: 0.5
     interactSuccessString: petting-success-soft-floofy
     interactFailureString: petting-failure-generic
+    interactSuccessSpawn: EffectHearts
     interactSuccessSound:
       path: /Audio/Animals/fox_squeak.ogg
   - type: Temperature
@@ -60,6 +61,116 @@
       gender: epicene
   - type: Bloodstream
     bloodMaxVolume: 100
+  - type: MobPrice
+    price: 400
   - type: Tag
     tags:
     - VimPilot
+
+- type: entity
+  name: security dog
+  parent: SimpleMobBase
+  id: MobSecDog
+  description: Funnily enough, this pig is actually a dog.
+  components:
+  - type: GhostRole
+    makeSentient: true
+    allowSpeech: true
+    allowMovement: true
+    name: "sentient security dog"
+    description: "Help out the security team by biting the baddies and barking at everything that moves."
+  - type: GhostTakeoverAvailable
+  - type: CombatMode
+  - type: MovementSpeedModifier
+    baseWalkSpeed : 3.5
+    baseSprintSpeed : 5.0
+  - type: NpcFactionMember
+    factions:
+      - PetsNT
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: DeltaV/Mobs/Pets/secdog.rsi
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      state: secdog
+  - type: HTN
+    rootTask:
+      task: SimpleHostileCompound
+  - type: Physics
+  - type: Speech
+    speechVerb: Canine
+    speechSounds: Vulpkanin
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 120 # BIG DOG :3
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: MobThresholds
+    thresholds: # BIG DOG. STRONG DOG
+      0: Alive
+      100: Critical
+      300: Dead
+  - type: StaminaDamageOnHit
+    damage: 22
+  - type: MeleeWeapon
+    hidden: true
+    soundHit:
+        path: /Audio/Effects/bite.ogg
+    angle: 0
+    attackRate: 0.75
+    damage:
+      types:
+        Slash: 10
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      40: 0.70
+      80: 0.30
+  - type: Appearance
+  - type: Inventory
+    speciesId: secdog
+    templateId: secdog
+  - type: InventorySlots
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+    - key: enum.StrippingUiKey.Key
+      type: StrippableBoundUserInterface
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: secdog
+      Critical:
+        Base: secdog_crit
+      Dead:
+        Base: secdog_dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeat
+      amount: 2
+  - type: ReplacementAccent
+    accent: dog
+  - type: InteractionPopup
+    successChance: 0.5
+    interactSuccessString: petting-success-dog
+    interactFailureString: petting-failure-generic
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark2.ogg
+  - type: Grammar
+    attributes:
+      gender: epicene
+  - type: Bloodstream
+    bloodMaxVolume: 300 # BIG DOG. MUCH BLOOD :3
+  - type: Puller
+  - type: MobPrice
+    price: 400
+  - type: Tag
+    tags:
+    - DoorBumpOpener
+    - VimPilot
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml
@@ -18,3 +18,33 @@
     tags:
     - CannotSuicide
     - VimPilot
+
+- type: entity
+  name: Laika
+  parent: MobSecDog
+  id: MobSecDogLaika
+  description: Much like her namesake, Laika is a specimen of indeterminate breed, fresh off the streets and ready to tussle.
+  components:
+  - type: GhostRole
+    makeSentient: true
+    allowSpeech: true
+    allowMovement: true
+    name: "Laika"
+    description: "Security's resident she-dog. Badger the officers for headpats and nip at the heels of violent offenders."
+  - type: GhostTakeoverAvailable
+  - type: InteractionPopup
+    successChance: 1
+  - type: Butcherable
+    spawned:
+    - id: FoodMeat
+      amount: 2
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: female
+  - type: Loadout
+    prototypes: [ MobSecDogLaikaGear ]
+  - type: Tag
+    tags:
+    - CannotSuicide
+    - VimPilot
diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/secdog_inventory_template.yml b/Resources/Prototypes/DeltaV/InventoryTemplates/secdog_inventory_template.yml
@@ -0,0 +1,45 @@
+- type: inventoryTemplate
+  id: secdog
+  slots:
+  - name: mask
+    slotTexture: mask
+    slotFlags: MASK
+    uiWindowPos: 1,1
+    strippingWindowPos: 1,1
+    displayName: Mask
+    whitelist:
+      tags:
+        - PetWearable
+
+  - name: suitstorage
+    slotTexture: suit_storage
+    slotFlags: SUITSTORAGE
+    slotGroup: SecondHotbar
+    stripTime: 3
+    uiWindowPos: 2,0
+    strippingWindowPos: 2,5
+    displayName: Suit Storage
+    whitelist:
+      components:
+        - GasTank
+
+  - name: eyes
+    slotTexture: glasses
+    slotFlags: EYES
+    stripTime: 3
+    uiWindowPos: 0,0
+    strippingWindowPos: 0,0
+    displayName: Eyes
+    whitelist:
+      tags:
+        - SecDogWearable
+
+  - name: pocket1
+    slotTexture: pocket
+    slotFlags: POCKET
+    slotGroup: MainHotbar
+    stripTime: 1.5
+    uiWindowPos: 2,3
+    strippingWindowPos: 1,4
+    displayName: Vest
+    stripHidden: false
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml
@@ -1,5 +1,13 @@
+
 #Misc outfit startingGear definitions.
 
+# Laika sec glasses
+
+- type: startingGear
+  id: MobSecDogLaikaGear
+  equipment:
+    eyes: ClothingEyesGlassesSecurity
+
 #Oldstation Roles
 
 - type: startingGear

diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml
@@ -18,5 +18,8 @@
 - type: Tag
   id: MagazinePistolSpecial # For the .38 special ammo and pistol
 
+- type: Tag
+  id: SecDogWearable # allows Laika to wear meson goggles (and more later?)
+
 - type: Tag
   id: SpeedLoaderSpecial
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
@@ -63,6 +63,9 @@
   - type: Clothing
     sprite: Clothing/Eyes/Glasses/meson.rsi
   - type: EyeProtection
+  - type: Tag
+    tags:
+    - SecDogWearable # DeltaV - let Laika wear meson goggles
 
 - type: entity
   parent: ClothingEyesBase
@@ -127,6 +130,7 @@
     tags:
     - HamsterWearable
     - WhitelistChameleon
+    - SecDogWearable # DeltaV - let Laika wear sunglasses
 
 - type: entity
   parent: ClothingEyesBase
@@ -145,6 +149,7 @@
     tags:
     - HamsterWearable
     - WhitelistChameleon
+    - SecDogWearable # DeltaV - let Laika wear secglasses
   - type: GuideHelp
     guides:
     - Security

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -466,9 +466,9 @@
   description: The responsibility weighs heavy, like a barbed crown. # DeltaV - changed description to remove THE LAW
   components:
   - type: Sprite
-    sprite: Clothing/Head/Hats/warden.rsi # DeltaV - resprite
+    sprite: DeltaV/Clothing/Head/Hats/warden.rsi # DeltaV - resprite
   - type: Clothing
-    sprite: Clothing/Head/Hats/warden.rsi # DeltaV - resprite
+    sprite: DeltaV/Clothing/Head/Hats/warden.rsi # DeltaV - resprite
 
 - type: entity
   parent: ClothingHeadBase

diff --git a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/equipped-EYES-secdog.png b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/equipped-EYES-secdog.png
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/meson.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES by TJohnson.",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-EYES",
       "directions": 4
     },
+    {
+      "name": "equipped-EYES-secdog",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-secdog.png b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-secdog.png
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES-hamster by TJohnson.",
   "size": {
     "x": 32,
     "y": 32
@@ -18,6 +18,10 @@
       "name": "equipped-EYES-hamster",
       "directions": 4
     },
+    {
+      "name": "equipped-EYES-secdog",
+      "directions": 4
+    },
     {
       "name": "inhand-left",
       "directions": 4

diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES-secdog.png b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/equipped-EYES-secdog.png
diff --git a/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da. equipped-EYES-secdog modified from equipped-EYES by TJohnson.",
   "size": {
     "x": 32,
     "y": 32
@@ -14,6 +14,10 @@
       "name": "equipped-EYES",
       "directions": 4
     },
+    {
+      "name": "equipped-EYES-secdog",
+      "directions": 4
+    },
     {
       "name": "equipped-EYES-hamster",
       "directions": 4

diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-secdog.png b/Resources/Textures/Clothing/Mask/breath.rsi/equipped-MASK-secdog.png
diff --git a/Resources/Textures/Clothing/Mask/breath.rsi/meta.json b/Resources/Textures/Clothing/Mask/breath.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-MASK-secdog modified from equipped-MASK-dog by TJohnson.",
   "size": {
     "x": 32,
     "y": 32
@@ -30,6 +30,10 @@
       "name": "equipped-MASK-dog",
       "directions": 4
     },
+    {
+      "name": "equipped-MASK-secdog",
+      "directions": 4
+    },
     {
       "name": "equipped-MASK-puppy",
       "directions": 4
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-LivestockSecDog = { ent-CrateNPCSecDog }
		.desc = { ent-CrateNPCSecDog.desc }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-CrateNPCSecDog = security dog shipment
		.desc = Contains a single mixed-breed dog, trained for security applications.