Skip to content

Commit

Permalink
Merge pull request #441 from Fansana/command-glasses
Browse files Browse the repository at this point in the history
Command Glasses
  • Loading branch information
Fansana authored Dec 31, 2024
2 parents 9609cc0 + d1e5ef7 commit bc21b6a
Show file tree
Hide file tree
Showing 14 changed files with 96 additions and 2 deletions.
5 changes: 5 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: CargoTechFabCircuitboard # Floof - port to EE if possible
- id: ClothingEyesGlassesCommand

- type: entity
id: LockerCaptainFilledHardsuit
Expand Down Expand Up @@ -56,6 +57,7 @@
- id: MedalCase
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: ClothingEyesGlassesCommand

- type: entity
id: LockerCaptainFilled
Expand Down Expand Up @@ -86,6 +88,7 @@
- id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: ClothingEyesGlassesCommand

- type: entity
id: LockerCaptainFilledNoLaser
Expand Down Expand Up @@ -115,6 +118,7 @@
- id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: ClothingEyesGlassesCommand

- type: entity
id: LockerHeadOfPersonnelFilled
Expand Down Expand Up @@ -150,6 +154,7 @@
- id: LunchboxCommandFilledRandom # Delta-V Lunchboxes!
prob: 0.3
- id: ServiceTechFabCircuitboard # Floof - port to ee if possible
- id: ClothingEyesHudCommand

- type: entity
id: LockerChiefEngineerFilledHardsuit
Expand Down
23 changes: 22 additions & 1 deletion Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,27 @@
- type: IdentityBlocker
coverage: EYES

- type: entity
parent: [ClothingEyesBase]
id: ClothingEyesGlassesCommand
name: administration glasses
description: Upgraded sunglasses that provide flash immunity and show ID card status.
components:
- type: Sprite
sprite: Clothing/Eyes/Glasses/commandglasses.rsi
- type: Clothing
sprite: Clothing/Eyes/Glasses/commandglasses.rsi
- type: FlashImmunity
- type: EyeProtection
protectionTime: 5
- type: Tag
tags:
- HamsterWearable
- WhitelistChameleon
- type: IdentityBlocker
coverage: EYES
- type: ShowJobIcons

- type: entity
parent: ClothingEyesBase
id: ClothingEyesGlassesMercenary
Expand Down Expand Up @@ -276,4 +297,4 @@
sprite: Clothing/Eyes/Glasses/etherealgoogles.rsi
- type: Clothing
sprite: Clothing/Eyes/Glasses/etherealgoogles.rsi
- type: ShowEthereal
- type: ShowEthereal
14 changes: 13 additions & 1 deletion Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,18 @@
tags:
- HudSecurity

- type: entity
parent: [ClothingEyesBase]
id: ClothingEyesHudCommand
name: administration hud
description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status.
components:
- type: Sprite
sprite: Clothing/Eyes/Hud/command.rsi
- type: Clothing
sprite: Clothing/Eyes/Hud/command.rsi
- type: ShowJobIcons

- type: entity
parent: ClothingEyesBase
id: ClothingEyesHudBeer
Expand Down Expand Up @@ -163,7 +175,7 @@
damageContainers:
- Biological
- type: ShowHealthIcons
damageContainers:
damageContainers:
- Biological

- 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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Ghagliiarghii",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-EYES",
"directions": 4
},
{
"name": "equipped-EYES-hamster",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
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/command.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, edited by SlamBamActionman",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-EYES",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

0 comments on commit bc21b6a

Please sign in to comment.