Skip to content

Commit

Permalink
Mirror: Removed Cannabis from thief objectives (#369)
Browse files Browse the repository at this point in the history
## Mirror of PR #26412: [Removed Cannabis from thief
objectives](space-wizards/space-station-14#26412)
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)

###### `b44015bd554eb97a2d4762d7b585c71e43865571`

PR opened by <img
src="https://avatars.githubusercontent.com/u/57235581?v=4"
width="16"/><a href="https://github.com/ChaseFlorom"> ChaseFlorom</a> at
2024-03-24 21:40:14 UTC

---

PR changed 3 files with 4 additions and 26 deletions.

The PR had the following labels:
- No C#
- Status: Needs Review


---

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

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> 
> Removed the cannabis objective from the thief objectives. 
> 
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> 
> 20-30 cannabis leaves is neither fun for the thief, or for the
botanist that they're asking to grow it. It doesn't fit with the heart
of the thief objective system, as the only real way to accomplish it is
to ask the botanist to grow it for you, or grow it yourself. Neither of
which is stealing.
> 
> Resolve [#26321] 
> 
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> Removed the proper .yml code.
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [x] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 🆑
> - remove: removed cannabis thief objective.


</details>

Co-authored-by: SimpleStation14 <Unknown>
SimpleStation14 authored May 20, 2024
1 parent eb7a089 commit e5314b2
Showing 3 changed files with 4 additions and 26 deletions.
Original file line number Diff line number Diff line change
@@ -17,8 +17,7 @@
reagents:
- ReagentId: THC
Quantity: 15
- type: StealTarget
stealGroup: Cannabis


- type: entity
name: dried cannabis leaves
@@ -38,8 +37,6 @@
- type: Sprite
sprite: Objects/Specific/Hydroponics/tobacco.rsi
state: dried
- type: StealTarget
stealGroup: Cannabis

- type: entity
name: ground cannabis
@@ -68,8 +65,7 @@
- Smokable
- type: Item
size: Tiny
- type: StealTarget
stealGroup: Cannabis


- type: entity
name: tobacco leaves
7 changes: 1 addition & 6 deletions Resources/Prototypes/Objectives/stealTargetGroups.yml
Original file line number Diff line number Diff line change
@@ -142,12 +142,7 @@
sprite: Objects/Misc/id_cards.rsi
state: default

- type: stealTargetGroup
id: Cannabis
name: cannabis
sprite:
sprite: Objects/Specific/Hydroponics/cannabis.rsi
state: produce


- type: stealTargetGroup
id: LAMP
15 changes: 1 addition & 14 deletions Resources/Prototypes/Objectives/thief.yml
Original file line number Diff line number Diff line change
@@ -142,20 +142,7 @@
- type: Objective
difficulty: 0.7

- type: entity
noSpawn: true
parent: BaseThiefStealCollectionObjective
id: CannabisStealCollectionObjective
components:
- type: NotJobRequirement
job: Botanist
- type: StealCondition
stealGroup: Cannabis
minCollectionSize: 20
maxCollectionSize: 30
verifyMapExistence: false
- type: Objective
difficulty: 0.5


- type: entity
noSpawn: true

0 comments on commit e5314b2

Please sign in to comment.