Skip to content

Commit

Permalink
Luxurious Loadout Items (#753)
Browse files Browse the repository at this point in the history
# Description


This PR adds the Blunt and Joint in the Smokeables category, the Station
Map, Lantern, MRE Flask, and undepartmentalized flasks in the misc
category, and it adds Cow Tools for the clown in the Jobs category for 3
points. Also found out the hard way that renaming your branch
essentially deletes it, therefore closing your PR. Not doing that again!

---


# Changelog


:cl:
- add: Several useful items have been added to loadouts
- add: Cowtools are selectable for clown in the "Jobs" category of
loadouts

---------

Signed-off-by: ShatteredSwords <[email protected]>
  • Loading branch information
ShatteredSwords authored Aug 20, 2024
1 parent 009d45a commit a992be0
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 0 deletions.
11 changes: 11 additions & 0 deletions Resources/Prototypes/Loadouts/Jobs/service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,17 @@
items:
- BedsheetClown

- type: loadout
id: LoadoutServiceClownCowToolboxFilled
category: Jobs
cost: 3
requirements:
- !type:CharacterJobRequirement
jobs:
- Clown
items:
- CowToolboxFilled

# Mime
- type: loadout
id: LoadoutServiceMimeOuterWinter
Expand Down
57 changes: 57 additions & 0 deletions Resources/Prototypes/Loadouts/items.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,21 @@
items:
- SmokingPipeFilledTobacco

- type: loadout
id: LoadoutItemBlunt
category: Items
cost: 2
items:
- Blunt

- type: loadout
id: LoadoutItemJoint
category: Items
cost: 2
items:
- Joint


# Instruments
- type: loadout
id: LoadoutItemMicrophoneInstrument
Expand Down Expand Up @@ -279,6 +294,13 @@
items:
- LunchboxGenericFilledRandom

- type: loadout
id: LoadoutItemDrinkMREFlask
category: Items
cost: 2
items:
- DrinkMREFlask

# Survival boxes
- type: loadout
id: LoadoutItemBoxSurvival
Expand Down Expand Up @@ -540,3 +562,38 @@
cost: 3
items:
- HandLabeler

- type: loadout
id: LoadoutItemHandheldStationMap
category: Items
cost: 2
items:
- HandheldStationMap

- type: loadout
id: LoadoutItemLantern
category: Items
cost: 2
items:
- Lantern

- type: loadout
id: LoadoutItemDrinkShinyFlask
category: Items
cost: 1
items:
- DrinkShinyFlask

- type: loadout
id: LoadoutItemDrinkLithiumFlask
category: Items
cost: 1
items:
- DrinkLithiumFlask

- type: loadout
id: LoadoutItemDrinkVacuumFlask
category: Items
cost: 1
items:
- DrinkVacuumFlask

0 comments on commit a992be0

Please sign in to comment.