From 2057d8656aed55d55ea9210451da20aceaec6177 Mon Sep 17 00:00:00 2001 From: BramvanZijp Date: Tue, 26 Dec 2023 12:01:48 +0100 Subject: [PATCH 1/5] Give laika some much needed love. --- Delta-v_test | 1 + .../DeltaV/Entities/Mobs/NPCs/animals.yml | 4 +++- .../DeltaV/Entities/Mobs/NPCs/pets.yml | 1 + .../secdog_inventory_template.yml | 18 ++++++++++++++++++ .../Roles/Jobs/Fun/misc_startinggear.yml | 2 ++ .../Objects/Misc/identification_cards.yml | 12 ++++++++++++ 6 files changed, 37 insertions(+), 1 deletion(-) create mode 160000 Delta-v_test diff --git a/Delta-v_test b/Delta-v_test new file mode 160000 index 00000000000..b6abced968b --- /dev/null +++ b/Delta-v_test @@ -0,0 +1 @@ +Subproject commit b6abced968bd8e5880c6774ab78c4c3d6d991a7f 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..23427d34b09 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml @@ -49,3 +49,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..80d9181582d 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -310,6 +310,18 @@ job: Bartender name: Pun Pun +- type: entity + parent: IDCardStandard + id: SecDogIDCard + name: Security Dog ID card + components: + - type: Sprite + layers: + - state: default + - state: idsecurityofficer + - type: PresetIdCard + job: SecurityOfficer + - type: entity parent: IDCardStandard id: ChefIDCard From 1e0b92b1d2415fe511224585a1540e04b18c5d1c Mon Sep 17 00:00:00 2001 From: BramvanZijp Date: Tue, 26 Dec 2023 12:06:45 +0100 Subject: [PATCH 2/5] Why did this random fodler exist for me? --- Delta-v_test | 1 - 1 file changed, 1 deletion(-) delete mode 160000 Delta-v_test diff --git a/Delta-v_test b/Delta-v_test deleted file mode 160000 index b6abced968b..00000000000 --- a/Delta-v_test +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b6abced968bd8e5880c6774ab78c4c3d6d991a7f From 2dae3a3bfd3ee84a26a1ccd27dc5cf983ebb53a6 Mon Sep 17 00:00:00 2001 From: BramvanZijp Date: Tue, 26 Dec 2023 12:19:56 +0100 Subject: [PATCH 3/5] Actually named Laika's ID Card since standard security dogs dont get any starting gear. --- .../Prototypes/Entities/Objects/Misc/identification_cards.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 80d9181582d..8ef60a3b864 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -321,6 +321,7 @@ - state: idsecurityofficer - type: PresetIdCard job: SecurityOfficer + name: Laika - type: entity parent: IDCardStandard From 7f45c96e5a8e961d48b995c99f1a3c4c3fc825cb Mon Sep 17 00:00:00 2001 From: BramvanZijp Date: Tue, 26 Dec 2023 13:14:14 +0100 Subject: [PATCH 4/5] Laika's role now requires you to be able to play security officer requirement wise. --- Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml index 23427d34b09..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 From e2b82ab1e4ad65289889e82367f4e6ebc9018895 Mon Sep 17 00:00:00 2001 From: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> Date: Thu, 28 Dec 2023 03:24:16 -0600 Subject: [PATCH 5/5] Update Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- .../Prototypes/Entities/Objects/Misc/identification_cards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 8ef60a3b864..a13a9d28d31 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -310,7 +310,7 @@ job: Bartender name: Pun Pun -- type: entity +- type: entity # DeltaV - Security dog Laika ID card parent: IDCardStandard id: SecDogIDCard name: Security Dog ID card