diff --git a/Resources/Locale/ru-RU/_sunrise/job/department.ftl b/Resources/Locale/ru-RU/_sunrise/job/department.ftl index 715ec9a6716..81d540b59e3 100644 --- a/Resources/Locale/ru-RU/_sunrise/job/department.ftl +++ b/Resources/Locale/ru-RU/_sunrise/job/department.ftl @@ -1,2 +1,3 @@ department-Law = Юридический отдел department-CentralCommand = Центральное командование +department-Blueshield = Синий Щит diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 41dfc983f69..704ef37a1e5 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -26,3 +26,18 @@ contents: - id: BoxSurvivalBrigmedic - id: Flash + +- type: entity + noSpawn: true + parent: ClothingBackpackBlueShield + id: ClothingBackpackBlueShieldFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalSecurity + - id: Flash + - id: TrackingImplanter + - id: TrackingImplanter + - id: TrackingImplanter + - id: TrackingImplanter + - id: ClothingOuterHardsuitBlueshield diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index df50eba9d92..2087e461706 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -26,3 +26,18 @@ contents: - id: BoxSurvivalBrigmedic - id: Flash + +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelBlueShield + id: ClothingBackpackDuffelBlueShieldFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalSecurity + - id: Flash + - id: TrackingImplanter + - id: TrackingImplanter + - id: TrackingImplanter + - id: TrackingImplanter + - id: ClothingOuterHardsuitBlueshield diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/satchel.yml index e61cf3e33e0..0d261043104 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -26,3 +26,18 @@ contents: - id: BoxSurvivalBrigmedic - id: Flash + +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelBlueShield + id: ClothingBackpackSatchelBlueShieldFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalSecurity + - id: Flash + - id: TrackingImplanter + - id: TrackingImplanter + - id: TrackingImplanter + - id: TrackingImplanter + - id: ClothingOuterHardsuitBlueshield diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/misc.yml index 355f04e11e8..38c32e942fd 100644 --- a/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/misc.yml +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Items/misc.yml @@ -7,3 +7,28 @@ containers: item: - CombatKnife + +- type: entity + id: ClothingBeltBlueShieldWebbingFilled + parent: ClothingBeltBlueShieldWebbing + suffix: Filled + components: + - type: StorageFill + contents: + - id: Handcuffs + - id: Handcuffs + - id: Stunbaton + - id: GrenadeFlashBang + - id: TearGasGrenade + - id: MedkitCombatFilled + + +- type: entity + id: ClothingShoesBootsBlueShieldFilled + parent: ClothingShoesBootsBlueShield + suffix: Filled + components: + - type: ContainerFill + containers: + item: + - CombatKnife diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml index 51272af0ad4..ec0f1118dcc 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/backpacks.yml @@ -4,12 +4,12 @@ name: army backpack description: A spacious backpack with lots of pockets, worn by military structures. components: - - type: Sprite - sprite: _Sunrise/Back/Backpacks/military.rsi - - type: Storage - grid: - - 0,0,6,3 # TODO: Change this - maxItemSize: Huge + - type: Sprite + sprite: _Sunrise/Back/Backpacks/military.rsi + - type: Storage + grid: + - 0,0,6,3 # TODO: Change this + maxItemSize: Huge - type: entity parent: ClothingBackpack @@ -17,12 +17,12 @@ name: death squadron backpack description: A spacious backpack using bluespace technology. components: - - type: Sprite - sprite: _Sunrise/Back/Backpacks/deathsquad-backpack.rsi - - type: Storage - grid: - - 0,0,6,3 # TODO: Change this - maxItemSize: Huge + - type: Sprite + sprite: _Sunrise/Back/Backpacks/deathsquad-backpack.rsi + - type: Storage + grid: + - 0,0,6,3 # TODO: Change this + maxItemSize: Huge - type: entity parent: ClothingBackpack @@ -30,5 +30,14 @@ name: chief engineer backpack description: Technicially progressive backpack. components: - - type: Sprite - sprite: _Sunrise/Back/Backpacks/ce.rsi + - type: Sprite + sprite: _Sunrise/Back/Backpacks/ce.rsi + +- type: entity + parent: ClothingBackpack + id: ClothingBackpackBlueShield + name: рюкзак офицера «синий щит» + description: На стиле. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Back/Backpacks/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/duffel.yml index b47125c9397..4f612730b02 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/duffel.yml @@ -4,12 +4,12 @@ name: army duffel bag description: A large duffel bag for holding any army goods. components: - - type: Sprite - sprite: _Sunrise/Back/Duffels/military.rsi - - type: Storage - grid: - - 0,0,6,3 # TODO: Change this - maxItemSize: Huge + - type: Sprite + sprite: _Sunrise/Back/Duffels/military.rsi + - type: Storage + grid: + - 0,0,6,3 # TODO: Change this + maxItemSize: Huge - type: entity parent: ClothingBackpackDuffel @@ -17,5 +17,14 @@ name: chief engineer duffel bag description: A large duffel bag for all instruments you need to create singularity. components: - - type: Sprite - sprite: _Sunrise/Back/Duffels/ce.rsi + - type: Sprite + sprite: _Sunrise/Back/Duffels/ce.rsi + +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelBlueShield + name: вещмешок офицера «синий щит» + description: На стиле. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Back/Duffels/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/satchel.yml index 5c182dd267f..5c03b86292c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Back/satchel.yml @@ -4,12 +4,12 @@ name: army satchel description: A tactical satchel for army related needs. components: - - type: Sprite - sprite: _Sunrise/Back/Satchels/military.rsi - - type: Storage - grid: - - 0,0,6,3 # TODO: Change this - maxItemSize: Huge + - type: Sprite + sprite: _Sunrise/Back/Satchels/military.rsi + - type: Storage + grid: + - 0,0,6,3 # TODO: Change this + maxItemSize: Huge - type: entity parent: ClothingBackpackSatchel @@ -17,5 +17,14 @@ name: chief engineer satchel description: A white satchel for best engineers. components: - - type: Sprite - sprite: _Sunrise/Back/Satchels/ce.rsi + - type: Sprite + sprite: _Sunrise/Back/Satchels/ce.rsi + +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelBlueShield + name: сумка офицера «синий щит» + description: На стиле. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Back/Satchels/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml new file mode 100644 index 00000000000..824362c3153 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Belt/belts.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltBlueShieldWebbing + name: рпс офицера «синий щит» + description: Голубой?! + components: + - type: Sprite + sprite: _Sunrise/Clothing/Belt/blueshield_webbing.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Belt/blueshield_webbing.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml index f25c2fdd953..bc8f5596c27 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Eyes/glasses.yml @@ -19,3 +19,29 @@ sprite: _Sunrise/Clothing/Eyes/Glasses/kim.rsi - type: Clothing sprite: _Sunrise/Clothing/Eyes/Glasses/kim.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesBlueShield + name: очки офицера «синий щит» + description: Инновационные синие линзы скрывают глаза от световых вспышек и имеют встроенный визор. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi + - type: FlashImmunity + - type: ShowJobIcons + - type: ShowMindShieldIcons + - type: ShowCriminalRecordIcons + - type: ShowHealthBars + damageContainers: + - Biological + - type: ShowHealthIcons + damageContainers: + - Biological + - type: Tag + tags: + - HudMedical + - type: EyeProtection + protectionTime: 5 diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml index 22172f8352b..2d6dd61e103 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hardsuit-helmets.yml @@ -39,3 +39,28 @@ Shock: 0.1 Cold: 0.2 Radiation: 0.2 + +# Blueshield Hardsuit + +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitBlueshield + noSpawn: true + name: шлем скафандра офицера «синий щит» + description: Синий. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Head/hardsuits/blueshield.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Head/hardsuits/blueshield.rsi + - type: PointLight + color: "#adeeff" + - type: PressureProtection + highPressureMultiplier: 0.45 + lowPressureMultiplier: 10000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml index f971c948c3d..73762eaff00 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/hats.yml @@ -85,3 +85,14 @@ sprite: _Sunrise/Clothing/Head/Hats/caphat.rsi - type: Clothing sprite: _Sunrise/Clothing/Head/Hats/caphat.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretBlueShield + name: берет офицера «синий щит» + description: Синий. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Head/Hats/blueshield.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Head/Hats/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml index 49bb67a5822..b04c5cdd13f 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml @@ -17,3 +17,25 @@ Heat: 0.5 - type: ExplosionResistance damageCoefficient: 0.65 + +- type: entity + parent: ClothingOuterArmorBasic + id: ClothingOuterArmorBlueShield + name: бронежилет офицера «синий щит» + description: Синий и прочный. + components: + - type: Sprite + sprite: _Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi + - type: Clothing + sprite: _Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.7 + - type: ExplosionResistance + damageCoefficient: 0.80 + - type: Item + size: Normal diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml index 9eba9f5df70..cf1273a9e26 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/hardsuits.yml @@ -30,3 +30,35 @@ damageCoefficient: 0.7 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetCBURNLeader + +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitBlueshield + name: скафандр офицера «синий щит» + description: Крепкий и надёжныый, как и его владелец. + components: + - type: Sprite + sprite: _Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi + - type: Clothing + sprite: _Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi + - type: PressureProtection + highPressureMultiplier: 0.525 + lowPressureMultiplier: 10000 + - type: ClothingSpeedModifier + walkModifier: 0.75 + sprintModifier: 0.75 + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.5 + Piercing: 0.5 + Heat: 0.8 + Radiation: 0.25 + Caustic: 0.6 + - type: ExplosionResistance + damageCoefficient: 0.6 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitBlueshield + - type: Item + size: Normal diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots.yml index f5c2bb46021..2147f8a7bfb 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Shoes/boots.yml @@ -6,3 +6,14 @@ sprite: _Sunrise/Clothing/Shoes/Boots/jackboots_sec.rsi - type: Clothing sprite: _Sunrise/Clothing/Shoes/Boots/jackboots_sec.rsi + +- type: entity + parent: ClothingShoesMilitaryBase + id: ClothingShoesBootsBlueShield + name: ботинки офицера «синий щит» + description: Синий или голубой, вот в чём вопрос. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Shoes/Boots/blueshield.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Shoes/Boots/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpskirts.yml index 475d3f9b930..0a99f4990df 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpskirts.yml @@ -64,3 +64,14 @@ sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi - type: Clothing sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/schoolskirt.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtBlueShield + name: юбка-комбинезон офицера «синий щит» + description: Детка... + components: + - type: Sprite + sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml index 16c2a22b3e6..7e639f134b9 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Uniforms/jumpsuits.yml @@ -52,3 +52,14 @@ sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi - type: Clothing sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/magistratebel.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitBlueShield + name: комбинезон офицера «синий щит» + description: На стиле. + components: + - type: Sprite + sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi + - type: Clothing + sprite: _Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi diff --git a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml index b3f5db85ab0..b0d44278283 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Markers/Spawners/jobs.yml @@ -24,6 +24,20 @@ - state: green - state: brigmedic +- type: entity + id: SpawnPointBlueShield + parent: SpawnPointJobBase + name: blueshield + components: + - type: SpawnPoint + job_id: BlueShield + - type: Sprite + sprite: _Sunrise/Markers/jobs.rsi + layers: + - state: green + - state: blueshield + - state: jobicon + - type: entity id: SpawnPointCentCommOperator parent: SpawnPointJobBase diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/identification_cards.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/identification_cards.yml new file mode 100644 index 00000000000..4316e9e930b --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/identification_cards.yml @@ -0,0 +1,15 @@ +- type: entity + parent: IDCardStandard + id: BlueShieldIDCard + name: ID карта офицера «синий щит» + description: Карта, необходимая для доступа в различные области станции. + components: + - type: Sprite + sprite: _Sunrise/Objects/Misc/id_cards.rsi + layers: + - state: silver + - state: idblueshield + - type: Item + heldPrefix: silver + - type: PresetIdCard + job: BlueShield diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml index 3972e0bfab4..eca09f198e2 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml @@ -11,7 +11,7 @@ borderColor: "#6f6192" - type: Icon state: pda-lawyer - + - type: entity parent: CaptainPDA id: MagistratPDA @@ -30,3 +30,27 @@ borderColor: "#7C5D00" - type: Icon state: pda-captain + +- type: entity + parent: BasePDA + id: BlueShieldPDA + name: КПК офицера «синий щит» + description: Охуенный стиль. + components: + - type: Pda + id: BlueShieldIDCard + state: pda-blueshield + - type: Icon + state: pda-blueshield + - type: Sprite + sprite: _Sunrise/Objects/pda.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + shader: "unshaded" + visible: false diff --git a/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Blueshield/blueshield.yml b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Blueshield/blueshield.yml new file mode 100644 index 00000000000..5264219522d --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Loadouts/Jobs/Blueshield/blueshield.yml @@ -0,0 +1,44 @@ +- type: loadout + id: BlueShieldBackpack + equipment: BlueShieldBackpack + +- type: startingGear + id: BlueShieldBackpack + equipment: + back: ClothingBackpackBlueShieldFilled + +- type: loadout + id: BlueShieldSatchel + equipment: BlueShieldSatchel + +- type: startingGear + id: BlueShieldSatchel + equipment: + back: ClothingBackpackSatchelBlueShieldFilled + +- type: loadout + id: BlueShieldDuffel + equipment: BlueShieldDuffel + +- type: startingGear + id: BlueShieldDuffel + equipment: + back: ClothingBackpackDuffelBlueShieldFilled + +- type: loadout + id: BlueShieldJumpsuit + equipment: BlueShieldJumpsuit + +- type: startingGear + id: BlueShieldJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitBlueShield + +- type: loadout + id: BlueShieldJumpskirt + equipment: BlueShieldJumpskirt + +- type: startingGear + id: BlueShieldJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtBlueShield diff --git a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml index 959b3163aac..c05426d84d5 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/loadout_groups.yml @@ -106,3 +106,18 @@ - PsychologistBackpack - PsychologistSatchel - PsychologistDuffel + +- type: loadoutGroup + id: BlueShieldBackpack + name: Офицер «Синий Щит», рюкзак + loadouts: + - BlueShieldBackpack + - BlueShieldSatchel + - BlueShieldDuffel + +- type: loadoutGroup + id: BlueShieldJumpsuit + name: Офицер «Синий Щит», комбинезон + loadouts: + - BlueShieldJumpsuit + - BlueShieldJumpskirt diff --git a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml index 92280108493..a37394ab1be 100644 --- a/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_Sunrise/Loadouts/role_loadouts.yml @@ -43,3 +43,13 @@ - Bra - Pants - Socks + +- type: roleLoadout + id: JobBlueShield + groups: + - Bra + - Pants + - Socks + - BlueShieldJumpsuit + - BlueShieldBackpack + - Trinkets diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield.yml new file mode 100644 index 00000000000..4d10ca54d8f --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Blueshield/blueshield.yml @@ -0,0 +1,55 @@ +- type: job + id: BlueShield + name: офицер «синий щит» + description: Ваша главная задача - защита глав. Помните, вы не офицер службы безопасности. + playTimeTracker: JobBlueShield + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 36000 # 10 hrs + - !type:DepartmentTimeRequirement + department: Command + time: 36000 # 10 hrs + startingGear: BlueShieldGear + icon: JobIconBlueShield + supervisors: job-supervisors-centcom + canBeAntag: false + access: + - Command + - Bar + - Service + - Maintenance + - Janitor + - Theatre + - Kitchen + - Chapel + - Hydroponics + - External + - Chemistry + - Engineering + - Research + - Detective + - Salvage + - Security + - Brig + - Cargo + - Atmospherics + - Cargo + - Medical + special: + - !type:AddImplantSpecial + implants: [MindShieldImplant] + +- type: startingGear + id: BlueShieldGear + equipment: + shoes: ClothingShoesBootsBlueShieldFilled + eyes: ClothingEyesGlassesBlueShield + head: ClothingHeadHatBeretBlueShield + outerClothing: ClothingOuterArmorBlueShield + id: BlueShieldPDA + ears: ClothingHeadsetAltCommand + belt: ClothingBeltBlueShieldWebbingFilled + gloves: ClothingHandsGlovesCombat + inhand: + - WeaponDisablerSMG # TODO: заменить это на X-01 diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml index 0933e3bd062..d8b5298ba34 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml @@ -4,9 +4,9 @@ color: "#FF5297" weight: 80 roles: - - Magistrat - - IAA - - Lawyer + - Magistrat + - IAA + - Lawyer - type: department id: CentralCommand @@ -14,6 +14,15 @@ color: "#048e0f" # Sunrise-Edit weight: 120 roles: - - CentCommOfficial - - CentCommOperator + - CentCommOfficial + - CentCommOperator primary: false + +- type: department # Surnise-Blueshield + id: Blueshield + description: department-Blueshield-description + color: "#05255D" + roles: + - BlueShield + primary: false + weight: 50 diff --git a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml index 40921a7062a..3eaea1f91a2 100644 --- a/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/_Sunrise/Roles/play_time_trackers.yml @@ -12,3 +12,6 @@ - type: playTimeTracker id: JobCentCommOfficial + +- type: playTimeTracker + id: JobBlueShield diff --git a/Resources/Prototypes/_Sunrise/StatusEffects/job.yml b/Resources/Prototypes/_Sunrise/StatusEffects/job.yml index 9367978c0a7..f2d8298653f 100644 --- a/Resources/Prototypes/_Sunrise/StatusEffects/job.yml +++ b/Resources/Prototypes/_Sunrise/StatusEffects/job.yml @@ -11,3 +11,10 @@ icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Magistrat + +- type: statusIcon + parent: JobIcon + id: JobIconBlueShield + icon: + sprite: /Textures/_Sunrise/Interface/Misc/job_icons.rsi + state: BlueShield diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..d0d36901c93 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/icon.png new file mode 100644 index 00000000000..b21a0b974ed Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..d7194024728 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..dd7edc78bc0 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/meta.json new file mode 100644 index 00000000000..76b1f59d533 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Back/Backpacks/blueshield.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..db822d622dc Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/icon.png new file mode 100644 index 00000000000..411bd837bb1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..8b12fd699e6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..6fc311d5308 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/meta.json new file mode 100644 index 00000000000..76b1f59d533 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Back/Duffels/blueshield.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/equipped-BACKPACK.png b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..22cfa08db31 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/icon.png new file mode 100644 index 00000000000..65c278508cf Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..f2ebc07741d Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..7ddb3bd3826 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/meta.json new file mode 100644 index 00000000000..76b1f59d533 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Back/Satchels/blueshield.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/equipped-BELT.png b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/equipped-BELT.png new file mode 100644 index 00000000000..97d3dc1c37f Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/icon.png new file mode 100644 index 00000000000..0404b78cce9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/inhand-left.png new file mode 100644 index 00000000000..30e8644bf07 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/inhand-right.png new file mode 100644 index 00000000000..05bbad9fae4 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/meta.json new file mode 100644 index 00000000000..ae2756b9c0a --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Belt/blueshield_webbing.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/equipped-EYES.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/equipped-EYES.png new file mode 100644 index 00000000000..221ed3abbcf Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/icon.png new file mode 100644 index 00000000000..0666f21d2ea Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/inhand-left.png new file mode 100644 index 00000000000..c25fd24aae2 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/inhand-right.png new file mode 100644 index 00000000000..6e096ebd386 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/meta.json new file mode 100644 index 00000000000..d9ed212742f --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Eyes/Glasses/blueshield_sunglasses.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/equipped-HELMET-hamster.png b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/equipped-HELMET-hamster.png new file mode 100644 index 00000000000..019b5b9c83a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/equipped-HELMET-hamster.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..6c5dbd05bc2 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/icon.png new file mode 100644 index 00000000000..4f4e5ba6a87 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/meta.json new file mode 100644 index 00000000000..6b2edfc8140 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Head/Hats/blueshield.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon-flash.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon-flash.png new file mode 100644 index 00000000000..83017f56e16 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon-flash.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon.png new file mode 100644 index 00000000000..83017f56e16 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..3168b97cf80 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..7da1aa3a5dd Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/meta.json new file mode 100644 index 00000000000..7698fb8f7cf --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/off-equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..eda1490beef Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/on-equipped-HELMET.png b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..eda1490beef Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Head/hardsuits/blueshield.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..9371b44e78a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/icon.png new file mode 100644 index 00000000000..4b69fb568b1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..aea0f39676c Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..cef6f162c71 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/meta.json new file mode 100644 index 00000000000..d07b9b02bb1 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/OuterClothing/Armor/blueshield.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "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/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..17df20f60c4 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/icon.png new file mode 100644 index 00000000000..f76c3356cc8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..e3ed2137f3d Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..78b4206377b Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/meta.json new file mode 100644 index 00000000000..d07b9b02bb1 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/OuterClothing/hardsuits/blueshield.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "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/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/equipped-FEET-digi.png b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/equipped-FEET-digi.png new file mode 100644 index 00000000000..46b244c19ef Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/equipped-FEET-digi.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/equipped-FEET.png b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/equipped-FEET.png new file mode 100644 index 00000000000..50a41ae8caf Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/icon.png new file mode 100644 index 00000000000..c7941655cf5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..03bdacf9fb5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..f00d861ca54 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/meta.json new file mode 100644 index 00000000000..63b949a526b --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Shoes/Boots/blueshield.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "equipped-FEET-digi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..59399389dfe Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..a3d853aa001 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/icon.png new file mode 100644 index 00000000000..6c52f2fd5ff Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..d5ca96c85f6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..0fcbfbaf67a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/meta.json new file mode 100644 index 00000000000..72f5ef9c020 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpskirt/blueshield.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-digi.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-digi.png new file mode 100644 index 00000000000..68793ee365d Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-digi.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..bb84d9edf2b Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..cbc963ca9fe Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/icon.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/icon.png new file mode 100644 index 00000000000..6b5d7ad25d1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-left.png new file mode 100644 index 00000000000..d5ca96c85f6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-right.png new file mode 100644 index 00000000000..0fcbfbaf67a Binary files /dev/null and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/meta.json b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/meta.json new file mode 100644 index 00000000000..f52664de071 --- /dev/null +++ b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/blueshield.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-digi", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Sunrise/Interface/Misc/job_icons.rsi/BlueShield.png b/Resources/Textures/_Sunrise/Interface/Misc/job_icons.rsi/BlueShield.png new file mode 100644 index 00000000000..96b3fc32738 Binary files /dev/null and b/Resources/Textures/_Sunrise/Interface/Misc/job_icons.rsi/BlueShield.png differ diff --git a/Resources/Textures/_Sunrise/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_Sunrise/Interface/Misc/job_icons.rsi/meta.json new file mode 100644 index 00000000000..74c6124ddbf --- /dev/null +++ b/Resources/Textures/_Sunrise/Interface/Misc/job_icons.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 8, + "y": 8 + }, + "states": [ + { + "name": "BlueShield" + } + ] +} diff --git a/Resources/Textures/_Sunrise/Markers/jobs.rsi/blueshield.png b/Resources/Textures/_Sunrise/Markers/jobs.rsi/blueshield.png new file mode 100644 index 00000000000..f76c3356cc8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Markers/jobs.rsi/blueshield.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/idblueshield.png b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/idblueshield.png new file mode 100644 index 00000000000..d95d8d4c6b6 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/idblueshield.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/meta.json new file mode 100644 index 00000000000..140c1e00f1c --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "silver" + }, + { + "name": "silver-inhand-left", + "directions": 4 + }, + { + "name": "silver-inhand-right", + "directions": 4 + }, + { + "name": "idblueshield" + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver-inhand-left.png b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver-inhand-left.png new file mode 100644 index 00000000000..8197fa122f9 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver-inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver-inhand-right.png new file mode 100644 index 00000000000..430322e892c Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver-inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver.png b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver.png new file mode 100644 index 00000000000..b13153a246e Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/Misc/id_cards.rsi/silver.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/equipped-BELT.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/equipped-BELT.png new file mode 100644 index 00000000000..6901e6c33b1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/equipped-IDCARD.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/equipped-IDCARD.png new file mode 100644 index 00000000000..6901e6c33b1 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/equipped-IDCARD.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/id_overlay.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/id_overlay.png new file mode 100644 index 00000000000..3f5d310e703 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/id_overlay.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/inhand-left.png new file mode 100644 index 00000000000..12b784f81e8 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/inhand-right.png new file mode 100644 index 00000000000..6919215bcf5 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/insert_overlay.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/insert_overlay.png new file mode 100644 index 00000000000..61ba781c1ff Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/insert_overlay.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/light_overlay.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/light_overlay.png new file mode 100644 index 00000000000..286a6c32558 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/light_overlay.png differ diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/pda.rsi/meta.json new file mode 100644 index 00000000000..b0fab9ab5b2 --- /dev/null +++ b/Resources/Textures/_Sunrise/Objects/pda.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "SUNRISE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "id_overlay" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "insert_overlay" + }, + { + "name": "light_overlay" + }, + { + "name": "equipped-IDCARD" + }, + { + "name": "pda-blueshield" + } + ] +} diff --git a/Resources/Textures/_Sunrise/Objects/pda.rsi/pda-blueshield.png b/Resources/Textures/_Sunrise/Objects/pda.rsi/pda-blueshield.png new file mode 100644 index 00000000000..02b5bbe5836 Binary files /dev/null and b/Resources/Textures/_Sunrise/Objects/pda.rsi/pda-blueshield.png differ