Merge remote-tracking branch 'upstream/master' into medical

Content.Shared/Access/Components/IdCardConsoleComponent.cs

@@ -73,6 +73,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<string> acc
         "Security",
         "Service",
         "Theatre",
+        "Orders", // DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml
     };
 
     [Serializable, NetSerializable]

Resources/Changelog/DeltaVChangelog.yml

@@ -121,3 +121,39 @@ Entries:
         Officers.
   id: 19
   time: '2023-09-27T22:51:15.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Tweak
+      message: Give back all the jobs their proper time requirements.
+  id: 20
+  time: '2023-09-28T14:49:00.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Remove
+      message: The Senior Roles are no longer available at round start.
+  id: 21
+  time: '2023-09-28T16:55:32.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Remove
+      message: Remove Ian as a traitor objective.
+  id: 22
+  time: '2023-09-28T17:01:47.0000000+00:00'
+- author: leonardo-dabepis
+  changes:
+    - type: Tweak
+      message: Bees can now be put in inventory and ground up as a ingredient.
+  id: 23
+  time: '2023-09-28T17:52:22.0000000+00:00'
+- author: JJ
+  changes:
+    - type: Add
+      message: Added Grilled Cheese.
+  id: 24
+  time: '2023-09-28T17:53:04.0000000+00:00'
+- author: DebugOk
+  changes:
+    - type: Tweak
+      message: Approving cargo orders now requires the Orders access level
+  id: 25
+  time: '2023-09-28T18:16:02.0000000+00:00'

Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl

@@ -0,0 +1 @@
+id-card-access-level-orders = Orders

Resources/Locale/en-US/job/job-supervisors.ftl

@@ -7,9 +7,9 @@ job-supervisors-cmo = the chief medical officer
 job-supervisors-rd = the research director
 job-supervisors-qm = the head of logistics
 job-supervisors-service = chefs, botanists, the bartender, and the head of personnel
-job-supervisors-engineering = station engineers, atmospheric technicians, the senior engineer, and the chief engineer
-job-supervisors-medicine = medical doctors, chemists, the senior physician, and the chief medical officer
-job-supervisors-security = security officers, the senior officer, the warden, and the head of security
-job-supervisors-science = scientists, the senior researcher, and the research director
+job-supervisors-engineering = station engineers, atmospheric technicians, and the chief engineer
+job-supervisors-medicine = medical doctors, chemists, and the chief medical officer
+job-supervisors-security = security officers, the warden, and the head of security
+job-supervisors-science = scientists, and the research director
 job-supervisors-hire = whoever hires you
 job-supervisors-everyone = absolutely everyone

Resources/Locale/en-US/nyanotrasen/prototypes/access/accesses.ftl

@@ -0,0 +1 @@
+id-card-access-level-mail = Mail

Resources/Prototypes/Access/cargo.yml

@@ -17,3 +17,4 @@
   - Salvage
   - Cargo
   - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
+  - Orders # Delta V - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml

Resources/Prototypes/Access/misc.yml

@@ -31,4 +31,5 @@
   - Hydroponics
   - Atmospherics
   - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml
+  - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml
   - Paramedic # DeltaV - Add Paramedic access

Resources/Prototypes/DeltaV/Access/cargo.yml

@@ -0,0 +1,3 @@
+- type: accessLevel
+  id: Orders
+  name: id-card-access-level-orders # Custom access level that allows the approval of orders

Resources/Prototypes/DeltaV/Entities/Consumable/Food/meals.yml

@@ -0,0 +1,22 @@
+- type: entity
+  name: grilled cheese
+  parent: FoodMealBase
+  id: FoodMealGrilledCheese
+  description: Two slices of bread cooked in butter with a lofty wedge of cheese in the middle.
+  components:
+  - type: FlavorProfile
+    flavors:
+      - butter
+      - cheesy
+  - type: Sprite
+    sprite: DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi
+    state: grilledcheese
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 15
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 6
+        - ReagentId: Vitamin
+          Quantity: 2

Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml

@@ -0,0 +1,9 @@
+- type: microwaveMealRecipe
+  id: RecipeGrilledCheese
+  name: grilled cheese
+  result: FoodMealGrilledCheese
+  time: 10
+  solids:
+    FoodBreadPlainSlice: 2
+    FoodCheeseSlice: 1
+    FoodButter: 1

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -113,6 +113,16 @@
     price: 50
   - type: Puller
     needsHands: true
+  - type: Item # DeltaV - Allow grabbing and storing bees in inventory
+    size: 5
+  - type: Extractable # DeltaV - Make it so bees can be ground up
+    grindableSolutionName: bee
+  - type: SolutionContainerManager
+    solutions:
+      bee:
+        reagents:
+        - ReagentId: GroundBee
+          Quantity: 5
 
 - type: entity
   name: bee

Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml

@@ -713,7 +713,7 @@
     energy: 1.6
     color: "#b89f25"
   - type: AccessReader
-    access: [["Cargo"]]
+    access: [["Orders"]] # DeltaV - see Resources/Prototypes/DeltaV/Access/cargo.yml
   - type: DeviceNetwork
     deviceNetId: Wireless
     receiveFrequencyId: BasicDevice

Resources/Prototypes/Maps/aspid.yml

@@ -33,26 +33,26 @@
             #engineering
             ChiefEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 2, 2 ]
-            SeniorEngineer: [ 1, 1 ]
+            # SeniorEngineer: [ 1, 1 ]
             StationEngineer: [ 2, 3 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
+            # SeniorPhysician: [ 1, 1 ]
             Paramedic: [ 1, 1 ]
             Chemist: [ 1, 2 ]
             MedicalDoctor: [ 3, 3 ]
             MedicalIntern: [ 4, 4 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ]
+            # SeniorResearcher: [ 1, 1 ]
             Scientist: [ 3, 4 ]
             ResearchAssistant: [ 4, 4 ]
             Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
+            # SeniorOfficer: [ 1, 1 ]
             Detective: [ 1, 1 ]
             SecurityOfficer: [ 3, 4 ]
             SecurityCadet: [ 4, 4 ]
@@ -65,4 +65,4 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            
+

Resources/Prototypes/Maps/bagel.yml

@@ -31,27 +31,27 @@
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            SeniorEngineer: [ 1, 1 ]
+            # SeniorEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 3, 3 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
+            # SeniorPhysician: [ 1, 1 ]
             Chemist: [ 2, 3 ]
             MedicalDoctor: [ 2, 2 ]
             Paramedic: [ 1, 1 ]
             MedicalIntern: [ 4, 4 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ]        
+            # SeniorResearcher: [ 1, 1 ]
             Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 4, 4 ] 
+            ResearchAssistant: [ 4, 4 ]
             Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
+            # SeniorOfficer: [ 1, 1 ]
             SecurityOfficer: [ 3, 3 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]

Resources/Prototypes/Maps/box.yml

@@ -30,28 +30,28 @@
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            SeniorEngineer: [ 1, 1 ]
+            # SeniorEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
+            # SeniorPhysician: [ 1, 1 ]
             Chemist: [ 2, 3 ]
             MedicalDoctor: [ 3, 3 ]
             Paramedic: [ 1, 1 ]
             MedicalIntern: [ 4, 4 ]
             Psychologist: [ 1, 1 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ]        
+            # SeniorResearcher: [ 1, 1 ]
             Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 4, 4 ] 
+            ResearchAssistant: [ 4, 4 ]
             Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
+            # SeniorOfficer: [ 1, 1 ]
             SecurityOfficer: [ 4, 4 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]
@@ -65,4 +65,4 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            
+

Resources/Prototypes/Maps/cluster.yml

@@ -32,26 +32,26 @@
             ServiceWorker: [ 1, 1 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            SeniorEngineer: [ 1, 1 ]
+            # SeniorEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 2, 2 ]
             StationEngineer: [ 2, 2 ]
             TechnicalAssistant: [ 2, 2 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
+            # SeniorPhysician: [ 1, 1 ]
             Chemist: [ 1, 1 ]
             MedicalDoctor: [ 1, 1 ]
             MedicalIntern: [ 2, 2 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1 , 1 ]
+            # SeniorResearcher: [ 1 , 1 ]
             Scientist: [ 2, 2 ]
             ResearchAssistant: [ 2, 2 ]
             Borg: [ 1, 1 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
+            # SeniorOfficer: [ 1, 1 ]
             Detective: [ 1, 1 ]
             SecurityOfficer: [ 2, 2 ]
             SecurityCadet: [ 2, 2 ]
@@ -64,4 +64,4 @@
             Clown: [ 1, 1 ]
             Mime: [ 1, 1 ]
             Musician: [ 1, 1 ]
-            
+

Resources/Prototypes/Maps/core.yml

@@ -34,27 +34,27 @@
             StationEngineer: [ 4, 4 ]
             AtmosphericTechnician: [ 2, 2 ]
             TechnicalAssistant: [ 2, 3 ]
-            SeniorEngineer: [ 1, 1 ]
+            # SeniorEngineer: [ 1, 1 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
             MedicalDoctor: [ 3, 4 ]
             Chemist: [ 2, 3 ]
             MedicalIntern: [ 2, 3 ]
             Paramedic: [ 1, 2 ]
-            SeniorPhysician: [ 1, 1 ]
+            # SeniorPhysician: [ 1, 1 ]
             #science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 3, 4 ]
             ResearchAssistant: [ 2, 2 ]
-            SeniorResearcher: [ 1, 1 ] 
+            # SeniorResearcher: [ 1, 1 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             SecurityOfficer: [ 4, 4 ]
             Warden: [ 1, 1 ]
             Lawyer: [ 2, 2 ]
             SecurityCadet: [ 2, 2 ]
             Detective: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
+            # SeniorOfficer: [ 1, 1 ]
             #supply
             CargoTechnician: [ 3, 3 ]
             Quartermaster: [ 1, 1 ]

Resources/Prototypes/Maps/europa.yml

@@ -34,27 +34,27 @@
             StationEngineer: [ 2, 2 ]
             AtmosphericTechnician: [ 2, 2 ]
             TechnicalAssistant: [ 1, 1 ]
-            SeniorEngineer: [ 1, 1 ]
+            # SeniorEngineer: [ 1, 1 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
             MedicalDoctor: [ 1, 2 ]
             Chemist: [ 1, 2 ]
             MedicalIntern: [ 1, 1 ]
             Paramedic: [ 1, 2 ]
-            SeniorPhysician: [ 1, 1 ]
+            # SeniorPhysician: [ 1, 1 ]
             #science
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 1, 2 ]
             ResearchAssistant: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ] 
+            # SeniorResearcher: [ 1, 1 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             SecurityOfficer: [ 2, 2 ]
             Warden: [ 1, 1 ]
             Lawyer: [ 1, 1 ]
             SecurityCadet: [ 3, 3 ]
             Detective: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
+            # SeniorOfficer: [ 1, 1 ]
             #supply
             CargoTechnician: [ 3, 3 ]
             Quartermaster: [ 1, 1 ]

Resources/Prototypes/Maps/fland.yml

@@ -30,27 +30,27 @@
             ServiceWorker: [ 2, 2 ]
             #engineering
             ChiefEngineer: [ 1, 1 ]
-            SeniorEngineer: [ 1, 1 ]
+            # SeniorEngineer: [ 1, 1 ]
             AtmosphericTechnician: [ 3, 3 ]
             StationEngineer: [ 4, 4 ]
             TechnicalAssistant: [ 4, 4 ]
             #medical
             ChiefMedicalOfficer: [ 1, 1 ]
-            SeniorPhysician: [ 1, 1 ]
+            # SeniorPhysician: [ 1, 1 ]
             Chemist: [ 3, 3 ]
             MedicalDoctor: [ 5, 5 ]
             Paramedic: [ 2, 2 ]
             MedicalIntern: [ 4, 4 ]
             #science
             ResearchDirector: [ 1, 1 ]
-            SeniorResearcher: [ 1, 1 ]        
+            # SeniorResearcher: [ 1, 1 ]
             Scientist: [ 4, 4 ]
-            ResearchAssistant: [ 6, 6 ] 
+            ResearchAssistant: [ 6, 6 ]
             Borg: [ 2, 2 ]
             #security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
-            SeniorOfficer: [ 1, 1 ]
+            # SeniorOfficer: [ 1, 1 ]
             SecurityOfficer: [ 7, 7 ]
             Detective: [ 1, 1 ]
             SecurityCadet: [ 4, 4 ]