cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fold cosmetic sunglasses into regular sunglasses (#23232) 

Fold cosmetic sunglasses into regular sunglasses.

(cherry picked from commit f7a923624a17c72454f0f43bbfd24c80b8c5e007)
This commit is contained in:
Nemanja 2023-12-30 23:30:21 +01:00 committed by Debug
parent 58074154ac
commit 70a165f9af
No known key found for this signature in database
GPG Key ID: 271270A74EF9C350
6 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Resources/Migrations/migration.yml
View File

@ -113,3 +113,6 @@ WarpPointBeaconNeutral: null
WarpPointBeaconScience: null
WarpPointBeaconSecurity: null
WarpPointBeaconService: null
# 2023-12-30
ClothingEyesGlassesCosmeticSunglasses: ClothingEyesGlassesSunglasses

2
Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
View File

@ -14,5 +14,5 @@
ClothingOuterArmorDuraVest: 2 # DeltaV - ClothingOuterArmorBasicSlim replaced in favour of stabproof vest
ClothingOuterVest: 2
ClothingBeltBandolier: 2
ClothingEyesGlassesCosmeticSunglasses: 2
ClothingEyesGlassesSunglasses: 2

2
Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
View File

@ -85,7 +85,7 @@
ClothingHeadRastaHat: 2
ClothingBeltStorageWaistbag: 3
ClothingEyesGlasses: 6
ClothingEyesGlassesCosmeticSunglasses: 6
ClothingEyesGlassesSunglasses: 2
ClothingHandsGlovesColorBlack: 4
contrabandInventory:
ClothingUniformJumpsuitTacticool: 1

13
Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml
View File

@ -129,7 +129,7 @@
- type: entity
parent: ClothingEyesBase
id: ClothingEyesGlassesCosmeticSunglasses
id: ClothingEyesGlassesSunglasses
name: sun glasses
description: A pair of black sunglasses.
components:
@ -137,20 +137,15 @@
sprite: Clothing/Eyes/Glasses/sunglasses.rsi
- type: Clothing
sprite: Clothing/Eyes/Glasses/sunglasses.rsi
- type: FlashImmunity
- type: EyeProtection
protectionTime: 5
- type: Tag
tags:
- HamsterWearable
- WhitelistChameleon
- SecDogWearable # DeltaV - let Laika wear sunglasses
- type: entity
parent: ClothingEyesGlassesCosmeticSunglasses
id: ClothingEyesGlassesSunglasses
components:
- type: FlashImmunity
- type: EyeProtection
protectionTime: 5
- type: entity
parent: ClothingEyesBase
id: ClothingEyesGlassesSecurity

2
Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
View File

@ -23,7 +23,7 @@
equipment:
jumpsuit: ClothingUniformJumpsuitMusician
back: ClothingBackpackMusicianFilled
eyes: ClothingEyesGlassesCosmeticSunglasses
eyes: ClothingEyesGlassesSunglasses
shoes: ClothingShoesBootsLaceup
id: MusicianPDA
ears: ClothingHeadsetService

2
RobustToolbox

@ -1 +1 @@
Subproject commit baa607532d0e9fc4a7d9212ab332d938d9324fbe
Subproject commit a891cacae53d704f1d0afa85bd3bc10820c38881