Skip to content

Commit

Permalink
More Loadout Items: Wave 3 (#633)
Browse files Browse the repository at this point in the history
# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Adds some useful items in the Items category and unused clothes into
Loadouts.

There are nine suits from Delta-V that were meant for a planned Mafia
gamemode, but otherwise, they are unused. These suits were made by
@TadJohnson00. I renamed some of the mobster suits to lessen the
association with and added them to Loadouts.

There is an "inspector's coat" in-game not used anywhere, that has been
renamed to "slim trench coat" and added to Loadouts.

Adds labels to survival boxes in the Loadouts UI to be able to
distinguish against them.

## New Items

### Uniform

Security (except HoS) can only select items marked with (*).

- [2] black suit (*)
- [2] dark suit (*)
- [2] red suit (*)
- [2] brown suit
- Security doesn't have this as a Security Officer wearing this might be
confused for the Detective.
- [2] dubious suit (*)
- [2] mafioso suit (*) 
- [2] white suit
- [2] negative suit (*)
- [2] gangster suit (*)

## Outer

- [3] slim trench coat
- [4] overcoat
- More expensive than other coats due to its increased resistance to
Slashing (10%) and Hea (25%).

## Items

- [1] book [Random]
- [1] water bottle
- [1] space medipen
- [1] emergency medipen
- [1] folder [grey]
- [1] breath mask
- [1] emergency flare
- [1] paper
- This item gives four pieces of paper instead of one, as indicated in
the loadout description.
- [1] pen
- [2] flashlight
- [2] pipe
- [3] flippo lighter
- [3] pre-packed lunchbox [Filled, Random]

### Medkits

Each medkit is only accessible to Medical (except Chemist) and Corpsman
unless specified otherwise.

- [4] first aid kit
  - Selectable by every role.
- [4] brute trauma treatment kit
- [4] burn treatment kit
- [4] combat medical kit
  - Selectable only by Chief Medical Officer and Corpsman.
- [4] oxygen deprivation treatment kit
- [4] radiation treatment kit
- [4] toxin treatment kit
- [5] advanced first aid kit

<details><summary><h1>Media</h1></summary>
<p>

## Survival box labels


![image](https://github.com/user-attachments/assets/4eab5ed4-51a1-4784-a9d5-f41b76e35365)

## Mobster suits


![image](https://github.com/user-attachments/assets/c7b8a1dd-c243-4b9d-9973-860d8810b793)

## Vintage


![image](https://github.com/user-attachments/assets/09e4dc1e-bfeb-46d1-80d8-da4338b5348e)

**Loadout:** black cowboy hat, **pipe**, **dubious suit**, **slim trench
coat**, laceup shoes

## Dapper Cop


![image](https://github.com/user-attachments/assets/2b6fbe0d-b00a-4d20-ba8f-c1a766cda392)

**Loadout:** white fedora, security hud, **pipe**, **gangster suit**,
striped red scarf, white gloves

## Biker


![image](https://github.com/user-attachments/assets/f4ca8fe0-e600-42cd-83d7-070b57d57b46)

**Loadout:** cheap sunglasses, **brown suit**, MNK black jacket, black
gloves, black cowboy boots

</p>
</details>

---

# Changelog

:cl: Skubman
- add: Added new clothes in Loadouts: slim trench coat, and Mafia-style
suits.
- add: Added new useful items in Loadouts: lunchbox, more survival gear,
paperwork, and medkits.

---------

Signed-off-by: Angelo Fallaria <[email protected]>
  • Loading branch information
angelofallars authored Aug 1, 2024
1 parent 0d1c931 commit c96cfcc
Show file tree
Hide file tree
Showing 6 changed files with 415 additions and 12 deletions.
22 changes: 22 additions & 0 deletions Resources/Locale/en-US/loadouts/items.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,25 @@ loadout-description-LoadoutItemPlushieSharkGrey = Introducing the Grey Shark Plu
loadout-description-LoadoutItemPlushieCarp = Brace for extraterrestrial antics with the Purple Space Carp Plushie! A fishy invader from the cosmic deep, this plushie brings a splash of humor to zero-gravity escapades. From hostile waters to interstellar giggles, it's a cuddly contradiction that's out of this world
loadout-description-LoadoutSolCommonTranslator = The most common of all translators, such that it can be purchased in any civilized station.
This device translates Sol Common speech into Galactic Common.
loadout-name-LoadoutItemPapers = papers (x4)
loadout-description-LoadoutItemPapers = four pieces of paper, good for filling out tedious paperwork and silent communication.
loadout-description-LoadoutItemBoxFolderGrey = A folder to store papers and top secret documents.
loadout-description-LoadoutBookRandom = A notebook with a random cover. Can be used as a diary, or for writing fanfiction drafts for SpacePad.
loadout-description-LoadoutPen = An extra pen, just in case your pen from your PDA gets robbed by skeletal space pirates.
loadout-description-LoadoutItemLunchboxGenericFilledRandom = Packed with love.
This is only useful when the chefs are either a.) nonexistent or b.) not doing their job.
In conclusion, this lunchbox is useful most of the time.
loadout-description-LoadoutHandLabeler = A hand labeler, used to label items and objects.
It's not really recommended to use this to label a fuel tank with "SOLUTION TO CLOWN PROBLEM".
loadout-description-LoadoutEmergencyMedipen = A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge.
WARNING: injecting two emergency medipens at once will cause an epinephrine overdose.
loadout-description-LoadoutSpaceMedipen = Contains a mix of chemicals that protect you from the deadly effects of space.
Also known as the "poor man's hardsuit".
WARNING: injecting two space medipens at once will cause a barozine overdose.
loadout-name-LoadoutItemBoxSurvival = survival box (standard)
loadout-name-LoadoutItemBoxSurvivalEngineering = extended-capacity survival box (engineering)
loadout-name-LoadoutItemBoxSurvivalSecurity = survival box (security)
loadout-name-LoadoutItemBoxSurvivalBrigmedic = survival box (corpsman)
loadout-name-LoadoutItemBoxSurvivalMedical = survival box (medical)
loadout-name-LoadoutItemBoxHug = box of hugs (clown)
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitSuitBlackMob
name: mobster's attire
description: A crisp red shirt and charcoal slacks. Reminds you of your debts.
name: red suit
description: A crisp red shirt and charcoal slacks. Reminds you of law enforcement.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi
Expand All @@ -67,7 +67,7 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitSuitBrownAlt
name: suspicious suit
name: dubious suit
description: A crisp grey shirt and chocolate slacks. Reminds you of clandestine operators.
components:
- type: Sprite
Expand All @@ -78,8 +78,8 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitSuitBrownMob
name: gangster's attire
description: A crisp red shirt and chocolate slacks. Reminds you of drivebys.
name: mafioso suit
description: A crisp red shirt and chocolate slacks. Reminds you of family.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi
Expand Down Expand Up @@ -111,8 +111,8 @@
- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitSuitWhiteMob
name: mafioso's attire
description: A crisp red shirt and ivory slacks. Reminds you of family.
name: gangster suit
description: A crisp red shirt and ivory slacks. Reminds you of organized Japanese crime.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterCoatInspector
name: inspector's coat
description: A strict inspector's coat for being intimidating during inspections.
name: slim trench coat
description: A slim minimalist trench coat best worn unbuttoned.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Coats/insp_coat.rsi
Expand Down
217 changes: 214 additions & 3 deletions Resources/Prototypes/Loadouts/items.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,18 @@
- CheapLighter

- type: loadout
id: LoadoutItemMatches
id: LoadoutItemLighterFlippo
category: Items
cost: 1
cost: 3
items:
- FlippoLighter

- type: loadout
id: LoadoutItemSmokingPipeFilledTobacco
category: Items
cost: 2
items:
- Matchbox
- SmokingPipeFilledTobacco

# Instruments
- type: loadout
Expand Down Expand Up @@ -176,6 +183,13 @@
items:
- DoubleEmergencyOxygenTankFilled

- type: loadout
id: LoadoutItemClothingMaskBreath
category: Items
cost: 1
items:
- ClothingMaskBreath

- type: loadout
id: LoadoutItemsEmergencyCrowbar
category: Items
Expand All @@ -190,6 +204,82 @@
items:
- FireExtinguisher

- type: loadout
id: LoadoutItemFlashlightLantern
category: Items
cost: 2
items:
- FlashlightLantern

- type: loadout
id: LoadoutItemFlare
category: Items
cost: 1
items:
- Flare

- type: loadout
id: LoadoutEmergencyMedipen
category: Items
cost: 1
items:
- EmergencyMedipen

- type: loadout
id: LoadoutSpaceMedipen
category: Items
cost: 1
items:
- SpaceMedipen

# Paperwork
- type: loadout
id: LoadoutItemPapers
category: Items
cost: 1
items:
- Paper
- Paper
- Paper
- Paper

- type: loadout
id: LoadoutItemBoxFolderGrey
category: Items
cost: 1
items:
- BoxFolderGrey

- type: loadout
id: LoadoutBookRandom
category: Items
cost: 1
items:
- BookRandom

- type: loadout
id: LoadoutPen
category: Items
cost: 1
items:
- Pen

# Food and drink
- type: loadout
id: LoadoutDrinkWaterBottleFull
category: Items
cost: 1
items:
- DrinkWaterBottleFull

- type: loadout
id: LoadoutItemLunchboxGenericFilledRandom
category: Items
cost: 3
items:
- LunchboxGenericFilledRandom

# Survival boxes
- type: loadout
id: LoadoutItemBoxSurvival
category: Items
Expand Down Expand Up @@ -230,6 +320,10 @@
- !type:CharacterDepartmentRequirement
departments:
- Security
- !type:CharacterJobRequirement
inverted: true
jobs:
- Brigmedic

- type: loadout
id: LoadoutItemBoxSurvivalBrigmedic
Expand Down Expand Up @@ -264,6 +358,116 @@
jobs:
- Clown

# Medkits
- type: loadout
id: LoadoutMedkitFilled
category: Items
cost: 4
items:
- MedkitFilled

- type: loadout
id: LoadoutMedkitBruteFilled
category: Items
cost: 4
items:
- MedkitBruteFilled
requirements:
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
- Paramedic
- ChiefMedicalOfficer
- MedicalIntern
- Brigmedic

- type: loadout
id: LoadoutMedkitBurnFilled
category: Items
cost: 4
items:
- MedkitBurnFilled
requirements:
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
- Paramedic
- ChiefMedicalOfficer
- MedicalIntern
- Brigmedic

- type: loadout
id: LoadoutMedkitToxinFilled
category: Items
cost: 4
items:
- MedkitToxinFilled
requirements:
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
- Paramedic
- ChiefMedicalOfficer
- MedicalIntern
- Brigmedic

- type: loadout
id: LoadoutMedkitOxygenFilled
category: Items
cost: 4
items:
- MedkitOxygenFilled
requirements:
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
- Paramedic
- ChiefMedicalOfficer
- MedicalIntern
- Brigmedic

- type: loadout
id: LoadoutMedkitRadiationFilled
category: Items
cost: 4
items:
- MedkitRadiationFilled
requirements:
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
- Paramedic
- ChiefMedicalOfficer
- MedicalIntern
- Brigmedic

- type: loadout
id: LoadoutMedkitAdvancedFilled
category: Items
cost: 5
items:
- MedkitAdvancedFilled
requirements:
- !type:CharacterJobRequirement
jobs:
- MedicalDoctor
- Paramedic
- ChiefMedicalOfficer
- MedicalIntern
- Brigmedic

- type: loadout
id: LoadoutMedkitCombatFilled
category: Items
cost: 4 # Discounted for the CMO and Corpsman
items:
- MedkitCombatFilled
requirements:
- !type:CharacterJobRequirement
jobs:
- ChiefMedicalOfficer
- Brigmedic

#Misc Items
- type: loadout
id: LoadoutItemPAI
Expand Down Expand Up @@ -316,3 +520,10 @@
cost: 3
items:
- SolCommonTranslator

- type: loadout
id: LoadoutHandLabeler
category: Items
cost: 3
items:
- HandLabeler
14 changes: 14 additions & 0 deletions Resources/Prototypes/Loadouts/outerClothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,3 +225,17 @@
cost: 3
items:
- ClothingOuterCoatGentle

- type: loadout
id: LoadoutOuterCoatInspector
category: Outer
cost: 3
items:
- ClothingOuterCoatInspector

- type: loadout
id: LoadoutOuterCoatOvercoat
category: Outer
cost: 4
items:
- ClothingOuterCoatOvercoat
Loading

0 comments on commit c96cfcc

Please sign in to comment.