Merge branch 'subpoenahud' of https://github.com/BellwetherLogic/Delta-v

 into subpoenahud

Resources/Changelog/DeltaVChangelog.yml

@@ -2747,3 +2747,31 @@
   id: 401
   time: '2024-06-14T21:15:48.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/1384
+- author: Bellwether
+  changes:
+  - message: The Chief Justice's apparel is now available in the uniform printer
+    type: Tweak
+  id: 402
+  time: '2024-06-17T16:37:43.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1395
+- author: deltanedas
+  changes:
+  - message: Added Carpy the Legal Carp, coming to justice departments near you.
+    type: Add
+  id: 403
+  time: '2024-06-17T16:50:22.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1398
+- author: Lyndomen
+  changes:
+  - message: Reduced minimum number of players to 20 for nukies to spawn
+    type: Tweak
+  id: 404
+  time: '2024-06-17T16:52:21.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1404
+- author: deltanedas
+  changes:
+  - message: Void Jetpacks can now be reverse engineered.
+    type: Tweak
+  id: 405
+  time: '2024-06-17T17:03:06.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/1400

Resources/Prototypes/DeltaV/Catalog/Shipyard/civilian.yml

@@ -25,7 +25,7 @@
   id: Helix
   name: NTMC Helix
   description: A large mobile health clinic for servicing distant outposts.
-  price: 42000
+  price: 43000
   path: /Maps/Shuttles/DeltaV/helix.yml
   categories:
   - Civilian

Resources/Prototypes/DeltaV/Damage/modifier_sets.yml

@@ -9,3 +9,16 @@
     Blunt: 1.15
     Slash: 1.15
     Piercing: 1.15
+
+- type: damageModifierSet
+  id: StorageTank
+  coefficients:
+    Blunt: 0.7
+    Slash: 0.5
+    Piercing: 0.7
+    Shock: 1.2
+  flatReductions:
+    Blunt: 5
+    Slash: 5
+    Piercing: 5
+    Heat: 5

Resources/Prototypes/DeltaV/Entities/Markers/Spawners/mobs.yml

@@ -50,3 +50,17 @@
     prototypes:
       - MobSecDogLaika
       - MobSpiderShiva
+
+- type: entity
+  parent: MarkerBase
+  id: SpawnMobJusticePet
+  name: Justice Pet Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Mobs/Aliens/Carps/space.rsi
+      state: icon
+  - type: ConditionalSpawner
+    prototypes:
+    - MobCarpLegal

Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml

@@ -53,3 +53,26 @@
     - CannotSuicide
     - VimPilot
     - DoorBumpOpener
+
+- type: entity
+  parent: MobCarp
+  id: MobCarpLegal
+  name: Carpy the Legal Carp
+  description: Has a degree in fish law.
+  components:
+  - type: NpcFactionMember
+    factions:
+    - PetsNT
+  - type: TypingIndicator
+    proto: lawyer # incase of cognizine
+  - type: GhostRole
+    makeSentient: true
+    allowSpeech: true
+    allowMovement: true
+    name: "Carpy the Legal Carp"
+    description: "The real brains behind the Justice department. Your honour my client is not fishy!"
+    requirements:
+    - !type:DepartmentTimeRequirement
+      department: Justice
+      time: 3600 # 1 hours
+  - type: GhostTakeoverAvailable

Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml

@@ -80,3 +80,60 @@
   completetime: 4
   materials:
     Cloth: 500
+
+# Chief Justice Wardrobe
+
+- type: latheRecipe
+  id: ClothingHeadHatCJToque
+  result: ClothingHeadHatCJToque
+  completetime: 2
+  materials:
+    Cloth: 100
+
+- type: latheRecipe
+  id: ClothingUniformJumpsuitChiefJustice
+  result: ClothingUniformJumpsuitChiefJustice
+  completetime: 4
+  materials:
+    Cloth: 300
+    Durathread: 100
+
+- type: latheRecipe
+  id: ClothingUniformJumpskirtChiefJustice
+  result: ClothingUniformJumpskirtChiefJustice
+  completetime: 4
+  materials:
+    Cloth: 300
+    Durathread: 100
+
+- type: latheRecipe
+  id: ClothingUniformJumpsuitChiefJusticeFormal
+  result: ClothingUniformJumpsuitChiefJusticeFormal
+  completetime: 4
+  materials:
+    Cloth: 300
+    Durathread: 100
+
+- type: latheRecipe
+  id: ClothingUniformJumpsuitChiefJusticeWhite
+  result: ClothingUniformJumpsuitChiefJusticeWhite
+  completetime: 5
+  materials:
+    Cloth: 300
+    Durathread: 100
+
+- type: latheRecipe
+  id: ClothingNeckCloakCJ
+  result: ClothingNeckCloakCJ
+  completetime: 2.8
+  materials:
+    Cloth: 200
+    Durathread: 150
+
+- type: latheRecipe
+  id: ClothingOuterChiefJustice
+  result: ClothingOuterChiefJustice
+  completetime: 3.2
+  materials:
+    Cloth: 300
+    Durathread: 200

Resources/Prototypes/DeltaV/Recipes/Lathes/devices.yml

@@ -0,0 +1,10 @@
+- type: latheRecipe
+  id: JetpackVoid
+  result: JetpackVoid
+  completetime: 15
+  materials:
+    Steel: 3000
+    Glass: 1500
+    Plastic: 1000
+    Gold: 300
+    Silver: 800

Resources/Prototypes/DeltaV/Roles/Jobs/Justice/chief_justice.yml

@@ -4,9 +4,9 @@
   description: job-description-chief-justice
   playTimeTracker: JobChiefJustice
   requirements:
-    - !type:RoleTimeRequirement
-      role: JobClerk
-      time: 36000 # DeltaV - 10 hours
+#    - !type:RoleTimeRequirement # DeltaV - Comment out clerk time till more people have clerk time. Maybe a week or so. 
+#      role: JobClerk
+#      time: 36000 # DeltaV - 10 hours
     - !type:RoleTimeRequirement
       role: JobLawyer
       time: 36000 # 10 hours

Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml

@@ -276,6 +276,10 @@
       - Back
       - suitStorage
       - Belt
+  - type: ReverseEngineering # DeltaV - make void jetpack RE'able
+    difficulty: 4
+    recipes:
+    - JetpackVoid
 
 # Filled void
 - type: entity

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -647,6 +647,9 @@
     - JetpackBlue
     - JetpackMini
   # End Nyano additions
+  # Begin DeltaV additions
+    - JetpackVoid
+  # End DeltaV additions
   - type: MaterialStorage
     whitelist:
       tags:
@@ -1075,6 +1078,11 @@
       - ClothingUniformJumpskirtQMTurtleneck
       - ClothingUniformJumpsuitQMFormal
       - ClothingHeadHatBeretRND
+      - ClothingHeadHatCJToque # DeltaV - Chief Justice
+      - ClothingUniformJumpsuitChiefJustice # DeltaV - Chief Justice
+      - ClothingUniformJumpskirtChiefJustice # DeltaV - Chief Justice
+      - ClothingUniformJumpsuitChiefJusticeFormal # DeltaV - Chief Justice
+      - ClothingUniformJumpsuitChiefJusticeWhite # DeltaV - Chief Justice
       - ClothingUniformJumpsuitResearchDirector
       - ClothingUniformJumpskirtResearchDirector
       - ClothingUniformJumpsuitScientist
@@ -1109,13 +1117,15 @@
       - ClothingOuterWinterWardenUnarmored
       - ClothingOuterWinterQM
       - ClothingOuterWinterRD
+      - ClothingOuterChiefJustice # DeltaV - Chief Justice
       - ClothingNeckMantleCap
       - ClothingNeckMantleCE
       - ClothingNeckMantleCMO
       - ClothingNeckMantleHOP
       - ClothingNeckMantleHOS
       - ClothingNeckMantleRD
       - ClothingNeckMantleQM
+      - ClothingNeckCloakCJ # DeltaV - Chief Justice
       - ClothingOuterStasecSweater # DeltaV - added stasec sweater to uniform printer.
       - ClothingOuterWinterMusician
       - ClothingOuterWinterClown

Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml

@@ -22,7 +22,7 @@
         - WallLayer
   - type: Damageable
     damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageModifierSet: StorageTank # DeltaV
   - type: Destructible
     thresholds:
     - trigger:
@@ -82,4 +82,4 @@
         mask:
         - MachineMask
         layer:
-        - WallLayer
+        - WallLayer

Resources/Prototypes/GameRules/roundstart.yml

@@ -94,7 +94,7 @@
   id: Nukeops
   components:
   - type: GameRule
-    minPlayers: 35 # DeltaV - Was 20
+    minPlayers: 20
   - type: LoadMapRule
     gameMap: NukieOutpost
   - type: AntagSelection