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.

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

New chemmedhud & handheld crew monitor changes #9

Merged
merged 11 commits into from
Jul 31, 2024
12 changes: 12 additions & 0 deletions Resources/Changelog/Mira.yml
Original file line number Diff line number Diff line change
Expand Up @@ -283,3 +283,15 @@ Entries:
type: Add
id: 44
time: '2024-07-30T15:47:00.0000000+00:00'
- author: Thurtik
changes:
- message: Adds a new "medchem hud" for CMOs, a gadget that combines the function of medhuds and chemical analysis goggles
type: Add
id: 45
time: '2024-07-31T13:00:00.0000000+00:00'
- author: Thurtik
changes:
- message: The handheld crew monitor is no longer a steal objective, and now spawns in paramedic lockers, NanoMed vendors and thief communicator kits
type: Tweak
id: 46
time: '2024-07-31T13:00:00.0000000+00:00'
4 changes: 2 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
contents:
- id: MedkitFilled
- id: ClothingHandsGlovesNitrile
- id: ClothingEyesHudMedical
- id: ClothingEyesHudMedChem
- id: ClothingHeadsetAltMedical
- id: ClothingCloakCmo
- id: ClothingBackpackDuffelSurgeryFilled
Expand All @@ -205,7 +205,7 @@
contents:
- id: MedkitFilled
- id: ClothingHandsGlovesNitrile
- id: ClothingEyesHudMedical
- id: ClothingEyesHudMedChem
- id: ClothingHeadsetAltMedical
- id: ClothingBackpackDuffelSurgeryFilled
- id: ClothingMaskSterile
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,5 +144,6 @@
- id: ClothingHeadsetMedical
- id: ClothingMaskSterile
- id: HandheldGPSBasic
- id: HandheldCrewMonitor
- id: MedkitFilled
prob: 0.3
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
Syringe: 5
ClothingEyesHudMedical: 2
ClothingEyesEyepatchHudMedical: 2
HandheldCrewMonitor: 1

1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/thief_toolbox_sets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
- CyberPen
- BriefcaseThiefBribingBundleFilled
- ClothingMaskGasVoiceChameleon
- HandheldCrewMonitor
#- todo Chameleon Stamp

- type: thiefBackpackSet
Expand Down
15 changes: 15 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,23 @@
sprite: Clothing/Eyes/Hud/diagpatch.rsi
- type: Clothing
sprite: Clothing/Eyes/Hud/diagpatch.rsi
- type: ShowHealthBars
damageContainers:
- Inorganic
- Silicon

- type: entity
parent: [ClothingEyesEyepatchHudDiag, ClothingHeadEyeBaseFlipped]
id: ClothingEyesEyepatchHudDiagFlipped
name: diagnostic hud eyepatch

- type: entity
parent: [ClothingEyesBase, ClothingEyesHudMedical, ClothingEyesGlassesChemical]
id: ClothingEyesHudMedChem
name: medchem hud
description: A heads-up display that scans nearby humanoids' health status and chemical composition of solutions.
components:
- type: Sprite
sprite: Clothing/Eyes/Hud/chemmed.rsi
- type: Clothing
sprite: Clothing/Eyes/Hud/chemmed.rsi
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
- type: entity
name: handheld crew monitor
suffix: DO NOT MAP
parent: BaseHandheldComputer
# CMO-only bud, don't add more.
id: HandheldCrewMonitor
description: A hand-held crew monitor displaying the status of suit sensors.
components:
Expand Down
7 changes: 0 additions & 7 deletions Resources/Prototypes/Objectives/stealTargetGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,6 @@
sprite: Objects/Specific/Medical/hypospray.rsi
state: hypo

- type: stealTargetGroup
id: HandheldCrewMonitor
name: handheld crew monitor
sprite:
sprite: Objects/Specific/Medical/handheldcrewmonitor.rsi
state: scanner

- type: stealTargetGroup
id: ClothingOuterHardsuitRd
name: experimental research hardsuit
Expand Down
7 changes: 0 additions & 7 deletions Resources/Prototypes/Objectives/traitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,6 @@
- type: StealCondition
stealGroup: Hypospray

- type: entity
parent: BaseCMOStealObjective
id: CMOCrewMonitorStealObjective
components:
- type: StealCondition
stealGroup: HandheldCrewMonitor

## rd

- type: entity
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions Resources/Textures/Clothing/Eyes/Hud/chemmed.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-EYES",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading