From 416a52bbe95b5813e004bb3d77cca4a23b20256e Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 2 Oct 2022 13:58:43 -0400 Subject: [PATCH 1/2] Merge pull request #13827 from VOREStation/Mining-Bugfix Mining bugfix --- code/modules/random_map/noise/ore.dm | 10 +++++----- maps/expedition_vr/aerostat/_aerostat.dm | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/code/modules/random_map/noise/ore.dm b/code/modules/random_map/noise/ore.dm index 1a776e0125..72d8e93b9f 100644 --- a/code/modules/random_map/noise/ore.dm +++ b/code/modules/random_map/noise/ore.dm @@ -76,10 +76,10 @@ T.resources["silver"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["uranium"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["phoron"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) - T.resources["osmium"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) + T.resources["platinum"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) - T.resources["hydrogen"] = 0 + T.resources["mhydrogen"] = 0 T.resources["diamond"] = 0 T.resources["hematite"] = 0 T.resources["marble"] = 0 @@ -95,8 +95,8 @@ T.resources["diamond"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) T.resources["phoron"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) - T.resources["osmium"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) - T.resources["hydrogen"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) + T.resources["platinum"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) + T.resources["mhydrogen"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["marble"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_HIGH_MAX) T.resources["hematite"] = 0 @@ -117,4 +117,4 @@ else if(value < deep_val) return "R" else - return "D" \ No newline at end of file + return "D" diff --git a/maps/expedition_vr/aerostat/_aerostat.dm b/maps/expedition_vr/aerostat/_aerostat.dm index 7a6abe2077..fc63ab8678 100644 --- a/maps/expedition_vr/aerostat/_aerostat.dm +++ b/maps/expedition_vr/aerostat/_aerostat.dm @@ -76,10 +76,10 @@ T.resources["silver"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["uranium"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["phoron"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) - T.resources["osmium"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) + T.resources["platinum"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) - T.resources["hydrogen"] = 0 + T.resources["mhydrogen"] = 0 T.resources["diamond"] = 0 T.resources["hematite"] = 0 T.resources["marble"] = 0 @@ -95,8 +95,8 @@ T.resources["diamond"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) T.resources["phoron"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) - T.resources["osmium"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) - T.resources["hydrogen"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) + T.resources["platinum"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) + T.resources["mhydrogen"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["marble"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_HIGH_MAX) T.resources["hematite"] = 0