Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Med kit rework (fill content, resizing, renaming, etc.) #34762

Closed
wants to merge 18 commits into from
Closed

Med kit rework (fill content, resizing, renaming, etc.) #34762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
33ab883
new medkit fills
K-Dynamic Jan 29, 2025
a525d8b
revert pill canister storage reduction from internal commit
K-Dynamic Jan 30, 2025
f8572f6
renamed cargo med kit catalog and changed prices
K-Dynamic Jan 30, 2025
002c27c
increase pill count of 'weak' medicines in pill canisters (inaprov, h…
K-Dynamic Jan 30, 2025
94d075f
renamed med kits
K-Dynamic Jan 30, 2025
0cc40aa
dexalin plus & saline bottle label
K-Dynamic Jan 30, 2025
c45788c
replace saline syringe in combat med kit with airloss syringe (dexali…
K-Dynamic Jan 30, 2025
d8b5e02
increase potassium iodide to 7 pills
K-Dynamic Jan 30, 2025
93eb08b
advanced first aid med kit cargo catalog rename
K-Dynamic Jan 30, 2025
8737319
nitrogen closet loot and medkit
K-Dynamic Jan 30, 2025
5b0d2fa
Revert "nitrogen closet loot and medkit"
K-Dynamic Jan 30, 2025
84f6d8c
make linter happy by moving around yml fields
K-Dynamic Jan 30, 2025
555f124
MED kits (forgot to write that in medical supplies crate)
K-Dynamic Jan 30, 2025
3b8289a
smaller medkits with whitelist
K-Dynamic Feb 2, 2025
86ded7f
replace gauze with trico pills
K-Dynamic Feb 2, 2025
cb6a65a
advanced first aid kit cost 2000 spesos
K-Dynamic Feb 2, 2025
97ebac4
Merge branch 'master' into medkit-fill
K-Dynamic Feb 5, 2025
47bd3a4
rename new airloss kit
K-Dynamic Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions Resources/Locale/en-US/lathe/recipes.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
lathe-recipe-Medkit-name = first aid kit (empty)
lathe-recipe-MedkitBurn-name = burn treatment kit (empty)
lathe-recipe-MedkitToxin-name = toxin treatment kit (empty)
lathe-recipe-MedkitO2-name = oxygen deprivation treatment kit (empty)
lathe-recipe-MedkitBrute-name = brute trauma treatment kit (empty)
lathe-recipe-MedkitAdvanced-name = advanced first aid kit (empty)
lathe-recipe-MedkitRadiation-name = radiation treatment kit (empty)
lathe-recipe-MedkitCombat-name = combat medical kit (empty)
lathe-recipe-Medkit-name = first aid med kit (empty)
lathe-recipe-MedkitBurn-name = burn med kit (empty)
lathe-recipe-MedkitToxin-name = toxin med kit (empty)
lathe-recipe-MedkitO2-name = airloss med kit (empty)
lathe-recipe-MedkitBrute-name = brute med kit (empty)
lathe-recipe-MedkitAdvanced-name = advanced med kit (empty)
lathe-recipe-MedkitRadiation-name = radiation med kit (empty)
24 changes: 17 additions & 7 deletions Resources/Prototypes/Catalog/Cargo/cargo_medical.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,23 @@
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: EmergencyFirstAidKit
icon:
sprite: Objects/Specific/Medical/firstaidkits.rsi
state: firstaid
product: CrateEmergencyFirstAidKit
cost: 1000
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: EmergencyBurnKit
icon:
sprite: Objects/Specific/Medical/firstaidkits.rsi
state: burnkit
product: CrateEmergencyBurnKit
cost: 700
cost: 1000
category: cargoproduct-category-name-medical
group: market

Expand All @@ -44,17 +54,17 @@
sprite: Objects/Specific/Medical/firstaidkits.rsi
state: toxinkit
product: CrateEmergencyToxinKit
cost: 600
cost: 800
category: cargoproduct-category-name-medical
group: market

- type: cargoProduct
id: EmergencyO2Kit
icon:
sprite: Objects/Specific/Medical/firstaidkits.rsi
state: o2kit
state: airlosskit
product: CrateEmergencyO2Kit
cost: 600
cost: 1000
category: cargoproduct-category-name-medical
group: market

Expand All @@ -64,7 +74,7 @@
sprite: Objects/Specific/Medical/firstaidkits.rsi
state: brutekit
product: CrateEmergencyBruteKit
cost: 600
cost: 1000
category: cargoproduct-category-name-medical
group: market

Expand All @@ -74,7 +84,7 @@
sprite: Objects/Specific/Medical/firstaidkits.rsi
state: advkit
product: CrateEmergencyAdvancedKit
cost: 1200
cost: 2000
category: cargoproduct-category-name-medical
group: market

Expand All @@ -84,7 +94,7 @@
sprite: Objects/Specific/Medical/firstaidkits.rsi
state: radkit
product: CrateEmergencyRadiationKit
cost: 600
cost: 800
category: cargoproduct-category-name-medical
group: market

Expand Down
36 changes: 23 additions & 13 deletions Resources/Prototypes/Catalog/Fills/Crates/medical.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
id: CrateMedicalSupplies
parent: CrateMedical
name: medical supplies crate
description: Basic medical supplies.
description: Basic medical supplies. Includes two first aid med kits.
components:
- type: StorageFill
contents:
Expand Down Expand Up @@ -86,11 +86,21 @@
- id: ClothingMaskSterile
amount: 3

- type: entity
id: CrateEmergencyFirstAidKit
parent: CrateMedical
name: first aid med kit
description: Crate filled with a first aid med kit.
components:
- type: StorageFill
contents:
- id: MedkitFilled

- type: entity
id: CrateEmergencyBurnKit
parent: CrateMedical
name: emergency burn kit
description: Crate filled with a burn treatment kit.
name: burn med kit
description: Crate filled with a burn med kit.
components:
- type: StorageFill
contents:
Expand All @@ -99,8 +109,8 @@
- type: entity
id: CrateEmergencyToxinKit
parent: CrateMedical
name: emergency toxin kit
description: Crate filled with a toxin treatment kit.
name: toxin med kit
description: Crate filled with a toxin med kit.
components:
- type: StorageFill
contents:
Expand All @@ -109,8 +119,8 @@
- type: entity
id: CrateEmergencyO2Kit
parent: CrateMedical
name: emergency O2 kit
description: Crate filled with an O2 treatment kit.
name: airloss med kit
description: Crate filled with an airloss med kit.
components:
- type: StorageFill
contents:
Expand All @@ -119,8 +129,8 @@
- type: entity
id: CrateEmergencyBruteKit
parent: CrateMedical
name: emergency brute kit
description: Crate filled with a brute treatment kit.
name: brute med kit
description: Crate filled with a brute med kit.
components:
- type: StorageFill
contents:
Expand All @@ -129,8 +139,8 @@
- type: entity
id: CrateEmergencyAdvancedKit
parent: CrateMedical
name: emergency advanced kit
description: Crate filled with an advanced treatment kit.
name: advanced first aid med kit
description: Crate filled with an advanced med kit.
components:
- type: StorageFill
contents:
Expand All @@ -139,8 +149,8 @@
- type: entity
id: CrateEmergencyRadiationKit
parent: CrateMedical
name: emergency radiation kit
description: Crate filled with a radiation treatment kit.
name: radiation med kit
description: Crate filled with a radiation med kit.
components:
- type: StorageFill
contents:
Expand Down
39 changes: 29 additions & 10 deletions Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@
- type: StorageFill
contents:
- id: Brutepack
amount: 2
- id: Ointment
- id: Gauze
amount: 2
- id: PillCanisterTricordrazine
- id: SyringeEpinephrine
- id: EpinephrineChemistryBottle
# see https://github.com/tgstation/blob/master/code/game/objects/items/storage/firstaid.dm for example contents

- type: entity
Expand All @@ -19,10 +22,12 @@
components:
- type: StorageFill
contents:
- id: RegenerativeMesh
- id: Ointment
amount: 2
amount: 3
- id: PillCanisterKelotane
- id: PillCanisterDermaline
- id: SyringeSigynate

- type: entity
id: MedkitBruteFilled
Expand All @@ -31,10 +36,13 @@
components:
- type: StorageFill
contents:
- id: MedicatedSuture
- id: Brutepack
amount: 2
- id: Gauze
- id: PillCanisterIron
- id: PillCanisterCopper
- id: Bloodpack
- id: PillCanisterBicaridine
amount: 2

- type: entity
id: MedkitToxinFilled
Expand All @@ -43,9 +51,10 @@
components:
- type: StorageFill
contents:
- id: SyringeIpecac
- id: SyringeEthylredoxrazine
- id: EthylredoxrazineChemistryBottle
- id: AntiPoisonMedipen
amount: 2
- id: PillCanisterDylovene
- id: PillCanisterCharcoal

Expand All @@ -56,11 +65,16 @@
components:
- type: StorageFill
contents:
- id: ClothingMaskBreathMedical
- id: EmergencyOxygenTankFilled
- id: EmergencyMedipen
- id: EmergencyNitrogenTankFilled
- id: SyringeDexalin
- id: SyringeInaprovaline
- id: DexalinChemistryBottle
- id: InaprovalineChemistryBottle
- id: ClothingMaskBreathMedical
amount: 2
- id: PillCanisterDexalin
- id: PillCanisterInaprovaline

- type: entity
id: MedkitRadiationFilled
Expand All @@ -71,8 +85,10 @@
contents:
- id: SyringePhalanximine
- id: RadAutoInjector
amount: 2
- id: PillCanisterPotassiumIodide
- id: PillCanisterHyronalin
- id: GeigerCounter
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Geiger counter for treatment?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think at some point we might track radiation contamination on objects so it's worth having or now (maybe in like 5 years).

I could remove it but then the medkit would seem strangely empty.


- type: entity
id: MedkitAdvancedFilled
Expand All @@ -82,9 +98,12 @@
- type: StorageFill
contents:
- id: MedicatedSuture
amount: 2
- id: RegenerativeMesh
- id: Bloodpack
amount: 2
- id: HandheldHealthAnalyzer
- id: SyringeAirloss
- id: AirlossChemistryBottle

- type: entity
id: MedkitCombatFilled
Expand All @@ -96,14 +115,14 @@
- id: MedicatedSuture
- id: RegenerativeMesh
- id: SyringeEphedrine
- id: SyringeSaline
- id: SyringeAirloss
- id: BruteAutoInjector
- id: BurnAutoInjector

- type: entity
id: StimkitFilled
suffix: Stimkit, Filled
parent: Medkit
parent: MedkitCombat
components:
- type: StorageFill
contents:
Expand Down
Loading
Loading