fix

EndrAnimet · Dec 22, 2024 · e00d9a8 · e00d9a8
2 parents 52b4a98 + 79c3fcc
commit e00d9a8
Show file tree

Hide file tree

Showing 32 changed files with 237 additions and 35 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,18 +1,4 @@
 Entries:
-- author: NullWanderer
-  changes:
-  - message: Fixed the spare ID safe being destructible
-    type: Fix
-  id: 308
-  time: '2024-04-11T12:47:31.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1078
-- author: Velcroboy
-  changes:
-  - message: Changed asteroids to have more ore...and some danger
-    type: Tweak
-  id: 309
-  time: '2024-04-11T18:25:42.0000000+00:00'
-  url: https://github.com/DeltaV-Station/Delta-v/pull/1079
 - author: deltanedas
   changes:
   - message: Fixed some doors being AA.
@@ -3826,3 +3812,19 @@
   id: 807
   time: '2024-12-21T13:51:53.0000000+00:00'
   url: https://github.com/DeltaV-Station/Delta-v/pull/2488
+- author: deltanedas
+  changes:
+  - message: You can now directly dump ore bags into ore processors by clicking on
+      them.
+    type: Tweak
+  id: 808
+  time: '2024-12-22T08:52:18.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2469
+- author: Radezolid
+  changes:
+  - message: The syndicate R&D team managed to disguise regular grenades into foam
+      dart grenades, get them at your local illegal arms dealer/uplink.
+    type: Add
+  id: 809
+  time: '2024-12-22T16:14:07.0000000+00:00'
+  url: https://github.com/DeltaV-Station/Delta-v/pull/2486
diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt
diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl
@@ -4,3 +4,5 @@ job-description-clerk = Organize trials, notarize documents, review charges, and
 job-description-prosecutor = Take statements from security and prepare cases against those accused of commiting crimes.
 job-description-courier = Deliver mail and other packages from and to logistics. Avoid dogs.
 job-description-security-borg = Purpose-built to ensure the right of every crew member to liberty, justice and freedom, ensure the peace aboard the space station by following your laws and patrolling the halls.
+job-description-roboticist = Fabricate borgs and other robots, repair and upgrade the station's silicon life, and scream "State Laws" when the AI takes too long to open a door.
+job-description-cargo-assistant = Learn the basics of the logistics department, deliver crates and take buy orders from the rest of the station.
diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl
@@ -4,6 +4,7 @@ job-name-clerk = Clerk
 job-name-prosecutor = Prosecutor
 job-name-lawyer = Attorney
 job-name-courier = Courier
+job-name-cargo-assistant = Cargo Assistant
 job-name-security-borg = Security Cyborg
 # Used by the Agent ID
 job-name-senior-physician = Senior Physician
@@ -67,3 +68,5 @@ JobChiefJustice = Chief Justice
 JobClerk = Clerk
 JobProsecutor = Prosecutor
 JobSecurityBorg = Security Cyborg
+JobRoboticist = Roboticist
+JobCargoAssistant = Cargo Assistant
diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl
@@ -49,6 +49,12 @@ loadout-group-mail-carrier-head = Mail Carrier head
 loadout-group-mail-carrier-jumpsuit = Mail Carrier jumpsuit
 loadout-group-mail-carrier-outerclothing = Mail Carrier outer clothing
 
+loadout-group-cargo-assistant-head = Cargo Assistant head
+loadout-group-cargo-assistant-jumpsuit = Cargo Assistant jumpsuit
+loadout-group-cargo-assistant-backpack = Cargo Assistant backpack
+loadout-group-cargo-assistant-outerclothing = Cargo Assistant outer clothing
+loadout-group-cargo-assistant-shoes = Cargo Assistant shoes
+
 loadout-group-salvage-specialist-neck = Salvage Specialist neck
 
 loadout-group-salvage-id-delta = Salvage Specialist PDA

diff --git a/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl b/Resources/Locale/en-US/deltav/store/uplink-catalog.ftl
@@ -23,3 +23,6 @@ uplink-home-run-bat-desc = Rigged bat pre-coated in blood for Syndicate tee-ball
 
 uplink-foam-sabre-name = Sharp Foam Sabre
 uplink-foam-sabre-desc = A blade disguised as a toy foam sabre. Perfect for assassins that pretend playing around.
+
+uplink-explosive-foam-grenade-name = Explosive Foam Grenade
+uplink-explosive-foam-grenade-desc = An explosive grenade disguised as a regular foam toy grenade.
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@@ -14,7 +14,7 @@
     ReagentContainerOliveoil: 2
     ReagentContainerMayo: 1
     VariantCubeBox: 1
-    FoodContainerEgg: 1
+    FoodContainerEgg: 2 # DeltaV - more eggs
     DrinkMilkCarton: 2
     DrinkSoyMilkCarton: 1
     FoodButter: 3

diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
@@ -117,3 +117,16 @@
     Telecrystal: 6
   categories:
   - UplinkWeaponry
+
+- type: listing
+  id: UplinkExGrenadeFoam
+  name: uplink-explosive-foam-grenade-name
+  description: uplink-explosive-foam-grenade-desc
+  productEntity: ExGrenadeFoam
+  discountCategory: usualDiscounts
+  discountDownTo:
+    Telecrystal: 2
+  cost:
+    Telecrystal: 4 # 1 TC more expensive than regular due to disguise.
+  categories:
+  - UplinkExplosives
diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml
@@ -91,4 +91,17 @@
     layers:
     - state: green
     - sprite: DeltaV/Markers/jobs.rsi
-      state: roboticist
+      state: roboticist
+
+- type: entity
+  parent: SpawnPointJobBase
+  id: SpawnPointCargoAssistant
+  name: cargo assistant
+  components:
+  - type: SpawnPoint
+    job_id: CargoTechnician # Change to CargoAssistant once it's mapped on every map
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: DeltaV/Markers/jobs.rsi
+      state: cargoassistant
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
@@ -190,6 +190,16 @@
       - MailMetricsCartridge
       - NanoChatCartridge
 
+- type: entity
+  parent: CargoPDA
+  id: CargoAssistantPDA
+  name: cargo assistant PDA
+  description: It smells like cardboard.
+  components:
+  - type: Pda
+    id: CargoAssistantIDCard
+    state: pda-cargo-assistant
+
 ## Alternate Job Titles
 
 # Passenger

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/books.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/books.yml
@@ -84,3 +84,27 @@
     damage:
       types:
         Blunt: 1
+
+
+- type: entity
+  id: BookLogistics
+  parent: BaseGuidebook
+  name: logistics 101
+  description: A Nanotrasen guide book for a new cargo assistant still on training
+  components:
+  - type: Sprite
+    layers:
+    - state: paper
+    - state: cover_strong
+      color: "#785214"
+    - state: decor_wingette
+      color: "#a8741e"
+    - state: decor_spine
+      color: "#a8741e"
+    - state: icon_diamond
+    - state: icon_text3
+      color: "#ffffff"
+  - type: GuideHelp
+    guides:
+    - Cargo
+    - Salvage
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml
@@ -50,6 +50,19 @@
   - type: PresetIdCard
     job: Courier
 
+- type: entity
+  parent: IDCardStandard
+  id: CargoAssistantIDCard
+  name: cargo assistant ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - sprite: DeltaV/Objects/Misc/id_cards.rsi
+      state: idcargoassistant
+  - type: PresetIdCard
+    job: CargoAssistant
+
 ## Alternate Job Titles
 
 # Passenger

diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -7,3 +7,13 @@
     totalIntensity: 1
     canCreateVacuum: false
     deleteAfterExplosion: false # prevent borg having an empty hand
+
+- type: entity
+  parent: ExGrenade
+  id: ExGrenadeFoam
+  name: foam dart grenade
+  suffix: Explosive
+  description: Releases a bothersome spray of foam darts that cause severe welching.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Grenades/foamdart.rsi
diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml
@@ -71,6 +71,43 @@
   - CourierPDA
   - MailCarrierPDA
 
+## Cargo Assistant
+- type: loadoutGroup
+  id: CargoAssistantHead
+  name: loadout-group-cargo-assistant-head
+  minLimit: 0
+  loadouts:
+  - CargoTechnicianHead
+
+- type: loadoutGroup
+  id: CargoAssistantJumpsuit
+  name: loadout-group-cargo-assistant-jumpsuit
+  loadouts:
+  - CargoTechnicianJumpsuit
+  - CargoTechnicianJumpskirt
+
+- type: loadoutGroup
+  id: CargoAssistantBackpack
+  name: loadout-group-cargo-assistant-backpack
+  loadouts:
+  - CargoTechnicianBackpack
+  - CargoTechnicianSatchel
+  - CargoTechnicianDuffel
+
+- type: loadoutGroup
+  id: CargoAssistantOuterClothing
+  name: loadout-group-cargo-assistant-outerclothing
+  minLimit: 0
+  loadouts:
+  - CargoTechnicianWintercoat
+
+- type: loadoutGroup
+  id: CargoAssistantShoes
+  name: loadout-group-cargo-assistant-shoes
+  loadouts:
+  - BlackShoes
+  - CargoWinterBoots
+
 # Security
 ## Brig Medic
 - type: loadoutGroup

diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml
@@ -18,6 +18,20 @@
   - Underpants
   - Socks
 
+- type: roleLoadout
+  id: JobCargoAssistant
+  groups:
+  - GroupTankHarness
+  - CargoAssistantHead
+  - CargoAssistantJumpsuit
+  - CargoAssistantBackpack
+  - CargoAssistantOuterClothing
+  - CargoAssistantShoes
+  - Glasses
+  - Survival
+  - Trinkets
+  - GroupSpeciesBreathTool
+
 # Security
 - type: roleLoadout
   id: JobBrigmedic

diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/cargo_assistant.yml
@@ -0,0 +1,18 @@
+- type: job
+  id: CargoAssistant
+  name: job-name-cargo-assistant
+  description: job-description-cargo-assistant
+  startingGear: CargoAssistantGear
+  playTimeTracker: JobCargoAssistant
+  icon: "JobIconCargoAssistant"
+  supervisors: job-supervisors-qm
+  access:
+  - Cargo
+  - Maintenance
+
+- type: startingGear
+  id: CargoAssistantGear
+  equipment:
+    id: CargoAssistantPDA
+    ears: ClothingHeadsetCargo
+    pocket1: BookLogistics
diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml
@@ -18,3 +18,6 @@
 
 - type: playTimeTracker
   id: JobSecurityBorg
+
+- type: playTimeTracker
+  id: JobCargoAssistant
diff --git a/Resources/Prototypes/DeltaV/StatusIcon/job.yml b/Resources/Prototypes/DeltaV/StatusIcon/job.yml
@@ -45,3 +45,11 @@
     sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
     state: SecurityBorg
   jobName: job-name-security-borg
+
+- type: jobIcon
+  parent: JobIcon
+  id: JobIconCargoAssistant
+  icon:
+    sprite: /Textures/DeltaV/Interface/Misc/job_icons.rsi
+    state: CargoAssistant
+  jobName: job-name-cargo-assistant
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -15,7 +15,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 50
+        maxVol: 100 # DeltaV - More reagents for chefs
   - type: SolutionTransfer
     # This is potentially badly-handled due to 'drink opening',
     #  but it lets the flour be tampered with, refilled, etc.
@@ -93,10 +93,10 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 50
+        maxVol: 100 # DeltaV - More reagents for chefs
         reagents:
         - ReagentId: Flour
-          Quantity: 50
+          Quantity: 100 # DeltaV - More reagents for chefs
 
 - type: entity
   parent: [ReagentPacketBase, ItemHeftyBase]
@@ -127,7 +127,7 @@
       food:
         reagents:
         - ReagentId: Cornmeal
-          Quantity: 50
+          Quantity: 100 # DeltaV - More reagents for chefs
 
 - type: entity
   parent: ReagentPacketBase
@@ -158,7 +158,7 @@
       food:
         reagents:
         - ReagentId: Rice
-          Quantity: 50
+          Quantity: 100 # DeltaV - More reagents for chefs
 
 - type: entity
   parent: ReagentPacketBase
@@ -189,7 +189,7 @@
       food:
         reagents:
         - ReagentId: Sugar
-          Quantity: 50
+          Quantity: 100 # DeltaV - More reagents for chefs
 
 - type: entity
   parent: ReagentPacketBase

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1470,6 +1470,8 @@
       transferSound:
         path: /Audio/Effects/Cargo/ping.ogg
     - type: MiningPointsLathe # DeltaV
+    - type: PlaceableSurface # DeltaV: Allow ore bags to dump into it directly
+      isPlaceable: false # but not place on it if you just click it with a random item
 
 - type: entity
   parent: OreProcessor

diff --git a/Resources/Prototypes/Recipes/Reactions/single_reagent.yml b/Resources/Prototypes/Recipes/Reactions/single_reagent.yml
@@ -8,15 +8,15 @@
   products:
     Protein: 0.5
 
-- type: reaction
-  id: EggCooking
-  impact: Low
-  minTemp: 344
-  reactants:
-    Egg:
-      amount: 0.5
-  products:
-    EggCooked: 0.5
+#- type: reaction # Delta V - Removed this reaction due to lack of function besides punishing chefs
+#  id: EggCooking
+#  impact: Low
+#  minTemp: 344
+#  reactants:
+#    Egg:
+#      amount: 0.5
+#  products:
+#    EggCooked: 0.5
 
 - type: reaction
   id: SapBoiling