From bf76d136ec420d7092d794221cc9b5f4e94b7f1e Mon Sep 17 00:00:00 2001 From: xTrainx Date: Fri, 19 Apr 2024 00:50:39 -0400 Subject: [PATCH] restore shit --- .github/workflows/ci_suite.yml | 4 ++-- _maps/map_files/Fortress Nash/FortNash1.dmm | 2 +- _maps/map_files/Pahrump-AB/Pahrump-AB.dmm | 4 ++-- .../map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm | 2 +- _maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm | 6 +++--- .../map_files/Pahrump-Sunset - Backup/MapGuide.dmm | 2 +- .../Pahrump-Sunset-Upper.dmm | 2 +- .../Pahrump-Sunset - Backup/Pahrump-Sunset.dmm | 2 +- .../map_files/Pahrump-Sunset - Backup/RedRiver.dmm | 14 +++++++------- .../Pahrump-Sunset - Backup/RockSprings.dmm | 4 ++-- _maps/map_files/Pahrump-Sunset-Lower.dmm | 2 +- .../Pahrump-Sunset-Lower - Outdated.dmm | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index b5caaf2a587..f58fa06f63d 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -116,8 +116,8 @@ jobs: - name: Build if: steps.auxmos-cache.outputs.cache-hit != 'true' run: | - cargo build --manifest-path auxmos/Cargo.toml --target=${{env.target}} --package auxmos --release --verbose - mv target/i686-unknown-linux-gnu/release/librust_g.so "$1/librust_g.so" + cargo build --manifest-path auxmos/Cargo.toml --target=${{env.target}} --release --verbose + ldd auxmos/target/${{env.target}}/release/libauxmos.so - name: Upload libauxmos artifact uses: actions/upload-artifact@v3 diff --git a/_maps/map_files/Fortress Nash/FortNash1.dmm b/_maps/map_files/Fortress Nash/FortNash1.dmm index 67c56177ebc..fb32d8648d1 100644 --- a/_maps/map_files/Fortress Nash/FortNash1.dmm +++ b/_maps/map_files/Fortress Nash/FortNash1.dmm @@ -38978,7 +38978,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/blacksmith/furnace, +/obj/structure/furnace, /turf/open/floor/plasteel, /area/f13/building) "jbE" = ( diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm index 4edcb06af0c..2fd93907d43 100644 --- a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm +++ b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm @@ -43220,7 +43220,7 @@ /area/f13/wasteland) "mFn" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/blacksmith/furnace, +/obj/structure/furnace, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ color = "#e4e4e4" }, @@ -60632,7 +60632,7 @@ /area/f13/wasteland) "uIx" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/blacksmith/anvil/obtainable/legion, +/obj/structure/anvil/obtainable/legion, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust{ color = "#e4e4e4" }, diff --git a/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm b/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm index e623cecd520..9cc64a1a4c5 100644 --- a/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm +++ b/_maps/map_files/Pahrump-Old/Pahrump-Sunset-Lower.dmm @@ -34981,7 +34981,7 @@ /turf/open/floor/plating/tunnel, /area/f13/caves) "vdZ" = ( -/obj/structure/blacksmith/furnace, +/obj/structure/furnace, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/building) "vep" = ( diff --git a/_maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm b/_maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm index 063769187cb..33ce2d3625b 100644 --- a/_maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm +++ b/_maps/map_files/Pahrump-Old/Pahrump-Sunset.dmm @@ -2329,7 +2329,7 @@ /turf/open/floor/plasteel/f13/vault_floor/white, /area/f13/village) "aVn" = ( -/obj/structure/blacksmith/furnace, +/obj/structure/furnace, /turf/open/indestructible/ground/outside/dirt, /area/f13/wasteland) "aVq" = ( @@ -13038,7 +13038,7 @@ /turf/open/floor/f13/wood, /area/f13/building) "fxC" = ( -/obj/structure/blacksmith/furnace, +/obj/structure/furnace, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "fxD" = ( @@ -23515,7 +23515,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/blacksmith/furnace, +/obj/structure/furnace, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "jKT" = ( diff --git a/_maps/map_files/Pahrump-Sunset - Backup/MapGuide.dmm b/_maps/map_files/Pahrump-Sunset - Backup/MapGuide.dmm index 3cf99a7efac..4aa9af7b266 100644 --- a/_maps/map_files/Pahrump-Sunset - Backup/MapGuide.dmm +++ b/_maps/map_files/Pahrump-Sunset - Backup/MapGuide.dmm @@ -1,6 +1,6 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( -/obj/structure/blacksmith/furnace, +/obj/structure/furnace, /obj/effect/turf_decal/weather/dirt{ dir = 1 }, diff --git a/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Upper.dmm b/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Upper.dmm index 6d9ae5a56c7..59ef68214c0 100644 --- a/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Upper.dmm +++ b/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset-Upper.dmm @@ -1896,7 +1896,7 @@ /area/f13/building/massfusion) "cKc" = ( /obj/structure/table/reinforced, -/obj/item/blacksmith/ingot/adamantine, +/obj/item/ingot/adamantine, /turf/open/floor/plasteel/f13{ icon_state = "darkrusty" }, diff --git a/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset.dmm b/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset.dmm index 77a7c195727..a7a6112e8e3 100644 --- a/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset.dmm +++ b/_maps/map_files/Pahrump-Sunset - Backup/Pahrump-Sunset.dmm @@ -11054,7 +11054,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/structure/blacksmith/furnace, +/obj/structure/furnace, /turf/open/floor/plasteel, /area/f13/building) "aMG" = ( diff --git a/_maps/map_files/Pahrump-Sunset - Backup/RedRiver.dmm b/_maps/map_files/Pahrump-Sunset - Backup/RedRiver.dmm index f806de68059..99b7b59e496 100644 --- a/_maps/map_files/Pahrump-Sunset - Backup/RedRiver.dmm +++ b/_maps/map_files/Pahrump-Sunset - Backup/RedRiver.dmm @@ -1247,8 +1247,8 @@ /obj/structure/closet/crate/footchest{ pixel_x = -8 }, -/obj/item/blacksmith/ingot/gold, -/obj/item/blacksmith/ingot/gold, +/obj/item/ingot/gold, +/obj/item/ingot/gold, /obj/item/coin/gold, /turf/open/indestructible/ground/inside/dirt, /area/f13/caves) @@ -11654,9 +11654,9 @@ }, /area/f13/wasteland/city) "gIH" = ( -/obj/item/blacksmith/ingot/silver, -/obj/item/blacksmith/ingot/gold, -/obj/item/blacksmith/ingot/titanium, +/obj/item/ingot/silver, +/obj/item/ingot/gold, +/obj/item/ingot/titanium, /turf/open/floor/plasteel/dark, /area/f13/building/abandoned) "gIL" = ( @@ -16624,7 +16624,7 @@ /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/building) "jFt" = ( -/obj/item/blacksmith/ingot/titanium, +/obj/item/ingot/titanium, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/f13/building/abandoned) @@ -38844,7 +38844,7 @@ /area/f13/wasteland) "wXv" = ( /obj/structure/closet/crate/wicker, -/obj/item/blacksmith/ingot/silver{ +/obj/item/ingot/silver{ pixel_x = 5; pixel_y = 2 }, diff --git a/_maps/map_files/Pahrump-Sunset - Backup/RockSprings.dmm b/_maps/map_files/Pahrump-Sunset - Backup/RockSprings.dmm index 629be417f47..82de31fca1d 100644 --- a/_maps/map_files/Pahrump-Sunset - Backup/RockSprings.dmm +++ b/_maps/map_files/Pahrump-Sunset - Backup/RockSprings.dmm @@ -13500,7 +13500,7 @@ }, /area/f13/wasteland) "gxZ" = ( -/obj/structure/blacksmith/furnace, +/obj/structure/furnace, /turf/open/floor/plasteel/cult, /area/f13/building/tribal) "gyv" = ( @@ -25240,7 +25240,7 @@ }, /area/f13/building/tribal) "mdu" = ( -/obj/structure/blacksmith/furnace, +/obj/structure/furnace, /turf/open/indestructible/ground/outside/sidewalk, /area/f13/building) "mdO" = ( diff --git a/_maps/map_files/Pahrump-Sunset-Lower.dmm b/_maps/map_files/Pahrump-Sunset-Lower.dmm index ebc201e6c33..bf5da4e9e21 100644 --- a/_maps/map_files/Pahrump-Sunset-Lower.dmm +++ b/_maps/map_files/Pahrump-Sunset-Lower.dmm @@ -565,7 +565,7 @@ /area/f13/caves) "asX" = ( /obj/effect/decal/cleanable/blood/old, -/obj/item/blacksmith/ingot/gold, +/obj/item/ingot/gold, /turf/open/indestructible/ground/inside/mountain, /area/f13/caves) "atk" = ( diff --git a/_maps/map_files/Temp Map Storage/Pahrump-Sunset-Lower - Outdated.dmm b/_maps/map_files/Temp Map Storage/Pahrump-Sunset-Lower - Outdated.dmm index b7757cbae31..234f2d95236 100644 --- a/_maps/map_files/Temp Map Storage/Pahrump-Sunset-Lower - Outdated.dmm +++ b/_maps/map_files/Temp Map Storage/Pahrump-Sunset-Lower - Outdated.dmm @@ -35056,7 +35056,7 @@ /turf/open/floor/plating/tunnel, /area/f13/caves) "vdZ" = ( -/obj/structure/blacksmith/furnace, +/obj/structure/furnace, /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust, /area/f13/building) "vep" = (