diff --git a/Resources/Prototypes/White/Fluff/fluff.yml b/Resources/Prototypes/White/Fluff/fluff.yml index c7b6ddf500..1110ff962b 100644 --- a/Resources/Prototypes/White/Fluff/fluff.yml +++ b/Resources/Prototypes/White/Fluff/fluff.yml @@ -53,6 +53,31 @@ sprite: White/Fluff/DOOMMAX/helmetglamour.rsi - type: GiftIgnore +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitGamma + suffix: fluff + name: Снаряжение отряда «Гамма» + description: Довольно старая и потрёпанная форма секретного и элитного отряда. + components: + - type: Sprite + sprite: White/Fluff/DOOMMAX/uniform.rsi + - type: Clothing + sprite: White/Fluff/DOOMMAX/uniform.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretGamma + suffix: fluff + name: Потрёпанный берет + description: Старый, слегка рваный и подгоревший берет лидера отряда «Гамма». На нем еще не засохла кровь былых боев. + components: + - type: Sprite + sprite: White/Fluff/DOOMMAX/hat.rsi + - type: Clothing + sprite: White/Fluff/DOOMMAX/hat.rsi + + # Maury #- type: entity # parent: ClothingUniformJumpsuitChemistry diff --git a/Resources/Prototypes/White/Fluff/sponsor.yml b/Resources/Prototypes/White/Fluff/sponsor.yml index bfa9f2a274..6731ab6b9a 100644 --- a/Resources/Prototypes/White/Fluff/sponsor.yml +++ b/Resources/Prototypes/White/Fluff/sponsor.yml @@ -3,13 +3,25 @@ id: SuitGlamorousLoadout entity: ClothingOuterSuitGlamorous sponsorOnly: true - blacklistJobs: [Captain, HeadOfPersonnel, ChiefEngineer, ChiefMedicalOfficer, ResearchDirector, HeadOfSecurity, Quartermaster] + blacklistJobs: [Captain, HeadOfPersonnel, ChiefEngineer, ChiefMedicalOfficer, ResearchDirector, HeadOfSecurity, Warden, Detective, SeniorOfficer, SecurityOfficer, Quartermaster] - type: loadout id: ClothingOuterHardsuitEVAGLAMOURsLoadout entity: ClothingOuterHardsuitEVAGLAMOUR sponsorOnly: true - whitelistJobs: [Captain, HeadOfPersonnel, ChiefEngineer, ChiefMedicalOfficer, ResearchDirector, HeadOfSecurity, Quartermaster] + whitelistJobs: [Captain, HeadOfPersonnel, ChiefEngineer, ChiefMedicalOfficer, ResearchDirector, Quartermaster] + +- type: loadout + id: GammaUniformLoadout + entity: ClothingUniformJumpsuitGamma + sponsorOnly: true + whitelistJobs: [HeadOfSecurity, Warden, SecurityOfficer, Detective, SeniorOfficer] + +- type: loadout + id: GammaBeretLoadout + entity: ClothingHeadHatBeretGamma + sponsorOnly: true + whitelistJobs: [HeadOfSecurity, Warden, SecurityOfficer, Detective, SeniorOfficer] # Maury #- type: loadout diff --git a/Resources/Textures/White/Fluff/DOOMMAX/hat.rsi/equipped-HELMET.png b/Resources/Textures/White/Fluff/DOOMMAX/hat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..87d2fd021d Binary files /dev/null and b/Resources/Textures/White/Fluff/DOOMMAX/hat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/White/Fluff/DOOMMAX/hat.rsi/icon.png b/Resources/Textures/White/Fluff/DOOMMAX/hat.rsi/icon.png new file mode 100644 index 0000000000..197febcb23 Binary files /dev/null and b/Resources/Textures/White/Fluff/DOOMMAX/hat.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/DOOMMAX/hat.rsi/meta.json b/Resources/Textures/White/Fluff/DOOMMAX/hat.rsi/meta.json new file mode 100644 index 0000000000..bbedc60f5f --- /dev/null +++ b/Resources/Textures/White/Fluff/DOOMMAX/hat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Meow", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..2f757b57f7 Binary files /dev/null and b/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/icon.png b/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/icon.png new file mode 100644 index 0000000000..aaddb15ea3 Binary files /dev/null and b/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/icon.png differ diff --git a/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/inhand-left.png b/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/inhand-left.png new file mode 100644 index 0000000000..2e4a7103ae Binary files /dev/null and b/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/inhand-left.png differ diff --git a/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/inhand-right.png b/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/inhand-right.png new file mode 100644 index 0000000000..8d34f3244e Binary files /dev/null and b/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/inhand-right.png differ diff --git a/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/meta.json b/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/meta.json new file mode 100644 index 0000000000..450762e080 --- /dev/null +++ b/Resources/Textures/White/Fluff/DOOMMAX/uniform.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, monkey made by brainfood1183 (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}