diff --git a/Resources/Locale/en-US/forensics/fibers.ftl b/Resources/Locale/en-US/forensics/fibers.ftl index c95b292c966..a625847fc2b 100644 --- a/Resources/Locale/en-US/forensics/fibers.ftl +++ b/Resources/Locale/en-US/forensics/fibers.ftl @@ -23,3 +23,4 @@ fibers-white = white fibers-yellow = yellow fibers-regal-blue = regal blue fibers-olive = olive +fibers-dyed = dyed fibers \ No newline at end of file diff --git a/Resources/Locale/en-US/loadouts/generic/hands.ftl b/Resources/Locale/en-US/loadouts/generic/hands.ftl index d9df439ce5a..3ceed69d176 100644 --- a/Resources/Locale/en-US/loadouts/generic/hands.ftl +++ b/Resources/Locale/en-US/loadouts/generic/hands.ftl @@ -1 +1,2 @@ loadout-name-LoadoutHandsColorWhite = gloves (colorable) +loadout-name-LoadoutHandsGlovesFingerlessWhite = fingerless gloves (colorable) \ No newline at end of file diff --git a/Resources/Locale/en-US/loadouts/generic/head.ftl b/Resources/Locale/en-US/loadouts/generic/head.ftl index efd13b00845..d2a6d511284 100644 --- a/Resources/Locale/en-US/loadouts/generic/head.ftl +++ b/Resources/Locale/en-US/loadouts/generic/head.ftl @@ -10,3 +10,6 @@ loadout-name-LoadoutHeadTurbanColorable = turban (colorable) loadout-name-LoadoutHeadKippahColorable = kippah (colorable) loadout-name-LoadoutHeadTinfoil = tinfoil hat (colorable) loadout-name-LoadoutHeadHatCowboyBountyHunter = bounty hunter hat (colorable) +loadout-name-LoadoutHeadBandWhite = headband (colorable) +loadout-name-LoadoutHeadBeretWhite = beret (colorable) +loadout-name-LoadoutHeadPoppyWhite = hair flower (colorable) \ No newline at end of file diff --git a/Resources/Locale/en-US/loadouts/generic/mask.ftl b/Resources/Locale/en-US/loadouts/generic/mask.ftl new file mode 100644 index 00000000000..79ebf9b2885 --- /dev/null +++ b/Resources/Locale/en-US/loadouts/generic/mask.ftl @@ -0,0 +1,3 @@ +loadout-name-LoadoutMaskBandWhite = cloth mask (colorable) +loadout-name-LoadoutMaskNeckGaiterWhite = neck gaiter (colorable) +loadout-name-LoadoutMaskSterile = sterile mask (colorable) \ No newline at end of file diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml index e6bd267b1d0..26f93d6531d 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/headGroup.yml @@ -21,6 +21,8 @@ id: LoadoutHeadBellhop - type: loadout id: LoadoutHeadPoppy + - type: loadout + id: LoadoutHeadPoppyWhite - type: loadout id: LoadoutHeadHatCorpsoft - type: loadout @@ -30,21 +32,9 @@ - type: loadout id: LoadoutHeadHatMimesoftFlipped - type: loadout - id: LoadoutHeadBandBlack - - type: loadout - id: LoadoutHeadBandBlue - - type: loadout - id: LoadoutHeadBandGold - - type: loadout - id: LoadoutHeadBandGreen - - type: loadout - id: LoadoutHeadBandGrey - - type: loadout - id: LoadoutHeadBandRed + id: LoadoutHeadBandWhite - type: loadout id: LoadoutHeadBandSkull - - type: loadout - id: LoadoutHeadBandMerc - type: loadout id: LoadoutHeadBandBrown - type: loadout @@ -60,9 +50,7 @@ - type: loadout id: LoadoutHeadBrownFlatcap - type: loadout - id: LoadoutHeadBeret - - type: loadout - id: LoadoutHeadBeretFrench + id: LoadoutHeadBeretWhite - type: loadout id: LoadoutHeadHijabColorable - type: loadout diff --git a/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml b/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml index ffe37fc0426..fe78d84c9e9 100644 --- a/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml +++ b/Resources/Prototypes/CharacterItemGroups/Generic/maskGroup.yml @@ -7,25 +7,9 @@ id: LoadoutMaskMuzzle - type: loadout id: LoadoutMaskGas - - type: loadout - id: LoadoutMaskBandBlack - - type: loadout - id: LoadoutMaskBandBlue - - type: loadout - id: LoadoutMaskBandGold - - type: loadout - id: LoadoutMaskBandGreen - - type: loadout - id: LoadoutMaskBandGrey - - type: loadout - id: LoadoutMaskBandRed - type: loadout id: LoadoutMaskBandSkull - type: loadout - id: LoadoutMaskBandMerc - - type: loadout - id: LoadoutMaskBandBrown - - type: loadout - id: LoadoutMaskNeckGaiter + id: LoadoutMaskBandWhite - type: loadout - id: LoadoutMaskNeckGaiterRed + id: LoadoutMaskNeckGaiterWhite diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 2abe1f0a80f..fdec5232026 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -300,6 +300,20 @@ fiberMaterial: fibers-synthetic fiberColor: fibers-black +- type: entity + parent: ClothingHandsButcherable + id: ClothingHandsGlovesFingerlessWhite + name: fingerless gloves + description: Plain gloves without fingertips. + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/fingerlesswhite.rsi + - type: Clothing + sprite: Clothing/Hands/Gloves/fingerlesswhite.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + fiberColor: fibers-dyed + - type: entity parent: ClothingHandsBase id: ClothingHandsGlovesFingerlessInsulated diff --git a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml index 51a56f1f1d6..29a99ce6440 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/bandanas.yml @@ -24,6 +24,11 @@ tags: - Bandana +- type: entity + parent: [ClothingHeadBandBase, ClothingMaskBandWhite] + id: ClothingHeadBandWhite + name: bandana + - type: entity parent: [ClothingHeadBandBase, ClothingMaskBandBlack] id: ClothingHeadBandBlack diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 5b5d281362d..fe590c55628 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -25,6 +25,17 @@ - HamsterWearable - WhitelistChameleon +- type: entity + parent: ClothingHeadHatBeret + id: ClothingHeadHatBeretWhite + name: beret + description: A beret, an artists favorite headwear. + components: + - type: Sprite + sprite: Clothing/Head/Hats/beretwhite.rsi + - type: Clothing + sprite: Clothing/Head/Hats/beretwhite.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatBeretFrench diff --git a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml index f5ad2fb6c83..f1f7ebc4cc5 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/bandanas.yml @@ -30,6 +30,17 @@ - Snout hideOnToggle: true +- type: entity + parent: ClothingMaskBandanaBase + id: ClothingMaskBandWhite + name: bandana + description: A bandana to make you look cool. + components: + - type: Sprite + sprite: Clothing/Head/Bandanas/white.rsi + - type: Clothing + sprite: Clothing/Head/Bandanas/white.rsi + - type: entity parent: ClothingMaskBandanaBase id: ClothingMaskBandBlack diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index c470605bb79..383e32e99d6 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -562,6 +562,16 @@ - WhitelistChameleon - IPCMaskWearable # Estacao Pirata - IPCs +- type: entity + parent: ClothingMaskNeckGaiter + id: ClothingMaskNeckGaiterWhite + name: neck gaiter + components: + - type: Sprite + sprite: Clothing/Mask/neckgaiterwhite.rsi + - type: Clothing + sprite: Clothing/Mask/neckgaiterwhite.rsi + - type: entity parent: ClothingMaskNeckGaiter id: ClothingMaskNeckGaiterRed diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 3bf253f773b..f9bd17860c8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1249,6 +1249,14 @@ tags: - Flower # TODO add "RedFlower" or "Poppy" tag, when other color flowers will be +- type: entity + name: hairflower + id: FoodPoppyWhite + parent: FoodPoppy + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/poppywhite.rsi + - type: entity name: lily parent: FoodPoppy diff --git a/Resources/Prototypes/Loadouts/Generic/hands.yml b/Resources/Prototypes/Loadouts/Generic/hands.yml index 830dcd7beee..2a35910a17c 100644 --- a/Resources/Prototypes/Loadouts/Generic/hands.yml +++ b/Resources/Prototypes/Loadouts/Generic/hands.yml @@ -61,12 +61,13 @@ group: LoadoutGloves - type: loadout - id: LoadoutHandsGlovesFingerless + id: LoadoutHandsGlovesFingerlessWhite category: Hands cost: 0 exclusive: true + customColorTint: true items: - - ClothingHandsGlovesFingerless + - ClothingHandsGlovesFingerlessWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutGloves diff --git a/Resources/Prototypes/Loadouts/Generic/head.yml b/Resources/Prototypes/Loadouts/Generic/head.yml index c48ad846e1d..3efef2fac4a 100644 --- a/Resources/Prototypes/Loadouts/Generic/head.yml +++ b/Resources/Prototypes/Loadouts/Generic/head.yml @@ -122,6 +122,18 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead +- type: loadout + id: LoadoutHeadPoppyWhite + category: Head + cost: 0 + exclusive: true + customColorTint: true + items: + - FoodPoppyWhite + requirements: + - !type:CharacterItemGroupRequirement + group: LoadoutHead + # Color Hats - type: loadout id: LoadoutHeadHatCorpsoft @@ -171,83 +183,13 @@ # Headbands - type: loadout - id: LoadoutHeadBandBlack - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandBlue - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandBlue - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandGold - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandGold - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandGreen - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandGreen - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandGrey - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandGrey - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandRed + id: LoadoutHeadBandWhite category: Head cost: 0 exclusive: true + customColorTint: true items: - - ClothingHeadBandRed + - ClothingHeadBandWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutHead @@ -264,36 +206,6 @@ - !type:CharacterItemGroupRequirement group: LoadoutHead -- type: loadout - id: LoadoutHeadBandMerc - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadBandMerc - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBandBrown - category: Head - cost: 0 - exclusive: true - items: - - ClothingHeadBandBrown - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutHead - - type: loadout id: LoadoutHeadFishCap category: Head @@ -375,23 +287,13 @@ # Berets - type: loadout - id: LoadoutHeadBeret - category: Head - cost: 1 - exclusive: true - items: - - ClothingHeadHatBeret - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutHead - -- type: loadout - id: LoadoutHeadBeretFrench + id: LoadoutHeadBeretWhite category: Head cost: 1 exclusive: true + customColorTint: true items: - - ClothingHeadHatBeretFrench + - ClothingHeadHatBeretWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutHead diff --git a/Resources/Prototypes/Loadouts/Generic/mask.yml b/Resources/Prototypes/Loadouts/Generic/mask.yml index 3d3754c6f7d..6445071d548 100644 --- a/Resources/Prototypes/Loadouts/Generic/mask.yml +++ b/Resources/Prototypes/Loadouts/Generic/mask.yml @@ -3,6 +3,7 @@ category: Mask cost: 0 exclusive: true + customColorTint: true items: - ClothingMaskSterile requirements: @@ -34,83 +35,13 @@ # Maskbands - type: loadout - id: LoadoutMaskBandBlack + id: LoadoutMaskBandWhite category: Mask cost: 0 exclusive: true + customColorTint: true items: - - ClothingMaskBandBlack - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandBlue - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandBlue - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandGold - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandGold - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandGreen - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandGreen - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandGrey - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandGrey - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandRed - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandRed + - ClothingMaskBandWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutMasks @@ -127,55 +58,15 @@ - !type:CharacterItemGroupRequirement group: LoadoutMasks -- type: loadout - id: LoadoutMaskBandMerc - category: Mask - cost: 1 - exclusive: true - items: - - ClothingMaskBandMerc - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskBandBrown - category: Mask - cost: 0 - exclusive: true - items: - - ClothingMaskBandBrown - requirements: - - !type:CharacterDepartmentRequirement - inverted: true - departments: - - Security - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - # Gaiters - type: loadout - id: LoadoutMaskNeckGaiter - category: Mask - cost: 1 - exclusive: true - items: - - ClothingMaskNeckGaiter - requirements: - - !type:CharacterItemGroupRequirement - group: LoadoutMasks - -- type: loadout - id: LoadoutMaskNeckGaiterRed + id: LoadoutMaskNeckGaiterWhite category: Mask cost: 1 exclusive: true + customColorTint: true items: - - ClothingMaskNeckGaiterRed + - ClothingMaskNeckGaiterWhite requirements: - !type:CharacterItemGroupRequirement group: LoadoutMasks diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/equipped-HAND.png new file mode 100644 index 00000000000..36170c46610 Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/icon.png new file mode 100644 index 00000000000..b4bda7cfddf Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-left.png new file mode 100644 index 00000000000..7fc12be332e Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-right.png new file mode 100644 index 00000000000..b2046039fab Binary files /dev/null and b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/meta.json b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/meta.json new file mode 100644 index 00000000000..e47f13296a6 --- /dev/null +++ b/Resources/Textures/Clothing/Hands/Gloves/fingerlesswhite.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/54ecdcc05bcaf335489938b1253a2a733ba12271", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET-vox.png new file mode 100644 index 00000000000..909b786581c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..62de52505ab Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK-vox.png new file mode 100644 index 00000000000..b47625c11d1 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK.png new file mode 100644 index 00000000000..8b592ff678e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon.png new file mode 100644 index 00000000000..a471b2b6ec3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon_mask.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon_mask.png new file mode 100644 index 00000000000..f7ffc9c4a36 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/icon_mask.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-left.png new file mode 100644 index 00000000000..8a0b841c1c4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-right.png new file mode 100644 index 00000000000..e959b046eca Binary files /dev/null and b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Bandanas/white.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/meta.json new file mode 100644 index 00000000000..a39a46ac810 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Bandanas/white.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_mask" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..7e54273cf3a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/icon.png new file mode 100644 index 00000000000..f4d7a07d370 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/inhand-left.png new file mode 100644 index 00000000000..ba9c6174815 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/inhand-right.png new file mode 100644 index 00000000000..f816479e2cf Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/meta.json new file mode 100644 index 00000000000..a470e009443 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/beretwhite.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK-reptilian.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK-reptilian.png new file mode 100644 index 00000000000..24a8d78449d Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK-reptilian.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK-vox.png new file mode 100644 index 00000000000..e425a136df3 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK-vox.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK.png new file mode 100644 index 00000000000..3512302b5fc Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/icon.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/icon.png new file mode 100644 index 00000000000..af3948b8f42 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-left.png new file mode 100644 index 00000000000..65acefa0c34 Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-right.png new file mode 100644 index 00000000000..2f39874647c Binary files /dev/null and b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/meta.json b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/meta.json new file mode 100644 index 00000000000..4da74959ddc --- /dev/null +++ b/Resources/Textures/Clothing/Mask/neckgaiterwhite.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by belay5 (Discord) | equipped-MASK-vox sprited by PuroSlavKing (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/dead.png new file mode 100644 index 00000000000..849b4242b4e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/equipped-HELMET.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..221e35fbc39 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/harvest.png new file mode 100644 index 00000000000..99ad68a5d28 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/meta.json new file mode 100644 index 00000000000..b49b49cc850 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/meta.json @@ -0,0 +1,36 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, equipped-HELMET taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/produce.png new file mode 100644 index 00000000000..84caa94b9a1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/seed.png new file mode 100644 index 00000000000..4197b68f37a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-1.png new file mode 100644 index 00000000000..1e582f92314 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-2.png new file mode 100644 index 00000000000..090715f6a01 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-3.png new file mode 100644 index 00000000000..edcd8617dc7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/poppywhite.rsi/stage-3.png differ