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

DeltaV-Station · Mar 19, 2024 · 10d87e8 · 10d87e8
2 parents 8324167 + 304fdcd
commit 10d87e8
Show file tree

Hide file tree

Showing 64 changed files with 568 additions and 52 deletions.
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -57,6 +57,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<string> acc
         "ChiefEngineer",
         "ChiefMedicalOfficer",
         "Clown", // DeltaV - Add Clown access
+        "Corpsman", // DeltaV - Add Corpsman access
         "Command",
         "Cryogenics",
         "Engineering",
@@ -67,7 +68,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<string> acc
         "Janitor",
         "Kitchen",
         "Lawyer",
-        "Library",  // DeltaV - Add Library access 
+        "Library",  // DeltaV - Add Library access
         "Maintenance",
         "Medical",
         "Mime", // DeltaV - Add Mime access

diff --git a/Resources/Locale/en-US/deltav/paper/paper-misc.ftl b/Resources/Locale/en-US/deltav/paper/paper-misc.ftl
@@ -0,0 +1,12 @@
+book-text-lunchbox-generic = Hello Honey!
+      I've packed your lunch for this shift, I hope you enjoy it!!
+      Love you so so much,
+       - Mum.
+book-text-lunchbox-healthy = Hello Honey!
+      I've packed you something healthy for this shift! I hope you enjoy it!!
+      Love you so so much,
+       - Mum.
+book-text-lunchbox-unhealthy = Hello Honey!
+      I've packed you something fun for this shift! I hope you enjoy it!!
+      Love you so so much,
+       - Mum.
diff --git a/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl b/Resources/Locale/en-US/deltav/prototypes/access/accesses.ftl
@@ -1,2 +1,3 @@
 id-card-access-level-orders = Orders
 id-card-access-level-mantis = Psionic Mantis
+id-card-access-level-corpsman = Corpsman
diff --git a/Resources/Maps/pebble.yml b/Resources/Maps/pebble.yml
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
@@ -44,3 +44,4 @@
   - Musician # DeltaV - Add Musician access
   - Reporter # DeltaV - Add Reporter access
   - Zookeeper # DeltaV - Add Zookeeper access
+  - Corpsman # DeltaV - Add Corpsman access
diff --git a/Resources/Prototypes/Access/security.yml b/Resources/Prototypes/Access/security.yml
@@ -28,6 +28,7 @@
   #- Brig #Delta V removed
   - Detective
   - Cryogenics
+  - Corpsman # DeltaV - add Corpsman access
 
 - type: accessGroup
   id: Armory

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -275,6 +275,8 @@
       - id: OxygenTankFilled
       - id: ClothingOuterHardsuitCombatCorpsman
       - id: ClothingMaskBreath
+  - type: AccessReader
+    access: [ [ "Corpsman" ] ]
 
 # DeltaV - End Changes
 

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@@ -20,4 +20,4 @@
     FoodButter: 4
     FoodCheese: 1
     FoodMeat: 6
-
+    LunchboxGenericFilledRandom: 5 # Delta-V Adds Lunchbox
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
@@ -24,3 +24,4 @@
     DrinkMugOne: 1
     DrinkMugRainbow: 2
     DrinkMugRed: 2
+    LunchboxGeneric: 10 # Delta-V Adds Lunchbox
diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml
@@ -15,6 +15,7 @@
     - Command
     - Security
     - Detective
+    - Corpsman
 #    - Armory
     - Lawyer
     - Engineering

diff --git a/Resources/Prototypes/DeltaV/Access/security.yml b/Resources/Prototypes/DeltaV/Access/security.yml
@@ -0,0 +1,3 @@
+- type: accessLevel
+  id: Corpsman
+  name: id-card-access-level-corpsman
diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Paper/manuals.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Paper/manuals.yml
@@ -0,0 +1,26 @@
+- type: entity
+  parent: Paper
+  id: PaperWrittenNoteFromMumGeneric
+  name: note from mom
+  suffix: Lunchbox, Generic
+  components:
+  - type: Paper
+    content: book-text-lunchbox-generic
+
+- type: entity
+  parent: PaperWrittenNoteFromMumGeneric
+  id: PaperWrittenNoteFromMumHealthy
+  name: note from mom
+  suffix: Lunchbox, Healthy
+  components:
+  - type: Paper
+    content: book-text-lunchbox-healthy
+
+- type: entity
+  parent: PaperWrittenNoteFromMumGeneric
+  id: PaperWrittenNoteFromMumUnhealthy
+  name: note from mom
+  suffix: Lunchbox, Unhealthy
+  components:
+  - type: Paper
+    content: book-text-lunchbox-unhealthy