Merge branch 'master' into Fixes2

DeltaV-Station · Dec 25, 2023 · ab3f35a · ab3f35a
2 parents e999f96 + 0f15db7
commit ab3f35a
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 5 deletions.
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -1200,3 +1200,15 @@ 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'
diff --git a/Resources/Maps/asterisk.yml b/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

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/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

diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/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

diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-left-blade.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-left-blade.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-left.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-right-blade.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-right-blade.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/inhand-right.png
diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/e_sword.rsi/meta.json b/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
+        ]
+      ]
+    }
+  ]
+}