From 90d1731739ddf20afa899a932ab7bbd68c435dc9 Mon Sep 17 00:00:00 2001 From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com> Date: Sat, 4 May 2024 17:45:46 -0700 Subject: [PATCH] Mirror: Remove Hamlet, Smile and Pun Pun from Thief objective (#120) ## Mirror of PR #25921: [Remove Hamlet, Smile and Pun Pun from Thief objective](https://github.com/space-wizards/space-station-14/pull/25921) from space-wizards [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `faed7a3746c90db98538958d0332c778092eb377` PR opened by TheShuEd at 2024-03-07 22:07:40 UTC PR merged by web-flow at 2024-03-07 23:53:36 UTC --- PR changed 4 files with 0 additions and 66 deletions. The PR had the following labels: - No C# ---

Original Body

> ## About the PR > title > > ## Why / Balance > stealing ghostrole is asspain > > **Changelog** > :cl: > - remove: Removed Hamlet, Smile and Pun Pun from Thief objectives >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- .../Prototypes/Entities/Mobs/NPCs/pets.yml | 6 ---- .../Prototypes/Objectives/objectiveGroups.yml | 3 -- .../Objectives/stealTargetGroups.yml | 21 ----------- Resources/Prototypes/Objectives/thief.yml | 36 ------------------- 4 files changed, 66 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 98db5b2acff..9981bb8bd92 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -593,8 +593,6 @@ - CannotSuicide - Hamster - VimPilot - - type: StealTarget - stealGroup: AnimalHamlet - type: entity name: Shiva @@ -767,8 +765,6 @@ attributes: proper: true gender: female - - type: StealTarget - stealGroup: AnimalSmile - type: entity name: Pun Pun @@ -803,8 +799,6 @@ attributes: proper: true gender: male - - type: StealTarget - stealGroup: AnimalPunPun - type: entity name: Tropico diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 2fe5f7c833f..fba2c4cc172 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -125,10 +125,7 @@ WalterStealObjective: 1 MortyStealObjective: 1 RenaultStealObjective: 1 - HamletStealObjective: 1 ShivaStealObjective: 1 - SmileStealObjective: 1 - PunPunStealObjective: 1 TropicoStealObjective: 1 - type: weightedRandom diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index d2a9690ae20..fb1e5e76fc0 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -386,13 +386,6 @@ sprite: Mobs/Animals/fox.rsi state: fox -- type: stealTargetGroup - id: AnimalHamlet - name: Hamlet - sprite: - sprite: Mobs/Pets/hamlet.rsi - state: hamster-0 - - type: stealTargetGroup id: AnimalShiva name: Shiva @@ -400,20 +393,6 @@ sprite: Mobs/Pets/shiva.rsi state: shiva -- type: stealTargetGroup - id: AnimalSmile - name: Smile - sprite: - sprite: Mobs/Aliens/slimes.rsi - state: rainbow_baby_slime - -- type: stealTargetGroup - id: AnimalPunPun - name: Pun Pun - sprite: - sprite: Mobs/Animals/monkey.rsi - state: monkey - - type: stealTargetGroup id: AnimalTropico name: Tropico diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml index 5ee8bd25d18..66258870d61 100644 --- a/Resources/Prototypes/Objectives/thief.yml +++ b/Resources/Prototypes/Objectives/thief.yml @@ -533,18 +533,6 @@ - type: Objective difficulty: 2 -- type: entity - noSpawn: true - parent: BaseThiefStealAnimalObjective - id: HamletStealObjective - components: - - type: NotJobRequirement - job: Captain - - type: StealCondition - stealGroup: AnimalHamlet - - type: Objective - difficulty: 1 - - type: entity noSpawn: true parent: BaseThiefStealAnimalObjective @@ -557,30 +545,6 @@ - type: Objective difficulty: 2 -- type: entity - noSpawn: true - parent: BaseThiefStealAnimalObjective - id: SmileStealObjective - components: - - type: NotJobRequirement - job: Scientist - - type: StealCondition - stealGroup: AnimalSmile - - type: Objective - difficulty: 1 - -- type: entity - noSpawn: true - parent: BaseThiefStealAnimalObjective - id: PunPunStealObjective - components: - - type: NotJobRequirement - job: Bartender - - type: StealCondition - stealGroup: AnimalPunPun - - type: Objective - difficulty: 2 - - type: entity noSpawn: true parent: BaseThiefStealAnimalObjective