SpaceCowboyServer · AsikKEsel · Apr 14, 2024 · Apr 28, 2024
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -90,6 +90,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
         "Mail", // Nyanotrasen - Mail, see Resources/Prototypes/Nyanotrasen/Access/cargo.yml
         "Mantis", // DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml
         "Zookeeper",  // DeltaV - Add Zookeeper access
+        "Mercenary"
     };
 
     [Serializable, NetSerializable]

diff --git a/Resources/ConfigPresets/Build/development.toml b/Resources/ConfigPresets/Build/development.toml
@@ -1,6 +1,6 @@
 [game]
 # Straight in-game baby
-lobbyenabled = false
+lobbyenabled = true
 # Dev map for faster loading & convenience
 map = "Dev"
 role_timers = false

diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
@@ -46,3 +46,7 @@
   - Zookeeper # DeltaV - Add Zookeeper access
   - Corpsman # DeltaV - Add Corpsman access
   - Robotics # Troyéshina pirates - Add Robotics access
+
+- type: accessLevel
+  id: Mercenary
+  name: id-card-access-level-mercenary
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -432,3 +432,17 @@
   - type: StorageFill
     contents:
       - id: BoxSurvival
+
+# Mercenary
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackMerc
+  id: ClothingBackpackMercFilled
+  components:
+    - type: StorageFill
+      contents:
+      - id: BoxSurvival
+      - id: Lighter
+      - id: CigPackBlack
+      - id: Flash
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -295,4 +295,17 @@
   - type: StorageFill
     contents:
       - id: BoxSurvival
-
+
+# Mercenary
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackDuffelMerc
+  id: ClothingBackpackDuffelMercFilled
+  components:
+    - type: StorageFill
+      contents:
+      - id: BoxSurvival
+      - id: Lighter
+      - id: CigPackBlack
+      - id: Flash
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -319,4 +319,17 @@
   - type: StorageFill
     contents:
       - id: BoxSurvival
-
+
+# Mercenary
+
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSatchelMerc
+  id: ClothingBackpackSatchelMercFilled
+  components:
+    - type: StorageFill
+      contents:
+      - id: BoxSurvival
+      - id: Lighter
+      - id: CigPackBlack
+      - id: Flash
diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -274,4 +274,10 @@
   components:
     - type: Sprite
       sprite: Clothing/Back/Duffels/robotics.rsi
-
+
+  id: ClothingBackpackDuffelMerc
+  name: mercenary duffel
+  description: A duffel that has been in many dangerous places, a reliable combat duffel.
+  components:
+    - type: Sprite
+      sprite: Clothing/Back/Duffels/mercenary.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml
@@ -198,4 +198,12 @@
   components:
   - type: Sprite
     sprite: Clothing/Back/Satchels/robotics.rsi
-
+
+- type: entity
+  parent: ClothingBackpackSatchel
+  id: ClothingBackpackSatchelMerc
+  name: mercenary satchel
+  description: A satchel that has been in many dangerous places, a reliable combat satchel.
+  components:
+    - type: Sprite
+      sprite: Clothing/Back/Satchels/mercenary.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1155,6 +1155,7 @@
 
 - type: entity
   parent: BasePDA
+
   id: RoboticistPDA
   name: Roboticist PDA
   description: Найкращий друг робота.
@@ -1167,3 +1168,21 @@
     accentVColor: "#891417"
   - type: Icon
     state: pda-roboticist
+
+  id: MercenaryPDA
+  name: Планшет найманця
+  description: Чому не зелений?
+  components:
+  - type: Pda
+    id: MercenaryIDCard
+    state: pda-mercenary
+  - type: PdaBorderColor
+    borderColor: "#717059"
+    accentVColor: "#A32D26"
+  - type: Icon
+    state: pda-mercenary
+  - type: CartridgeLoader # DeltaV - Crime Assist
+    preinstalled:
+      - CrewManifestCartridge
+      - NotekeeperCartridge
+      - NewsReaderCartridge
diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -867,6 +867,7 @@
 
 - type: entity
   parent: IDCardStandard
+
   id: RoboticistIDCard
   name: Roboticist ID card
   components:
@@ -879,3 +880,12 @@
     - type: PresetIdCard
       job: Roboticist
 
+  id: MercenaryIDCard
+  name: ID найманця
+  components:
+  - type: PresetIdCard
+    job: Mercenary
+  - type: Sprite
+    layers:
+    - state: default
+    - state: idmercenary
diff --git a/Resources/Prototypes/Loadouts/Jobs/mercenary.yml b/Resources/Prototypes/Loadouts/Jobs/mercenary.yml
@@ -0,0 +1,11 @@
+- type: loadout
+  id: LoadoutMercenaryPackageBse
+  category: Jobs
+  cost: 3
+  exclusive: true
+  requirements:
+    - !type:LoadoutJobRequirement
+      jobs:
+        - Mercenary
+  items:
+    - MercPackageBase
diff --git a/Resources/Prototypes/Maps/debug.yml b/Resources/Prototypes/Maps/debug.yml
@@ -29,8 +29,10 @@
         - type: StationJobs
           overflowJobs:
           - Captain
+          - Mercenary
           availableJobs:
             Captain: [ -1, -1 ]
+            Mercenary: [ -1, -1 ]
 
 - type: gameMap
   id: TestTeg

diff --git a/Resources/Prototypes/Roles/Jobs/Security/mercenary.yml b/Resources/Prototypes/Roles/Jobs/Security/mercenary.yml
@@ -0,0 +1,40 @@
+- type: job
+  id: Mercenary
+  name: job-name-mercenary
+  description: job-description-mercenary
+  playTimeTracker: JobMercenary
+  requirements:
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 14400
+    - !type:WhitelistRequirement
+  startingGear: MercenaryGear
+  canBeAntag: true
+  icon: "JobIconMercenary" #
+  supervisors: job-supervisors-hire
+  setPreference: true
+  access:
+  - Maintenance
+  - External
+  - Mercenary
+
+- type: startingGear
+  id: MercenaryGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitMercenary
+    back: ClothingBackpackMercFilled 
+    shoes: ClothingShoesBootsMercFilled
+    # shoes: ClothingShoesBootsMagMercenaryFilled # Give this only to new spawns
+    mask: ClothingMaskGasMerc
+    eyes: ClothingEyesGlassesMercenary
+    gloves: ClothingHandsMercGlovesCombat
+#    head: ClothingHeadHatBeretMercenary
+    head: ClothingHeadHelmetMerc
+    outerClothing: ClothingOuterVestWebMerc
+    id: MercenaryPDA
+    ears: ClothingHeadsetGrey 
+    belt: ClothingBeltMercWebbing
+    pocket1: WeaponPistolPollock
+  innerClothingSkirt: ClothingUniformJumpskirtMercenary
+  satchel: ClothingBackpackSatchelMercFilled 
+  duffelbag: ClothingBackpackDuffelMercFilled 
diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -118,4 +118,5 @@
   - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
   - Prisoner # Nyanotrasen - Prisoner, see Resrouces/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
   - Brigmedic # DeltaV - Corpsman, see Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
+  - Mercenary
   primary: false
diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml
@@ -382,3 +382,10 @@
   icon:
     sprite: /Textures/Interface/Misc/job_icons.rsi
     state: Visitor
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconMercenary
+  icon:
+    sprite: /Textures/Interface/Misc/job_icons.rsi
+    state: Mercenary
diff --git a/Resources/Prototypes/_Pirate/Catalog/Package/Jobs/Mercenary/base_package.yml b/Resources/Prototypes/_Pirate/Catalog/Package/Jobs/Mercenary/base_package.yml
@@ -0,0 +1,16 @@
+- type: entity
+  parent: BaseItem
+  id: MercPackageBase
+  name: Mercenary base package
+  description: A small package with base equipment
+  components:
+  - type: Item
+    size: Normal
+  - type: Sprite
+    sprite: Objects/Storage/boxes.rsi
+    state: boxwide
+  - type: SpawnItemsOnUse
+    items:
+    - id: CaptainIDCard #test
+    sound:
+      path: /Audio/Effects/unwrap.ogg
diff --git a/Resources/Textures/Clothing/Back/Duffels/mercenary.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/mercenary.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/mercenary.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/mercenary.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/mercenary.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/mercenary.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/mercenary.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/mercenary.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Duffels/mercenary.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/mercenary.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 | Resprited for mercenary by erhardsteinhauer (discord)",
+    "license": "CC-BY-SA-3.0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ],
+    "version": 1
+}
diff --git a/Resources/Textures/Clothing/Back/Satchels/mercenary.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/mercenary.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/mercenary.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/mercenary.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/mercenary.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/mercenary.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/mercenary.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/mercenary.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Back/Satchels/mercenary.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/mercenary.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/547852588166c8e091b441e4e67169e156bb09c1 | Resprited for mercenary by erhardsteinhauer (discord)",
+    "license": "CC-BY-SA-3.0",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ],
+    "version": 1
+}
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Mercenary.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Mercenary.png
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -188,6 +188,9 @@
         },
         {
             "name": "InitialInfected"
+        },
+        {
+            "name": "Mercenary"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json
@@ -229,6 +229,9 @@
     {
       "name": "pda-blueshield"
     },
+    {
+      "name": "pda-mercenary"
+    },
     {
       "name": "equipped-IDCARD",
       "directions": 4

diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-mercenary.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-mercenary.png
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idmercenary.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idmercenary.png
-Original file line number
+Diff line change
@@ Expand Up / @@ -188,6 +188,9 @@ @@
             },
             {
                 "name": "InitialInfected"
+            },
+            {
+                "name": "Mercenary"
             }
         ]
     }