From 547053a7689133c43057086df40c9db8c73de07b Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sat, 4 Feb 2017 15:44:14 +0000 Subject: [PATCH] if you don't rename all of something, bad things happen m'kay kids --- code/modules/mining/drilling/drill.dm | 4 ++-- code/modules/mining/drilling/scanner.dm | 2 +- code/modules/random_map/noise/ore.dm | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index 31d99ebb05c..5b1cbe496f2 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -17,7 +17,7 @@ var/list/resource_field = list() var/ore_types = list( - "iron" = /obj/item/weapon/ore/iron, + "hematite" = /obj/item/weapon/ore/iron, "uranium" = /obj/item/weapon/ore/uranium, "gold" = /obj/item/weapon/ore/gold, "silver" = /obj/item/weapon/ore/silver, @@ -26,7 +26,7 @@ "osmium" = /obj/item/weapon/ore/osmium, "hydrogen" = /obj/item/weapon/ore/hydrogen, "silicates" = /obj/item/weapon/ore/glass, - "carbonaceous rock" = /obj/item/weapon/ore/coal + "carbon" = /obj/item/weapon/ore/coal ) //Upgrades diff --git a/code/modules/mining/drilling/scanner.dm b/code/modules/mining/drilling/scanner.dm index c0c3dd937d2..4a8c3c59b6c 100644 --- a/code/modules/mining/drilling/scanner.dm +++ b/code/modules/mining/drilling/scanner.dm @@ -29,7 +29,7 @@ var/ore_type switch(metal) - if("silicates", "carbonaceous rock", "iron") ore_type = "surface minerals" + if("silicates", "carbon", "hematite") ore_type = "surface minerals" if("gold", "silver", "diamond") ore_type = "precious metals" if("uranium") ore_type = "nuclear fuel" if("phoron", "osmium", "hydrogen") ore_type = "exotic matter" diff --git a/code/modules/random_map/noise/ore.dm b/code/modules/random_map/noise/ore.dm index 4caacb70995..697a0b416d8 100644 --- a/code/modules/random_map/noise/ore.dm +++ b/code/modules/random_map/noise/ore.dm @@ -49,11 +49,11 @@ if(!priority_process) sleep(-1) T.resources = list() T.resources["silicates"] = rand(3,5) - T.resources["carbonaceous rock"] = rand(3,5) + T.resources["carbon"] = rand(3,5) var/current_cell = map[get_map_cell(x,y)] if(current_cell < rare_val) // Surface metals. - T.resources["iron"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) + T.resources["hematite"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) T.resources["gold"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["silver"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) @@ -69,14 +69,14 @@ T.resources["osmium"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["hydrogen"] = 0 T.resources["diamond"] = 0 - T.resources["iron"] = 0 + T.resources["hematite"] = 0 else // Deep metals. T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["diamond"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_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["iron"] = 0 + T.resources["hematite"] = 0 T.resources["gold"] = 0 T.resources["silver"] = 0 return