Merge branch 'new-frontiers-14:master' into 20240409-DungeonLootSpawners

new-frontiers-14 · Apr 28, 2024 · 8117ab0 · 8117ab0
2 parents 2cc225a + f009aa0
commit 8117ab0
Show file tree

Hide file tree

Showing 20 changed files with 1,200 additions and 802 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -4323,3 +4323,21 @@ Entries:
       message: Shuttle console display UI now shows ship name and designation
   id: 4950
   time: '2024-04-27T19:07:30.0000000+00:00'
+- author: erhardsteinhauer
+  changes:
+    - type: Fix
+      message: 'Fixes the plasteel recipe to be lore accurate: Plasteel = Plasma + Steel'
+  id: 4951
+  time: '2024-04-27T23:46:34.0000000+00:00'
+- author: dvir01
+  changes:
+    - type: Tweak
+      message: Updated conveyor belts sprites.
+  id: 4952
+  time: '2024-04-28T03:15:52.0000000+00:00'
+- author: MagnusCrowe
+  changes:
+    - type: Tweak
+      message: Rotated Bocakillo.
+  id: 4953
+  time: '2024-04-28T06:02:55.0000000+00:00'
diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/bocakillo.yml
diff --git a/Resources/Prototypes/Entities/Structures/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml
@@ -12,7 +12,7 @@
   - type: Transform
     anchored: true
   - type: Sprite
-    sprite: Structures/conveyor.rsi
+    sprite: _NF/Structures/conveyor.rsi # Frontier
     state: conveyor_started_cw
     drawdepth: FloorObjects
   - type: ApcPowerReceiver

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/conveyor.yml
@@ -8,7 +8,7 @@
           steps:
             - tag: ConveyorAssembly
               icon:
-                sprite: Structures/conveyor.rsi
+                sprite: _NF/Structures/conveyor.rsi # Frontier
                 state: conveyor_loose
               name: conveyor belt assembly
               doAfter: 2

diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml b/Resources/Prototypes/_NF/Recipes/Lathes/eva.yml
@@ -1,27 +1,3 @@
-
-#    Cloth: 300
-#    Steel: 50
-#    Plastic: 50
-#    Gold: 100
-#    Silver: 100
-
-# Raw mats
-- type: latheRecipe
-  id: Durathread
-  result: MaterialDurathread1
-  completetime: 0.2
-  materials:
-    Plastic: 100
-    Cloth: 100
-
-- type: latheRecipe
-  id: Plasteel
-  result: SheetPlasteel1
-  completetime: 0.2
-  materials:
-    Plastic: 100
-    Steel: 100
-
 # Softsuits
 - type: latheRecipe
   id: ClothingOuterSuitEmergency

diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/materials.yml b/Resources/Prototypes/_NF/Recipes/Lathes/materials.yml
@@ -0,0 +1,16 @@
+# Raw mats
+- type: latheRecipe
+  id: Durathread
+  result: MaterialDurathread1
+  completetime: 0.2
+  materials:
+    Plastic: 100
+    Cloth: 100
+
+- type: latheRecipe
+  id: Plasteel
+  result: SheetPlasteel1
+  completetime: 0.2
+  materials:
+    Plasma: 100
+    Steel: 100
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_loose.png b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_loose.png
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_ccw.png b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_ccw.png
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_ccw_r.png b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_ccw_r.png
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_cw.png b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_cw.png
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_cw_r.png b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_started_cw_r.png
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_stopped_ccw.png b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_stopped_ccw.png
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_stopped_cw.png b/Resources/Textures/_NF/Structures/conveyor.rsi/conveyor_stopped_cw.png
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/greenlight.png b/Resources/Textures/_NF/Structures/conveyor.rsi/greenlight.png
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/meta.json b/Resources/Textures/_NF/Structures/conveyor.rsi/meta.json
@@ -0,0 +1,256 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and modified by Dvir01",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "conveyor_loose"
+    },
+    {
+      "name": "conveyor_started_ccw",
+      "directions": 8,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "conveyor_started_ccw_r",
+      "directions": 8,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "conveyor_started_cw",
+      "directions": 8,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "conveyor_started_cw_r",
+      "directions": 8,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "conveyor_stopped_ccw",
+      "directions": 8
+    },
+    {
+      "name": "conveyor_stopped_cw",
+      "directions": 8
+    },
+    {
+      "name": "greenlight"
+    },
+    {
+      "name": "redlight"
+    },
+    {
+      "name": "switch"
+    },
+    {
+      "name": "switch-fwd"
+    },
+    {
+      "name": "switch-off"
+    },
+    {
+      "name": "switch-rev"
+    }
+  ]
+}
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/redlight.png b/Resources/Textures/_NF/Structures/conveyor.rsi/redlight.png
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/switch-fwd.png b/Resources/Textures/_NF/Structures/conveyor.rsi/switch-fwd.png
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/switch-off.png b/Resources/Textures/_NF/Structures/conveyor.rsi/switch-off.png
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/switch-rev.png b/Resources/Textures/_NF/Structures/conveyor.rsi/switch-rev.png
diff --git a/Resources/Textures/_NF/Structures/conveyor.rsi/switch.png b/Resources/Textures/_NF/Structures/conveyor.rsi/switch.png