diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 042d4e7372..709c9db8f4 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 = Senior Officer +ob-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 4cf4d2caea..462dccbf36 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -308,6 +308,18 @@ - id: CrowbarRed - id: AdvMopItem +- type: entity + noSpawn: true + parent: ClothingBackpackBlueshield + id: ClothingBackpackBlueshieldFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalSecurity + - id: MedkitAdvancedFilled + - id: HandheldCrewMonitor + - id: Flash + # Death Squad - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 3a8db627e0..d05c0e3797 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -254,3 +254,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 68c13608a2..c4f1100ed8 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -276,3 +276,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 2b193fd61b..21c5cffca4 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -170,3 +170,16 @@ - 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 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 923bfac502..80e2d92fdd 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -164,6 +164,69 @@ Lethal: { state: mode-lethal } Special: { state: mode-stun } # Unused +- type: entity + name: advanced energy revolver + parent: BaseWeaponBatterySmall + id: WeaponEnergyGunAdvancedRevolver + description: A light version of the Energy gun with a smaller capacity. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mode-disabler + shader: unshaded + map: [ "Firemode" ] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi + - type: Gun + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg + - type: Battery + maxCharge: 2000 + startingCharge: 2000 + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 100 + - type: EnergyGun + fireModes: + - proto: BulletDisabler + fireCost: 100 + name: disable + state: disabler + - proto: BulletEnergyGunLaser + fireCost: 200 + name: lethal + state: lethal + # - proto: BulletEnergyGunIon + # fireCost: 500 + # name: ion + # state: special + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: GenericVisualizer + visuals: + enum.EnergyGunFireModeVisuals.State: + Firemode: + Disabler: { state: mode-disabler } + Lethal: { state: mode-lethal } + Special: { state: mode-ion } + - type: Tag + tags: + - HighRiskItem + - Sidearm + - type: StaticPrice + price: 750 + - type: entity name: PDW-9 Energy Pistol parent: BaseWeaponBatterySmall diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index eca5fd7d0d..5ac8719d36 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -245,6 +245,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 f307b56a82..80eb8faa53 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -248,4 +248,13 @@ - type: ClothingSpeedModifier walkModifier: 1 sprintModifier: 1 - - type: HeldSpeedModifier \ No newline at end of file + - type: HeldSpeedModifier + +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelBlueshield + name: blueshield duffel backpack + description: Велика штука для великих речей. + components: + - type: Sprite + sprite: Clothing/Back/Duffels/blueshield.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 9d3cfb7f79..5a0f9291fb 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -169,3 +169,12 @@ shader: unshaded - type: Storage capacity: 9999 + +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelBlueshield + name: blueshield satchel + description: сумка яка допоможе тобі запам'ятати число Пі. + components: + - type: Sprite + sprite: Clothing/Back/Satchels/blueshield.rsi \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 19929b9888..3fb9d4d083 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -878,3 +878,17 @@ sprite: Clothing/Head/Hats/party_blue.rsi - type: Clothing sprite: Clothing/Head/Hats/party_blue.rsi + +- 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 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml index 9e361d5919..4a5a18fd65 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml @@ -40,3 +40,4 @@ - ClothMade - HamsterWearable - WhitelistChameleon + diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index b179e0820a..8a3dd5a0fa 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 f49f5f4804..a1c0608f44 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -75,3 +75,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 9a8c1c2a5c..4850c054f7 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -805,6 +805,17 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi # DeltaV - resprite +- 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: ClothingUniformJumpskirtWeb @@ -925,3 +936,4 @@ - state: equipped-INNERCLOTHING-jumpskirt - state: equipped-INNERCLOTHING-shirt color: "#b30000" + diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 1eb0761cc5..209e7f64d8 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -20,6 +20,17 @@ - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/ancient.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: ClothingUniformJumpsuitBartender diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 970562b826..a24c7569ef 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1101,3 +1101,18 @@ whitelist: components: - Cartridge + +- 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 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index a13a9d28d3..040b1e1465 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -865,3 +865,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/aspid.yml b/Resources/Prototypes/Maps/aspid.yml index 6380a1e78c..3f3074f8a1 100644 --- a/Resources/Prototypes/Maps/aspid.yml +++ b/Resources/Prototypes/Maps/aspid.yml @@ -51,6 +51,7 @@ Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] Detective: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/asterisk.yml b/Resources/Prototypes/Maps/asterisk.yml index be02655388..ae610d762f 100644 --- a/Resources/Prototypes/Maps/asterisk.yml +++ b/Resources/Prototypes/Maps/asterisk.yml @@ -51,6 +51,7 @@ Borg: [ 1, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] Detective: [ 1, 1 ] Brigmedic: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/atlas.yml b/Resources/Prototypes/Maps/atlas.yml index e333c2782b..6638bf9fab 100644 --- a/Resources/Prototypes/Maps/atlas.yml +++ b/Resources/Prototypes/Maps/atlas.yml @@ -45,6 +45,7 @@ Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] SecurityOfficer: [ 4, 4 ] SecurityCadet: [ 1, 3 ] diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index abe9c86665..b70b9e9a4b 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -50,6 +50,7 @@ Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] diff --git a/Resources/Prototypes/Maps/barratry.yml b/Resources/Prototypes/Maps/barratry.yml index 99cc973385..7e7c9fae3e 100644 --- a/Resources/Prototypes/Maps/barratry.yml +++ b/Resources/Prototypes/Maps/barratry.yml @@ -49,6 +49,7 @@ ResearchAssistant: [2, 4] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] Detective: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index 2692447219..d3f2af7b63 100644 --- a/Resources/Prototypes/Maps/box.yml +++ b/Resources/Prototypes/Maps/box.yml @@ -50,6 +50,7 @@ Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 4, 4 ] diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index 73d90122e1..7836808d34 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -50,6 +50,7 @@ Borg: [ 1, 1 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] Detective: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index 5a1919129c..68b0046e66 100644 --- a/Resources/Prototypes/Maps/core.yml +++ b/Resources/Prototypes/Maps/core.yml @@ -49,6 +49,7 @@ SeniorResearcher: [ 1, 1 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] SecurityOfficer: [ 4, 4 ] Warden: [ 1, 1 ] Lawyer: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/edge.yml b/Resources/Prototypes/Maps/edge.yml index 5b515b93cd..58e01163f5 100644 --- a/Resources/Prototypes/Maps/edge.yml +++ b/Resources/Prototypes/Maps/edge.yml @@ -53,6 +53,7 @@ Borg: [ 1, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] Detective: [ 1, 1 ] SecurityOfficer: [ 2, 4 ] diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml index e4891b0509..b85cda7253 100644 --- a/Resources/Prototypes/Maps/europa.yml +++ b/Resources/Prototypes/Maps/europa.yml @@ -49,6 +49,7 @@ SeniorResearcher: [ 1, 1 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] SecurityOfficer: [ 2, 2 ] Warden: [ 1, 1 ] Lawyer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index 12d373c914..97ded0de81 100644 --- a/Resources/Prototypes/Maps/fland.yml +++ b/Resources/Prototypes/Maps/fland.yml @@ -49,6 +49,7 @@ Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 7, 7 ] diff --git a/Resources/Prototypes/Maps/frontier.yml b/Resources/Prototypes/Maps/frontier.yml index a4e5ecdacf..84f2d65ca7 100644 --- a/Resources/Prototypes/Maps/frontier.yml +++ b/Resources/Prototypes/Maps/frontier.yml @@ -24,8 +24,8 @@ Brigmedic: [ 0, 0 ] SecurityOfficer: [ 0, 0 ] SecurityCadet: [ 0, 0 ] - StationTrafficController: [ 0, 0 ] - Valet: [ 1, 1 ] +# StationTrafficController: [ 0, 0 ] <--- жаліється перевірка що такого айді не існує +# Valet: [ 1, 1 ] <--- і тут також MailCarrier: [ 0, 0 ] Janitor: [ 1, 1 ] # Others: diff --git a/Resources/Prototypes/Maps/gemini.yml b/Resources/Prototypes/Maps/gemini.yml index 20d2db2948..5371a4be75 100644 --- a/Resources/Prototypes/Maps/gemini.yml +++ b/Resources/Prototypes/Maps/gemini.yml @@ -48,6 +48,7 @@ Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] Detective: [ 1, 1 ] SecurityOfficer: [ 5, 7 ] diff --git a/Resources/Prototypes/Maps/hive.yml b/Resources/Prototypes/Maps/hive.yml index 2d5b27734d..f68b879700 100644 --- a/Resources/Prototypes/Maps/hive.yml +++ b/Resources/Prototypes/Maps/hive.yml @@ -38,6 +38,7 @@ Psychologist: [ 1, 1 ] #security Brigmedic: [ 1, 1 ] + Blueshield: [ 1, 1 ] Detective: [ 1, 1 ] HeadOfSecurity: [ 1, 1 ] Prisoner: [ 2, 3 ] diff --git a/Resources/Prototypes/Maps/kettle.yml b/Resources/Prototypes/Maps/kettle.yml index 9126b63165..fef6f9ef0e 100644 --- a/Resources/Prototypes/Maps/kettle.yml +++ b/Resources/Prototypes/Maps/kettle.yml @@ -51,6 +51,7 @@ Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] Detective: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index a4dbaec732..4001512c6e 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -50,6 +50,7 @@ Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index 8294b229e9..fb4ccb2e8e 100644 --- a/Resources/Prototypes/Maps/meta.yml +++ b/Resources/Prototypes/Maps/meta.yml @@ -49,6 +49,7 @@ Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 4, 6 ] diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml index eb023c0b1f..5740dae186 100644 --- a/Resources/Prototypes/Maps/omega.yml +++ b/Resources/Prototypes/Maps/omega.yml @@ -46,6 +46,7 @@ ResearchAssistant: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index 9da101e5e4..7d6b13234b 100644 --- a/Resources/Prototypes/Maps/origin.yml +++ b/Resources/Prototypes/Maps/origin.yml @@ -51,6 +51,7 @@ Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] Detective: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index 7cb4f0b294..6ffb5ff719 100644 --- a/Resources/Prototypes/Maps/packed.yml +++ b/Resources/Prototypes/Maps/packed.yml @@ -47,6 +47,7 @@ ResearchAssistant: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] diff --git a/Resources/Prototypes/Maps/pebble.yml b/Resources/Prototypes/Maps/pebble.yml index b97c68b95c..b398b289d2 100644 --- a/Resources/Prototypes/Maps/pebble.yml +++ b/Resources/Prototypes/Maps/pebble.yml @@ -48,6 +48,7 @@ Borg: [ 1, 1 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] Detective: [ 1, 1 ] SecurityOfficer: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/saltern.yml b/Resources/Prototypes/Maps/saltern.yml index b41286688d..535298db6c 100644 --- a/Resources/Prototypes/Maps/saltern.yml +++ b/Resources/Prototypes/Maps/saltern.yml @@ -48,6 +48,7 @@ Borg: [ 2, 2 ] #security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] Warden: [ 1, 1 ] SeniorOfficer: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] diff --git a/Resources/Prototypes/Maps/shoukou.yml b/Resources/Prototypes/Maps/shoukou.yml index c9f331a376..f6e81c4a5a 100644 --- a/Resources/Prototypes/Maps/shoukou.yml +++ b/Resources/Prototypes/Maps/shoukou.yml @@ -47,6 +47,7 @@ MedicalIntern: [ 2, 3 ] #Security HeadOfSecurity: [ 1, 1 ] + Blueshield: [ 1, 1 ] SecurityOfficer: [ 2, 4 ] Detective: [ 1, 1 ] Warden: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/tortuga.yml b/Resources/Prototypes/Maps/tortuga.yml index 82e6309f49..85cb4897e2 100644 --- a/Resources/Prototypes/Maps/tortuga.yml +++ b/Resources/Prototypes/Maps/tortuga.yml @@ -37,6 +37,7 @@ Psychologist: [ 1, 1 ] #security Brigmedic: [ 1, 1 ] + Blueshield: [ 1, 1 ] Detective: [ 1, 1 ] HeadOfSecurity: [ 1, 1 ] Prisoner: [ 2, 3 ] diff --git a/Resources/Prototypes/Roles/Jobs/Command/blueshield.yml b/Resources/Prototypes/Roles/Jobs/Command/blueshield.yml new file mode 100644 index 0000000000..f2f981dd62 --- /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 Delta-V removed + - Cargo + - Atmospherics + - Medical + - Armory +# - Mercenary + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant, TrackingImplant, StorageImplant ] + +- type: startingGear + id: BlueshieldGear + equipment: + jumpsuit: ClothingUniformJumpsuitBlueshield + back: ClothingBackpackBlueshieldFilled + shoes: ClothingShoesBootsCombatFilled + head: ClothingHeadHatBeretBlueshield + eyes: ClothingEyesGlassesSecurity + gloves: ClothingHandsGlovesCombat + outerClothing: ClothingOuterVestBlueshield + id: BlueshieldPDA + ears: ClothingHeadsetAltSecurity + pocket1: WeaponEnergyGunAdvancedRevolver + 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 2dc5bf68a3..9a61b5e7e6 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -40,6 +40,7 @@ color: "#334E6D" roles: - Captain + - Blueshield - CentralCommandOfficial - ChiefEngineer - ChiefMedicalOfficer @@ -78,6 +79,7 @@ color: "#DE3A3A" roles: - HeadOfSecurity + - Blueshield - SecurityCadet - SecurityOfficer - SeniorOfficer diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index 58eab7864b..cf3b30efbf 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -150,3 +150,6 @@ - type: playTimeTracker id: JobZookeeper + +- type: playTimeTracker + id: JobBlueshield \ No newline at end of file diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index e467efc783..81cad845bb 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 0000000000..e6764f885b 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 0000000000..397b064d82 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 0000000000..d94c22d060 --- /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 0000000000..8e7f6c2141 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 0000000000..f5c1618119 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 0000000000..122843fdd8 --- /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 0000000000..9c6706b291 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 0000000000..7333658af9 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 0000000000..122843fdd8 --- /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 0000000000..2ced9c8159 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 0000000000..ed8b04c561 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 0000000000..9992fb89e6 --- /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 0000000000..83e6e42b8a 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 0000000000..f81e72ce3c 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 0000000000..000007c2cb --- /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 0000000000..d564b23919 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 0000000000..59cbf280c5 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 0000000000..e876fe440b --- /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 0000000000..dd4c083e70 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 0000000000..05467e0745 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 0000000000..e876fe440b --- /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 0000000000..86aa0a2f47 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 0000000000..7584d2b90b 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 0000000000..d95c0eeb23 --- /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 0000000000..4b980b5e64 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 0000000000..681710092c 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 0000000000..d95c0eeb23 --- /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/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/base.png new file mode 100644 index 0000000000..e0cfa6baad Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/disabler-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/disabler-inhand-left.png new file mode 100644 index 0000000000..0ff6f98972 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/disabler-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/disabler-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/disabler-inhand-right.png new file mode 100644 index 0000000000..895d331208 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/disabler-inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/equipped-BELT.png new file mode 100644 index 0000000000..33d05e86d8 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/icon.png new file mode 100644 index 0000000000..e0cfa6baad Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/lethal-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/lethal-inhand-left.png new file mode 100644 index 0000000000..444862e0f8 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/lethal-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/lethal-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/lethal-inhand-right.png new file mode 100644 index 0000000000..17e978be31 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/lethal-inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-0.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..a50af1eeab Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-1.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..2a53d0a8d9 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-2.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..4fa11c961d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-3.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..e9b808ace0 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-4.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..9b74ebafc1 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/meta.json new file mode 100644 index 0000000000..61d2b840c8 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/meta.json @@ -0,0 +1,70 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from paradise station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mode-disabler" + }, + { + "name": "mode-lethal" + }, + { + "name": "mode-ion" + }, + { + "name": "mag-unshaded-0", + "delays": [[ 0.3, 0.3 ]] + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "disabler-inhand-left", + "directions": 4 + }, + { + "name": "disabler-inhand-right", + "directions": 4 + }, + { + "name": "lethal-inhand-left", + "directions": 4 + }, + { + "name": "lethal-inhand-right", + "directions": 4 + }, + { + "name": "special-inhand-left", + "directions": 4 + }, + { + "name": "special-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mode-disabler.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mode-disabler.png new file mode 100644 index 0000000000..b2f3b34982 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mode-disabler.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mode-ion.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mode-ion.png new file mode 100644 index 0000000000..c6432e1a49 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mode-ion.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mode-lethal.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mode-lethal.png new file mode 100644 index 0000000000..4ed2624ecf Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/mode-lethal.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/special-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/special-inhand-left.png new file mode 100644 index 0000000000..73d17f58e7 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/special-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/special-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/special-inhand-right.png new file mode 100644 index 0000000000..a6b053d617 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Battery/advanced_revolver.rsi/special-inhand-right.png differ 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 0000000000..d281688a42 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 da00077fbd..0db1000530 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -175,6 +175,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 f77f8c0e71..306b25d2e3 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -226,6 +226,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 0000000000..16fad8f1b0 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 0000000000..3930f30e7e 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 a84c76a46c..e0b513e333 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -217,6 +217,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 0000000000..6f15a947c0 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/special.png differ