diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 5c4dcf9b93f3..6dd966a48a47 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -48,6 +48,7 @@ job-name-senior-engineer = Senior Engineer job-name-senior-researcher = Senior Researcher job-name-senior-physician = Senior Physician job-name-senior-officer = Sergeant +job-name-blueshield = Blueshield Officer # Role timers - Make these alphabetical or I cut you JobAtmosphericTechnician = Atmospheric Technician diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 6c7df6878b64..f35250728e3a 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -384,3 +384,16 @@ contents: - id: BoxSurvivalBrigmedic - id: Flash + +- type: entity + noSpawn: true + parent: ClothingBackpackBlueshield + id: ClothingBackpackBlueshieldFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalSecurity + - id: MedkitAdvancedFilled + - id: HandheldCrewMonitor + - id: Flash + - id: WeaponDisabler \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index a5902f03d197..2b944a7dbdc6 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -259,3 +259,16 @@ - type: StorageFill contents: - id: BoxSurvival + +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelBlueshield + id: ClothingBackpackDuffelBlueshieldFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalSecurity + - id: MedkitAdvancedFilled + - id: HandheldCrewMonitor + - id: Flash + - id: WeaponDisabler \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 008d3bf066db..72e016324100 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -281,3 +281,16 @@ contents: - id: BoxSurvival - id: RubberStampMime + +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelBlueshield + id: ClothingBackpackSatchelBlueshieldFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalSecurity + - id: MedkitAdvancedFilled + - id: HandheldCrewMonitor + - id: Flash + - id: WeaponDisabler \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 86a94921836a..5b9d2ae49772 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -181,3 +181,18 @@ - id: WeaponRevolverInspector - id: SpeedLoaderMagnum - id: SpeedLoaderMagnumRubber + +- type: entity + id: ClothingBeltSecurityBlueshieldFilled + parent: ClothingBeltSecurity + suffix: Filled + components: + - type: StorageFill + contents: + - id: GrenadeFlashBang + - id: GrenadeFlashBang + - id: Stunbaton + - id: Handcuffs + - id: Handcuffs + - id: MagazinePistolCaselessRifle + - id: MagazinePistolCaselessRifleRubber \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 92925dbd8336..ed9aed1c0925 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -248,6 +248,15 @@ - type: Sprite sprite: Clothing/Back/Backpacks/ertclown.rsi +- type: entity + parent: ClothingBackpack + id: ClothingBackpackBlueshield + name: blueshield backpack + description: Не їстівне, нажаль... + components: + - type: Sprite + sprite: Clothing/Back/Backpacks/blueshield.rsi + #Special - type: entity parent: ClothingBackpack diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index ae121148e70e..d1b5d8ec984e 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -130,6 +130,15 @@ - type: Sprite sprite: Clothing/Back/Duffels/science.rsi +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelBlueshield + name: blueshield duffel backpack + description: Велика штука для великих речей. + components: + - type: Sprite + sprite: Clothing/Back/Duffels/blueshield.rsi + - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelHydroponics diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 1c87943ba556..b7def14c295b 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -25,6 +25,15 @@ - type: Sprite sprite: Clothing/Back/Satchels/engineering.rsi +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelBlueshield + name: blueshield satchel + description: сумка яка допоможе тобі запам'ятати число Пі. + components: + - type: Sprite + sprite: Clothing/Back/Satchels/blueshield.rsi + - type: entity parent: ClothingBackpackSatchel id: ClothingBackpackSatchelAtmospherics diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 5b6e15e03550..9dc7a03d5e73 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -41,6 +41,20 @@ - HamsterWearable - WhitelistChameleon +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretBlueshield + name: blueshield beret + description: Стоїть на захисті твого ніжного волосся. + components: + - type: Sprite + sprite: Clothing/Head/Hats/beret_blueshield.rsi + - type: Clothing + sprite: Clothing/Head/Hats/beret_blueshield.rsi + - type: Tag + tags: + - ClothMade + - type: entity parent: ClothingHeadBase id: ClothingHeadHatCasa diff --git a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml index 2c272730bdce..1dd52d99e294 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml @@ -40,3 +40,14 @@ - ClothMade - HamsterWearable - WhitelistChameleon + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckTieBlue + name: синя краватка + description: Синя краватка із застібкою з неошовку. + components: + - type: Sprite + sprite: Clothing/Neck/Ties/bluetie.rsi + - type: Clothing + sprite: Clothing/Neck/Ties/bluetie.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 038b6bb34674..39f3d19bc105 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -371,3 +371,14 @@ sprite: Clothing/OuterClothing/Coats/space_asshole.rsi - type: Clothing sprite: Clothing/OuterClothing/Coats/space_asshole.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatBlueshield + name: blueshield coat + description: Знехтуйте своєю безпекою заради кишень для цигарок! + components: + - type: Sprite + sprite: Clothing/OuterClothing/Coats/blueshield_coat.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Coats/blueshield_coat.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index 9c4df2906409..5cd3920ceb0d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -76,3 +76,15 @@ sprite: Clothing/OuterClothing/Vests/vest.rsi - type: Clothing sprite: Clothing/OuterClothing/Vests/vest.rsi + +#Blueshield vest +- type: entity + parent: ClothingOuterArmorBasic + id: ClothingOuterVestBlueshield + name: blueshield vest + description: Це желет а не желе!. + components: + - type: Sprite + sprite: Clothing/OuterClothing/Vests/blueshield.rsi + - type: Clothing + sprite: Clothing/OuterClothing/Vests/blueshield.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 1e66f9e6d798..580bcf4b2766 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -836,6 +836,17 @@ graph: WebObjects node: jumpskirt +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtBlueshield + name: blueshield jumpskirt + description: Міс, цей комбенізон був внесений до модного журналу!. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/blueshield.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/blueshield.rsi + - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtCasualBlue diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 959302ba1086..a26cb816f514 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -1370,6 +1370,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/gladiator.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitBlueshield + name: blueshield jumpsuit + description: Сер, це дуже технологічний комбенізон, він зшитий найдосвідчинішими клоунами!. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/blueshield.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/blueshield.rsi + - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCasualBlue diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 3d927b63c160..192a1283d4b4 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1024,6 +1024,21 @@ - type: Icon state: pda-pirate +- type: entity + parent: BasePDA + id: BlueshieldPDA + name: blueshield PDA + description: Коштує дорожче ніж ви, сер. + components: + - type: Pda + id: BlueshieldIDCard + state: pda-blueshield + - type: PdaBorderColor + borderColor: "#004281" + accentHColor: "#001932" + - type: Icon + state: pda-blueshield + - type: entity parent: BasePDA id: SyndiAgentPDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 0bfb2c7f566b..58c55f976586 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -850,3 +850,17 @@ - state: idseniorofficer - type: PresetIdCard job: SeniorOfficer + +- type: entity + parent: IDCardStandard + id: BlueshieldIDCard + name: Blueshield ID card + components: + - type: Sprite + layers: + - state: special + - state: idblueshield + - type: Item + heldPrefix: special + - type: PresetIdCard + job: Blueshield \ No newline at end of file diff --git a/Resources/Prototypes/Maps/frontier.yml b/Resources/Prototypes/Maps/frontier.yml index a4e5ecdacfa1..dcdca8ab9f8f 100644 --- a/Resources/Prototypes/Maps/frontier.yml +++ b/Resources/Prototypes/Maps/frontier.yml @@ -19,6 +19,7 @@ availableJobs: Passenger: [ -1, -1 ] HeadOfPersonnel: [ 1, 1 ] + Blueshield: [ 1, 1 ] HeadOfSecurity: [ 1, 1 ] SeniorOfficer: [ 0, 0 ] Brigmedic: [ 0, 0 ] diff --git a/Resources/Prototypes/Roles/Jobs/Command/blueshield.yml b/Resources/Prototypes/Roles/Jobs/Command/blueshield.yml new file mode 100644 index 000000000000..89398147def0 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Command/blueshield.yml @@ -0,0 +1,64 @@ +- type: job + id: Blueshield + name: job-name-blueshield + description: job-description-blueshield + playTimeTracker: JobBlueshield + requirements: + - !type:OverallPlaytimeRequirement + time: 14000 + # - !type:RoleTimeRequirement # + # role: JobHeadOfPersonnel # + # time: 3600 #1 hrs # + # - !type:RoleTimeRequirement # треба буде якось це налаштувати. + # role: JobHeadOfSecurity # просто я не можу придумати на яких ролях треба награти для такої професії + # time: 3600 #1 hrs # або ж мені просто лінь придумувати )) + # - !type:RoleTimeRequirement # + # role: JobChiefMedicalOfficer # + # time: 3600 #1 hrs # + weight: 20 + startingGear: BlueshieldGear + icon: "JobIconBlueshield" + requireAdminNotify: true + joinNotifyCrew: true + supervisors: job-supervisors-centcom + canBeAntag: false + access: + - Command + - Service + - Frontier + - Maintenance + - External + - Chemistry + - Engineering + - Research + - Detective + - Salvage + - Security + - Brig + - Cargo + - Atmospherics + - Medical + - Armory + - Mercenary + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant, TrackingImplant ] + +- type: startingGear + id: BlueshieldGear + equipment: + jumpsuit: ClothingUniformJumpsuitBlueshield + back: ClothingBackpackBlueshieldFilled + shoes: ClothingShoesBootsCombatFilled + head: ClothingHeadHatBeretBlueshield + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterVestBlueshield + id: BlueshieldPDA + ears: ClothingHeadsetAltSecurity + pocket1: WeaponPistolCobra + belt: ClothingBeltSecurityBlueshieldFilled + neck: ClothingNeckTieBlue + innerClothingSkirt: ClothingUniformJumpskirtBlueshield + satchel: ClothingBackpackSatchelBlueshieldFilled + duffelbag: ClothingBackpackDuffelBlueshieldFilled \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index a749c56e0427..27ae2f0f9ccb 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -43,6 +43,7 @@ color: "#334E6D" roles: - Captain + - Blueshield - CentralCommandOfficial - ChiefEngineer - ChiefMedicalOfficer @@ -81,6 +82,7 @@ color: "#DE3A3A" roles: - HeadOfSecurity + - Blueshield - SecurityCadet - SecurityOfficer - SeniorOfficer diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index 8be71cc61555..f9d5c62245ac 100644 --- a/Resources/Prototypes/StatusEffects/job.yml +++ b/Resources/Prototypes/StatusEffects/job.yml @@ -367,3 +367,10 @@ icon: sprite: Interface/Misc/job_icons.rsi state: SeniorResearcher + +- type: statusIcon + parent: JobIcon + id: JobIconBlueshield + icon: + sprite: Interface/Misc/job_icons.rsi + state: BlueshieldOfficer \ No newline at end of file diff --git a/Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi/equipped-BACKPACK.png new file mode 100644 index 000000000000..e6764f885b67 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi/icon.png new file mode 100644 index 000000000000..397b064d8229 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi/meta.json new file mode 100644 index 000000000000..122843fdd8c8 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/ParadiseSS13/Paradise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Back/Duffels/blueshield.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/blueshield.rsi/equipped-BACKPACK.png new file mode 100644 index 000000000000..8e7f6c2141b4 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/blueshield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/blueshield.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/blueshield.rsi/icon.png new file mode 100644 index 000000000000..f5c16181193f Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/blueshield.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/blueshield.rsi/meta.json new file mode 100644 index 000000000000..122843fdd8c8 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Duffels/blueshield.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/ParadiseSS13/Paradise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Back/Satchels/blueshield.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/blueshield.rsi/equipped-BACKPACK.png new file mode 100644 index 000000000000..9c6706b29123 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/blueshield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/blueshield.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/blueshield.rsi/icon.png new file mode 100644 index 000000000000..7333658af988 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/blueshield.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/blueshield.rsi/meta.json new file mode 100644 index 000000000000..122843fdd8c8 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/blueshield.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/ParadiseSS13/Paradise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Head/Hats/beret_blueshield.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_blueshield.rsi/equipped-HELMET.png new file mode 100644 index 000000000000..2ced9c815991 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_blueshield.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_blueshield.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_blueshield.rsi/icon.png new file mode 100644 index 000000000000..ed8b04c5611c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_blueshield.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/beret_blueshield.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_blueshield.rsi/meta.json new file mode 100644 index 000000000000..9992fb89e65c --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/beret_blueshield.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/ParadiseSS13/Paradise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Neck/Ties/bluetie.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Ties/bluetie.rsi/equipped-NECK.png new file mode 100644 index 000000000000..83e6e42b8ac1 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Ties/bluetie.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/Clothing/Neck/Ties/bluetie.rsi/icon.png b/Resources/Textures/Clothing/Neck/Ties/bluetie.rsi/icon.png new file mode 100644 index 000000000000..f81e72ce3c20 Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Ties/bluetie.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Neck/Ties/bluetie.rsi/meta.json b/Resources/Textures/Clothing/Neck/Ties/bluetie.rsi/meta.json new file mode 100644 index 000000000000..000007c2cba6 --- /dev/null +++ b/Resources/Textures/Clothing/Neck/Ties/bluetie.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Flareguy for Space Station 14 | resprited by AsikKEsel", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "icon" + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/blueshield_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Coats/blueshield_coat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 000000000000..d564b239190f Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/blueshield_coat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/blueshield_coat.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Coats/blueshield_coat.rsi/icon.png new file mode 100644 index 000000000000..59cbf280c538 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Coats/blueshield_coat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Coats/blueshield_coat.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Coats/blueshield_coat.rsi/meta.json new file mode 100644 index 000000000000..e876fe440bf3 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Coats/blueshield_coat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/ParadiseSS13/Paradise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/blueshield.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Vests/blueshield.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 000000000000..dd4c083e7003 Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/blueshield.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/blueshield.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Vests/blueshield.rsi/icon.png new file mode 100644 index 000000000000..05467e0745bc Binary files /dev/null and b/Resources/Textures/Clothing/OuterClothing/Vests/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/OuterClothing/Vests/blueshield.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/Vests/blueshield.rsi/meta.json new file mode 100644 index 000000000000..e876fe440bf3 --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/Vests/blueshield.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/ParadiseSS13/Paradise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 000000000000..86aa0a2f471e Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/blueshield.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/blueshield.rsi/icon.png new file mode 100644 index 000000000000..7584d2b90b2a Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpskirt/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/blueshield.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpskirt/blueshield.rsi/meta.json new file mode 100644 index 000000000000..d95c0eeb239c --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpskirt/blueshield.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/ParadiseSS13/Paradise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 000000000000..4b980b5e6469 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/blueshield.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/blueshield.rsi/icon.png new file mode 100644 index 000000000000..681710092c30 Binary files /dev/null and b/Resources/Textures/Clothing/Uniforms/Jumpsuit/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/blueshield.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/blueshield.rsi/meta.json new file mode 100644 index 000000000000..d95c0eeb239c --- /dev/null +++ b/Resources/Textures/Clothing/Uniforms/Jumpsuit/blueshield.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "https://github.com/ParadiseSS13/Paradise", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/BlueshieldOfficer.png b/Resources/Textures/Interface/Misc/job_icons.rsi/BlueshieldOfficer.png new file mode 100644 index 000000000000..d281688a425a Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/BlueshieldOfficer.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index aa122359db8e..349923f0b048 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -178,6 +178,9 @@ }, { "name": "Syndicate" + }, + { + "name": "BlueshieldOfficer" } ] } diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index fb4ffdd0bc98..16aecf5aad8a 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -232,6 +232,9 @@ { "name": "pda-seniorofficer" }, + { + "name": "pda-blueshield" + }, { "name": "equipped-IDCARD", "directions": 4 diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-blueshield.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-blueshield.png new file mode 100644 index 000000000000..16fad8f1b03e Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-blueshield.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idblueshield.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idblueshield.png new file mode 100644 index 000000000000..3930f30e7ef3 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idblueshield.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index bbdb01021b65..55d8d8b79148 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -220,6 +220,12 @@ { "name": "idseniorofficer" }, + { + "name": "idblueshield" + }, + { + "name": "special" + }, { "name": "gold-inhand-left", "directions": 4 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/special.png b/Resources/Textures/Objects/Misc/id_cards.rsi/special.png new file mode 100644 index 000000000000..6f15a947c0c8 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/special.png differ