diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index fb926a2fc5..91f364df3b 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -99988,7 +99988,7 @@ entities: - pos: 56.473743,-16.515564 parent: 13329 type: Transform -- proto: ClothingEyesGlassesBeer +- proto: ClothingEyesHudBeer entities: - uid: 31731 components: diff --git a/Resources/Maps/origin.yml b/Resources/Maps/origin.yml index d63dcf3987..01d2e10735 100644 --- a/Resources/Maps/origin.yml +++ b/Resources/Maps/origin.yml @@ -80820,7 +80820,7 @@ entities: - pos: -57.484028,-27.38782 parent: 2 type: Transform -- proto: ClothingEyesGlassesBeer +- proto: ClothingEyesHudBeer entities: - uid: 12174 components: diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index 854fc9b3a9..245532d667 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -8,7 +8,7 @@ - id: ClothingOuterArmorBasicSlim - id: WeaponShotgunDoubleBarreledRubber - id: DrinkShaker - - id: ClothingEyesGlassesBeer + - id: ClothingEyesHudBeer - id: DrinkBottleBeer prob: 0.5 - id: DrinkBottleBeer diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml index 5c67b70189..00b35b92c2 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml @@ -3,7 +3,7 @@ startingInventory: ClothingHeadHatBowlerHat: 2 ClothingHeadHatTophat: 2 - ClothingEyesGlassesBeer: 2 + ClothingEyesHudBeer: 2 ClothingHeadsetService: 2 ClothingOuterWinterBar: 2 ClothingUniformJumpsuitBartender: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 64a17abff2..93a3ec443d 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -1,14 +1,3 @@ -- type: entity - parent: ClothingEyesBase - id: ClothingEyesGlassesBeer - name: beer goggles - description: A pair of sunglasses outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. - components: - - type: Sprite - sprite: Clothing/Eyes/Glasses/beergoggles.rsi - - type: Clothing - sprite: Clothing/Eyes/Glasses/beergoggles.rsi - - type: entity parent: ClothingEyesBase id: ClothingEyesGlassesGar diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 1493c321b9..9405e1f83c 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -30,3 +30,91 @@ sprite: Clothing/Eyes/Hud/sec.rsi - type: Clothing sprite: Clothing/Eyes/Hud/sec.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesHudBeer + name: beer goggles + description: A pair of sunHud outfitted with apparatus to scan reagents, as well as providing an innate understanding of liquid viscosity while in motion. + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/beergoggles.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/beergoggles.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesHudFriedOnion + name: fried onion goggles + description: Filler + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/friedonion.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/friedonion.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesHudOnionBeer + name: thungerst goggles + description: Filler + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/onionbeer.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/onionbeer.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesHudMedOnion + name: medonion hud + description: Filler + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/medonion.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/medonion.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesHudMedOnionBeer + name: medthungerst hud + description: Filler + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/medonionbeer.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/medonionbeer.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesHudMedSec + name: medsec hud + description: Filler + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/medsec.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/medsec.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesHudMultiversal + name: multiversal hud + description: Filler + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/medsecengi.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/medsecengi.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesHudOmni + name: omni hud + description: Filler + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/omni.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/omni.rsi diff --git a/Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/equipped-EYES.png deleted file mode 100644 index f72e29ec42..0000000000 Binary files a/Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/equipped-EYES.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/equipped-EYES.png new file mode 100644 index 0000000000..02ae05df0c Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/icon.png rename to Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/icon.png diff --git a/Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Eyes/Glasses/beergoggles.rsi/meta.json rename to Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi/meta.json diff --git a/Resources/Textures/Clothing/Eyes/Glasses/friedoniongoggles.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/friedonion.rsi/equipped-EYES.png similarity index 100% rename from Resources/Textures/Clothing/Eyes/Glasses/friedoniongoggles.rsi/equipped-EYES.png rename to Resources/Textures/Clothing/Eyes/Hud/friedonion.rsi/equipped-EYES.png diff --git a/Resources/Textures/Clothing/Eyes/Glasses/friedoniongoggles.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/friedonion.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Eyes/Glasses/friedoniongoggles.rsi/icon.png rename to Resources/Textures/Clothing/Eyes/Hud/friedonion.rsi/icon.png diff --git a/Resources/Textures/Clothing/Eyes/Glasses/friedoniongoggles.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/friedonion.rsi/meta.json similarity index 100% rename from Resources/Textures/Clothing/Eyes/Glasses/friedoniongoggles.rsi/meta.json rename to Resources/Textures/Clothing/Eyes/Hud/friedonion.rsi/meta.json diff --git a/Resources/Textures/Clothing/Eyes/Hud/medonion.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/medonion.rsi/equipped-EYES.png new file mode 100644 index 0000000000..f08c247f5f Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/medonion.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/medonion.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/medonion.rsi/icon.png new file mode 100644 index 0000000000..132fd293f9 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/medonion.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/medonion.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/medonion.rsi/meta.json new file mode 100644 index 0000000000..945139fb05 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/medonion.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Derby", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Eyes/Hud/medonionbeer.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/medonionbeer.rsi/equipped-EYES.png new file mode 100644 index 0000000000..5b0aa9063f Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/medonionbeer.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/medonionbeer.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/medonionbeer.rsi/icon.png new file mode 100644 index 0000000000..9f2d28abe5 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/medonionbeer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/medonionbeer.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/medonionbeer.rsi/meta.json new file mode 100644 index 0000000000..945139fb05 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/medonionbeer.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Derby", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/equipped-EYES.png new file mode 100644 index 0000000000..22b26456c9 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/icon.png new file mode 100644 index 0000000000..77c9e430b9 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/meta.json new file mode 100644 index 0000000000..945139fb05 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Derby", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Eyes/Hud/medsecengi.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/medsecengi.rsi/equipped-EYES.png new file mode 100644 index 0000000000..cd45181a06 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/medsecengi.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/medsecengi.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/medsecengi.rsi/icon.png new file mode 100644 index 0000000000..c6980b5cae Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/medsecengi.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/medsecengi.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/medsecengi.rsi/meta.json new file mode 100644 index 0000000000..945139fb05 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/medsecengi.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Derby", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Eyes/Hud/omni.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/omni.rsi/equipped-EYES.png new file mode 100644 index 0000000000..cb52aa5576 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/omni.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/omni.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/omni.rsi/icon.png new file mode 100644 index 0000000000..288bdaa54f Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/omni.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/omni.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/omni.rsi/meta.json new file mode 100644 index 0000000000..945139fb05 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/omni.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Derby", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Eyes/Hud/onionbeer.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/onionbeer.rsi/equipped-EYES.png new file mode 100644 index 0000000000..2182ad6af1 Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/onionbeer.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/onionbeer.rsi/icon.png b/Resources/Textures/Clothing/Eyes/Hud/onionbeer.rsi/icon.png new file mode 100644 index 0000000000..17b1727aec Binary files /dev/null and b/Resources/Textures/Clothing/Eyes/Hud/onionbeer.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Eyes/Hud/onionbeer.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/onionbeer.rsi/meta.json new file mode 100644 index 0000000000..945139fb05 --- /dev/null +++ b/Resources/Textures/Clothing/Eyes/Hud/onionbeer.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Derby", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + } + ] +}