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

Jump to bottom

Corpsman Glasses Adjustment #1879

Merged
merged 7 commits into from
Sep 21, 2024
Merged

Corpsman Glasses Adjustment #1879

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2c3015c
Corpsman Glasses Adjustment
Avalon-Proto Sep 21, 2024
d143b87
Merge branch 'master' into Corpsman-Glasses-Adjustment
TadJohnson00 Sep 21, 2024
cf83b86
Fixed WrongHUDS lol
Avalon-Proto Sep 21, 2024
bca53bc
Forgotpartwoops
Avalon-Proto Sep 21, 2024
4341f31
Merge remote-tracking branch 'upstream/master' into Corpsman-Glasses-…
Avalon-Proto Sep 21, 2024
63906a0
Return of The Glasses
Avalon-Proto Sep 21, 2024
adc26d5
clean comments
TadJohnson00 Sep 21, 2024
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
4 changes: 2 additions & 2 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
Caustic: 0.85

- type: entity
parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons, BaseRestrictedContraband]
parent: [ClothingEyesBase, ShowMedicalIcons, BaseRestrictedContraband]
id: ClothingEyesGlassesCorpsman
name: corpsman glasses
description: Security glasses designed for the Corpsman for medical and security needs. Now with a cool blue hue*
description: Security glasses designed for the Corpsman for medical needs. Now with a cool blue hue*
components:
- type: Sprite
sprite: DeltaV/Clothing/Eyes/Glasses/corpsglasses.rsi
Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
sprite: Clothing/Eyes/Glasses/sunglasses.rsi
state: icon
doAfter: 5
- tag: HudMedicalSecurity
name: medsec hud
- tag: HudSecurity
Avalon-Proto marked this conversation as resolved.
Show resolved Hide resolved
name: sec hud
icon:
sprite: Clothing/Eyes/Hud/medsec.rsi
sprite: Clothing/Eyes/Hud/sec.rsi
state: icon
doAfter: 5
- material: Cable
Expand Down
Loading