Cherry-picked commit faed7a3 from space-wizards/space-station-14/master

Simple-Station · Apr 21, 2024 · 67c9a2d · 67c9a2d
1 parent 3bf08c7
commit 67c9a2d
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 66 deletions.
diff --git 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
@@ -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
@@ -386,34 +386,13 @@
     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
   sprite:
     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
@@ -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