Merge remote-tracking branch 'upstream/master' into HoS's-Shades

DeltaV-Station · Dec 29, 2023 · 9d1d1c5 · 9d1d1c5
2 parents e71b26c + 6b2d0a8
commit 9d1d1c5
Show file tree

Hide file tree

Showing 7 changed files with 1,040 additions and 289 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1224,3 +1224,17 @@ Entries:
       message: 'Added 3 classic hairstyles: Long hair, Long hair 2, Long hair 3.'
   id: 183
   time: '2023-12-27T18:23:39.0000000+00:00'
+- author: BramvanZijp
+  changes:
+    - type: Tweak
+      message: >-
+        Security dogs now can wear an id card and radio, are able to drag
+        things, and have received additional combat training.
+  id: 184
+  time: '2023-12-28T09:32:10.0000000+00:00'
+- author: Adrian16199
+  changes:
+    - type: Fix
+      message: Gives shoukou an oxygen miner until air actualy works.
+  id: 185
+  time: '2023-12-28T21:38:57.0000000+00:00'
diff --git a/Resources/Maps/shoukou.yml b/Resources/Maps/shoukou.yml
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml
@@ -120,10 +120,11 @@
     damage: 22
   - type: MeleeWeapon
     hidden: true
+    altDisarm: false
     soundHit:
         path: /Audio/Effects/bite.ogg
     angle: 0
-    attackRate: 0.75
+    attackRate: 1
     damage:
       types:
         Slash: 10
@@ -168,6 +169,7 @@
   - type: Bloodstream
     bloodMaxVolume: 300 # BIG DOG. MUCH BLOOD :3
   - type: Puller
+    needsHands: false
   - type: MobPrice
     price: 400
   - type: Tag

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml
@@ -31,6 +31,10 @@
     allowMovement: true
     name: "Laika"
     description: "Security's resident she-dog. Badger the officers for headpats and nip at the heels of violent offenders."
+    requirements:
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 14400 # DeltaV - 4 hours
   - type: GhostTakeoverAvailable
   - type: InteractionPopup
     successChance: 1
@@ -49,3 +53,4 @@
     - CannotSuicide
     - VimPilot
     - DoorBumpOpener
+  - type: PotentialPsionic # Smart girl.
diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/secdog_inventory_template.yml b/Resources/Prototypes/DeltaV/InventoryTemplates/secdog_inventory_template.yml
@@ -43,3 +43,21 @@
     strippingWindowPos: 1,4
     displayName: Vest
     stripHidden: false
+
+  - name: id
+    slotTexture: id
+    slotFlags: IDCARD
+    slotGroup: SecondHotbar
+    stripTime: 6
+    uiWindowPos: 2,1
+    strippingWindowPos: 2,4
+    displayName: ID
+
+  - name: ears
+    slotTexture: ears
+    slotFlags: EARS
+    slotGroup: MainHotbar
+    stripTime: 4.5
+    uiWindowPos: 1,2
+    strippingWindowPos: 1,2
+    displayName: Ears
diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml
@@ -7,6 +7,8 @@
   id: MobSecDogLaikaGear
   equipment:
     eyes: ClothingEyesGlassesSecurity
+    ears: ClothingHeadsetSecurity
+    id: SecDogIDCard
 
 #Oldstation Roles
 

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -310,6 +310,19 @@
       job: Bartender
       name: Pun Pun
 
+- type: entity # DeltaV - Security dog Laika ID card
+  parent: IDCardStandard
+  id: SecDogIDCard
+  name: Security Dog ID card
+  components:
+    - type: Sprite
+      layers:
+        - state: default
+        - state: idsecurityofficer
+    - type: PresetIdCard
+      job: SecurityOfficer
+      name: Laika
+
 - type: entity
   parent: IDCardStandard
   id: ChefIDCard