SpaceCowboyServer · AsikKEsel · Dec 28, 2023 · Dec 28, 2023 · Jan 17, 2024 · Jan 17, 2024
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
@@ -48,6 +48,7 @@ job-name-senior-engineer = Senior Engineer
 job-name-senior-researcher = Senior Researcher
 job-name-senior-physician = Senior Physician
 job-name-senior-officer = Sergeant
+job-name-blueshield = Blueshield Officer
 
 # Role timers - Make these alphabetical or I cut you
 JobAtmosphericTechnician = Atmospheric Technician

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -384,3 +384,16 @@
     contents:
       - id: BoxSurvivalBrigmedic
       - id: Flash
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackBlueshield
+  id: ClothingBackpackBlueshieldFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalSecurity
+      - id: MedkitAdvancedFilled
+      - id: HandheldCrewMonitor
+      - id: Flash
+      - id: WeaponDisabler
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -259,3 +259,16 @@
     - type: StorageFill
       contents:
         - id: BoxSurvival
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackDuffelBlueshield
+  id: ClothingBackpackDuffelBlueshieldFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalSecurity
+      - id: MedkitAdvancedFilled
+      - id: HandheldCrewMonitor
+      - id: Flash
+      - id: WeaponDisabler
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -281,3 +281,16 @@
     contents:
       - id: BoxSurvival
       - id: RubberStampMime
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSatchelBlueshield
+  id: ClothingBackpackSatchelBlueshieldFilled
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalSecurity
+      - id: MedkitAdvancedFilled
+      - id: HandheldCrewMonitor
+      - id: Flash
+      - id: WeaponDisabler
diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -181,3 +181,18 @@
         - id: WeaponRevolverInspector
         - id: SpeedLoaderMagnum
         - id: SpeedLoaderMagnumRubber
+
+- type: entity
+  id: ClothingBeltSecurityBlueshieldFilled
+  parent: ClothingBeltSecurity
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: GrenadeFlashBang
+      - id: GrenadeFlashBang
+      - id: Stunbaton
+      - id: Handcuffs
+      - id: Handcuffs
+      - id: MagazinePistolCaselessRifle
+      - id: MagazinePistolCaselessRifleRubber
diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml
@@ -248,6 +248,15 @@
   - type: Sprite
     sprite: Clothing/Back/Backpacks/ertclown.rsi
 
+- type: entity
+  parent: ClothingBackpack
+  id: ClothingBackpackBlueshield
+  name: blueshield backpack
+  description: Не їстівне, нажаль...
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Backpacks/blueshield.rsi
+
 #Special
 - type: entity
   parent: ClothingBackpack

diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -130,6 +130,15 @@
     - type: Sprite
       sprite: Clothing/Back/Duffels/science.rsi
 
+- type: entity
+  parent: ClothingBackpackDuffel
+  id: ClothingBackpackDuffelBlueshield
+  name: blueshield duffel backpack
+  description: Велика штука для великих речей.
+  components:
+    - type: Sprite
+      sprite: Clothing/Back/Duffels/blueshield.rsi
+
 - type: entity
   parent: ClothingBackpackDuffel
   id: ClothingBackpackDuffelHydroponics

diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -25,6 +25,15 @@
   - type: Sprite
     sprite: Clothing/Back/Satchels/engineering.rsi
 
+- type: entity
+  parent: ClothingBackpackSatchel
+  id: ClothingBackpackSatchelBlueshield
+  name: blueshield satchel
+  description: сумка яка допоможе тобі запам'ятати число Пі.
+  components:
+  - type: Sprite
+    sprite: Clothing/Back/Satchels/blueshield.rsi
+
 - type: entity
   parent: ClothingBackpackSatchel
   id: ClothingBackpackSatchelAtmospherics

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -41,6 +41,20 @@
     - HamsterWearable
     - WhitelistChameleon
 
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatBeretBlueshield
+  name: blueshield beret
+  description: Стоїть на захисті твого ніжного волосся.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/beret_blueshield.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/beret_blueshield.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+
 - type: entity
   parent: ClothingHeadBase
   id: ClothingHeadHatCasa

diff --git a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml
@@ -40,3 +40,14 @@
     - ClothMade
     - HamsterWearable
     - WhitelistChameleon
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckTieBlue
+  name: синя краватка
+  description: Синя краватка із застібкою з неошовку.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Ties/bluetie.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Ties/bluetie.rsi
diff --git 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
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml
@@ -76,3 +76,15 @@
     sprite: Clothing/OuterClothing/Vests/vest.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Vests/vest.rsi
+
+#Blueshield vest
+- type: entity
+  parent: ClothingOuterArmorBasic
+  id: ClothingOuterVestBlueshield
+  name: blueshield vest
+  description: Це желет а не желе!.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Vests/blueshield.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Vests/blueshield.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -836,6 +836,17 @@
     graph: WebObjects
     node: jumpskirt
 
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpskirtBlueshield
+  name: blueshield jumpskirt
+  description: Міс, цей комбенізон був внесений до модного журналу!.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/blueshield.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/blueshield.rsi
+
 - type: entity
   parent: ClothingUniformSkirtBase
   id: ClothingUniformJumpskirtCasualBlue

diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -1370,6 +1370,17 @@
   - type: Clothing
     sprite: Clothing/Uniforms/Jumpsuit/gladiator.rsi
 
+- type: entity
+  parent: ClothingUniformBase
+  id: ClothingUniformJumpsuitBlueshield
+  name: blueshield jumpsuit
+  description: Сер, це дуже технологічний комбенізон, він зшитий найдосвідчинішими клоунами!.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpsuit/blueshield.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpsuit/blueshield.rsi
+
 - type: entity
   parent: ClothingUniformBase
   id: ClothingUniformJumpsuitCasualBlue

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1024,6 +1024,21 @@
   - type: Icon
     state: pda-pirate
 
+- type: entity
+  parent: BasePDA
+  id: BlueshieldPDA
+  name: blueshield PDA
+  description: Коштує дорожче ніж ви, сер.
+  components:
+  - type: Pda
+    id: BlueshieldIDCard
+    state: pda-blueshield
+  - type: PdaBorderColor
+    borderColor: "#004281"
+    accentHColor: "#001932"
+  - type: Icon
+    state: pda-blueshield
+
 - type: entity
   parent: BasePDA
   id: SyndiAgentPDA

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -850,3 +850,17 @@
     - state: idseniorofficer
   - type: PresetIdCard
     job: SeniorOfficer
+
+- type: entity
+  parent: IDCardStandard
+  id: BlueshieldIDCard
+  name: Blueshield ID card
+  components:
+    - type: Sprite
+      layers:
+        - state: special
+        - state: idblueshield
+    - type: Item
+      heldPrefix: special
+    - type: PresetIdCard
+      job: Blueshield
diff --git a/Resources/Prototypes/Maps/frontier.yml b/Resources/Prototypes/Maps/frontier.yml
@@ -19,6 +19,7 @@
           availableJobs:
             Passenger: [ -1, -1 ]
             HeadOfPersonnel: [ 1, 1 ]
+            Blueshield: [ 1, 1 ]
             HeadOfSecurity: [ 1, 1 ]
             SeniorOfficer: [ 0, 0 ]
             Brigmedic: [ 0, 0 ]

diff --git a/Resources/Prototypes/Roles/Jobs/Command/blueshield.yml b/Resources/Prototypes/Roles/Jobs/Command/blueshield.yml
@@ -0,0 +1,64 @@
+- type: job
+  id: Blueshield
+  name: job-name-blueshield
+  description: job-description-blueshield
+  playTimeTracker: JobBlueshield
+  requirements:
+    - !type:OverallPlaytimeRequirement
+      time: 14000
+ #   - !type:RoleTimeRequirement        # 
+ #     role: JobHeadOfPersonnel         # 
+ #     time: 3600 #1 hrs                # 
+ #   - !type:RoleTimeRequirement        # треба буде якось це налаштувати.
+ #     role: JobHeadOfSecurity          # просто я не можу придумати на яких ролях треба награти для такої професії
+ #     time: 3600 #1 hrs                # або ж мені просто лінь придумувати ))
+ #   - !type:RoleTimeRequirement        # 
+ #     role: JobChiefMedicalOfficer     #
+ #     time: 3600 #1 hrs                #
+  weight: 20
+  startingGear: BlueshieldGear
+  icon: "JobIconBlueshield"
+  requireAdminNotify: true
+  joinNotifyCrew: true
+  supervisors: job-supervisors-centcom
+  canBeAntag: false
+  access:
+  - Command
+  - Service
+  - Frontier
+  - Maintenance
+  - External
+  - Chemistry 
+  - Engineering 
+  - Research 
+  - Detective
+  - Salvage
+  - Security
+  - Brig 
+  - Cargo
+  - Atmospherics
+  - Medical
+  - Armory 
+  - Mercenary
+  special:
+  - !type:AddImplantSpecial
+    implants: [ MindShieldImplant, TrackingImplant ]
+
+- type: startingGear
+  id: BlueshieldGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitBlueshield
+    back: ClothingBackpackBlueshieldFilled
+    shoes: ClothingShoesBootsCombatFilled
+    head: ClothingHeadHatBeretBlueshield
+    eyes: ClothingEyesGlassesSecurity
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterVestBlueshield
+    id: BlueshieldPDA
+    ears: ClothingHeadsetAltSecurity
+    pocket1: WeaponPistolCobra
+    belt: ClothingBeltSecurityBlueshieldFilled
+    neck: ClothingNeckTieBlue
+  innerClothingSkirt: ClothingUniformJumpskirtBlueshield
+  satchel: ClothingBackpackSatchelBlueshieldFilled
+  duffelbag: ClothingBackpackDuffelBlueshieldFilled
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -43,6 +43,7 @@
   color: "#334E6D"
   roles:
   - Captain
+  - Blueshield
   - CentralCommandOfficial
   - ChiefEngineer
   - ChiefMedicalOfficer
@@ -81,6 +82,7 @@
   color: "#DE3A3A"
   roles:
   - HeadOfSecurity
+  - Blueshield
   - SecurityCadet
   - SecurityOfficer
   - SeniorOfficer

diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml
@@ -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
diff --git a/Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi/icon.png b/Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Backpacks/blueshield.rsi/meta.json 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
+      }
+    ]
+  }
diff --git a/Resources/Textures/Clothing/Back/Duffels/blueshield.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/blueshield.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/blueshield.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/blueshield.rsi/icon.png