Skip to content

Commit

Permalink
Mirror: Remove Hamlet, Smile and Pun Pun from Thief objective (#120)
Browse files Browse the repository at this point in the history
## Mirror of PR #25921: [Remove Hamlet, Smile and Pun Pun from Thief
objective](space-wizards/space-station-14#25921)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `faed7a3746c90db98538958d0332c778092eb377`

PR opened by <img
src="https://avatars.githubusercontent.com/u/96445749?v=4"
width="16"/><a href="https://github.com/TheShuEd"> TheShuEd</a> at
2024-03-07 22:07:40 UTC
PR merged by <img
src="https://avatars.githubusercontent.com/u/19864447?v=4"
width="16"/><a href="https://github.com/web-flow"> web-flow</a> 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#


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> title
> 
> ## Why / Balance
> stealing ghostrole is asspain 
> 
> **Changelog**
> :cl:
> - remove: Removed Hamlet, Smile and Pun Pun from Thief objectives
> 


</details>

Co-authored-by: Ed <[email protected]>
  • Loading branch information
SimpleStation14 and TheShuEd authored May 5, 2024
1 parent cb108dd commit 90d1731
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 66 deletions.
6 changes: 0 additions & 6 deletions Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -593,8 +593,6 @@
- CannotSuicide
- Hamster
- VimPilot
- type: StealTarget
stealGroup: AnimalHamlet

- type: entity
name: Shiva
Expand Down Expand Up @@ -767,8 +765,6 @@
attributes:
proper: true
gender: female
- type: StealTarget
stealGroup: AnimalSmile

- type: entity
name: Pun Pun
Expand Down Expand Up @@ -803,8 +799,6 @@
attributes:
proper: true
gender: male
- type: StealTarget
stealGroup: AnimalPunPun

- type: entity
name: Tropico
Expand Down
3 changes: 0 additions & 3 deletions Resources/Prototypes/Objectives/objectiveGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,7 @@
WalterStealObjective: 1
MortyStealObjective: 1
RenaultStealObjective: 1
HamletStealObjective: 1
ShivaStealObjective: 1
SmileStealObjective: 1
PunPunStealObjective: 1
TropicoStealObjective: 1

- type: weightedRandom
Expand Down
21 changes: 0 additions & 21 deletions Resources/Prototypes/Objectives/stealTargetGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 0 additions & 36 deletions Resources/Prototypes/Objectives/thief.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 90d1731

Please sign in to comment.