Merge remote-tracking branch 'upstream/master' into Three-Sword-Style

Resources/Changelog/DeltaVChangelog.yml

@@ -1200,3 +1200,27 @@ Entries:
       message: The random client freezes/crashes should be mostly gone.
   id: 179
   time: '2023-12-22T23:46:32.0000000+00:00'
+- author: ps3moira
+  changes:
+    - type: Tweak
+      message: Reverted in-hand E-Sword sprites.
+  id: 180
+  time: '2023-12-24T02:56:01.0000000+00:00'
+- author: deltanedas
+  changes:
+    - type: Tweak
+      message: Ore Bags of Holding now use bluespace crystals instead of uranium.
+  id: 181
+  time: '2023-12-24T19:58:23.0000000+00:00'
+- author: Adrian16199
+  changes:
+    - type: Fix
+      message: Fixes cyborgs spawning with nearsighted trait.
+  id: 182
+  time: '2023-12-27T17:55:07.0000000+00:00'
+- author: Adrian16199
+  changes:
+    - type: Add
+      message: 'Added 3 classic hairstyles: Long hair, Long hair 2, Long hair 3.'
+  id: 183
+  time: '2023-12-27T18:23:39.0000000+00:00'

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

@@ -7,3 +7,6 @@ marking-HumanHairClassicLowFade = Fade (Low, Classic)
 marking-HumanHairClassicMedFade = Fade (Medium, Classic)
 marking-HumanHairClassicOmbre = Ombre Classic
 marking-HumanHairClassicCrewcut = Crewcut Classic
+marking-HumanHairClassicLong = Long 1 (Classic)
+marking-HumanHairClassicLong2 = Long 2 (Classic)
+marking-HumanHairClassicLong3 = Long 3 (Classic)

Resources/Maps/asterisk.yml

@@ -254,9 +254,9 @@ entities:
       type: Fixtures
     - type: OccluderTree
     - type: SpreaderGrid
-    - angularDamping: 10000
+    - type: Shuttle
+      angularDamping: 10000
       linearDamping: 10000
-      type: Shuttle
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg

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

@@ -69,3 +69,27 @@
   sprites:
     - sprite: DeltaV/Mobs/Customization/hair.rsi
       state: classic_crewcut
+
+- type: marking
+  id: HumanHairClassicLong
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: DeltaV/Mobs/Customization/hair.rsi
+      state: classic_long
+
+- type: marking
+  id: HumanHairClassicLong2
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: DeltaV/Mobs/Customization/hair.rsi
+      state: classic_long2
+
+- type: marking
+  id: HumanHairClassicLong3
+  bodyPart: Hair
+  markingCategory: Hair
+  sprites:
+    - sprite: DeltaV/Mobs/Customization/hair.rsi
+      state: classic_long3

Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml

@@ -31,7 +31,7 @@
         Blunt: 4.5
   - type: Item
     size: 5
-    sprite: Objects/Weapons/Melee/e_sword-inhands.rsi
+    sprite: DeltaV/Objects/Weapons/Melee/e_sword.rsi # Delta-V
   - type: UseDelay
     delay: 1.0
   - type: PointLight

Resources/Prototypes/Nyanotrasen/Voice/speech_emotes.yml

@@ -18,6 +18,7 @@
     - meow.
     - meow!
     - meows.
+    - meows~
     - meows!
     - meowing.
     - meowed.
@@ -27,8 +28,12 @@
     - nya.
     - nyas.
     - nyas!
+    - mraow.
+    - mraow!
+    - mraow~
     - mraows.
     - mraows!
+    - mraows~
 
 - type: emote
   id: Mew
@@ -37,8 +42,10 @@
   chatTriggers:
     - mew.
     - mew!
+    - mew~
     - mews.
     - mews!
+    - mews~
     - mewing.
     - mewed.
 
@@ -60,6 +67,7 @@
   chatTriggers:
     - purr.
     - purrs.
+    - purrs~
     - purrs!
     - purring.
     - purred.

Resources/Prototypes/Recipes/Lathes/devices.yml

@@ -141,8 +141,8 @@
   materials:
     Steel: 2000
     Silver: 750
-    Plasma: 1500
-    Uranium: 150
+    Plasma: 1000 #DeltaV: Bluespace Exists so less plasma used, no uranium
+    Bluespace: 200 #DeltaV: Bluespace Exists
 
 - type: latheRecipe
   id: WeaponCrusher

Resources/Prototypes/SimpleStation14/Traits/disabilities.yml

@@ -5,4 +5,7 @@
   traitGear: ClothingEyesGlasses
   components:
     - type: Nearsighted
+  whitelist: # Delta V fix to borgs spawning with it.
+    components:
+      - Blindable
 

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

@@ -39,6 +39,18 @@
         {
             "name":"classic_crewcut",
             "directions": 4
+        },
+        {
+            "name":"classic_long",
+            "directions": 4
+        },
+        {
+            "name":"classic_long2",
+            "directions": 4
+        },
+        {
+            "name":"classic_long3",
+            "directions": 4
         }
     ]
 }

Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/meta.json

@@ -0,0 +1,63 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-blade",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right-blade",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ],
+		[
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}