diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml index bf998a48cf..a7a1398e27 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/shoes.yml @@ -947,3 +947,29 @@ sprite: Clothing/Shoes/yellow.rsi - type: Clothing sprite: Clothing/Shoes/yellow.rsi + +- type: entity + parent: ShoesBase + id: ShoesBee + name: bee socks + description: Make them loins buzz + components: + - type: Sprite + sprite: Clothing/Shoes/beesocks.rsi + - type: Icon + sprite: Clothing/Shoes/beesocks.rsi + - type: Clothing + sprite: Clothing/Shoes/beesocks.rsi + +- type: entity + parent: ShoesBase + id: ShoesCoder + name: coder socks + description: It's time to code sisters!!!1 + components: + - type: Sprite + sprite: Clothing/Shoes/codersocks.rsi + - type: Icon + sprite: Clothing/Shoes/codersocks.rsi + - type: Clothing + sprite: Clothing/Shoes/codersocks.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/bartender.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/bartender.yml deleted file mode 100644 index cc979b45d2..0000000000 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/bartender.yml +++ /dev/null @@ -1,40 +0,0 @@ -- type: entity - parent: UniformBase - id: UniformBartender - name: bartender's uniform - description: It looks like it could use some more flair. - components: - - type: Sprite - sprite: Clothing/Uniforms/bartender.rsi - state: barman - - type: Icon - sprite: Clothing/Uniforms/bartender.rsi - state: barman - - type: Clothing - sprite: Clothing/Uniforms/bartender.rsi - -- type: entity - parent: UniformBartender - id: UniformBartenderSkirt - name: bartender's skirt - components: - - type: Sprite - state: skirt - - type: Icon - state: skirt - - type: Clothing - ClothingPrefix: skirt - femaleMask: UniformTop - - -- type: entity - parent: UniformBartender - id: UniformBartenderPurple - name: purple bartender's uniform - components: - - type: Sprite - state: purple - - type: Icon - state: purple - - type: Clothing - ClothingPrefix: purple diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml index 2e450da638..77bbc86139 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/color.yml @@ -6,8 +6,10 @@ components: - type: Sprite sprite: Clothing/Uniforms/color.rsi + - type: Icon sprite: Clothing/Uniforms/color.rsi + - type: Clothing sprite: Clothing/Uniforms/color.rsi @@ -38,6 +40,7 @@ - type: Clothing ClothingPrefix: grey_skirt femaleMask: UniformTop + HeldPrefix: grey # Black - type: entity @@ -64,6 +67,7 @@ - type: Clothing ClothingPrefix: black_skirt femaleMask: UniformTop + HeldPrefix: black # Blue - type: entity @@ -81,7 +85,7 @@ - type: entity parent: UniformColorBlue id: UniformColorBlueSkirt - name: grey jumpskirt + name: blue jumpskirt components: - type: Sprite state: blue_skirt @@ -90,6 +94,7 @@ - type: Clothing ClothingPrefix: blue_skirt femaleMask: UniformTop + HeldPrefix: blue # Green - type: entity @@ -116,6 +121,7 @@ - type: Clothing ClothingPrefix: green_skirt femaleMask: UniformTop + HeldPrefix: green # Orange - type: entity @@ -143,6 +149,7 @@ - type: Clothing ClothingPrefix: orange_skirt femaleMask: UniformTop + HeldPrefix: orange # Pink - type: entity @@ -157,7 +164,7 @@ state: pink - type: Clothing ClothingPrefix: pink - HeldPrefix: purple + HeldPrefix: pink - type: entity parent: UniformColorPink @@ -171,6 +178,19 @@ - type: Clothing ClothingPrefix: pink_skirt femaleMask: UniformTop + HeldPrefix: pink + +- type: entity + parent: UniformColorBase + id: S + name: s + components: + - type: Sprite + state: s + - type: Icon + state: s + - type: Clothing + HeldPrefix: s # Red - type: entity @@ -197,6 +217,7 @@ - type: Clothing ClothingPrefix: red_skirt femaleMask: UniformTop + HeldPrefix: red # White - type: entity @@ -223,6 +244,7 @@ - type: Clothing ClothingPrefix: white_skirt femaleMask: UniformTop + HeldPrefix: white # Yellow - type: entity @@ -249,6 +271,7 @@ - type: Clothing ClothingPrefix: yellow_skirt femaleMask: UniformTop + HeldPrefix: yellow # Dark blue - type: entity @@ -262,7 +285,7 @@ state: darkblue - type: Clothing ClothingPrefix: darkblue - HeldPrefix: blue + HeldPrefix: darkblue - type: entity parent: UniformColorDarkBlue @@ -276,6 +299,7 @@ - type: Clothing ClothingPrefix: darkblue_skirt femaleMask: UniformTop + HeldPrefix: darkblue # Teal - type: entity @@ -289,7 +313,7 @@ state: teal - type: Clothing ClothingPrefix: teal - HeldPrefix: blue + HeldPrefix: teal - type: entity parent: UniformColorTeal @@ -303,6 +327,7 @@ - type: Clothing ClothingPrefix: teal_skirt femaleMask: UniformTop + HeldPrefix: teal # Purple - type: entity @@ -316,7 +341,7 @@ state: lightpurple - type: Clothing ClothingPrefix: lightpurple - HeldPrefix: purple + HeldPrefix: lightpurple - type: entity parent: UniformColorPurple @@ -330,6 +355,7 @@ - type: Clothing ClothingPrefix: lightpurple_skirt femaleMask: UniformTop + HeldPrefix: lightpurple # Dark Green - type: entity @@ -357,6 +383,7 @@ - type: Clothing ClothingPrefix: darkgreen_skirt femaleMask: UniformTop + HeldPrefix: green # Light Brown - type: entity @@ -383,6 +410,7 @@ - type: Clothing ClothingPrefix: lightbrown_skirt femaleMask: UniformTop + HeldPrefix: lightbrown # Brown - type: entity @@ -423,7 +451,7 @@ state: maroon - type: Clothing ClothingPrefix: maroon - HeldPrefix: red + HeldPrefix: maroon - type: entity parent: UniformColorMaroon @@ -437,6 +465,7 @@ - type: Clothing ClothingPrefix: maroon_skirt femaleMask: UniformTop + HeldPrefix: maroon # Rainbow - type: entity @@ -464,3 +493,4 @@ - type: Clothing ClothingPrefix: rainbow_skirt femaleMask: UniformTop + HeldPrefix: rainbow diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml index c027ce1a5e..e78b4cd10c 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/uniforms.yml @@ -8,19 +8,32 @@ - type: entity parent: UniformBase - id: JanitorUniform + id: UniformJanitor name: janitor jumpsuit description: The jumpsuit for the poor sop with a mop components: - type: Sprite sprite: Clothing/Uniforms/uniform_janitor.rsi - state: janitor + state: icon - type: Icon sprite: Clothing/Uniforms/uniform_janitor.rsi - state: janitor + state: icon - type: Clothing sprite: Clothing/Uniforms/uniform_janitor.rsi +- type: entity + parent: UniformJanitor + id: UniformJanitorSkirt + name: janitor jumpskirt + components: + - type: Sprite + state: jan_skirt + - type: Icon + state: jan_skirt + - type: Clothing + ClothingPrefix: jan_skirt + femaleMask: UniformTop + - type: entity parent: UniformBase id: UniformEngineering @@ -28,13 +41,26 @@ components: - type: Sprite sprite: Clothing/Uniforms/uniform_engineering.rsi - state: engine + state: icon - type: Icon sprite: Clothing/Uniforms/uniform_engineering.rsi - state: engine + state: icon - type: Clothing sprite: Clothing/Uniforms/uniform_engineering.rsi +- type: entity + parent: UniformEngineering + id: UniformEngineeringSkirt + name: engineering jumpskirt + components: + - type: Sprite + state: engine_skirt + - type: Icon + state: engine_skirt + - type: Clothing + ClothingPrefix: engine_skirt + femaleMask: UniformTop + - type: entity parent: UniformBase id: UniformAssistant @@ -49,6 +75,107 @@ - type: Clothing sprite: Clothing/Uniforms/uniform_assistant.rsi +- type: entity + parent: UniformBase + id: UniformChemistry + name: chemistry jumpsuit + components: + - type: Sprite + sprite: Clothing/Uniforms/uniform_medical.rsi + state: chemistry + - type: Icon + sprite: Clothing/Uniforms/uniform_medical.rsi + state: chemistry + - type: Clothing + sprite: Clothing/Uniforms/uniform_medical.rsi + ClothingPrefix: chemistry + +- type: entity + parent: UniformChemistry + id: UniformChemistrySkirt + name: chemistry jumpskirt + components: + - type: Sprite + state: chemistry_skirt + - type: Icon + state: chemistry_skirt + - type: Clothing + ClothingPrefix: chemistry_skirt + femaleMask: UniformTop + +- type: entity + parent: UniformBase + id: UniformParamedic + name: paramedic jumpsuit + components: + - type: Sprite + sprite: Clothing/Uniforms/uniform_medical.rsi + state: paramedic + - type: Icon + sprite: Clothing/Uniforms/uniform_medical.rsi + state: paramedic + - type: Clothing + sprite: Clothing/Uniforms/uniform_medical.rsi + ClothingPrefix: paramedic + +- type: entity + parent: UniformParamedic + id: UniformParamedicSkirt + name: paramedic jumpskirt + components: + - type: Sprite + state: paramedic_skirt + - type: Icon + state: paramedic_skirt + - type: Clothing + ClothingPrefix: paramedic_skirt + femaleMask: UniformTop + +- type: entity + parent: UniformBase + id: UniformScrubsPurple + name: purple scrubs + components: + - type: Sprite + sprite: Clothing/Uniforms/uniform_medical.rsi + state: scrubspurple + - type: Icon + sprite: Clothing/Uniforms/uniform_medical.rsi + state: scrubspurple + - type: Clothing + sprite: Clothing/Uniforms/uniform_medical.rsi + ClothingPrefix: scrubspurple + +- type: entity + parent: UniformBase + id: UniformScrubsGreen + name: green scrubs + components: + - type: Sprite + sprite: Clothing/Uniforms/uniform_medical.rsi + state: scrubsgreen + - type: Icon + sprite: Clothing/Uniforms/uniform_medical.rsi + state: scrubsgreen + - type: Clothing + sprite: Clothing/Uniforms/uniform_medical.rsi + ClothingPrefix: scrubsgreen + +- type: entity + parent: UniformBase + id: UniformScrubsBlue + name: blue scrubs + components: + - type: Sprite + sprite: Clothing/Uniforms/uniform_medical.rsi + state: scrubsblue + - type: Icon + sprite: Clothing/Uniforms/uniform_medical.rsi + state: scrubsblue + - type: Clothing + sprite: Clothing/Uniforms/uniform_medical.rsi + ClothingPrefix: scrubsblue + - type: entity parent: UniformBase id: UniformClown @@ -80,36 +207,104 @@ - type: Clothing sprite: Clothing/Uniforms/uniform_sec.rsi +- type: entity + parent: UniformSec + id: UniformSecSkirt + name: security jumpskirt + description: A jumpskirt made of strong material, providing robust protection. + components: + - type: Sprite + state: sec_skirt + - type: Icon + state: sec_skirt + - type: Clothing + ClothingPrefix: sec_skirt + femaleMask: UniformTop + - type: entity parent: UniformBase id: UniformCargoTech - name: cargo technician jumpsuit - description: Shooooorts! They're comfy and easy to wear! + name: cargo tech jumpsuit + description: components: - type: Sprite sprite: Clothing/Uniforms/uniform_cargotech.rsi - state: cargotech + state: icon - type: Icon sprite: Clothing/Uniforms/uniform_cargotech.rsi - state: cargotech + state: icon - type: Clothing sprite: Clothing/Uniforms/uniform_cargotech.rsi +- type: entity + parent: UniformCargoTech + id: UniformCargoTechSkirt + name: cargo tech jumpskirt + components: + - type: Sprite + state: cargo_skirt + - type: Icon + state: cargo_skirt + - type: Clothing + ClothingPrefix: cargo_skirt + femaleMask: UniformTop + +- type: entity + parent: UniformBase + id: UniformQM + name: qm jumpsuit + description: + components: + - type: Sprite + sprite: Clothing/Uniforms/uniform_cargotech.rsi + state: qm + - type: Icon + sprite: Clothing/Uniforms/uniform_cargotech.rsi + state: qm + - type: Clothing + sprite: Clothing/Uniforms/uniform_cargotech.rsi + +- type: entity + parent: UniformQM + id: UniformQMSkirt + name: qm jumpskirt + components: + - type: Sprite + state: qm_skirt + - type: Icon + state: qm_skirt + - type: Clothing + ClothingPrefix: qm_skirt + femaleMask: UniformTop + - type: entity parent: UniformBase id: UniformChef - name: chef's uniform + name: chef uniform description: Can't cook without this. components: - type: Sprite sprite: Clothing/Uniforms/uniform_chef.rsi - state: chef + state: icon - type: Icon sprite: Clothing/Uniforms/uniform_chef.rsi - state: chef + state: icon - type: Clothing sprite: Clothing/Uniforms/uniform_chef.rsi +- type: entity + parent: UniformChef + id: UniformChefSkirt + name: chef skirt + components: + - type: Sprite + state: chef_skirt + - type: Icon + state: chef_skirt + - type: Clothing + ClothingPrefix: chef_skirt + femaleMask: UniformTop + - type: entity parent: UniformBase id: UniformCaptain @@ -125,51 +320,62 @@ - type: Clothing sprite: Clothing/Uniforms/uniform_captain.rsi -- type: entity - parent: UniformBase - id: UniformHoP - name: head of personnel jumpsuit - description: It's a jumpsuit worn by someone who works in the position of Head of Personnel. - components: - - type: Sprite - sprite: Clothing/Uniforms/uniform_hop.rsi - state: hop - - type: Icon - sprite: Clothing/Uniforms/uniform_hop.rsi - state: hop - - type: Clothing - sprite: Clothing/Uniforms/uniform_hop.rsi - - type: entity parent: UniformBase id: UniformChiefEngineer - name: chief engineer jumpsuit + name: ce jumpsuit description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. It has minor radiation shielding. components: - type: Sprite sprite: Clothing/Uniforms/uniform_ce.rsi - state: ce + state: icon - type: Icon sprite: Clothing/Uniforms/uniform_ce.rsi - state: ce + state: icon - type: Clothing sprite: Clothing/Uniforms/uniform_ce.rsi +- type: entity + parent: UniformChiefEngineer + id: UniformChiefEngineerSkirt + name: ce jumpskirt + components: + - type: Sprite + state: chief_skirt + - type: Icon + state: chief_skirt + - type: Clothing + ClothingPrefix: chief_skirt + femaleMask: UniformTop + - type: entity parent: UniformBase id: UniformCMO - name: chief medical officer jumpsuit + name: cmo jumpsuit description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. components: - type: Sprite sprite: Clothing/Uniforms/uniform_cmo.rsi - state: cmo + state: icon - type: Icon sprite: Clothing/Uniforms/uniform_cmo.rsi - state: cmo + state: icon - type: Clothing sprite: Clothing/Uniforms/uniform_cmo.rsi +- type: entity + parent: UniformCMO + id: UniformCMOSkirt + name: cmo jumpskirt + components: + - type: Sprite + state: cmo_skirt + - type: Icon + state: cmo_skirt + - type: Clothing + ClothingPrefix: cmo_skirt + femaleMask: UniformTop + - type: entity parent: UniformBase id: UniformMedicalDoctor @@ -177,13 +383,26 @@ description: It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel. components: - type: Sprite - sprite: Clothing/Uniforms/uniform_md.rsi - state: md + sprite: Clothing/Uniforms/uniform_medical.rsi + state: icon - type: Icon - sprite: Clothing/Uniforms/uniform_md.rsi - state: md + sprite: Clothing/Uniforms/uniform_medical.rsi + state: icon - type: Clothing - sprite: Clothing/Uniforms/uniform_md.rsi + sprite: Clothing/Uniforms/uniform_medical.rsi + +- type: entity + parent: UniformMedicalDoctor + id: UniformMedicalDoctorSkirt + name: medical doctor jumpskirt + components: + - type: Sprite + state: medical_skirt + - type: Icon + state: medical_skirt + - type: Clothing + ClothingPrefix: medical_skirt + femaleMask: UniformTop - type: entity parent: UniformBase @@ -193,32 +412,58 @@ components: - type: Sprite sprite: Clothing/Uniforms/uniform_scientist.rsi - state: scientist + state: icon - type: Icon sprite: Clothing/Uniforms/uniform_scientist.rsi - state: scientist + state: icon - type: Clothing sprite: Clothing/Uniforms/uniform_scientist.rsi +- type: entity + parent: UniformScientist + id: UniformScientistSkirt + name: scientist jumpskirt + components: + - type: Sprite + state: sci_skirt + - type: Icon + state: sci_skirt + - type: Clothing + ClothingPrefix: sci_skirt + femaleMask: UniformTop + - type: entity parent: UniformBase id: UniformResearchDirector - name: research director vest suit - description: It's a suit worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. + name: rd turtleneck + description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. components: - type: Sprite - sprite: Clothing/Uniforms/uniform_rd.rsi - state: rd + sprite: Clothing/Uniforms/uniform_rnd.rsi + state: icon - type: Icon - sprite: Clothing/Uniforms/uniform_rd.rsi - state: rd + sprite: Clothing/Uniforms/uniform_rnd.rsi + state: icon - type: Clothing - sprite: Clothing/Uniforms/uniform_rd.rsi + sprite: Clothing/Uniforms/uniform_rnd.rsi + +- type: entity + parent: UniformResearchDirector + id: UniformResearchDirectorSkirt + name: rd skirtleneck + components: + - type: Sprite + state: rnd_skirt + - type: Icon + state: rnd_skirt + - type: Clothing + ClothingPrefix: rnd_skirt + femaleMask: UniformTop - type: entity parent: UniformBase id: UniformMime - name: mime's clothes + name: mime suit description: ... components: - type: Sprite @@ -230,17 +475,199 @@ - type: Clothing sprite: Clothing/Uniforms/uniform_mime.rsi +- type: entity + parent: UniformMime + id: UniformMimeSkirt + name: mime skirt + components: + - type: Sprite + state: mime_skirt + - type: Icon + state: mime_skirt + - type: Clothing + ClothingPrefix: mime_skirt + femaleMask: UniformTop + - type: entity parent: UniformBase - id: UniformHoS - name: head of security jumpsuit - description: A security jumpsuit decorated for those few with the dedication to achieve the position of Head of Security. + id: UniformHoSAlt + name: head of security turtleneck + description: components: - type: Sprite sprite: Clothing/Uniforms/uniform_hos.rsi - state: hos + state: hosalt - type: Icon sprite: Clothing/Uniforms/uniform_hos.rsi - state: hos + state: hosalt - type: Clothing sprite: Clothing/Uniforms/uniform_hos.rsi + HeldPrefix: hosalt + +- type: entity + parent: UniformHoSAlt + id: UniformHoSAltSkirt + name: head of security skirtleneck + components: + - type: Sprite + state: hosalt_skirt + - type: Icon + state: hosalt_skirt + - type: Clothing + sprite: Clothing/Uniforms/uniform_hos.rsi + ClothingPrefix: hosalt_skirt + femaleMask: UniformTop + HeldPrefix: hosalt + +- type: entity + parent: UniformBase + id: UniformHoS + name: head of security jumpsuit + description: + components: + - type: Sprite + sprite: Clothing/Uniforms/uniform_hos.rsi + state: icon + - type: Icon + sprite: Clothing/Uniforms/uniform_hos.rsi + state: icon + - type: Clothing + sprite: Clothing/Uniforms/uniform_hos.rsi + +- type: entity + parent: UniformHoS + id: UniformHoSSkirt + name: head of security jumpskirt + components: + - type: Sprite + state: hos_skirt + - type: Icon + state: hos_skirt + - type: Clothing + sprite: Clothing/Uniforms/uniform_hos.rsi + ClothingPrefix: hos_skirt + femaleMask: UniformTop + +- type: entity + parent: UniformBase + id: UniformPrisoner + name: prisoner jumpsuit + description: + components: + - type: Sprite + sprite: Clothing/Uniforms/uniform_prisoner.rsi + state: icon + - type: Icon + sprite: Clothing/Uniforms/uniform_prisoner.rsi + state: icon + - type: Clothing + sprite: Clothing/Uniforms/uniform_prisoner.rsi + +- type: entity + parent: UniformPrisoner + id: UniformPrisonerSkirt + name: prisoner jumpskirt + components: + - type: Sprite + state: prisoner_skirt + - type: Icon + state: prisoner_skirt + - type: Clothing + ClothingPrefix: prisoner_skirt + femaleMask: UniformTop + +- type: entity + parent: UniformBase + id: UniformHop + name: hop jumpsuit + description: + components: + - type: Sprite + sprite: Clothing/Uniforms/uniform_hop.rsi + state: icon + - type: Icon + sprite: Clothing/Uniforms/uniform_hop.rsi + state: icon + - type: Clothing + sprite: Clothing/Uniforms/uniform_hop.rsi + +- type: entity + parent: UniformHop + id: UniformHopSkirt + name: hop jumpskirt + components: + - type: Sprite + state: hop_skirt + - type: Icon + state: hop_skirt + - type: Clothing + ClothingPrefix: hop_skirt + femaleMask: UniformTop + +- type: entity + parent: UniformBase + id: UniformHydroponics + name: hydroponics jumpsuit + description: + components: + - type: Sprite + sprite: Clothing/Uniforms/uniform_hydro.rsi + state: icon + - type: Icon + sprite: Clothing/Uniforms/uniform_hydro.rsi + state: icon + - type: Clothing + sprite: Clothing/Uniforms/uniform_hydro.rsi + +- type: entity + parent: UniformHydroponics + id: UniformHydroponicsSkirt + name: hydroponics jumpskirt + components: + - type: Sprite + state: hydro_skirt + - type: Icon + state: hydro_skirt + - type: Clothing + ClothingPrefix: hydro_skirt + femaleMask: UniformTop + +- type: entity + parent: UniformBase + id: UniformBartender + name: bartender's uniform + description: It looks like it could use some more flair. + components: + - type: Sprite + sprite: Clothing/Uniforms/bartender.rsi + state: icon + - type: Icon + sprite: Clothing/Uniforms/bartender.rsi + state: icon + - type: Clothing + sprite: Clothing/Uniforms/bartender.rsi + +- type: entity + parent: UniformBartender + id: UniformBartenderSkirt + name: bartender's skirt + components: + - type: Sprite + state: skirt + - type: Icon + state: skirt + - type: Clothing + ClothingPrefix: skirt + femaleMask: UniformTop + +- type: entity + parent: UniformBartender + id: UniformBartenderPurple + name: purple bartender's uniform + components: + - type: Sprite + state: purple + - type: Icon + state: purple + - type: Clothing + ClothingPrefix: purple diff --git a/Resources/Textures/Clothing/Shoes/beesocks.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/beesocks.rsi/equipped-FEET.png new file mode 100644 index 0000000000..6a803d7431 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/beesocks.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/beesocks.rsi/icon.png b/Resources/Textures/Clothing/Shoes/beesocks.rsi/icon.png new file mode 100644 index 0000000000..469f0f2ee2 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/beesocks.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/beesocks.rsi/meta.json b/Resources/Textures/Clothing/Shoes/beesocks.rsi/meta.json new file mode 100644 index 0000000000..9135c12b9b --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/beesocks.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Shoes/codersocks.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/codersocks.rsi/equipped-FEET.png new file mode 100644 index 0000000000..0fea622063 Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/codersocks.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/Clothing/Shoes/codersocks.rsi/icon.png b/Resources/Textures/Clothing/Shoes/codersocks.rsi/icon.png new file mode 100644 index 0000000000..ada609941e Binary files /dev/null and b/Resources/Textures/Clothing/Shoes/codersocks.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Shoes/codersocks.rsi/meta.json b/Resources/Textures/Clothing/Shoes/codersocks.rsi/meta.json new file mode 100644 index 0000000000..9135c12b9b --- /dev/null +++ b/Resources/Textures/Clothing/Shoes/codersocks.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/bartender.rsi/barman.png b/Resources/Textures/Clothing/Uniforms/bartender.rsi/icon.png similarity index 100% rename from Resources/Textures/Clothing/Uniforms/bartender.rsi/barman.png rename to Resources/Textures/Clothing/Uniforms/bartender.rsi/icon.png diff --git a/Resources/Textures/Clothing/Uniforms/bartender.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/bartender.rsi/meta.json index 1083be0cef..678d053575 100644 --- a/Resources/Textures/Clothing/Uniforms/bartender.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/bartender.rsi/meta.json @@ -1 +1,144 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"barman","directions":1,"delays":[[1.0]]},{"name":"barman_d","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"purple-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"purple","directions":1,"delays":[[1.0]]},{"name":"skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"skirt","directions":1,"delays":[[1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "barman_d", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "purple-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "purple", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/blue-inhand-left.png b/Resources/Textures/Clothing/Uniforms/color.rsi/blue-inhand-left.png index 6e92e6d045..6aad457526 100644 Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/blue-inhand-left.png and b/Resources/Textures/Clothing/Uniforms/color.rsi/blue-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/blue-inhand-right.png b/Resources/Textures/Clothing/Uniforms/color.rsi/blue-inhand-right.png index 664744efab..b185b62396 100644 Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/blue-inhand-right.png and b/Resources/Textures/Clothing/Uniforms/color.rsi/blue-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue-inhand-left.png b/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue-inhand-left.png new file mode 100644 index 0000000000..ea01f616e4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue-inhand-right.png b/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue-inhand-right.png new file mode 100644 index 0000000000..2ef7181ab0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/color.rsi/darkblue-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple-inhand-left.png b/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple-inhand-left.png new file mode 100644 index 0000000000..46be5288e6 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple-inhand-right.png b/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple-inhand-right.png new file mode 100644 index 0000000000..f1911c7ec0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/color.rsi/lightpurple-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/maroon-inhand-left.png b/Resources/Textures/Clothing/Uniforms/color.rsi/maroon-inhand-left.png new file mode 100644 index 0000000000..a703128c96 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/color.rsi/maroon-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/maroon-inhand-right.png b/Resources/Textures/Clothing/Uniforms/color.rsi/maroon-inhand-right.png new file mode 100644 index 0000000000..8c73e1c7ce Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/color.rsi/maroon-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/color.rsi/meta.json index b1ab26e5da..395fb66630 100644 --- a/Resources/Textures/Clothing/Uniforms/color.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/color.rsi/meta.json @@ -1 +1,1809 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"black-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"black_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"black_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"blue-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"blue_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"blue_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"brown-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"brown_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"brown_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"darkblue-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"darkblue_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"darkblue_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"darkgreen-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"darkgreen_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"darkgreen_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"green-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"green_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"green_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"grey-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"grey_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"grey_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"lightbrown-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"lightbrown_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"lightbrown_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"lightpurple-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"lightpurple_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"lightpurple_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"maroon-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"maroon_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"maroon_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"orange-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"orange_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"orange_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"pink-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"pink_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"pink_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"rainbow-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"rainbow_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"red-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"red_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"red_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"teal-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"teal_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"teal_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"white-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"white_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"white_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"yellow-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"yellow_d-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"yellow_skirt-equipped-INNERCLOTHING","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"black","directions":1,"delays":[[1.0]]},{"name":"black-inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"black-inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"black_skirt","directions":1,"delays":[[1.0]]},{"name":"blue","directions":1,"delays":[[1.0]]},{"name":"blue-inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"blue-inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"blue_skirt","directions":1,"delays":[[1.0]]},{"name":"brown","directions":1,"delays":[[1.0]]},{"name":"brown_skirt","directions":1,"delays":[[1.0]]},{"name":"darkblue","directions":1,"delays":[[1.0]]},{"name":"darkblue_skirt","directions":1,"delays":[[1.0]]},{"name":"darkgreen","directions":1,"delays":[[1.0]]},{"name":"darkgreen_skirt","directions":1,"delays":[[1.0]]},{"name":"green","directions":1,"delays":[[1.0]]},{"name":"green-inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"green-inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"green_skirt","directions":1,"delays":[[1.0]]},{"name":"grey","directions":1,"delays":[[1.0]]},{"name":"grey-inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"grey-inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"grey_skirt","directions":1,"delays":[[1.0]]},{"name":"lightbrown","directions":1,"delays":[[1.0]]},{"name":"lightbrown-inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"lightbrown-inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"lightbrown_skirt","directions":1,"delays":[[1.0]]},{"name":"lightpurple","directions":1,"delays":[[1.0]]},{"name":"lightpurple_skirt","directions":1,"delays":[[1.0]]},{"name":"maroon","directions":1,"delays":[[1.0]]},{"name":"maroon_skirt","directions":1,"delays":[[1.0]]},{"name":"orange","directions":1,"delays":[[1.0]]},{"name":"orange-inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"orange-inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"orange_skirt","directions":1,"delays":[[1.0]]},{"name":"pink","directions":1,"delays":[[1.0]]},{"name":"pink_skirt","directions":1,"delays":[[1.0]]},{"name":"purple-inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"purple-inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"rainbow","directions":1,"delays":[[1.0]]},{"name":"rainbow-inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"rainbow-inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"rainbow_skirt","directions":1,"delays":[[1.0]]},{"name":"random_jumpsuit","directions":1,"delays":[[1.0]]},{"name":"red","directions":1,"delays":[[1.0]]},{"name":"red-inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"red-inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"red_skirt","directions":1,"delays":[[1.0]]},{"name":"teal","directions":1,"delays":[[1.0]]},{"name":"teal_skirt","directions":1,"delays":[[1.0]]},{"name":"white","directions":1,"delays":[[1.0]]},{"name":"white-inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"white-inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"white_skirt","directions":1,"delays":[[1.0]]},{"name":"yellow","directions":1,"delays":[[1.0]]},{"name":"yellow-inhand-left","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"yellow-inhand-right","directions":4,"delays":[[1.0],[1.0],[1.0],[1.0]]},{"name":"yellow_skirt","directions":1,"delays":[[1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "black-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "black_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "black_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "blue-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "blue_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "blue_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "brown-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "brown_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "brown_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "darkblue-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "darkblue_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "darkblue_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "darkgreen-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "darkgreen_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "darkgreen_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "green-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "green_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "green_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "grey-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "grey_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "grey_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "lightbrown-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "lightbrown_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "lightbrown_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "lightpurple-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "lightpurple_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "lightpurple_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "maroon-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "maroon_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "maroon_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "orange-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "orange_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "orange_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "pink-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "pink_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "pink_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "rainbow-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "rainbow_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "red-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "red-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "s-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "red_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "red_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "teal-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "teal_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "teal_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "white-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "white_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "white_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "yellow-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "yellow_d-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "yellow_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "black", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "black-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "black-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "black_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "blue", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "blue-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "blue-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "blue_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "brown", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "brown_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "darkblue", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "darkblue_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "darkgreen", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "darkgreen_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "green", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "green-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "green-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "green_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "grey", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "grey-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "grey-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "grey_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "s", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "lightbrown", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "lightbrown-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "lightbrown-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "lightbrown_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "lightpurple", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "lightpurple_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "maroon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "maroon_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "orange", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "orange-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "orange-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "darkblue-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "darkblue-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "lightpurple-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "lightpurple-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "maroon-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "maroon-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "teal-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "teal-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "pink-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "pink-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "orange_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "pink", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "pink_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "rainbow", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "rainbow-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "rainbow-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "rainbow_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "random_jumpsuit", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "red", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "red-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "red-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "red_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "teal", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "teal_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "white", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "white-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "white-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "white_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "yellow", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "yellow-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "yellow-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "yellow_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/orange-inhand-left.png b/Resources/Textures/Clothing/Uniforms/color.rsi/orange-inhand-left.png index 07847bba62..5e5c42697c 100644 Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/orange-inhand-left.png and b/Resources/Textures/Clothing/Uniforms/color.rsi/orange-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/orange-inhand-right.png b/Resources/Textures/Clothing/Uniforms/color.rsi/orange-inhand-right.png index 9473237297..fee1dd85cd 100644 Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/orange-inhand-right.png and b/Resources/Textures/Clothing/Uniforms/color.rsi/orange-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/pink-inhand-left.png b/Resources/Textures/Clothing/Uniforms/color.rsi/pink-inhand-left.png new file mode 100644 index 0000000000..9112f9b980 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/color.rsi/pink-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/pink-inhand-right.png b/Resources/Textures/Clothing/Uniforms/color.rsi/pink-inhand-right.png new file mode 100644 index 0000000000..d3df7bcb6b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/color.rsi/pink-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/purple-inhand-left.png b/Resources/Textures/Clothing/Uniforms/color.rsi/purple-inhand-left.png deleted file mode 100644 index 1163e084ec..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/purple-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/purple-inhand-right.png b/Resources/Textures/Clothing/Uniforms/color.rsi/purple-inhand-right.png deleted file mode 100644 index e5d2af9bc8..0000000000 Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/purple-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/s-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/color.rsi/s-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..213562cf97 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/color.rsi/s-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/s.png b/Resources/Textures/Clothing/Uniforms/color.rsi/s.png new file mode 100644 index 0000000000..7282eb27f6 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/color.rsi/s.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/teal-inhand-left.png b/Resources/Textures/Clothing/Uniforms/color.rsi/teal-inhand-left.png new file mode 100644 index 0000000000..748bfb2e97 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/color.rsi/teal-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/teal-inhand-right.png b/Resources/Textures/Clothing/Uniforms/color.rsi/teal-inhand-right.png new file mode 100644 index 0000000000..4944e6fc0b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/color.rsi/teal-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/yellow-inhand-left.png b/Resources/Textures/Clothing/Uniforms/color.rsi/yellow-inhand-left.png index dbfdbb270f..6959537bce 100644 Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/yellow-inhand-left.png and b/Resources/Textures/Clothing/Uniforms/color.rsi/yellow-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/color.rsi/yellow-inhand-right.png b/Resources/Textures/Clothing/Uniforms/color.rsi/yellow-inhand-right.png index 0ae0c3dd95..148b981232 100644 Binary files a/Resources/Textures/Clothing/Uniforms/color.rsi/yellow-inhand-right.png and b/Resources/Textures/Clothing/Uniforms/color.rsi/yellow-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargo_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargo_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..cf98ea6389 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargo_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargo_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargo_skirt.png new file mode 100644 index 0000000000..6b24d163fd Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/cargo_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/icon.png new file mode 100644 index 0000000000..d4e48f65e4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/meta.json index 340c5aa220..9b69da180b 100644 --- a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/meta.json @@ -1 +1,155 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "cargotech", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "cargo_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "qm", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "qm_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "cargo_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "qm-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "qm_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..7e73af119c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm.png b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm.png new file mode 100644 index 0000000000..13dfc341d3 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..0a9dead099 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm_skirt.png new file mode 100644 index 0000000000..8cce6ffffa Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cargotech.rsi/qm_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/chief_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/chief_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..3263c54ec9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/chief_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/chief_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/chief_skirt.png new file mode 100644 index 0000000000..5f662e0280 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/chief_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/icon.png new file mode 100644 index 0000000000..e2c37a0c2c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/meta.json index 0d1d9076dd..e2362cc36b 100644 --- a/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/uniform_ce.rsi/meta.json @@ -1 +1,101 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "ce", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "chief_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "chief_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..37435795c5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef_skirt.png new file mode 100644 index 0000000000..6969d40be7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/chef_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/icon.png new file mode 100644 index 0000000000..cb5599f81c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/meta.json index 2f24b9fc23..fb7b2822a0 100644 --- a/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/uniform_chef.rsi/meta.json @@ -5,23 +5,41 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", + "copyright": "https://github.com/tgstation/tgstation", "states": [ { "name": "equipped-INNERCLOTHING", "directions": 4, "delays": [ [ - 1.0 + 1 ], [ - 1.0 + 1 ], [ - 1.0 + 1 ], [ - 1.0 + 1 + ] + ] + }, + { + "name": "chef_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 ] ] }, @@ -30,16 +48,16 @@ "directions": 4, "delays": [ [ - 1.0 + 1 ], [ - 1.0 + 1 ], [ - 1.0 + 1 ], [ - 1.0 + 1 ] ] }, @@ -48,25 +66,34 @@ "directions": 4, "delays": [ [ - 1.0 + 1 ], [ - 1.0 + 1 ], [ - 1.0 + 1 ], [ - 1.0 + 1 ] ] }, { - "name": "chef", + "name": "icon", "directions": 1, "delays": [ [ - 1.0 + 1 + ] + ] + }, + { + "name": "chef_skirt", + "directions": 1, + "delays": [ + [ + 1 ] ] } diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..955ee298f6 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo_skirt.png new file mode 100644 index 0000000000..029688868d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/cmo_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/icon.png new file mode 100644 index 0000000000..5b695db74e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/meta.json index c2e6055487..8008dfed9e 100644 --- a/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/uniform_cmo.rsi/meta.json @@ -1 +1,101 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "cmo", "directions": 1, "delays": [[1.0]]}, {"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "cmo_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "cmo_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..0fe314e778 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine_skirt.png new file mode 100644 index 0000000000..76ea48170d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/engine_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/equipped-INNERCLOTHING.png index b60ce95734..51b8458cf2 100644 Binary files a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/icon.png new file mode 100644 index 0000000000..51f8d000f6 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/meta.json index 0c0ed98d44..aaba98511e 100644 --- a/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/uniform_engineering.rsi/meta.json @@ -5,10 +5,19 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", + "copyright": "https://github.com/tgstation/tgstation", "states": [ { - "name": "engine", + "name": "icon", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "engine_skirt", "directions": 1, "delays": [ [ @@ -34,6 +43,24 @@ ] ] }, + { + "name": "engine_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, { "name": "inhand-left", "directions": 4, diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..cf547d1ce9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop_skirt.png new file mode 100644 index 0000000000..69b9a2ff97 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/hop_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/icon.png new file mode 100644 index 0000000000..f65a93f00d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/meta.json index d76243d007..be5ce7a876 100644 --- a/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/uniform_hop.rsi/meta.json @@ -1 +1,101 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hop", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "hop_skirt", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "hop_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ], + [ + 1.0 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/equipped-INNERCLOTHING.png index b3c4071233..80984c51c1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..0eff0ab3fa Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_skirt.png new file mode 100644 index 0000000000..31ba54e8af Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hos_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..d034a9fbb8 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-inhand-left.png new file mode 100644 index 0000000000..2e4a7103ae Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-inhand-right.png new file mode 100644 index 0000000000..8d34f3244e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt.png new file mode 100644 index 0000000000..6dde5c525b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..b8b3c25e76 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt_skirt.png new file mode 100644 index 0000000000..682bc0ea02 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/hosalt_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/icon.png new file mode 100644 index 0000000000..9400796353 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-left.png index 30f0be7f75..4ddf7ba69f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-right.png index 8a3b1671ac..63de853068 100644 Binary files a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/meta.json index 2afb00249f..8a88429721 100644 --- a/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/uniform_hos.rsi/meta.json @@ -1 +1,191 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "hos", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "hos_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "hosalt_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "hosalt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "hosalt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "hosalt_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "hos_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "hosalt-inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "hosalt-inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..bf66e84ec6 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/hydro_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/hydro_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..f38f8dd3a7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/hydro_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/hydro_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/hydro_skirt.png new file mode 100644 index 0000000000..a377a731b1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/hydro_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/icon.png new file mode 100644 index 0000000000..5393fcdf4b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/inhand-left.png new file mode 100644 index 0000000000..dccc69e247 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/inhand-right.png new file mode 100644 index 0000000000..7b999ae252 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/meta.json new file mode 100644 index 0000000000..555ae48c20 --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/uniform_hydro.rsi/meta.json @@ -0,0 +1,101 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "hydro_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "hydro_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/icon.png new file mode 100644 index 0000000000..1a0adb6f1a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/jan_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/jan_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..88bbd84397 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/jan_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/jan_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/jan_skirt.png new file mode 100644 index 0000000000..b014441074 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/jan_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/meta.json index 12a1932f33..6bd9062f51 100644 --- a/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/uniform_janitor.rsi/meta.json @@ -5,23 +5,41 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", + "copyright": "https://github.com/tgstation/tgstation", "states": [ + { + "name": "jan_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, { "name": "equipped-INNERCLOTHING", "directions": 4, "delays": [ [ - 1.0 + 1 ], [ - 1.0 + 1 ], [ - 1.0 + 1 ], [ - 1.0 + 1 ] ] }, @@ -30,16 +48,16 @@ "directions": 4, "delays": [ [ - 1.0 + 1 ], [ - 1.0 + 1 ], [ - 1.0 + 1 ], [ - 1.0 + 1 ] ] }, @@ -48,25 +66,34 @@ "directions": 4, "delays": [ [ - 1.0 + 1 ], [ - 1.0 + 1 ], [ - 1.0 + 1 ], [ - 1.0 + 1 ] ] }, { - "name": "janitor", + "name": "icon", "directions": 1, "delays": [ [ - 1.0 + 1 + ] + ] + }, + { + "name": "jan_skirt", + "directions": 1, + "delays": [ + [ + 1 ] ] } diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..647f95e4b5 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry.png new file mode 100644 index 0000000000..178e741a1c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..5608a2451c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry_skirt.png new file mode 100644 index 0000000000..c5d3ad90e0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/chemistry_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..2fa90b99bb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/icon.png new file mode 100644 index 0000000000..c36a4c0f4c Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/inhand-left.png new file mode 100644 index 0000000000..5fca30bad4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/inhand-right.png new file mode 100644 index 0000000000..5d4a08b433 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/medical_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/medical_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..3128383e68 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/medical_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/medical_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/medical_skirt.png new file mode 100644 index 0000000000..5afae7d932 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/medical_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/meta.json new file mode 100644 index 0000000000..a62ae14bbf --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/meta.json @@ -0,0 +1,290 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "chemistry-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "chemistry_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "medical_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "paramedic-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "paramedic_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "scrubsblue-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "scrubspurple-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "scrubsgreen-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "medical_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "paramedic", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "paramedic_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "scrubsblue", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "scrubsgreen", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "scrubspurple", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "chemistry", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "chemistry_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..dcda0ddbc9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic.png new file mode 100644 index 0000000000..ae8083baf2 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..b582d02aa8 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic_skirt.png new file mode 100644 index 0000000000..3440af11d7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/paramedic_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsblue-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsblue-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..95f66fab84 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsblue-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsblue.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsblue.png new file mode 100644 index 0000000000..91cad641b2 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsblue.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsgreen-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsgreen-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..9323083108 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsgreen-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsgreen.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsgreen.png new file mode 100644 index 0000000000..688b52822e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubsgreen.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubspurple-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubspurple-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..588b96e1b3 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubspurple-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubspurple.png b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubspurple.png new file mode 100644 index 0000000000..078c780eeb Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_medical.rsi/scrubspurple.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/meta.json index 43a137083a..6894f1aacb 100644 --- a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/meta.json @@ -25,6 +25,24 @@ ] ] }, + { + "name": "mime_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, { "name": "inhand-left", "directions": 4, @@ -69,6 +87,15 @@ 1 ] ] + }, + { + "name": "mime_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] } ] } diff --git a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/mime_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/mime_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..e6532029e4 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/mime_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/mime_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/mime_skirt.png new file mode 100644 index 0000000000..ae1f854292 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_mime.rsi/mime_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..a4ec7058a1 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/icon.png new file mode 100644 index 0000000000..6910994580 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/inhand-left.png new file mode 100644 index 0000000000..0e02959652 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/inhand-right.png new file mode 100644 index 0000000000..cfbe848c3b Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/meta.json new file mode 100644 index 0000000000..bca2534a2b --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/meta.json @@ -0,0 +1,101 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "prisoner_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "prisoner_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/prisoner_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/prisoner_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..1492d76a1d Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/prisoner_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/prisoner_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/prisoner_skirt.png new file mode 100644 index 0000000000..e2cb52fdec Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_prisoner.rsi/prisoner_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..10d438e86a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/icon.png new file mode 100644 index 0000000000..511d13dbaa Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/inhand-left.png new file mode 100644 index 0000000000..21b03dcf0e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/inhand-right.png new file mode 100644 index 0000000000..dd794e37b0 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/meta.json new file mode 100644 index 0000000000..34220d134e --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/meta.json @@ -0,0 +1,101 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "rnd_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "rnd_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/rnd_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/rnd_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..3671a3b548 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/rnd_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/rnd_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/rnd_skirt.png new file mode 100644 index 0000000000..77e75f8fb9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_rnd.rsi/rnd_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/icon.png new file mode 100644 index 0000000000..56b47c78d7 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/meta.json index 09a94e8f35..a76ba8c5e5 100644 --- a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/meta.json @@ -1 +1,101 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/BeeStation/BeeStation-Hornet", "states": [{"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "scientist", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sci_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "sci_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/sci_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/sci_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..a55307841a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/sci_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/sci_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/sci_skirt.png new file mode 100644 index 0000000000..cf454bc23a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_scientist.rsi/sci_skirt.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/equipped-INNERCLOTHING.png index 0b70362132..b3977c9748 100644 Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/icon.png index 4e2aefba0e..a3186ba4c1 100644 Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/icon.png and b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-left.png index 7a2fab4918..4ddf7ba69f 100644 Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-left.png and b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-right.png index 8a3b1671ac..63de853068 100644 Binary files a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-right.png and b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/meta.json index 16408ad188..8b1f7477da 100644 --- a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/meta.json +++ b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/meta.json @@ -1 +1,101 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/vgstation-coders/vgstation13 at commit 125c975f1b3bf9826b37029e9ab5a5f89e975a7e", "states": [{"name": "equipped-INNERCLOTHING", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]} \ No newline at end of file +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/tgstation/tgstation", + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "sec_skirt-equipped-INNERCLOTHING", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "sec_skirt", + "directions": 1, + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/sec_skirt-equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/sec_skirt-equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..7c12f7cbe9 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/sec_skirt-equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/sec_skirt.png b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/sec_skirt.png new file mode 100644 index 0000000000..aac288256a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/uniform_sec.rsi/sec_skirt.png differ