Merge remote-tracking branch 'upstream/master' into mouse-ops

Resources/Changelog/DeltaVChangelog.yml

@@ -796,3 +796,31 @@ Entries:
       message: Removed starvation!
   id: 121
   time: '2023-11-05T19:24:51.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Tweak
+      message: Cat Ears have been moved from the Syndicate Uplink into the AutoDrobe.
+  id: 122
+  time: '2023-11-06T14:39:49.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Remove
+      message: Removed the carp suit bundle from the syndicate uplink.
+  id: 123
+  time: '2023-11-06T14:54:09.0000000+00:00'
+- author: Colin-Tel
+  changes:
+    - type: Fix
+      message: >-
+        Fixed a few issues with Asterisk, including getting stuck on Epi's park
+        tree and evac docking at cargo.
+  id: 124
+  time: '2023-11-06T15:25:25.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Add
+      message: >-
+        Cyborgs using the Medical model can now print candies with medicine once
+        again.
+  id: 125
+  time: '2023-11-06T15:46:56.0000000+00:00'

Resources/Locale/en-US/deltav/accessories/hair.ftl

@@ -4,4 +4,6 @@ marking-HumanHairMessyClassic = Messy Classic
 marking-HumanHairClassicGentle = Gentle Classic
 marking-HumanHairClassicNoFade = Fade (None, Classic)
 marking-HumanHairClassicLowFade = Fade (Low, Classic)
-marking-HumanHairClassicMedFade = Fade (Medium. Classic)
+marking-HumanHairClassicMedFade = Fade (Medium, Classic)
+marking-HumanHairClassicOmbre = Ombre Classic
+marking-HumanHairClassicCrewcut = Crewcut Classic

Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml

@@ -72,6 +72,7 @@
     ClothingCostumeMioSkirt: 1 # Nyano - Clothing addition
     ClothingCostumeNaota: 1 # Nyano - Clothing addition
     ClothingUniformJumpsuitSober: 1 # DeltaV - Clothing addition
+    ClothingHeadHatCatEars: 2 # DeltaV - Move cat ears out of syndicate uplink into the AutoDrobe
   emaggedInventory:
     ClothingShoesBling: 1
     ClothingOuterDogi: 1

Resources/Prototypes/Catalog/uplink_catalog.yml

@@ -1274,15 +1274,15 @@
   categories:
   - UplinkPointless
 
-- type: listing
-  id: UplinkCatEars
-  name: uplink-cat-ears-name
-  description: uplink-cat-ears-desc
-  productEntity: ClothingHeadHatCatEars
-  cost:
-    Telecrystal: 4 # Nyanotrasen - Make Cat Ears 4TC instead of 26TC
-  categories:
-  - UplinkPointless
+# - type: listing # DeltaV - Move cat ears out of syndicate uplink into the AutoDrobe
+#   id: UplinkCatEars
+#   name: uplink-cat-ears-name
+#   description: uplink-cat-ears-desc
+#   productEntity: ClothingHeadHatCatEars
+#   cost:
+#     Telecrystal: 4 # Nyanotrasen - Make Cat Ears 4TC instead of 26TC
+#   categories:
+#   - UplinkPointless
 
 - type: listing
   id: UplinkOutlawHat
@@ -1324,15 +1324,15 @@
   categories:
   - UplinkPointless
 
-- type: listing
-  id: UplinkCarpSuitBundle
-  name: uplink-carp-suit-bundle-name
-  description: uplink-carp-suit-bundle-desc
-  productEntity: ClothingBackpackDuffelSyndicateCarpSuit
-  cost:
-    Telecrystal: 4
-  categories:
-  - UplinkPointless
+# - type: listing # DeltaV - Disable carp suit being buyable
+#   id: UplinkCarpSuitBundle
+#   name: uplink-carp-suit-bundle-name
+#   description: uplink-carp-suit-bundle-desc
+#   productEntity: ClothingBackpackDuffelSyndicateCarpSuit
+#   cost:
+#     Telecrystal: 4
+#   categories:
+#   - UplinkPointless
 
 - type: listing
   id: UplinkOperativeSuit

Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml

@@ -12,44 +12,60 @@
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
-      state: bobclassic
+      state: classic_bob
 
 - type: marking
   id: HumanHairMessyClassic
   bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
-      state: messyclassic
+      state: classic_messy
 
 - type: marking
   id: HumanHairClassicNoFade
   bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
-      state: classicnofade
+      state: classic_nofade
 
 - type: marking
   id: HumanHairClassicGentle
   bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
-      state: classicgentle
+      state: classic_gentle
 
 - type: marking
   id: HumanHairClassicLowFade
   bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
-      state: classiclowfade
+      state: classic_lowfade
 
 - type: marking
   id: HumanHairClassicMedFade
   bodyPart: Hair
   markingCategory: Hair
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
-      state: classicmedfade
+      state: classic_medfade
+
+- type: marking
+  id: HumanHairClassicOmbre
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: DeltaV/Mobs/Customization/hair.rsi
+      state: classic_ombre
+
+- type: marking
+  id: HumanHairClassicCrewcut
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: DeltaV/Mobs/Customization/hair.rsi
+      state: classic_crewcut

Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml

@@ -132,6 +132,7 @@
     noMindState: medical_e_r
   - type: Construction
     node: medical
+  - type: FabricateCandy # Nyanotrasen - The medical cyborg can generate candies filled with medicine.
 
 - type: entity
   id: BorgChassisService

Resources/Textures/DeltaV/Mobs/Customization/hair.rsi/meta.json

@@ -9,27 +9,35 @@
             "directions": 4
         },
         {
-            "name":"bobclassic",
+            "name":"classic_bob",
             "directions": 4
         },
         {
-           "name":"messyclassic",
+           "name":"classic_messy",
            "directions":4
         },
         {
-            "name":"classicgentle",
+            "name":"classic_gentle",
             "directions": 4
         },
         {
-            "name":"classiclowfade",
+            "name":"classic_lowfade",
             "directions": 4
         },
         {
-            "name":"classicmedfade",
+            "name":"classic_medfade",
             "directions": 4
         },
         {
-            "name":"classicnofade",
+            "name":"classic_nofade",
+            "directions": 4
+        },
+        {
+            "name":"classic_ombre",
+            "directions": 4
+        },
+        {
+            "name":"classic_crewcut",
             "directions": 4
         }
     ]