diff --git a/Resources/Prototypes/Goobstation/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Goobstation/Entities/Clothing/Eyes/glasses.yml new file mode 100644 index 00000000000..86afaae5a31 --- /dev/null +++ b/Resources/Prototypes/Goobstation/Entities/Clothing/Eyes/glasses.yml @@ -0,0 +1,23 @@ +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesMedical + name: medglasses + description: Sunglasses with a medical hud + components: + - type: Sprite + sprite: Goobstation/Clothing/Eyes/Glasses/medglasses.rsi + - type: Clothing + sprite: Goobstation/Clothing/Eyes/Glasses/medglasses.rsi + - type: Tag + tags: + - WhitelistChameleon + - HudMedical + - type: IdentityBlocker + coverage: EYES + - type: ShowHealthBars + damageContainers: + - Biological + - type: ShowHealthIcons + damageContainers: + - Biological + diff --git a/Resources/Prototypes/Goobstation/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Goobstation/Entities/Clothing/Head/hats.yml new file mode 100644 index 00000000000..837bd389064 --- /dev/null +++ b/Resources/Prototypes/Goobstation/Entities/Clothing/Head/hats.yml @@ -0,0 +1,29 @@ +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretNavy + name: navy blue officer beret + description: A navy blue beret with the silver shield of the Nanotrasen security forces. + components: + - type: Sprite + sprite: Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi + - type: Clothing + sprite: Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi + - type: Tag + tags: + - ClothMade + - WhitelistChameleon + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretOfficer + name: officers beret + description: A black beret with the silver shield of the Nanotrasen security forces. + components: + - type: Sprite + sprite: Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi + - type: Clothing + sprite: Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi + - type: Tag + tags: + - ClothMade + - WhitelistChameleon diff --git a/Resources/Prototypes/Goobstation/Entities/Clothing/OuterClothing/armour.yml b/Resources/Prototypes/Goobstation/Entities/Clothing/OuterClothing/armour.yml new file mode 100644 index 00000000000..1184d228bb1 --- /dev/null +++ b/Resources/Prototypes/Goobstation/Entities/Clothing/OuterClothing/armour.yml @@ -0,0 +1,20 @@ +# Blueshield Armour Vest +- type: entity + parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing] + id: ClothingBlueshieldArmourVest + name: blueshield's security armour + description: An armoured vest with the badge of the blueshield + components: + - type: Sprite + sprite: Goobstation/Clothing/Armor/bso_armour.rsi + - type: Clothing + sprite: Goobstation/Clothing/Armor/bso_armour.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.60 + Slash: 0.60 + Piercing: 0.65 + Heat: 0.70 + - type: ExplosionResistance + damageCoefficient: 0.8 diff --git a/Resources/Prototypes/Goobstation/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Goobstation/Entities/Clothing/Uniforms/jumpskirts.yml new file mode 100644 index 00000000000..b8b83532b58 --- /dev/null +++ b/Resources/Prototypes/Goobstation/Entities/Clothing/Uniforms/jumpskirts.yml @@ -0,0 +1,32 @@ +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtBlueshieldOfficer + name: blueshield officer jumpskirt + description: A short-sleeved grey and blue jumpskirt, made out of a sturdy material. Blueshield standard issue. + components: + - type: Sprite + sprite: Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi + - type: Clothing + sprite: Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: CentcomAgentSkirt + name: centcom agent skirt + description: A skirt worn by CentComs legal team. Smells of burnt coffee. + components: + - type: Sprite + sprite: Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi + - type: Clothing + sprite: Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtNanotrasenRepresentative + name: nanotrasen representative skirt + description: A black skirt worn by officials. + components: + - type: Sprite + sprite: Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi + - type: Clothing + sprite: Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml new file mode 100644 index 00000000000..ddc7907dd2b --- /dev/null +++ b/Resources/Prototypes/Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml @@ -0,0 +1,26 @@ +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitBlueshieldOfficer + name: blueshield officer jumpsuit + description: A short-sleeved grey and blue jumpsuit, made out of a sturdy material. Blueshield standard issue. + components: + - type: Sprite + sprite: Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi + - type: Clothing + sprite: Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Heat: 0.95 + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitNanotrasenRepresentative + name: nanotrasen representative suit + description: A black suit worn by officials. + components: + - type: Sprite + sprite: Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi + - type: Clothing + sprite: Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi diff --git a/Resources/Prototypes/Goobstation/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Goobstation/Entities/Markers/Spawners/jobs.yml new file mode 100644 index 00000000000..9bf7854bf7d --- /dev/null +++ b/Resources/Prototypes/Goobstation/Entities/Markers/Spawners/jobs.yml @@ -0,0 +1,25 @@ +# Command + +- type: entity + id: SpawnPointBlueshieldOfficer + parent: SpawnPointJobBase + name: blueshieldofficer + components: + - type: SpawnPoint + job_id: BlueshieldOfficer + - type: Sprite + layers: + - state: green + - state: ertleader + +- type: entity + id: SpawnPointNanotrasenRepresentative + parent: SpawnPointJobBase + name: nanotrasenrepresentative + components: + - type: SpawnPoint + job_id: NanotrasenRepresentative + - type: Sprite + layers: + - state: green + - state: centcom diff --git a/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/cane.yml b/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/cane.yml new file mode 100644 index 00000000000..c47b69689ef --- /dev/null +++ b/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/cane.yml @@ -0,0 +1,36 @@ +- type: entity + name: cane blade + suffix: Nanotrasen + parent: BaseItem + id: CaneBladeNanotrasen + description: A sharp blade with a cane shaped hilt, a Nanotrasen logo is engraved on the blade. + components: + - type: Sharp + - type: Sprite + sprite: Objects/Weapons/Melee/cane_blade.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: 65 + attackRate: 1.25 + damage: + types: + Slash: 10 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Item + size: Normal + sprite: Objects/Weapons/Melee/cane_blade.rsi + - type: Tag + tags: + - CaneBlade + - type: DisarmMalus + +- type: entity + id: CaneSheathFilledNanotrasen + parent: CaneSheath + suffix: Filled, Nanotrasen + components: + - type: ContainerFill + containers: + item: + - CaneBladeNanotrasen diff --git a/Resources/Prototypes/Goobstation/Roles/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/Goobstation/Roles/Jobs/Command/blueshield_officer.yml new file mode 100644 index 00000000000..716e1a16a49 --- /dev/null +++ b/Resources/Prototypes/Goobstation/Roles/Jobs/Command/blueshield_officer.yml @@ -0,0 +1,45 @@ +- type: job + id: BlueshieldOfficer + name: Blueshield Officer + description: "Act as a bodyguard and advisor for Command and CentCom VIPs." + playTimeTracker: JobBlueshieldOfficer + requirements: + - !type:DepartmentTimeRequirement + department: Command + min: 54000 # 15 hours + - !type:DepartmentTimeRequirement + department: Medical + min: 54000 # 15 hours + - !type:DepartmentTimeRequirement + department: Security + min: 54000 # 15 hours + weight: 20 + startingGear: BlueshieldOfficerGear + icon: "JobIconNanotrasen" + requireAdminNotify: true + joinNotifyCrew: true + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + +- type: startingGear + id: BlueshieldOfficerGear + equipment: + back: ClothingBackpack + jumpsuit: ClothingUniformJumpsuitBlueshieldOfficer + shoes: ClothingShoesBootsCombatFilled + eyes: ClothingEyesGlassesMedical + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingBlueshieldArmourVest + id: ERTSecurityPDA + ears: ClothingHeadsetAltCommand + belt: ClothingBeltSecurityFilled + pocket1: WeaponPistolMk58 + pocket2: DeathAcidifierImplanter diff --git a/Resources/Prototypes/Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml b/Resources/Prototypes/Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml new file mode 100644 index 00000000000..e09cdcd30db --- /dev/null +++ b/Resources/Prototypes/Goobstation/Roles/Jobs/Command/nanotrasen_representative.yml @@ -0,0 +1,35 @@ +- type: job + id: NanotrasenRepresentative + name: Nanotrasen Representative + description: "Represent NT, send reports back to them on the station's situation, inform the heads of anything CentCom orders them to do." + playTimeTracker: JobNanotrasenRepresentative + requirements: + - !type:DepartmentTimeRequirement + department: Command + min: 54000 # 15 hours + weight: 20 + startingGear: NanotrasenRepresentativeGear + icon: "JobIconNanotrasenRepresentative" + requireAdminNotify: true + joinNotifyCrew: true + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + +- type: startingGear + id: NanotrasenRepresentativeGear + equipment: + shoes: ClothingShoesColorBlack + id: CentcomPDA + ears: ClothingHeadsetCentCom + pocket1: CaneSheathFilledNanotrasen + storage: + back: + - RubberStampCentcom diff --git a/Resources/Prototypes/Goobstation/Roles/play_time_trackers.yml b/Resources/Prototypes/Goobstation/Roles/play_time_trackers.yml new file mode 100644 index 00000000000..fbaf30463be --- /dev/null +++ b/Resources/Prototypes/Goobstation/Roles/play_time_trackers.yml @@ -0,0 +1,5 @@ +- type: playTimeTracker + id: JobBlueshieldOfficer + +- type: playTimeTracker + id: JobNanotrasenRepresentative diff --git a/Resources/Prototypes/Goobstation/StatusEffects/job.yml b/Resources/Prototypes/Goobstation/StatusEffects/job.yml new file mode 100644 index 00000000000..eae22251c02 --- /dev/null +++ b/Resources/Prototypes/Goobstation/StatusEffects/job.yml @@ -0,0 +1,13 @@ +- type: statusIcon + parent: JobIcon + id: JobIconNanotrasenRepresentative + icon: + sprite: /Textures/Goobstation/Interface/Misc/job_icons.rsi + state: nanotrasenrepresentative + +- type: statusIcon + parent: JobIcon + id: JobIconBlueshield + icon: + sprite: /Textures/Goobstation/Interface/Misc/job_icons.rsi + state: blueshield diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index dd29f4a1339..06963eb8988 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -58,6 +58,8 @@ - ERTEngineer - DeathSquad - AdministrativeAssistant # Delta V - Administrative Assistant, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Command/admin_assistant.yml + - BlueshieldOfficer # Goobstation + - NanotrasenRepresentative # Goobstation primary: false weight: 100 diff --git a/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..4f3819da74e Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/icon.png b/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/icon.png new file mode 100644 index 00000000000..3a535daf054 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/icon.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/inhand-left.png b/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/inhand-left.png new file mode 100644 index 00000000000..afeaf1e4972 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/inhand-left.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/inhand-right.png b/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/inhand-right.png new file mode 100644 index 00000000000..be59dee2c2c Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/inhand-right.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/meta.json b/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/meta.json new file mode 100644 index 00000000000..53b3e11ff1a --- /dev/null +++ b/Resources/Textures/Goobstation/Clothing/Armor/bso_armour.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/pull/26498/commits/17c167b6648e8b67eb9c2f23f2f5b61e1a86f028", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/EQUIPPED-backpack.png b/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/EQUIPPED-backpack.png new file mode 100644 index 00000000000..fba602fdc39 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/EQUIPPED-backpack.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/icon.png b/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/icon.png new file mode 100644 index 00000000000..e774d376369 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/icon.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/inhand-left.png b/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/inhand-left.png new file mode 100644 index 00000000000..64ada33c4f4 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/inhand-left.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/inhand-right.png b/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/inhand-right.png new file mode 100644 index 00000000000..033b54e389a Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/inhand-right.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/meta.json b/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/meta.json new file mode 100644 index 00000000000..cf99d45fad6 --- /dev/null +++ b/Resources/Textures/Goobstation/Clothing/Back/Satchels/nanorep.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 by KingFroozy (Github) for SS14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "EQUIPPED-backpack", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/equipped-EYES.png b/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/equipped-EYES.png new file mode 100644 index 00000000000..6435d329488 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/icon.png b/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/icon.png new file mode 100644 index 00000000000..e3a1a931d26 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/icon.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/inhand-left.png b/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/inhand-left.png new file mode 100644 index 00000000000..36f81903f7f Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/inhand-right.png b/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/inhand-right.png new file mode 100644 index 00000000000..4b70792bb5a Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/meta.json b/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/meta.json new file mode 100644 index 00000000000..775ddefdb0a --- /dev/null +++ b/Resources/Textures/Goobstation/Clothing/Eyes/Glasses/medglasses.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise at commit https://github.com/ParadiseSS13/Paradise/pull/26498/commits/17c167b6648e8b67eb9c2f23f2f5b61e1a86f028", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/equipped-HELMET.png b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..8080ef32d03 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/icon.png b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/icon.png new file mode 100644 index 00000000000..4a538106ae5 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/icon.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/inhand-left.png b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/inhand-left.png new file mode 100644 index 00000000000..69b1932bd7d Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/inhand-left.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/inhand-right.png b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/inhand-right.png new file mode 100644 index 00000000000..9ab3a81bdc9 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/inhand-right.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/meta.json b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/meta.json new file mode 100644 index 00000000000..9f26d95de4a --- /dev/null +++ b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/pull/26498/commits/17c167b6648e8b67eb9c2f23f2f5b61e1a86f028", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/equipped-HELMET.png b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..78232e33546 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/icon.png b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/icon.png new file mode 100644 index 00000000000..4556d582a53 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/icon.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/inhand-left.png b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/inhand-left.png new file mode 100644 index 00000000000..82298c09dc2 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/inhand-right.png b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/inhand-right.png new file mode 100644 index 00000000000..589ecca6186 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/meta.json b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/meta.json new file mode 100644 index 00000000000..9f26d95de4a --- /dev/null +++ b/Resources/Textures/Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/pull/26498/commits/17c167b6648e8b67eb9c2f23f2f5b61e1a86f028", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..30ab9dba752 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/icon.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/icon.png new file mode 100644 index 00000000000..de89a9220c7 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/icon.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/inhand-left.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/inhand-left.png new file mode 100644 index 00000000000..c8512e4e086 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/inhand-right.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/inhand-right.png new file mode 100644 index 00000000000..08d38ebb33c Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/meta.json b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/meta.json new file mode 100644 index 00000000000..0079dff8f29 --- /dev/null +++ b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/pull/26498/commits/17c167b6648e8b67eb9c2f23f2f5b61e1a86f028", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..9452ab83130 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/icon.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/icon.png new file mode 100644 index 00000000000..57cfc5469ca Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/icon.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/inhand-left.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/inhand-left.png new file mode 100644 index 00000000000..9dc326377ef Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/inhand-left.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/inhand-right.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/inhand-right.png new file mode 100644 index 00000000000..74166e77adb Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/inhand-right.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/meta.json b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/meta.json new file mode 100644 index 00000000000..d288a02447a --- /dev/null +++ b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Stitched together lovingly by BeeRobyn", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..7adfb81ac73 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/icon.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/icon.png new file mode 100644 index 00000000000..cd18e0d51aa Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/icon.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/inhand-left.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/inhand-left.png new file mode 100644 index 00000000000..6e2cec8ce4d Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/inhand-left.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/inhand-right.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/inhand-right.png new file mode 100644 index 00000000000..791a983c01b Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/inhand-right.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/meta.json b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/meta.json new file mode 100644 index 00000000000..66fe2f9230f --- /dev/null +++ b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise @ https://github.com/ParadiseSS13/Paradise/commit/14a7b74c2aad4002bf575687ed01321c8d66e5ff", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..624924965cc Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/icon.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/icon.png new file mode 100644 index 00000000000..3205976ee88 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/icon.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/inhand-left.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/inhand-left.png new file mode 100644 index 00000000000..b133681071c Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/inhand-left.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/inhand-right.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/inhand-right.png new file mode 100644 index 00000000000..e21fc75b514 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/inhand-right.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/meta.json b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/meta.json new file mode 100644 index 00000000000..0079dff8f29 --- /dev/null +++ b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Paradise Station at commit https://github.com/ParadiseSS13/Paradise/pull/26498/commits/17c167b6648e8b67eb9c2f23f2f5b61e1a86f028", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..3bccb78d216 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/icon.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/icon.png new file mode 100644 index 00000000000..237ef281464 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/icon.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/inhand-left.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/inhand-left.png new file mode 100644 index 00000000000..98cc05bf5ee Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/inhand-left.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/inhand-right.png b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/inhand-right.png new file mode 100644 index 00000000000..9bb599b35a8 Binary files /dev/null and b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/inhand-right.png differ diff --git a/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/meta.json b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/meta.json new file mode 100644 index 00000000000..66fe2f9230f --- /dev/null +++ b/Resources/Textures/Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise @ https://github.com/ParadiseSS13/Paradise/commit/14a7b74c2aad4002bf575687ed01321c8d66e5ff", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Goobstation/Interface/Misc/job_icons.rsi/blueshield.png b/Resources/Textures/Goobstation/Interface/Misc/job_icons.rsi/blueshield.png new file mode 100644 index 00000000000..87c352c376c Binary files /dev/null and b/Resources/Textures/Goobstation/Interface/Misc/job_icons.rsi/blueshield.png differ diff --git a/Resources/Textures/Goobstation/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Goobstation/Interface/Misc/job_icons.rsi/meta.json new file mode 100644 index 00000000000..1c7da3045b0 --- /dev/null +++ b/Resources/Textures/Goobstation/Interface/Misc/job_icons.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Blueshield and Nanotrasen Representative taken from Paradise @ https://github.com/ParadiseSS13/Paradise/commit/5a68c5f6d3b60ee82c06e0287d1eb8108d2e1fe2", + "size": { + "x": 8, + "y": 8 + }, + "states": [ + { + "name": "nanotrasenrepresentative" + }, + { + "name": "blueshield" + } + ] +} diff --git a/Resources/Textures/Goobstation/Interface/Misc/job_icons.rsi/nanotrasenrepresentative.png b/Resources/Textures/Goobstation/Interface/Misc/job_icons.rsi/nanotrasenrepresentative.png new file mode 100644 index 00000000000..a62c65ef24d Binary files /dev/null and b/Resources/Textures/Goobstation/Interface/Misc/job_icons.rsi/nanotrasenrepresentative.png differ