From 2c3015c8eea2e62a1be59629d5d8570102821f17 Mon Sep 17 00:00:00 2001 From: Avalon Date: Fri, 20 Sep 2024 22:29:53 -0400 Subject: [PATCH 1/5] Corpsman Glasses Adjustment --- .../Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml | 4 ++-- .../Construction/Graphs/clothing/glasses_corpshud.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml index 4124ca5b132..287ccc3ba99 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml index 2a29d4cf103..16c936e53ed 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml @@ -12,10 +12,10 @@ sprite: Clothing/Eyes/Glasses/sunglasses.rsi state: icon doAfter: 5 - - tag: HudMedicalSecurity - name: medsec hud + - tag: HudSecurity + name: sec hud icon: - sprite: Clothing/Eyes/Hud/medsec.rsi + sprite: Clothing/Eyes/Hud/sec.rsi state: icon doAfter: 5 - material: Cable From cf83b86990461318ab64b1a0a745d5167952f2df Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 21 Sep 2024 07:16:37 -0400 Subject: [PATCH 2/5] Fixed WrongHUDS lol --- .../Recipes/Construction/Graphs/clothing/glasses_corpshud.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml index 16c936e53ed..8ce53f779f3 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml @@ -12,8 +12,8 @@ sprite: Clothing/Eyes/Glasses/sunglasses.rsi state: icon doAfter: 5 - - tag: HudSecurity - name: sec hud + - tag: HudMedical + name: med hud icon: sprite: Clothing/Eyes/Hud/sec.rsi state: icon From bca53bccee4189803c455a37e290fbd8f14f3deb Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 21 Sep 2024 07:17:48 -0400 Subject: [PATCH 3/5] Forgotpartwoops --- .../Recipes/Construction/Graphs/clothing/glasses_corpshud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml index 8ce53f779f3..d0b516a4511 100644 --- a/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml +++ b/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/glasses_corpshud.yml @@ -15,7 +15,7 @@ - tag: HudMedical name: med hud icon: - sprite: Clothing/Eyes/Hud/sec.rsi + sprite: Clothing/Eyes/Hud/med.rsi state: icon doAfter: 5 - material: Cable From 63906a00a343c5f91356d6e89e7a373cbf294f8d Mon Sep 17 00:00:00 2001 From: Avalon Date: Sat, 21 Sep 2024 07:27:49 -0400 Subject: [PATCH 4/5] Return of The Glasses --- Resources/Prototypes/Catalog/Fills/Lockers/security.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index fff245e1f52..c4d0f017c27 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -106,7 +106,7 @@ components: - type: StorageFill contents: -# - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses | removed until HUD/sunglasses balance can be discussed and reworked. + - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses | removed until HUD/sunglasses balance can be discussed and reworked. - id: WeaponDisabler - id: TrackingImplanter amount: 2 From adc26d51273ca3bf5527ce0540248d9ac05d2312 Mon Sep 17 00:00:00 2001 From: "Tad \"Taddy\" Johnson" <120885811+TadJohnson00@users.noreply.github.com> Date: Sat, 21 Sep 2024 23:12:21 +1000 Subject: [PATCH 5/5] clean comments Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com> --- Resources/Prototypes/Catalog/Fills/Lockers/security.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index c4d0f017c27..8f7c5e8d1c9 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -106,7 +106,7 @@ components: - type: StorageFill contents: - - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses | removed until HUD/sunglasses balance can be discussed and reworked. + - id: ClothingEyesGlassesCorpsman - id: WeaponDisabler - id: TrackingImplanter amount: 2 @@ -148,7 +148,7 @@ components: - type: StorageFill contents: -# - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses | removed until HUD/sunglasses balance can be discussed and reworked. + - id: ClothingEyesGlassesCorpsman - id: WeaponDisabler - id: TrackingImplanter amount: 2