diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml index 15a30f4c02e..5975ecb0da8 100644 --- 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 index c561265f6b8..9eff92c3fb8 100644 --- 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. \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/secdog_inventory_template.yml b/Resources/Prototypes/DeltaV/InventoryTemplates/secdog_inventory_template.yml index f53f586dfec..fb237cf578a 100644 --- 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 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml index 72830e0d85b..dd8c0b1de8a 100644 --- 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 index 82f80c0856f..a13a9d28d31 100644 --- 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