From 367fcef1d85cd22374afefdd1106b6a90701924e Mon Sep 17 00:00:00 2001 From: Radezolid Date: Fri, 8 May 2026 23:57:16 -0300 Subject: [PATCH 1/5] Job stuff --- Resources/Locale/en-US/_DV/job/job-description.ftl | 1 + Resources/Locale/en-US/_DV/job/job-names.ftl | 1 + Resources/Prototypes/_DV/Roles/Jobs/Pets/pets.yml | 11 +++++++++++ Resources/Prototypes/_DV/Roles/play_time_trackers.yml | 3 +++ 4 files changed, 16 insertions(+) diff --git a/Resources/Locale/en-US/_DV/job/job-description.ftl b/Resources/Locale/en-US/_DV/job/job-description.ftl index e9ef0803d5..9ff145eb47 100644 --- a/Resources/Locale/en-US/_DV/job/job-description.ftl +++ b/Resources/Locale/en-US/_DV/job/job-description.ftl @@ -19,6 +19,7 @@ role-description-ifrit = "Burn baby, burn!" role-description-carpy = "Grrr!" role-description-shiva = "Hsssss!" role-description-pun-pun = "Ook!" +role-description-baba = "Wawa?" job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. job-description-zookeeper = Put on a joyful display of cute animals and space carps for all the crew to see. diff --git a/Resources/Locale/en-US/_DV/job/job-names.ftl b/Resources/Locale/en-US/_DV/job/job-names.ftl index b0873222f1..f8186e5658 100644 --- a/Resources/Locale/en-US/_DV/job/job-names.ftl +++ b/Resources/Locale/en-US/_DV/job/job-names.ftl @@ -97,6 +97,7 @@ role-name-ifrit = Ifrit role-name-carpy = Carpy role-name-shiva = Shiva role-name-pun-pun = Pun Pun +role-name-baba = Baba # Station specific job-name-boxer = Boxer diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Pets/pets.yml b/Resources/Prototypes/_DV/Roles/Jobs/Pets/pets.yml index 6195cc81a0..23ea243f54 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Pets/pets.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Pets/pets.yml @@ -73,3 +73,14 @@ - !type:RoleTimeRequirement role: JobBartender time: 1h + +- type: job + id: RoleBaba + name: role-name-baba + description: role-description-baba + setPreference: false + playTimeTracker: RoleBaba + requirements: + - !type:RoleTimeRequirement + role: JobBartender + time: 1h diff --git a/Resources/Prototypes/_DV/Roles/play_time_trackers.yml b/Resources/Prototypes/_DV/Roles/play_time_trackers.yml index 11e7efc34d..1617f8351a 100644 --- a/Resources/Prototypes/_DV/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_DV/Roles/play_time_trackers.yml @@ -54,3 +54,6 @@ - type: playTimeTracker id: JobZookeeper + +- type: playTimeTracker + id: RoleBaba From b0fe704cf1807beff5eed0e1df608713fd979879 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Fri, 8 May 2026 23:57:29 -0300 Subject: [PATCH 2/5] ID and gear --- .../Entities/Objects/Misc/identification_cards.yml | 14 ++++++++++++++ .../_DV/Roles/Jobs/Fun/misc_startinggear.yml | 10 ++++++++++ 2 files changed, 24 insertions(+) diff --git a/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml index 0c2ecbab45..aacfefcd39 100644 --- a/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/_DV/Entities/Objects/Misc/identification_cards.yml @@ -202,6 +202,20 @@ - type: PresetIdCard job: Prosecutor +# Service + +- type: entity + parent: BartenderIDCard + id: BabaIDCard + name: Baba ID card + components: + - type: PresetIdCard + job: Bartender + name: BaBa + - type: Tag + tags: + - DoorBumpOpener + # Other - type: entity diff --git a/Resources/Prototypes/_DV/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/_DV/Roles/Jobs/Fun/misc_startinggear.yml index 97fb2bf5b1..9fd945d586 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/Fun/misc_startinggear.yml @@ -72,3 +72,13 @@ pocket1: AgentIDCard pocket2: HandheldStationMapRecordsTablet # innerClothingSkirt: ClothingUniformJumpsuitPyjamaSyndicatePink # I don't think loadouts work for ghost roles anyways + +# Station pets + +- type: startingGear + id: MobScurretBaba + equipment: + ears: ClothingHeadsetService + jumpsuit: ClothingUniformSeniorBartender + id: BabaIDCard + back: ClothingBagPet From dd5122be8c15d09eb6cfbc2ee1aea00e46ee33fc Mon Sep 17 00:00:00 2001 From: Radezolid Date: Fri, 8 May 2026 23:58:49 -0300 Subject: [PATCH 3/5] Wawa + ghost role locale --- .../_DV/ghost/roles/ghost-role-component.ftl | 3 ++ .../_DV/Entities/Mobs/NPCs/pets.yml | 30 +++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/Resources/Locale/en-US/_DV/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/_DV/ghost/roles/ghost-role-component.ftl index b4dd09ad0b..2f00de18e7 100644 --- a/Resources/Locale/en-US/_DV/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/_DV/ghost/roles/ghost-role-component.ftl @@ -1 +1,4 @@ ghost-role-information-rat-king-description = You are the Rat King, an evil creature bent on devouring all food on the station. Lay claim to your new kingdom with your army of rats! + +ghost-role-information-baba-name = Baba +ghost-role-information-baba-description = A cute scurret hired to help the bartender manage the bar. diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml index fe00e2f7ae..c7d0511e1b 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml @@ -278,3 +278,33 @@ - FootstepSound - type: StealTarget stealGroup: AnimalSilvia + +- type: entity + parent: MobBaseScurret + id: MobScurretBaBa + name: Baba + description: Wawa? + components: + - type: Sprite + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + sprite: Mobs/Animals/scurret/scurret.rsi + state: scurret + color: "#e69d00" + - type: GhostRole + makeSentient: true + allowSpeech: true + allowMovement: true + name: ghost-role-information-baba-name + description: ghost-role-information-baba-description + rules: ghost-role-information-nonantagonist-rules + job: RoleBaba + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [MobScurretBaba] + - type: Tag + tags: + - CannotSuicide + - DoorBumpOpener + - VimPilot + - AnomalyHost From 047ab040b7e5ffb28f9274058c5abf2d3caa766e Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sat, 9 May 2026 00:41:52 -0300 Subject: [PATCH 4/5] Fix ID + spawner --- Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml | 1 + Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml index fa43875657..855e592155 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Mobs/pets.yml @@ -217,6 +217,7 @@ - type: ConditionalSpawner prototypes: - MobMonkeyPunpun + - MobScurretBaba # DeltaV - Add Baba as an alternative to Pun Pun - type: entity parent: MarkerBase diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml index c7d0511e1b..b1d01616c5 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml @@ -281,7 +281,7 @@ - type: entity parent: MobBaseScurret - id: MobScurretBaBa + id: MobScurretBaba name: Baba description: Wawa? components: From 1917a563208fbc51e5c0efb76b10f7c904f11f98 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sat, 9 May 2026 22:25:48 -0300 Subject: [PATCH 5/5] Fix handcuff --- Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml index b1d01616c5..31c0403e3f 100644 --- a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/pets.yml @@ -291,6 +291,11 @@ sprite: Mobs/Animals/scurret/scurret.rsi state: scurret color: "#e69d00" + - map: [ "enum.HumanoidVisualLayers.Handcuffs" ] + color: "#ffffff" + sprite: Objects/Misc/handcuffs.rsi + state: body-overlay-2 + visible: false - type: GhostRole makeSentient: true allowSpeech: true