Rename metal sheets to iron sheets (#56643)

It's a specific type of metal, it shouldnt just be called generic "metal".
The reagent, ore and material datum are already called iron.
This commit is contained in:
Fikou
2021-02-05 15:48:00 +00:00
committed by GitHub
parent 039abf2b07
commit 8d586a7cb0
155 changed files with 505 additions and 506 deletions
@@ -150,7 +150,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
/obj/item/stack/sheet/rglass/cyborg
mats_per_unit = null
cost = 250
source = /datum/robot_energy_storage/metal
source = /datum/robot_energy_storage/iron
/// What energy storage this draws glass from as a robot module.
var/datum/robot_energy_storage/glasource = /datum/robot_energy_storage/glass
@@ -15,15 +15,15 @@
merge_type = /obj/item/stack/light_w
/obj/item/stack/light_w/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/stack/sheet/metal))
var/obj/item/stack/sheet/metal/M = O
if(istype(O, /obj/item/stack/sheet/iron))
var/obj/item/stack/sheet/iron/M = O
if (M.use(1))
var/obj/item/L = new /obj/item/stack/tile/light(user.drop_location())
to_chat(user, "<span class='notice'>You make a light tile.</span>")
L.add_fingerprint(user)
use(1)
else
to_chat(user, "<span class='warning'>You need one metal sheet to finish the light tile!</span>")
to_chat(user, "<span class='warning'>You need one iron sheet to finish the light tile!</span>")
else
return ..()
@@ -1,6 +1,6 @@
/* Diffrent misc types of sheets
* Contains:
* Metal
* Iron
* Plasteel
* Wood
* Cloth
@@ -12,7 +12,7 @@
*/
/*
* Metal
* Iron
*/
GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE), \
@@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("canister frame", /obj/structure/canister_frame/machine/frame_tier_0, 5, time = 8, one_per_turf = TRUE, on_floor = TRUE), \
null, \
new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20), \
new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \
new/datum/stack_recipe("iron rod", /obj/item/stack/rods, 1, 2, 60), \
null, \
new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 40, one_per_turf = TRUE, on_floor = TRUE, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75), \
null, \
@@ -114,46 +114,46 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("shower frame", /obj/structure/showerframe, 2, time= 2 SECONDS)
))
/obj/item/stack/sheet/metal
name = "metal"
desc = "Sheets made out of metal."
singular_name = "metal sheet"
/obj/item/stack/sheet/iron
name = "iron"
desc = "Sheets made out of iron."
singular_name = "iron sheet"
icon_state = "sheet-metal"
inhand_icon_state = "sheet-metal"
mats_per_unit = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT)
throwforce = 10
flags_1 = CONDUCT_1
resistance_flags = FIRE_PROOF
merge_type = /obj/item/stack/sheet/metal
merge_type = /obj/item/stack/sheet/iron
grind_results = list(/datum/reagent/iron = 20)
point_value = 2
tableVariant = /obj/structure/table
material_type = /datum/material/iron
matter_amount = 4
cost = 500
source = /datum/robot_energy_storage/metal
source = /datum/robot_energy_storage/iron
/obj/item/stack/sheet/metal/narsie_act()
/obj/item/stack/sheet/iron/narsie_act()
new /obj/item/stack/sheet/runed_metal(loc, amount)
qdel(src)
/obj/item/stack/sheet/metal/fifty
/obj/item/stack/sheet/iron/fifty
amount = 50
/obj/item/stack/sheet/metal/twenty
/obj/item/stack/sheet/iron/twenty
amount = 20
/obj/item/stack/sheet/metal/ten
/obj/item/stack/sheet/iron/ten
amount = 10
/obj/item/stack/sheet/metal/five
/obj/item/stack/sheet/iron/five
amount = 5
/obj/item/stack/sheet/metal/get_main_recipes()
/obj/item/stack/sheet/iron/get_main_recipes()
. = ..()
. += GLOB.metal_recipes
/obj/item/stack/sheet/metal/suicide_act(mob/living/carbon/user)
/obj/item/stack/sheet/iron/suicide_act(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user] begins whacking [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return BRUTELOSS