Merge branch 'master' into Shoko

Resources/Changelog/DeltaVChangelog.yml

@@ -790,3 +790,37 @@ Entries:
         technician, and a familiar parallax...
   id: 120
   time: '2023-11-02T20:38:51.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Remove
+      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/Maps/pebble.yml

@@ -68,6 +68,8 @@ entities:
     - type: OccluderTree
     - type: LoadedMap
     - type: GridTree
+    - parallax: PebbleStation
+      type: Parallax
     - type: MovedGrids
   - uid: 2
     components:

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/Prototypes/Entities/Mobs/NPCs/space.yml

@@ -64,13 +64,13 @@
     radius: 1.2
     energy: 2
     color: "#4faffb"
-  - type: GhostTakeoverAvailable
+  #- type: GhostTakeoverAvailable # Delta V: Moves ghost takeover to child
   - type: Speech
     speechVerb: LargeMob
 
 - type: entity
   name: space bear
-  id: MobBearSpace
+  id: MobBearSpaceNPC # Delta V : remove ghosttakeover comps
   parent: MobSpaceBasic
   description: It looks friendly. Why don't you give it a hug?
   components:
@@ -110,10 +110,7 @@
     interactFailureString: petting-failure-bear
     interactSuccessSound:
       path: /Audio/Animals/sloth_squeak.ogg
-  - type: GhostRole
-    prob: 0.25
-    name: ghost-role-information-space-bear-name
-    description: ghost-role-information-space-bear-description
+  # Moved to Nyanotrasen\Entities\Mobs\NPCs\space.yml
 
 - type: entity
   id: MobBearSpaceSalvage
@@ -129,7 +126,7 @@
 
 - type: entity
   name: space kangaroo
-  id: MobKangarooSpace
+  id: MobKangarooSpaceNPC # Delta V : remove ghosttakeover comps
   parent: MobSpaceBasic
   description: It looks friendly. Why don't you give it a hug?
   components:
@@ -182,10 +179,7 @@
     interfaces:
     - key: enum.StrippingUiKey.Key
       type: StrippableBoundUserInterface
-  - type: GhostRole
-    prob: 0.25
-    name: ghost-role-information-space-kangaroo-name
-    description: ghost-role-information-space-kangaroo-description
+  # Moved to Nyanotrasen\Entities\Mobs\NPCs\space.yml
 
 - type: entity
   id: MobKangarooSpaceSalvage
@@ -201,7 +195,7 @@
 
 - type: entity
   name: space spider
-  id: MobSpiderSpace
+  id: MobSpiderSpaceNPC # Delta V : remove ghosttakeover comps
   parent: MobSpaceBasic
   description: It's so glowing, it looks dangerous.
   components:
@@ -278,10 +272,7 @@
     color: "#4faffb"
   - type: NoSlip
   - type: IgnoreSpiderWeb
-  - type: GhostRole
-    prob: 0.30
-    name: ghost-role-information-space-spider-name
-    description: ghost-role-information-space-spider-description
+  # Moved to Nyanotrasen\Entities\Mobs\NPCs\space.yml
   - type: Speech
     speechVerb: Arachnid
 

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

@@ -96,13 +96,13 @@
     spawned:
     - id: FoodMeatXeno
       amount: 5
-  - type: GhostRole
-    allowMovement: true
-    allowSpeech: true
-    makeSentient: true
-    name: ghost-role-information-xeno-name
-    description: ghost-role-information-xeno-description
-    rules: ghost-role-information-xeno-rules
+  #- type: GhostRole # Delta V - Moves ghost role from parent to child
+  #  allowMovement: true # Delta V - Moves ghost role from parent to child
+  #  allowSpeech: true # Delta V - Moves ghost role from parent to child
+  #  makeSentient: true # Delta V - Moves ghost role from parent to child
+  #  name: ghost-role-information-xeno-name # Delta V - Moves ghost role from parent to child
+  #  description: ghost-role-information-xeno-description # Delta V - Moves ghost role from parent to child
+  #  rules: ghost-role-information-xeno-rules # Delta V - Moves ghost role from parent to child
   # - type: GhostTakeoverAvailable # Delta V - Moves ghost role from parent to child
   - type: TypingIndicator
     proto: alien

Resources/Prototypes/Entities/Mobs/Species/arachnid.yml

@@ -12,11 +12,11 @@
     species: Arachnid
   - type: Hunger
     baseDecayRate: 0.0125 # Spiders have slow metabolisms all things considered, so I decided to just make their hunger drain slower.
-    starvationDamage:
-      types:
-        Cold: 0.5
-        Bloodloss: 0.5
-  - type: Carriable # Carrying system from nyanotrasen.      
+    # starvationDamage: # DeltaV - Disable starvation damage
+    #   types:
+    #     Cold: 0.5
+    #     Bloodloss: 0.5
+  - type: Carriable # Carrying system from nyanotrasen.
   - type: Thirst
     baseDecayRate: 0.0125 # Read comment in hunger
   # Damage (Self)

Resources/Prototypes/Entities/Mobs/Species/diona.yml

@@ -8,13 +8,13 @@
   - type: HumanoidAppearance
     species: Diona
   - type: Hunger
-    starvationDamage:
-      types:
-        Bloodloss: 0.5
+    # starvationDamage: # DeltaV - Disable starvation damage
+    #   types:
+    #     Bloodloss: 0.5
     baseDecayRate: 0.0083
   - type: Thirst
     baseDecayRate: 0.0083
-  - type: Carriable # Carrying system from nyanotrasen.  
+  - type: Carriable # Carrying system from nyanotrasen.
   - type: Icon
     sprite: Mobs/Species/Diona/parts.rsi
     state: full

Resources/Prototypes/Entities/Mobs/Species/dwarf.yml

@@ -6,10 +6,10 @@
   abstract: true
   components:
   - type: Hunger
-    starvationDamage:
-      types:
-        Cold: 0.5
-        Bloodloss: 0.5
+    # starvationDamage: # DeltaV - Disable starvation damage
+    #   types:
+    #     Cold: 0.5
+    #     Bloodloss: 0.5
   - type: Thirst
   - type: Carriable # Carrying system from nyanotrasen.
   - type: Icon

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -6,10 +6,10 @@
   abstract: true
   components:
   - type: Hunger
-    starvationDamage:
-      types:
-        Cold: 0.5
-        Bloodloss: 0.5
+    # starvationDamage: # DeltaV - Disable starvation damage
+    #   types:
+    #     Cold: 0.5
+    #     Bloodloss: 0.5
   - type: Icon # It will not have an icon in the adminspawn menu without this. Body parts seem fine for whatever reason.
     sprite: Mobs/Species/Human/parts.rsi
     state: full
@@ -21,7 +21,7 @@
     spawned:
     - id: FoodMeatHuman
       amount: 5
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
+  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
 
 - type: entity
   parent: BaseSpeciesDummy

Resources/Prototypes/Entities/Mobs/Species/moth.yml

@@ -8,10 +8,10 @@
   - type: HumanoidAppearance
     species: Moth
   - type: Hunger
-    starvationDamage:
-      types:
-        Cold: 0.5
-        Bloodloss: 0.5
+    # starvationDamage: # DeltaV - Disable starvation damage
+    #   types:
+    #     Cold: 0.5
+    #     Bloodloss: 0.5
   - type: Thirst
   - type: Carriable # Carrying system from nyanotrasen.
   - type: Icon

Resources/Prototypes/Entities/Mobs/Species/reptilian.yml

@@ -8,10 +8,10 @@
   - type: HumanoidAppearance
     species: Reptilian
   - type: Hunger
-    starvationDamage:
-      types:
-        Cold: 0.5
-        Bloodloss: 0.5
+    # starvationDamage: # DeltaV - Disable starvation damage
+    #   types:
+    #     Cold: 0.5
+    #     Bloodloss: 0.5
   - type: Puller
     needsHands: false
   - type: Thirst

Resources/Prototypes/Entities/Mobs/Species/slime.yml

@@ -5,9 +5,9 @@
   abstract: true
   components:
   - type: Hunger
-    starvationDamage:
-      types:
-        Bloodloss: 0.5
+    # starvationDamage: # DeltaV - Disable starvation damage
+    #   types:
+    #     Bloodloss: 0.5
   - type: Thirst
   - type: Carriable # Carrying system from nyanotrasen.
   - type: Icon