diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index bf495442db5..27d01fed124 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -1444,7 +1444,7 @@ /turf/open/floor/carpet/orange, /area/ruin/powered/beach) "UZ" = ( -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 815f139286c..5ee82434988 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -1431,7 +1431,7 @@ /obj/structure/closet/crate, /obj/item/storage/box/stockparts/deluxe, /obj/item/storage/box/stockparts/deluxe, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/circuitboard/machine/processor, /obj/item/circuitboard/machine/gibber, @@ -4445,7 +4445,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty{ pixel_x = -1; pixel_y = 1 }, diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index d63ba5aaeef..7eea3bc9e66 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -3070,16 +3070,16 @@ dir = 1 }, /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/bridge/ai_upload) "mz" = ( @@ -3877,16 +3877,16 @@ /area/ruin/space/derelict/singularity_engine) "Xu" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /turf/open/floor/plasteel/airless, /area/ruin/space/derelict/bridge/ai_upload) "YQ" = ( diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index b5fc35667e8..f8d6f9be200 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -547,7 +547,7 @@ /area/ruin/space/has_grav/derelictoutpost/dockedship) "bN" = ( /obj/structure/table_frame, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/effect/decal/cleanable/blood/old{ icon_state = "trails_1"; name = "dried blood trail" @@ -732,7 +732,7 @@ }, /obj/structure/alien/weeds/creature, /obj/structure/table_frame, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/item/stack/sheet/plasteel, /obj/effect/turf_decal/tile/red{ dir = 1 @@ -1584,8 +1584,8 @@ /area/ruin/space/has_grav/derelictoutpost/cargostorage) "eA" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/ruin/space/has_grav/derelictoutpost/cargostorage) diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm index 421f7afb316..a9227b27e09 100644 --- a/_maps/RandomRuins/SpaceRuins/bus.dmm +++ b/_maps/RandomRuins/SpaceRuins/bus.dmm @@ -310,7 +310,7 @@ }, /area/ruin/unpowered/no_grav) "bb" = ( -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "XA" = ( diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm index 3b47bb509d0..2e558a1c889 100644 --- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm +++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm @@ -303,7 +303,7 @@ /turf/template_noop, /area/template_noop) "br" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/template_noop, /area/template_noop) "bs" = ( @@ -355,7 +355,7 @@ /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered) "ex" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered) "eG" = ( diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index 803ad116e95..d846ccafedb 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -190,19 +190,19 @@ /area/ruin/space/has_grav/deepstorage/storage) "aK" = ( /obj/structure/closet/cardboard, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty{ pixel_x = 2; pixel_y = 2 }, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty{ pixel_x = 2; pixel_y = 2 }, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty{ pixel_x = 2; pixel_y = 2 }, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty{ pixel_x = 2; pixel_y = 2 }, @@ -1320,7 +1320,7 @@ /area/ruin/space/has_grav/deepstorage/armory) "dv" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty{ pixel_x = 2; pixel_y = 2 }, diff --git a/_maps/RandomRuins/SpaceRuins/derelict6.dmm b/_maps/RandomRuins/SpaceRuins/derelict6.dmm index 7ba497a7fa6..66b4e002b7d 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict6.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict6.dmm @@ -21,7 +21,7 @@ }, /area/ruin/unpowered) "ae" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/structure/lattice, /turf/template_noop, /area/template_noop) @@ -96,7 +96,7 @@ /turf/open/floor/plating/airless, /area/ruin/unpowered) "as" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plating/airless{ icon_state = "platingdmg2" }, @@ -106,7 +106,7 @@ /turf/open/floor/plasteel/airless, /area/ruin/unpowered) "au" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plating/airless{ icon_state = "platingdmg3" }, @@ -116,7 +116,7 @@ /turf/open/floor/plasteel/airless, /area/ruin/unpowered) "aw" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plasteel/airless, /area/ruin/unpowered) "ax" = ( @@ -156,7 +156,7 @@ /turf/open/floor/plasteel/airless, /area/ruin/unpowered) "aD" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 @@ -291,7 +291,7 @@ /area/ruin/unpowered) "aY" = ( /obj/structure/lattice, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/template_noop, /area/template_noop) "aZ" = ( @@ -326,7 +326,7 @@ }, /area/ruin/unpowered) "bg" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plating/airless{ icon_state = "platingdmg1" }, @@ -339,7 +339,7 @@ /turf/open/floor/plasteel/airless/cafeteria, /area/ruin/unpowered) "bi" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/item/clothing/head/chefhat, /turf/open/floor/plating/airless{ icon_state = "platingdmg3" @@ -373,7 +373,7 @@ /turf/template_noop, /area/template_noop) "bp" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/structure/girder, /turf/open/floor/plating/airless{ icon_state = "platingdmg1" @@ -387,7 +387,7 @@ /area/ruin/unpowered) "br" = ( /obj/structure/girder, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plating/airless{ icon_state = "platingdmg1" }, diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm index 963479691cd..c914400ddba 100644 --- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm +++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm @@ -331,9 +331,9 @@ /obj/structure/closet/crate/secure/gear{ req_one_access_txt = "150" }, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/plasteel/twenty, /obj/item/stack/sheet/mineral/plastitanium{ amount = 50 @@ -363,7 +363,7 @@ }, /obj/item/circuitboard/machine/circuit_imprinter, /obj/item/circuitboard/machine/protolathe, -/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/iron/twenty, /obj/item/stack/sheet/glass{ amount = 10 }, diff --git a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm index 248913b23aa..89e1e6a928f 100644 --- a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm +++ b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm @@ -106,7 +106,7 @@ /area/ruin/space/has_grav/hellfactoryoffice) "ar" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/five, +/obj/item/stack/sheet/iron/five, /obj/item/grenade/firecracker, /turf/open/floor/plasteel, /area/ruin/space/has_grav/hellfactory) diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 122c6fc6db9..dc1a0299fc9 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -540,7 +540,7 @@ dir = 8 }, /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/iron/twenty, /obj/item/stack/sheet/glass{ amount = 10 }, diff --git a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm index d0988330415..7dfa5c7a12c 100644 --- a/_maps/RandomRuins/SpaceRuins/mechtransport.dmm +++ b/_maps/RandomRuins/SpaceRuins/mechtransport.dmm @@ -168,7 +168,7 @@ /turf/open/floor/mineral/titanium/yellow/airless, /area/ruin/space/has_grav/powered/mechtransport) "P" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/template_noop, /area/ruin/space/has_grav/powered/mechtransport) "Q" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 12d7e695d77..e2184fbcd58 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -2076,7 +2076,7 @@ "fv" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty{ pixel_x = 3; pixel_y = 3 @@ -3748,10 +3748,10 @@ /area/ruin/space/has_grav/ancientstation/betacorridor) "jf" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 20 }, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 20 }, /obj/structure/closet/crate, @@ -5924,7 +5924,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, @@ -6067,10 +6067,10 @@ /area/ruin/space/has_grav/ancientstation/medbay) "ox" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 50 }, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 25 }, /obj/item/clothing/gloves/color/yellow, diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm index 978cd8ff4d4..759754e2ae4 100644 --- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm @@ -373,7 +373,7 @@ /turf/open/floor/plating, /area/ruin/space/has_grav/onehalf/drone_bay) "bf" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plating/airless{ icon_state = "platingdmg1" }, @@ -643,7 +643,7 @@ /turf/closed/wall/r_wall, /area/ruin/space/has_grav/onehalf/bridge) "bV" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/template_noop, /area/template_noop) "bW" = ( diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index 727596775dd..68dc80c3c73 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -2647,8 +2647,8 @@ /area/ruin/space/has_grav/hotel/power) "ix" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index e1170399842..29c399443bf 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -627,7 +627,7 @@ /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "cJ" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plating, /area/awaymission/academy/classrooms) "cK" = ( @@ -2195,7 +2195,7 @@ dir = 8 }, /obj/structure/rack, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plasteel, /area/awaymission/academy/academyaft) "iF" = ( diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm index 1dae4df96e6..343cb3c6bb4 100644 --- a/_maps/RandomZLevels/caves.dmm +++ b/_maps/RandomZLevels/caves.dmm @@ -1192,7 +1192,7 @@ /turf/open/floor/plating, /area/awaymission/caves/northblock) "dL" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plating, /area/awaymission/caves/northblock) "dM" = ( @@ -1261,7 +1261,7 @@ /turf/open/floor/wood, /area/awaymission/caves/northblock) "ea" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/wood, /area/awaymission/caves/northblock) "eb" = ( @@ -1992,7 +1992,7 @@ /area/awaymission/caves/bmp_asteroid/level_two) "gt" = ( /obj/structure/table_frame, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plasteel, /area/awaymission/caves/bmp_asteroid) "gu" = ( diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 038a2580e78..0e4e87950b1 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -1415,7 +1415,7 @@ /area/awaymission/moonoutpost19/syndicate) "cY" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 12 }, /obj/effect/decal/cleanable/dirt, diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 4d617eb6230..682c62f8c56 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -166,7 +166,7 @@ /area/awaymission/research/interior/engineering) "aF" = ( /obj/item/stack/rods, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/item/stock_parts/cell/high/empty, /turf/open/floor/plating, /area/awaymission/research/interior/engineering) @@ -356,7 +356,7 @@ }, /area/awaymission/research/interior/engineering) "bh" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -587,7 +587,7 @@ /turf/open/floor/plasteel/white, /area/awaymission/research/interior/engineering) "bG" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index b7873e0ac3a..7929660d807 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -6394,7 +6394,7 @@ pixel_x = 1; pixel_y = -1 }, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty{ pixel_x = -1; pixel_y = 1 }, @@ -10426,7 +10426,7 @@ /turf/open/floor/plating/snowed/cavern, /area/awaymission/snowdin/post/mining_dock) "zK" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plating/asteroid/snow, /area/awaymission/snowdin/outside) "zL" = ( @@ -10496,7 +10496,7 @@ /area/awaymission/snowdin/cave/cavern) "zU" = ( /obj/structure/girder, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/outside) "zV" = ( @@ -10835,7 +10835,7 @@ /area/awaymission/snowdin/post/minipost) "AR" = ( /obj/structure/girder, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plating/snowed/smoothed, /area/awaymission/snowdin/post/minipost) "AS" = ( @@ -13074,7 +13074,7 @@ /area/awaymission/snowdin/post/mining_main/robotics) "GA" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /turf/open/floor/plating, /area/awaymission/snowdin/post/mining_main/robotics) "GB" = ( @@ -14543,7 +14543,7 @@ /area/awaymission/snowdin/post/mining_main) "KJ" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty{ pixel_x = -1; pixel_y = 1 }, diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index c4ec62f28e1..e3670b92dbd 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -510,7 +510,7 @@ }, /area/awaymission/spacebattle/cruiser) "cx" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/item/ammo_casing/c10mm, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) @@ -596,7 +596,7 @@ /turf/open/floor/plasteel/cafeteria, /area/awaymission/spacebattle/cruiser) "cQ" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "cS" = ( @@ -1444,7 +1444,7 @@ /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "fL" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plasteel{ icon_state = "damaged1" }, @@ -2008,7 +2008,7 @@ /turf/open/floor/wood, /area/awaymission/spacebattle/cruiser) "hF" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plasteel{ icon_state = "damaged3" }, @@ -2059,7 +2059,7 @@ /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "hQ" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plasteel{ icon_state = "damaged4" }, @@ -2543,7 +2543,7 @@ /obj/item/ammo_casing/shotgun, /obj/item/ammo_casing/c10mm, /obj/item/ammo_casing/c10mm, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -2563,14 +2563,14 @@ /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "jR" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/wood, /area/awaymission/spacebattle/cruiser) "jS" = ( /turf/open/floor/plasteel/airless, /area/awaymission/spacebattle/cruiser) "jT" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plasteel/airless, /area/awaymission/spacebattle/cruiser) "jU" = ( @@ -2779,7 +2779,7 @@ /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "kI" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/space, /area/space/nearstation) "kJ" = ( diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index e7130367dca..d385001b336 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -3234,7 +3234,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 23 }, /turf/open/floor/plasteel/white/side{ @@ -6343,7 +6343,7 @@ /area/awaymission/undergroundoutpost45/crew_quarters) "mz" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/rods/fifty, /turf/open/floor/plating{ @@ -12774,7 +12774,7 @@ dir = 4 }, /obj/structure/closet/crate, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 26 }, /obj/item/stack/sheet/glass{ diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index c5e99c72ff3..a57c352a5fc 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -2321,7 +2321,7 @@ /area/construction/mining/aux_base) "ahc" = ( /obj/structure/table/reinforced, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass{ amount = 30 }, @@ -4595,7 +4595,7 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/plasteel/fifty, /obj/machinery/camera{ @@ -15258,7 +15258,7 @@ /obj/item/stack/sheet/glass{ amount = 30 }, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 30 }, /obj/item/stack/cable_coil, @@ -30765,8 +30765,8 @@ /area/engine/atmos) "bmY" = ( /obj/structure/table/reinforced, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/grenade/chem_grenade/smart_metal_foam, /obj/item/grenade/chem_grenade/smart_metal_foam, /obj/machinery/newscaster{ @@ -46577,7 +46577,7 @@ /area/maintenance/port/fore) "bOp" = ( /obj/structure/table/reinforced, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 30 }, /obj/item/stack/sheet/glass{ @@ -47923,7 +47923,7 @@ /area/storage/tools) "bQZ" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/rods/fifty, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -53137,7 +53137,7 @@ /area/ai_monitored/security/armory) "bZZ" = ( /obj/structure/table/reinforced, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/mineral/plasma{ amount = 20 @@ -58544,7 +58544,7 @@ "clB" = ( /obj/item/stack/rods/fifty, /obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/target, /obj/item/target/syndicate, /obj/item/target/alien, @@ -62870,7 +62870,7 @@ /area/maintenance/port) "cve" = ( /obj/structure/table/reinforced, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 30 }, /obj/item/stack/sheet/glass{ @@ -63839,7 +63839,7 @@ /area/gateway) "cwW" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/rods{ amount = 25 }, @@ -64340,8 +64340,8 @@ /area/engine/storage) "cxM" = ( /obj/structure/table/reinforced, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/crowbar, @@ -66800,7 +66800,7 @@ /obj/item/radio/intercom{ pixel_y = 26 }, -/obj/item/stack/sheet/metal/five, +/obj/item/stack/sheet/iron/five, /obj/item/circuitboard/machine/paystand, /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -67824,7 +67824,7 @@ /turf/open/floor/plasteel, /area/vacant_room/commissary) "cEB" = ( -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/wrench, /obj/structure/extinguisher_cabinet{ @@ -77512,7 +77512,7 @@ /area/science/research) "cXC" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/package_wrap, /obj/machinery/light, @@ -79250,7 +79250,7 @@ /area/science/lab) "daW" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/wrench, /obj/item/clothing/glasses/welding, @@ -86706,7 +86706,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 30 }, /obj/item/stack/package_wrap, @@ -87947,7 +87947,7 @@ /area/science/research/abandoned) "dut" = ( /obj/structure/table/reinforced, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/assembly/flash/handheld, /obj/effect/turf_decal/bot, @@ -89973,9 +89973,9 @@ /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hor) "dzF" = ( -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/structure/table/reinforced, /obj/machinery/requests_console{ @@ -94702,7 +94702,7 @@ "dJL" = ( /obj/item/stack/rods/fifty, /obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/target, /obj/item/target/syndicate, /obj/item/target/alien, @@ -98116,7 +98116,7 @@ "dQG" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 30 }, /obj/item/stack/sheet/glass{ @@ -103890,7 +103890,7 @@ /area/hallway/secondary/exit/departure_lounge) "edJ" = ( /obj/structure/table/reinforced, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 30 }, /obj/item/stack/sheet/glass/fifty, @@ -109971,8 +109971,8 @@ /area/maintenance/starboard/aft) "ovb" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/construction/plumbing, /obj/item/construction/plumbing, /obj/machinery/light, @@ -111256,7 +111256,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 30 }, /obj/item/stack/sheet/glass{ @@ -113539,7 +113539,7 @@ pixel_x = 7; pixel_y = 3 }, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/engineering) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 4050364e404..52c5735074d 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -3710,7 +3710,7 @@ /area/security/brig) "aio" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/rglass{ amount = 50 }, @@ -5057,7 +5057,7 @@ /turf/open/floor/wood, /area/maintenance/port/aft) "akZ" = ( -/obj/item/stack/sheet/metal/five, +/obj/item/stack/sheet/iron/five, /turf/open/floor/plating, /area/maintenance/port/aft) "ala" = ( @@ -12193,8 +12193,8 @@ /area/maintenance/solars/port/fore) "aCT" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -14172,8 +14172,8 @@ /area/science/robotics/mechbay) "aHN" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/crowbar, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -16184,7 +16184,7 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "aND" = ( -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/cable_coil, /obj/item/flashlight/lamp, @@ -19831,7 +19831,7 @@ dir = 6 }, /obj/structure/table, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/item/storage/box/bodybags, /obj/item/pen, /obj/structure/sign/warning/coldtemp{ @@ -23419,7 +23419,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/clothing/glasses/welding, /obj/item/storage/toolbox/mechanical{ pixel_x = -2; @@ -26802,9 +26802,9 @@ "bpT" = ( /obj/structure/table, /obj/item/storage/belt/utility, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass{ amount = 20; pixel_x = -3; @@ -31867,7 +31867,7 @@ /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) "bEx" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plating/icemoon, /area/icemoon/surface/outdoors) "bEy" = ( @@ -35562,8 +35562,8 @@ /area/engine/atmos) "bSG" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty{ pixel_x = 2; pixel_y = 2 }, @@ -39531,7 +39531,7 @@ /area/engine/engine_smes) "ciX" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/rods/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/electronics/airlock, @@ -39840,7 +39840,7 @@ }, /obj/structure/cable, /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stock_parts/cell/emproof{ pixel_x = 6; @@ -40827,8 +40827,8 @@ /area/maintenance/port/aft) "cqN" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/plasteel{ amount = 10 }, @@ -41648,7 +41648,7 @@ /area/ai_monitored/turret_protected/aisat/service) "cux" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/clothing/head/welding, /obj/item/stack/sheet/mineral/plasma{ @@ -44372,9 +44372,9 @@ }, /obj/structure/table, /obj/item/storage/belt/utility, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass{ amount = 20; pixel_x = -3; @@ -46490,7 +46490,7 @@ /area/medical/surgery) "gbT" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) @@ -47688,7 +47688,7 @@ /area/crew_quarters/heads/hor) "ijc" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /turf/open/floor/plasteel/dark, /area/engine/engineering) "ijG" = ( @@ -48545,7 +48545,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/mineral/plasma, /obj/machinery/firealarm{ pixel_y = 24 @@ -52186,7 +52186,7 @@ /obj/machinery/firealarm{ pixel_y = 26 }, -/obj/item/stack/sheet/metal/five, +/obj/item/stack/sheet/iron/five, /obj/item/circuitboard/machine/paystand, /obj/item/stack/cable_coil/five, /obj/effect/turf_decal/tile/brown{ @@ -54549,8 +54549,8 @@ c_tag = "Auxiliary Tool Storage" }, /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/storage/box/lights/mixed, /obj/effect/turf_decal/tile/yellow{ dir = 4 diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 736bd98e938..f3b1376fb7a 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -3291,7 +3291,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/stack/sheet/metal/ten, +/obj/item/stack/sheet/iron/ten, /obj/item/stack/cable_coil, /obj/item/storage/backpack/duffelbag/sec/surgery{ pixel_y = 5 @@ -14264,9 +14264,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/glass/fifty, @@ -15363,7 +15363,7 @@ /area/engine/engineering) "azK" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/rods/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/electronics/airlock, @@ -30131,9 +30131,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/storage/belt/utility, /obj/item/clothing/head/welding, @@ -31415,7 +31415,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/clothing/glasses/welding, /obj/item/radio/intercom{ @@ -45189,7 +45189,7 @@ dir = 4 }, /obj/structure/rack, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/wrench, /obj/item/crowbar/red, @@ -49907,8 +49907,8 @@ dir = 4 }, /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/glass/fifty, /obj/machinery/button/door{ @@ -56253,7 +56253,7 @@ "bNk" = ( /obj/effect/turf_decal/bot, /obj/structure/table, -/obj/item/stack/sheet/metal/ten{ +/obj/item/stack/sheet/iron/ten{ amount = 5 }, /obj/item/assembly/prox_sensor, @@ -59615,7 +59615,7 @@ }, /obj/structure/table, /obj/item/stack/sheet/plasteel/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -66379,8 +66379,8 @@ /area/ai_monitored/turret_protected/ai) "cee" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/clothing/head/welding{ pixel_x = 4; pixel_y = 4 @@ -68875,7 +68875,7 @@ /area/ai_monitored/storage/satellite) "ciD" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/mineral/plasma{ amount = 5 @@ -80970,9 +80970,9 @@ "cEz" = ( /obj/structure/table, /obj/effect/turf_decal/tile/neutral, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/storage/belt/utility, /obj/item/clothing/head/welding, @@ -83569,8 +83569,8 @@ dir = 8 }, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/pipe_dispenser, /obj/structure/extinguisher_cabinet{ pixel_y = 28 @@ -85074,8 +85074,8 @@ dir = 1 }, /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/construction/plumbing, /obj/item/construction/plumbing, /obj/machinery/button/door{ @@ -91431,7 +91431,7 @@ "weO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating{ icon_state = "panelscorched" diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 8fb5a7e0598..2bb54ef9e24 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1925,7 +1925,7 @@ }, /obj/structure/table/reinforced, /obj/item/storage/box/lights/mixed, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 30 }, /obj/item/radio{ @@ -8178,15 +8178,15 @@ /area/hallway/primary/port) "avI" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty{ pixel_x = 2; pixel_y = 2 }, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty{ pixel_x = 2; pixel_y = 2 }, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty{ pixel_x = 2; pixel_y = 2 }, @@ -12640,9 +12640,9 @@ /area/engine/engineering) "aGR" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/glass/fifty, @@ -15061,7 +15061,7 @@ /area/engine/engineering) "aNo" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/rods/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/electronics/airlock, @@ -16882,8 +16882,8 @@ /area/construction/mining/aux_base) "aRF" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/pipe_dispenser, /obj/machinery/light{ @@ -22193,7 +22193,7 @@ /obj/machinery/firealarm{ pixel_y = 26 }, -/obj/item/stack/sheet/metal/five, +/obj/item/stack/sheet/iron/five, /obj/item/radio/intercom{ pixel_x = 28; pixel_y = 5 @@ -22331,8 +22331,8 @@ /area/storage/tools) "bdS" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/storage/box/lights/mixed, /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -30480,7 +30480,7 @@ /area/crew_quarters/theatre) "byO" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/stack/sheet/mineral/plasma{ amount = 35 @@ -30497,8 +30497,8 @@ /area/ai_monitored/storage/satellite) "byZ" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/grenade/chem_grenade/smart_metal_foam, /obj/item/grenade/chem_grenade/smart_metal_foam, /obj/machinery/airalarm{ @@ -33975,7 +33975,7 @@ /obj/item/stack/sheet/rglass{ amount = 50 }, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/rods/fifty, /obj/item/storage/toolbox/emergency, /obj/item/flashlight, @@ -34447,7 +34447,7 @@ /obj/item/stack/sheet/rglass{ amount = 50 }, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/storage/toolbox/emergency, /obj/item/flashlight, /obj/structure/window/reinforced, @@ -36187,8 +36187,8 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bOo" = ( -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/structure/table, /obj/item/stack/sheet/plasteel{ amount = 10 @@ -41249,7 +41249,7 @@ /area/maintenance/port/aft) "cbA" = ( /obj/structure/closet, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 34 }, /obj/item/extinguisher/mini, @@ -48509,8 +48509,8 @@ dir = 4 }, /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/construction/plumbing, /obj/item/construction/plumbing, /turf/open/floor/plasteel/white, @@ -49322,7 +49322,7 @@ pixel_x = 3; pixel_y = -4 }, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /turf/open/floor/plating, /area/maintenance/aft/secondary) "cMm" = ( @@ -57768,7 +57768,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/iron/twenty, /turf/open/floor/plasteel, /area/maintenance/port/aft) "fJp" = ( @@ -59057,7 +59057,7 @@ /obj/item/stack/sheet/glass{ amount = 30 }, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 30 }, /obj/item/stack/cable_coil, @@ -63400,9 +63400,9 @@ /obj/structure/table/reinforced, /obj/machinery/power/apc/auto_name/east, /obj/structure/cable, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/circuitboard/mecha/ripley/main, /obj/item/circuitboard/mecha/ripley/peripherals, @@ -69833,7 +69833,7 @@ /area/hallway/primary/starboard) "oXi" = ( /obj/structure/table, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 10 }, /obj/item/electropack, @@ -75958,7 +75958,7 @@ "tnI" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /turf/open/floor/plasteel/dark, /area/engine/atmos) "toP" = ( @@ -79727,7 +79727,7 @@ /obj/effect/turf_decal/siding{ dir = 8 }, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/glass/fifty, /obj/item/wrench, /obj/item/clothing/glasses/welding, diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 43d5335ace9..f8b5ba1a434 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -5656,8 +5656,8 @@ /area/centcom/ferry) "rs" = ( /obj/structure/table/reinforced, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/plasteel{ amount = 15 }, @@ -15580,7 +15580,7 @@ "Tq" = ( /obj/structure/table/wood/bar, /obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/storage/toolbox/mechanical, /obj/item/multitool, /turf/open/floor/wood, @@ -15648,8 +15648,8 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/stack/sheet/plasteel{ amount = 15 }, diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index 54744f68b75..08be228af73 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -1550,7 +1550,7 @@ /area/shuttle/escape) "dd" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, diff --git a/_maps/shuttles/emergency_construction.dmm b/_maps/shuttles/emergency_construction.dmm index 86204a51cf1..532d3d8c954 100644 --- a/_maps/shuttles/emergency_construction.dmm +++ b/_maps/shuttles/emergency_construction.dmm @@ -136,11 +136,11 @@ /area/shuttle/escape) "m" = ( /obj/structure/table, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty{ pixel_x = 3; pixel_y = 3 }, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty{ pixel_x = -2; pixel_y = -2 }, diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm index 8499922038f..8fbb04cb691 100644 --- a/_maps/shuttles/emergency_medisim.dmm +++ b/_maps/shuttles/emergency_medisim.dmm @@ -633,7 +633,7 @@ end_create_message = "dispenses a pair of binoculars."; glass_cost = 0; maximum_idle = 1; - metal_cost = 0; + iron_cost = 0; name = "binoculars fabricator"; power_used = 0; starting_amount = 25000 diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm index 9e0cf85a13e..80add0d5df7 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -2306,7 +2306,7 @@ /obj/item/stack/sheet/glass/fifty{ layer = 4 }, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 20; layer = 3.1 }, diff --git a/_maps/shuttles/emergency_narnar.dmm b/_maps/shuttles/emergency_narnar.dmm index d6ace95f2ab..d0b74c7fb23 100644 --- a/_maps/shuttles/emergency_narnar.dmm +++ b/_maps/shuttles/emergency_narnar.dmm @@ -89,7 +89,7 @@ /turf/open/floor/plasteel/cult, /area/shuttle/escape) "q" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/effect/decal/remains/human, /turf/open/floor/plasteel/cult, /area/shuttle/escape) @@ -234,11 +234,11 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plasteel/cult, /area/shuttle/escape) "R" = ( -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plasteel/cult, /area/shuttle/escape) "S" = ( diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index 5a33d7268cd..930a50c6b5c 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -1993,7 +1993,7 @@ pixel_x = -2; pixel_y = 2 }, -/obj/item/stack/sheet/metal/fifty{ +/obj/item/stack/sheet/iron/fifty{ pixel_x = 4; pixel_y = -4 }, diff --git a/_maps/shuttles/infiltrator_advanced.dmm b/_maps/shuttles/infiltrator_advanced.dmm index 7ade32fe4cb..b18113917c7 100644 --- a/_maps/shuttles/infiltrator_advanced.dmm +++ b/_maps/shuttles/infiltrator_advanced.dmm @@ -915,7 +915,7 @@ /area/shuttle/syndicate/eva) "bT" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/iron/twenty, /obj/item/stack/sheet/glass{ amount = 10 }, diff --git a/_maps/shuttles/ruin_caravan_victim.dmm b/_maps/shuttles/ruin_caravan_victim.dmm index 0fe52c3db0f..b7ee52c1272 100644 --- a/_maps/shuttles/ruin_caravan_victim.dmm +++ b/_maps/shuttles/ruin_caravan_victim.dmm @@ -200,7 +200,7 @@ /area/shuttle/caravan/freighter1) "lt" = ( /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/iron/twenty, /obj/item/stack/sheet/glass{ amount = 10 }, @@ -514,7 +514,7 @@ }, /area/shuttle/caravan/freighter1) "Ax" = ( -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /turf/open/floor/plasteel/airless{ icon_state = "floorscorched2" }, @@ -1016,7 +1016,7 @@ /obj/structure/closet/crate{ icon_state = "crateopen" }, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /turf/open/floor/plasteel/airless/dark, /area/shuttle/caravan/freighter1) "Ut" = ( diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm index e1e349e8f03..07568650471 100644 --- a/_maps/shuttles/ruin_pirate_cutter.dmm +++ b/_maps/shuttles/ruin_pirate_cutter.dmm @@ -765,7 +765,7 @@ dir = 1 }, /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/iron/twenty, /obj/item/stack/sheet/glass{ amount = 10 }, diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index f3fe70a8df3..2621f038491 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -469,7 +469,7 @@ /obj/machinery/power/terminal{ dir = 1 }, -/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/iron/twenty, /obj/item/stack/sheet/glass{ amount = 10 }, diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm index ae4a848aa04..df0f803213c 100644 --- a/_maps/shuttles/whiteship_cere.dmm +++ b/_maps/shuttles/whiteship_cere.dmm @@ -114,8 +114,8 @@ /obj/structure/closet/crate{ name = "spare equipment crate" }, -/obj/item/stack/sheet/metal/fifty, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, diff --git a/_maps/shuttles/whiteship_delta.dmm b/_maps/shuttles/whiteship_delta.dmm index 2983c788e17..0f47c868758 100644 --- a/_maps/shuttles/whiteship_delta.dmm +++ b/_maps/shuttles/whiteship_delta.dmm @@ -638,7 +638,7 @@ /area/shuttle/abandoned/bar) "bj" = ( /obj/structure/girder, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plating/airless, /area/shuttle/abandoned/bar) "bk" = ( @@ -1631,7 +1631,7 @@ /obj/effect/turf_decal/bot_white, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/storage/toolbox/electrical{ pixel_x = -3; pixel_y = 8 @@ -1987,7 +1987,7 @@ dir = 8 }, /obj/structure/girder/reinforced, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plating/airless, /area/shuttle/abandoned/cargo) "dy" = ( @@ -2010,7 +2010,7 @@ }, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/iron/twenty, /obj/item/stack/sheet/glass{ amount = 10 }, diff --git a/_maps/shuttles/whiteship_donut.dmm b/_maps/shuttles/whiteship_donut.dmm index 6e6d6371be2..78b3d0047d9 100644 --- a/_maps/shuttles/whiteship_donut.dmm +++ b/_maps/shuttles/whiteship_donut.dmm @@ -28,7 +28,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/structure/tank_dispenser, /turf/open/floor/plasteel/airless, /area/shuttle/abandoned) @@ -127,7 +127,7 @@ /area/shuttle/abandoned) "ax" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/plasteel/airless, /area/shuttle/abandoned) "ay" = ( @@ -308,7 +308,7 @@ /area/shuttle/abandoned) "aY" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /obj/effect/turf_decal/tile/yellow{ dir = 1 }, @@ -520,7 +520,7 @@ /area/shuttle/abandoned) "tT" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/item/stack/sheet/metal{ +/obj/item/stack/sheet/iron{ amount = 50 }, /turf/open/floor/plasteel/airless, diff --git a/_maps/shuttles/whiteship_kilo.dmm b/_maps/shuttles/whiteship_kilo.dmm index 3bff558331a..7f7d3868cd5 100644 --- a/_maps/shuttles/whiteship_kilo.dmm +++ b/_maps/shuttles/whiteship_kilo.dmm @@ -171,7 +171,7 @@ "ao" = ( /obj/effect/turf_decal/bot_white, /obj/structure/table, -/obj/item/stack/sheet/metal/fifty, +/obj/item/stack/sheet/iron/fifty, /obj/item/storage/toolbox/electrical{ pixel_x = -3; pixel_y = 8 @@ -845,7 +845,7 @@ "bx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/iron/twenty, /obj/item/stack/sheet/glass{ amount = 10 }, @@ -1222,7 +1222,7 @@ /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/table_frame, -/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/iron, /turf/open/floor/mineral/plastitanium, /area/shuttle/abandoned/bridge) "ck" = ( diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index 740b3936b7c..f7852fbc1f5 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -1214,7 +1214,7 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/table, -/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/iron/twenty, /obj/item/stack/sheet/glass{ amount = 10 }, @@ -2444,7 +2444,7 @@ pixel_y = -23 }, /obj/structure/closet/crate, -/obj/item/stack/sheet/metal/twenty, +/obj/item/stack/sheet/iron/twenty, /obj/item/stack/sheet/glass{ amount = 10 }, diff --git a/code/__DEFINES/cult.dm b/code/__DEFINES/cult.dm index 054d6345dbd..ec5e9b4ba8f 100644 --- a/code/__DEFINES/cult.dm +++ b/code/__DEFINES/cult.dm @@ -19,7 +19,7 @@ #define BLOOD_SPEAR_COST 150 #define BLOOD_BARRAGE_COST 300 #define BLOOD_BEAM_COST 500 -#define METAL_TO_CONSTRUCT_SHELL_CONVERSION 50 +#define IRON_TO_CONSTRUCT_SHELL_CONVERSION 50 //screen locations #define DEFAULT_BLOODSPELLS "6:-29,4:-2" #define DEFAULT_BLOODTIP "14:6,14:27" diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 4b90fb2a181..a48202a4e30 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -35,14 +35,13 @@ //used in design to specify which machine can build it #define IMPRINTER (1<<0) //For circuits. Uses glass/chemicals. -#define PROTOLATHE (1<<1) //New stuff. Uses glass/metal/chemicals -#define AUTOLATHE (1<<2) //Uses glass/metal only. -#define CRAFTLATHE (1<<3) //Uses fuck if I know. For use eventually. -#define MECHFAB (1<<4) //Remember, objects utilising this flag should have construction_time and construction_cost vars. -#define BIOGENERATOR (1<<5) //Uses biomass -#define LIMBGROWER (1<<6) //Uses synthetic flesh -#define SMELTER (1<<7) //uses various minerals -#define NANITE_COMPILER (1<<8) //Prints nanite disks +#define PROTOLATHE (1<<1) //New stuff. Uses various minerals +#define AUTOLATHE (1<<2) //Prints basic designs without research +#define MECHFAB (1<<3) //Remember, objects utilising this flag should have construction_time and construction_cost vars. +#define BIOGENERATOR (1<<4) //Uses biomass +#define LIMBGROWER (1<<5) //Uses synthetic flesh +#define SMELTER (1<<6) //uses various minerals +#define NANITE_COMPILER (1<<7) //Prints nanite disks //Note: More than one of these can be added to a design but imprinter and lathe designs are incompatable. //Modular computer/NTNet defines diff --git a/code/__DEFINES/materials.dm b/code/__DEFINES/materials.dm index a2a37069e46..2914384d463 100644 --- a/code/__DEFINES/materials.dm +++ b/code/__DEFINES/materials.dm @@ -1,7 +1,7 @@ /// Is the material from an ore? currently unused but exists atm for categorizations sake #define MAT_CATEGORY_ORE "ore capable" -/// Hard materials, such as iron or metal +/// Hard materials, such as iron or silver #define MAT_CATEGORY_RIGID "rigid material" /// Materials that can be used to craft items diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 46d4dee4bcb..708cb2e2298 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -105,7 +105,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items /obj/item/stack/cable_coil = 1, /obj/item/stock_parts/cell = 1, /obj/item/stack/rods/twentyfive = 1, - /obj/item/stack/sheet/metal/twenty = 1, + /obj/item/stack/sheet/iron/twenty = 1, /obj/item/stack/sheet/mineral/plasma = 1, /obj/item/sign = 1, diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 5f653439f1a..02dae04d648 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -100,7 +100,7 @@ name = "Bola" result = /obj/item/restraints/legcuffs/bola reqs = list(/obj/item/restraints/handcuffs/cable = 1, - /obj/item/stack/sheet/metal = 6) + /obj/item/stack/sheet/iron = 6) time = 20//15 faster than crafting them by hand! category= CAT_WEAPONRY subcategory = CAT_WEAPON @@ -109,7 +109,7 @@ name = "Gonbola" result = /obj/item/restraints/legcuffs/bola/gonbola reqs = list(/obj/item/restraints/handcuffs/cable = 1, - /obj/item/stack/sheet/metal = 6, + /obj/item/stack/sheet/iron = 6, /obj/item/stack/sheet/animalhide/gondola = 1) time = 40 category= CAT_WEAPONRY @@ -119,7 +119,7 @@ name = "Tail Club" result = /obj/item/tailclub reqs = list(/obj/item/organ/tail/lizard = 1, - /obj/item/stack/sheet/metal = 1) + /obj/item/stack/sheet/iron = 1) time = 40 category = CAT_WEAPONRY subcategory = CAT_WEAPON @@ -146,7 +146,7 @@ name = "Modular Rifle Reciever" tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_SAW) result = /obj/item/weaponcrafting/receiver - reqs = list(/obj/item/stack/sheet/metal = 5, + reqs = list(/obj/item/stack/sheet/iron = 5, /obj/item/stack/sticky_tape = 1, /obj/item/screwdriver = 1, /obj/item/assembly/mousetrap = 1) @@ -308,7 +308,7 @@ /obj/item/clothing/suit/armor/vest = 1, /obj/item/bodypart/l_leg/robot = 1, /obj/item/bodypart/r_leg/robot = 1, - /obj/item/stack/sheet/metal = 1, + /obj/item/stack/sheet/iron = 1, /obj/item/stack/cable_coil = 1, /obj/item/gun/energy/disabler = 1, /obj/item/assembly/prox_sensor = 1) @@ -401,7 +401,7 @@ name = "Pneumatic Cannon" result = /obj/item/pneumatic_cannon/ghetto tools = list(TOOL_WELDER, TOOL_WRENCH) - reqs = list(/obj/item/stack/sheet/metal = 4, + reqs = list(/obj/item/stack/sheet/iron = 4, /obj/item/stack/package_wrap = 8, /obj/item/pipe = 2) time = 50 @@ -478,7 +478,7 @@ /datum/crafting_recipe/improvisedslug name = "Improvised Shotgun Shell" result = /obj/item/ammo_casing/shotgun/improvised - reqs = list(/obj/item/stack/sheet/metal = 2, + reqs = list(/obj/item/stack/sheet/iron = 2, /obj/item/stack/cable_coil = 1, /datum/reagent/fuel = 10) tools = list(TOOL_SCREWDRIVER) @@ -618,7 +618,7 @@ name = "Skateboard" result = /obj/vehicle/ridden/scooter/skateboard/improvised time = 60 - reqs = list(/obj/item/stack/sheet/metal = 5, + reqs = list(/obj/item/stack/sheet/iron = 5, /obj/item/stack/rods = 10) category = CAT_MISC @@ -626,14 +626,14 @@ name = "Scooter" result = /obj/vehicle/ridden/scooter time = 65 - reqs = list(/obj/item/stack/sheet/metal = 5, + reqs = list(/obj/item/stack/sheet/iron = 5, /obj/item/stack/rods = 12) category = CAT_MISC /datum/crafting_recipe/wheelchair name = "Wheelchair" result = /obj/vehicle/ridden/wheelchair - reqs = list(/obj/item/stack/sheet/metal = 4, + reqs = list(/obj/item/stack/sheet/iron = 4, /obj/item/stack/rods = 6) time = 100 category = CAT_MISC @@ -641,7 +641,7 @@ /datum/crafting_recipe/motorized_wheelchair name = "Motorized Wheelchair" result = /obj/vehicle/ridden/wheelchair/motorized - reqs = list(/obj/item/stack/sheet/metal = 10, + reqs = list(/obj/item/stack/sheet/iron = 10, /obj/item/stack/rods = 8, /obj/item/stock_parts/manipulator = 2, /obj/item/stock_parts/capacitor = 1) @@ -912,7 +912,7 @@ name = "Pressure Plate" result = /obj/item/pressure_plate time = 5 - reqs = list(/obj/item/stack/sheet/metal = 1, + reqs = list(/obj/item/stack/sheet/iron = 1, /obj/item/stack/tile/plasteel = 1, /obj/item/stack/cable_coil = 2, /obj/item/assembly/igniter = 1) @@ -924,7 +924,7 @@ result = /obj/item/rcl/ghetto time = 40 tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WRENCH) - reqs = list(/obj/item/stack/sheet/metal = 15) + reqs = list(/obj/item/stack/sheet/iron = 15) category = CAT_MISC /datum/crafting_recipe/mummy @@ -1145,7 +1145,7 @@ name = "Aquarium" result = /obj/structure/aquarium time = 10 SECONDS - reqs = list(/obj/item/stack/sheet/metal = 15, + reqs = list(/obj/item/stack/sheet/iron = 15, /obj/item/stack/sheet/glass = 10, /obj/item/aquarium_kit = 1 ) diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm index 91e76c4f88e..45e8b211a36 100644 --- a/code/datums/materials/basemats.dm +++ b/code/datums/materials/basemats.dm @@ -4,7 +4,7 @@ desc = "Common iron ore often found in sedimentary and igneous layers of the crust." color = "#878687" categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE) - sheet_type = /obj/item/stack/sheet/metal + sheet_type = /obj/item/stack/sheet/iron value_per_unit = 0.0025 /datum/material/iron/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item) diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index f0e4a464af1..c40cbde96db 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -190,7 +190,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) new/obj/item/stack/sheet/rglass{amount=50}(usr.loc) if("hsbmetal") - new/obj/item/stack/sheet/metal{amount=50}(usr.loc) + new/obj/item/stack/sheet/iron/fifty(usr.loc) if("hsbplasteel") new/obj/item/stack/sheet/plasteel{amount=50}(usr.loc) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 4d7f3d1be80..0535eac673d 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -4,7 +4,7 @@ /obj/machinery/autolathe name = "autolathe" - desc = "It produces items using metal and glass." + desc = "It produces items using iron and glass." icon_state = "autolathe" density = TRUE use_power = IDLE_POWER_USE diff --git a/code/game/machinery/bounty_board.dm b/code/game/machinery/bounty_board.dm index 6a3acb4c6fd..64021656713 100644 --- a/code/game/machinery/bounty_board.dm +++ b/code/game/machinery/bounty_board.dm @@ -47,7 +47,7 @@ GLOBAL_LIST_EMPTY(request_list) playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE) if(machine_stat & BROKEN) to_chat(user, "The broken remains of [src] fall on the ground.") - new /obj/item/stack/sheet/metal(loc, 3) + new /obj/item/stack/sheet/iron(loc, 3) new /obj/item/shard(loc) else to_chat(user, "You [anchored ? "un" : ""]secure [name].") diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 251f51e26df..b866bbeccca 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -277,7 +277,7 @@ /obj/structure/camera_assembly/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal(loc) + new /obj/item/stack/sheet/iron(loc) qdel(src) diff --git a/code/game/machinery/canister_frame.dm b/code/game/machinery/canister_frame.dm index 6811a0a592b..06f3ddef9ea 100644 --- a/code/game/machinery/canister_frame.dm +++ b/code/game/machinery/canister_frame.dm @@ -26,7 +26,7 @@ /obj/structure/canister_frame/machine/deconstruct(disassembled = TRUE) if (!(flags_1 & NODECONSTRUCT_1)) // Spawn 5 sheets for the tier 0 frame - new /obj/item/stack/sheet/metal(loc, 5) + new /obj/item/stack/sheet/iron(loc, 5) // Loop backwards in the tiers and spawn the requirement for each tier var/obj/structure/canister_frame/machine/i_prev = prev_tier @@ -42,7 +42,7 @@ icon_state = "frame_0" next_tier = /obj/structure/canister_frame/machine/frame_tier_1 - next_tier_reqitem = /obj/item/stack/sheet/metal + next_tier_reqitem = /obj/item/stack/sheet/iron next_tier_reqitem_am = 5 /obj/structure/canister_frame/machine/frame_tier_1 diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 5236a75201f..7edb90233cb 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -21,7 +21,7 @@ to_chat(user, "You start deconstructing the frame...") if(P.use_tool(src, user, 20, volume=50)) to_chat(user, "You deconstruct the frame.") - var/obj/item/stack/sheet/metal/M = new (drop_location(), 5) + var/obj/item/stack/sheet/iron/M = new (drop_location(), 5) M.add_fingerprint(user) qdel(src) return diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 1f235deaa73..f47b8c33f42 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -15,7 +15,7 @@ /obj/structure/frame/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal(loc, 5) + new /obj/item/stack/sheet/iron(loc, 5) if(circuit) circuit.forceMove(loc) circuit = null @@ -97,7 +97,7 @@ if(P.use_tool(src, user, 40, volume=50)) if(state == 1) to_chat(user, "You disassemble the frame.") - var/obj/item/stack/sheet/metal/M = new (loc, 5) + var/obj/item/stack/sheet/iron/M = new (loc, 5) M.add_fingerprint(user) qdel(src) return diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 7bef7675e5d..bce6208606a 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -39,7 +39,7 @@ #define AIRLOCK_EMAG 6 #define AIRLOCK_SECURITY_NONE 0 //Normal airlock //Wires are not secured -#define AIRLOCK_SECURITY_METAL 1 //Medium security airlock //There is a simple metal over wires (use welder) +#define AIRLOCK_SECURITY_IRON 1 //Medium security airlock //There is a simple iron plate over wires (use welder) #define AIRLOCK_SECURITY_PLASTEEL_I_S 2 //Sliced inner plating (use crowbar), jumps to 0 #define AIRLOCK_SECURITY_PLASTEEL_I 3 //Removed outer plating, second layer here (use welder) #define AIRLOCK_SECURITY_PLASTEEL_O_S 4 //Sliced outer plating (use crowbar) @@ -127,13 +127,13 @@ addtimer(CALLBACK(.proc/update_other_id), 5) if(glass) airlock_material = "glass" - if(security_level > AIRLOCK_SECURITY_METAL) + if(security_level > AIRLOCK_SECURITY_IRON) obj_integrity = normal_integrity * AIRLOCK_INTEGRITY_MULTIPLIER max_integrity = normal_integrity * AIRLOCK_INTEGRITY_MULTIPLIER else obj_integrity = normal_integrity max_integrity = normal_integrity - if(damage_deflection == AIRLOCK_DAMAGE_DEFLECTION_N && security_level > AIRLOCK_SECURITY_METAL) + if(damage_deflection == AIRLOCK_DAMAGE_DEFLECTION_N && security_level > AIRLOCK_SECURITY_IRON) damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_R prepare_huds() for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds) @@ -646,8 +646,8 @@ switch(security_level) if(AIRLOCK_SECURITY_NONE) . += "Its wires are exposed!" - if(AIRLOCK_SECURITY_METAL) - . += "Its wires are hidden behind a welded metal cover." + if(AIRLOCK_SECURITY_IRON) + . += "Its wires are hidden behind a welded iron cover." if(AIRLOCK_SECURITY_PLASTEEL_I_S) . += "There is some shredded plasteel inside." if(AIRLOCK_SECURITY_PLASTEEL_I) @@ -659,7 +659,7 @@ if(AIRLOCK_SECURITY_PLASTEEL) . += "There is a protective grille over its panel." else if(security_level) - if(security_level == AIRLOCK_SECURITY_METAL) + if(security_level == AIRLOCK_SECURITY_IRON) . += "It looks a bit stronger." else . += "It looks very robust." @@ -810,18 +810,18 @@ if(panel_open) switch(security_level) if(AIRLOCK_SECURITY_NONE) - if(istype(C, /obj/item/stack/sheet/metal)) - var/obj/item/stack/sheet/metal/S = C + if(istype(C, /obj/item/stack/sheet/iron)) + var/obj/item/stack/sheet/iron/S = C if(S.get_amount() < 2) - to_chat(user, "You need at least 2 metal sheets to reinforce [src].") + to_chat(user, "You need at least 2 iron sheets to reinforce [src].") return to_chat(user, "You start reinforcing [src].") if(do_after(user, 2 SECONDS, src)) if(!panel_open || !S.use(2)) return - user.visible_message("[user] reinforces \the [src] with metal.", - "You reinforce \the [src] with metal.") - security_level = AIRLOCK_SECURITY_METAL + user.visible_message("[user] reinforces \the [src] with iron.", + "You reinforce \the [src] with iron.") + security_level = AIRLOCK_SECURITY_IRON update_icon() return else if(istype(C, /obj/item/stack/sheet/plasteel)) @@ -840,7 +840,7 @@ damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_R update_icon() return - if(AIRLOCK_SECURITY_METAL) + if(AIRLOCK_SECURITY_IRON) if(C.tool_behaviour == TOOL_WELDER) if(!C.tool_start_check(user, amount=2)) return @@ -852,7 +852,7 @@ "You cut through \the [src]'s shielding.", "You hear welding.") security_level = AIRLOCK_SECURITY_NONE - spawn_atom_to_turf(/obj/item/stack/sheet/metal, user.loc, 2) + spawn_atom_to_turf(/obj/item/stack/sheet/iron, user.loc, 2) update_icon() return if(AIRLOCK_SECURITY_PLASTEEL_I_S) @@ -1582,7 +1582,7 @@ #undef AIRLOCK_EMAG #undef AIRLOCK_SECURITY_NONE -#undef AIRLOCK_SECURITY_METAL +#undef AIRLOCK_SECURITY_IRON #undef AIRLOCK_SECURITY_PLASTEEL_I_S #undef AIRLOCK_SECURITY_PLASTEEL_I #undef AIRLOCK_SECURITY_PLASTEEL_O_S diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 5c2b37b44b1..f7196fa1a0e 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -366,7 +366,7 @@ user.visible_message("[user] cuts apart [src]!", \ "You cut [src] into metal.") var/turf/T = get_turf(src) - new /obj/item/stack/sheet/metal(T, 3) + new /obj/item/stack/sheet/iron(T, 3) if(reinforced) new /obj/item/stack/sheet/plasteel(T, 2) qdel(src) diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index 460363f8468..0c4db767900 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -4,7 +4,7 @@ /obj/machinery/drone_dispenser //Most customizable machine 2015 name = "drone shell dispenser" - desc = "A hefty machine that, when supplied with metal and glass, will periodically create a drone shell. Does not need to be manually operated." + desc = "A hefty machine that, when supplied with iron and glass, will periodically create a drone shell. Does not need to be manually operated." icon = 'icons/obj/machines/droneDispenser.dmi' icon_state = "on" @@ -21,7 +21,7 @@ var/list/using_materials var/starting_amount = 0 - var/metal_cost = 1000 + var/iron_cost = 1000 var/glass_cost = 1000 var/power_used = 1000 @@ -53,14 +53,14 @@ var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_DRONE_DISPENSER, allowed_items=/obj/item/stack) materials.insert_amount_mat(starting_amount) materials.precise_insertion = TRUE - using_materials = list(/datum/material/iron = metal_cost, /datum/material/glass = glass_cost) + using_materials = list(/datum/material/iron = iron_cost, /datum/material/glass = glass_cost) /obj/machinery/drone_dispenser/preloaded starting_amount = 5000 /obj/machinery/drone_dispenser/syndrone //Please forgive me name = "syndrone shell dispenser" - desc = "A suspicious machine that will create Syndicate exterminator drones when supplied with metal and glass. Disgusting." + desc = "A suspicious machine that will create Syndicate exterminator drones when supplied with iron and glass. Disgusting." dispense_type = /obj/effect/mob_spawn/drone/syndrone //If we're gonna be a jackass, go the full mile - 10 second recharge timer cooldownTime = 100 @@ -69,18 +69,18 @@ /obj/machinery/drone_dispenser/syndrone/badass //Please forgive me name = "badass syndrone shell dispenser" - desc = "A suspicious machine that will create Syndicate exterminator drones when supplied with metal and glass. Disgusting. This one seems ominous." + desc = "A suspicious machine that will create Syndicate exterminator drones when supplied with iron and glass. Disgusting. This one seems ominous." dispense_type = /obj/effect/mob_spawn/drone/syndrone/badass end_create_message = "dispenses an ominous suspicious drone shell." // I don't need your forgiveness, this is awesome. /obj/machinery/drone_dispenser/snowflake name = "snowflake drone shell dispenser" - desc = "A hefty machine that, when supplied with metal and glass, will periodically create a snowflake drone shell. Does not need to be manually operated." + desc = "A hefty machine that, when supplied with iron and glass, will periodically create a snowflake drone shell. Does not need to be manually operated." dispense_type = /obj/effect/mob_spawn/drone/snowflake end_create_message = "dispenses a snowflake drone shell." // Those holoprojectors aren't cheap - metal_cost = 2000 + iron_cost = 2000 glass_cost = 2000 power_used = 2000 starting_amount = 10000 @@ -88,10 +88,10 @@ // If the derelict gets lonely, make more friends. /obj/machinery/drone_dispenser/derelict name = "derelict drone shell dispenser" - desc = "A rusty machine that, when supplied with metal and glass, will periodically create a derelict drone shell. Does not need to be manually operated." + desc = "A rusty machine that, when supplied with iron and glass, will periodically create a derelict drone shell. Does not need to be manually operated." dispense_type = /obj/effect/mob_spawn/drone/derelict end_create_message = "dispenses a derelict drone shell." - metal_cost = 10000 + iron_cost = 10000 glass_cost = 5000 starting_amount = 0 cooldownTime = 600 @@ -107,7 +107,7 @@ icon_on = "hivebot_fab" icon_recharging = "hivebot_fab" icon_creating = "hivebot_fab_on" - metal_cost = 0 + iron_cost = 0 glass_cost = 0 power_used = 0 cooldownTime = 10 //Only 1 second - hivebots are extremely weak @@ -233,7 +233,7 @@ /obj/machinery/drone_dispenser/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal(loc, 5) + new /obj/item/stack/sheet/iron(loc, 5) qdel(src) #undef DRONE_PRODUCTION diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index c57114e3997..76872a33701 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -326,7 +326,7 @@ /obj/machinery/firealarm/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal(loc, 1) + new /obj/item/stack/sheet/iron(loc, 1) if(!(machine_stat & BROKEN)) var/obj/item/I = new /obj/item/electronics/firealarm(loc) if(!disassembled) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index f74dec76478..8a6c9590965 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -162,7 +162,7 @@ F.id = id playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE) else - new /obj/item/stack/sheet/metal (loc, 2) + new /obj/item/stack/sheet/iron (loc, 2) qdel(src) /obj/machinery/flasher/portable/Initialize() diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 8aec8304814..9403cb8ae4c 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -114,7 +114,7 @@ /obj/machinery/iv_drip/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal(loc) + new /obj/item/stack/sheet/iron(loc) qdel(src) /obj/machinery/iv_drip/process(delta_time) diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 395361592e1..e50085636c6 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -728,7 +728,7 @@ GLOBAL_LIST_EMPTY(allCasters) playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE) if(machine_stat & BROKEN) to_chat(user, "The broken remains of [src] fall on the ground.") - new /obj/item/stack/sheet/metal(loc, 5) + new /obj/item/stack/sheet/iron(loc, 5) new /obj/item/shard(loc) new /obj/item/shard(loc) else @@ -767,7 +767,7 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal(loc, 2) + new /obj/item/stack/sheet/iron(loc, 2) new /obj/item/shard(loc) new /obj/item/shard(loc) qdel(src) diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 7c83daebbf0..84e6eda1aa9 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -296,7 +296,7 @@ DEFINE_BITFIELD(turret_flags, list( stored_gun = null to_chat(user, "You remove the turret and salvage some components.") if(prob(50)) - new /obj/item/stack/sheet/metal(loc, rand(1,4)) + new /obj/item/stack/sheet/iron(loc, rand(1,4)) if(prob(50)) new /obj/item/assembly/prox_sensor(loc) else diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm index 3cf94c1a5e0..98b31dd19f4 100644 --- a/code/game/machinery/porta_turret/portable_turret_construct.dm +++ b/code/game/machinery/porta_turret/portable_turret_construct.dm @@ -33,19 +33,19 @@ else if(I.tool_behaviour == TOOL_CROWBAR && !anchored) I.play_tool_sound(src, 75) to_chat(user, "You dismantle the turret construction.") - new /obj/item/stack/sheet/metal( loc, 5) + new /obj/item/stack/sheet/iron( loc, 5) qdel(src) return if(PTURRET_BOLTED) - if(istype(I, /obj/item/stack/sheet/metal)) - var/obj/item/stack/sheet/metal/M = I + if(istype(I, /obj/item/stack/sheet/iron)) + var/obj/item/stack/sheet/iron/M = I if(M.use(2)) to_chat(user, "You add some metal armor to the interior frame.") build_step = PTURRET_START_INTERNAL_ARMOUR icon_state = "turret_frame2" else - to_chat(user, "You need two sheets of metal to continue construction!") + to_chat(user, "You need two sheets of iron to continue construction!") return else if(I.tool_behaviour == TOOL_WRENCH) @@ -72,7 +72,7 @@ if(I.use_tool(src, user, 20, volume=50, amount=5)) //uses up 5 fuel build_step = PTURRET_BOLTED to_chat(user, "You remove the turret's interior metal armor.") - new /obj/item/stack/sheet/metal(drop_location(), 2) + new /obj/item/stack/sheet/iron(drop_location(), 2) return @@ -111,13 +111,13 @@ if(PTURRET_CLOSED) - if(istype(I, /obj/item/stack/sheet/metal)) - var/obj/item/stack/sheet/metal/M = I + if(istype(I, /obj/item/stack/sheet/iron)) + var/obj/item/stack/sheet/iron/M = I if(M.use(2)) to_chat(user, "You add some metal armor to the exterior frame.") build_step = PTURRET_START_EXTERNAL_ARMOUR else - to_chat(user, "You need two sheets of metal to continue construction!") + to_chat(user, "You need two sheets of iron to continue construction!") return else if(I.tool_behaviour == TOOL_SCREWDRIVER) @@ -153,7 +153,7 @@ else if(I.tool_behaviour == TOOL_CROWBAR) I.play_tool_sound(src, 75) to_chat(user, "You pry off the turret's exterior armor.") - new /obj/item/stack/sheet/metal(loc, 2) + new /obj/item/stack/sheet/iron(loc, 2) build_step = PTURRET_CLOSED return diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index fbb846ad995..f939f5d64d8 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -202,7 +202,7 @@ if(!(flags_1 & NODECONSTRUCT_1)) open_machine() dump_inventory_contents() - new /obj/item/stack/sheet/metal(loc, 2) + new /obj/item/stack/sheet/iron(loc, 2) qdel(src) /obj/machinery/suit_storage_unit/interact(mob/living/user) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 8f4e4df3c42..45c96cff2e8 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -350,7 +350,7 @@ GLOBAL_LIST_INIT(dye_registry, list( /obj/machinery/washing_machine/deconstruct(disassembled = TRUE) if (!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal(drop_location(), 2) + new /obj/item/stack/sheet/iron(drop_location(), 2) qdel(src) /obj/machinery/washing_machine/open_machine(drop = 1) diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index b8c9a5b5181..1289c3a902a 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -11,7 +11,7 @@ RLD /obj/item/construction name = "not for ingame use" - desc = "A device used to rapidly build and deconstruct. Reload with metal, plasteel, glass or compressed matter cartridges." + desc = "A device used to rapidly build and deconstruct. Reload with iron, plasteel, glass or compressed matter cartridges." opacity = FALSE density = FALSE anchored = FALSE @@ -53,7 +53,7 @@ RLD if(upgrade & RCD_UPGRADE_SILO_LINK) . += "Remote storage link state: [silo_link ? "[silo_mats.on_hold() ? "ON HOLD" : "ON"]" : "OFF"]." if(silo_link && silo_mats.mat_container && !silo_mats.on_hold()) - . += "Remote connection has iron in equivalent to [silo_mats.mat_container.get_material_amount(/datum/material/iron)/500] RCD unit\s." //1 matter for 1 floor tile, as 4 tiles are produced from 1 metal + . += "Remote connection has iron in equivalent to [silo_mats.mat_container.get_material_amount(/datum/material/iron)/500] RCD unit\s." //1 matter for 1 floor tile, as 4 tiles are produced from 1 iron /obj/item/construction/Destroy() QDEL_NULL(spark_system) @@ -749,7 +749,7 @@ RLD /obj/item/construction/rcd/arcd name = "advanced rapid-construction-device (ARCD)" - desc = "A prototype RCD with ranged capability and extended capacity. Reload with metal, plasteel, glass or compressed matter cartridges." + desc = "A prototype RCD with ranged capability and extended capacity. Reload with iron, plasteel, glass or compressed matter cartridges." max_matter = 300 matter = 300 delay_mod = 0.6 @@ -774,7 +774,7 @@ RLD /obj/item/construction/rld name = "Rapid Lighting Device (RLD)" - desc = "A device used to rapidly provide lighting sources to an area. Reload with metal, plasteel, glass or compressed matter cartridges." + desc = "A device used to rapidly provide lighting sources to an area. Reload with iron, plasteel, glass or compressed matter cartridges." icon = 'icons/obj/tools.dmi' icon_state = "rld-5" worn_icon_state = "RPD" @@ -931,7 +931,7 @@ RLD /obj/item/construction/rld/mini name = "mini-rapid-light-device (MRLD)" - desc = "A device used to rapidly provide lighting sources to an area. Reload with metal, plasteel, glass or compressed matter cartridges." + desc = "A device used to rapidly provide lighting sources to an area. Reload with iron, plasteel, glass or compressed matter cartridges." icon = 'icons/obj/tools.dmi' icon_state = "rld-5" lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index e9e9304dc06..fb0ff8aeaa6 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -72,7 +72,7 @@ if(W.tool_behaviour == TOOL_WRENCH && (metal_amt || glass_amt)) to_chat(user, "You dismantle [src].") if(metal_amt) - new /obj/item/stack/sheet/metal(get_turf(src), metal_amt) + new /obj/item/stack/sheet/iron(get_turf(src), metal_amt) if(glass_amt) new /obj/item/stack/sheet/glass(get_turf(src), glass_amt) qdel(src) diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index 9f12998c9f0..f66fcb17733 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -645,7 +645,7 @@ if(istype(W, /obj/item/stack/rods)) var/obj/item/stack/rods/R = W if(!R.use(1))//borgs can still fail this if they have no metal - to_chat(user, "You do not have enough metal to put [src] on a stick!") + to_chat(user, "You do not have enough iron to put [src] on a stick!") return ..() to_chat(user, "You stick the rod into the stick of butter.") var/obj/item/food/butter/on_a_stick/new_item = new(usr.loc) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index c4984eceaaf..ba508c0835e 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -163,10 +163,10 @@ else to_chat(user, "You need one rod to make a wired rod!") return - else if(istype(I, /obj/item/stack/sheet/metal)) - var/obj/item/stack/sheet/metal/M = I + else if(istype(I, /obj/item/stack/sheet/iron)) + var/obj/item/stack/sheet/iron/M = I if(M.get_amount() < 6) - to_chat(user, "You need at least six metal sheets to make good enough weights!") + to_chat(user, "You need at least six iron sheets to make good enough weights!") return to_chat(user, "You begin to apply [I] to [src]...") if(do_after(user, 35, target = src)) diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index 0dddebc549c..6ce75b8b5df 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -97,10 +97,10 @@
  • Secure the mainboard with a screwdriver.
  • Install the peripherals control module (Not included. Use supplied datadisk to create one).
  • Secure the peripherals control module with a screwdriver
  • -
  • Install the internal armor plating (Not included due to Nanotrasen regulations. Can be made using 5 metal sheets.)
  • +
  • Install the internal armor plating (Not included due to Nanotrasen regulations. Can be made using 5 iron sheets.)
  • Secure the internal armor plating with a wrench
  • Weld the internal armor plating to the chassis
  • -
  • Install the external reinforced armor plating (Not included due to Nanotrasen regulations. Can be made using 5 reinforced metal sheets.)
  • +
  • Install the external reinforced armor plating (Not included due to Nanotrasen regulations. Can be made using 5 reinforced iron sheets.)
  • Secure the external reinforced armor plating with a wrench
  • Weld the external reinforced armor plating to the chassis
  • diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 2ad31d4ef75..58d14b06904 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -148,8 +148,8 @@ /obj/item/robot_suit/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/stack/sheet/metal)) - var/obj/item/stack/sheet/metal/M = W + if(istype(W, /obj/item/stack/sheet/iron)) + var/obj/item/stack/sheet/iron/M = W if(!l_arm && !r_arm && !l_leg && !r_leg && !chest && !head) if (M.use(1)) var/obj/item/bot_assembly/ed209/B = new @@ -160,7 +160,7 @@ if (holding_this) user.put_in_inactive_hand(B) else - to_chat(user, "You need one sheet of metal to start building ED-209!") + to_chat(user, "You need one sheet of iron to start building ED-209!") return else if(istype(W, /obj/item/bodypart/l_leg/robot)) if(l_leg) diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index 426154fdf28..27c4cb47b0a 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -100,7 +100,7 @@ /obj/item/shield/riot/roman/shatter(mob/living/carbon/human/owner) playsound(owner, 'sound/effects/grillehit.ogg', 100) - new /obj/item/stack/sheet/metal(get_turf(src)) + new /obj/item/stack/sheet/iron(get_turf(src)) /obj/item/shield/riot/buckler name = "wooden buckler" diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 6236538efc7..0be94aa0f80 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -9,9 +9,9 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ )) /obj/item/stack/rods - name = "metal rod" + name = "iron rod" desc = "Some rods. Can be used for building or something." - singular_name = "metal rod" + singular_name = "iron rod" icon_state = "rods" inhand_icon_state = "rods" flags_1 = CONDUCT_1 @@ -29,7 +29,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ novariants = TRUE matter_amount = 2 cost = 250 - source = /datum/robot_energy_storage/metal + source = /datum/robot_energy_storage/iron merge_type = /obj/item/stack/rods /obj/item/stack/rods/suicide_act(mob/living/carbon/user) @@ -58,9 +58,9 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ return if(W.use_tool(src, user, 0, volume=40)) - var/obj/item/stack/sheet/metal/new_item = new(usr.loc) - user.visible_message("[user.name] shaped [src] into metal with [W].", \ - "You shape [src] into metal with [W].", \ + var/obj/item/stack/sheet/iron/new_item = new(usr.loc) + user.visible_message("[user.name] shaped [src] into iron sheets with [W].", \ + "You shape [src] into iron sheets with [W].", \ "You hear welding.") var/obj/item/stack/rods/R = src src = null @@ -86,7 +86,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ /obj/item/stack/rods/lava name = "heat resistant rod" - desc = "Treated, specialized metal rods. When exposed to the vaccum of space their coating breaks off, but they can hold up against the extreme heat of active lava." + desc = "Treated, specialized iron rods. When exposed to the vaccum of space their coating breaks off, but they can hold up against the extreme heat of active lava." singular_name = "heat resistant rod" icon_state = "rods" inhand_icon_state = "rods" diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 6814e2f2079..6b0956ed7ba 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -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 diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm index 2ec427147e2..7fd45f47ee2 100644 --- a/code/game/objects/items/stacks/sheets/light.dm +++ b/code/game/objects/items/stacks/sheets/light.dm @@ -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, "You make a light tile.") L.add_fingerprint(user) use(1) else - to_chat(user, "You need one metal sheet to finish the light tile!") + to_chat(user, "You need one iron sheet to finish the light tile!") else return ..() diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 8ddae465374..1a3ce70253b 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -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("[user] begins whacking [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") return BRUTELOSS diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm index 506d1222ed7..01f5369d716 100644 --- a/code/game/objects/items/stacks/tiles/light.dm +++ b/code/game/objects/items/stacks/tiles/light.dm @@ -12,7 +12,7 @@ /obj/item/stack/tile/light/attackby(obj/item/O, mob/user, params) if(O.tool_behaviour == TOOL_CROWBAR) - new/obj/item/stack/sheet/metal(user.loc) + new/obj/item/stack/sheet/iron(user.loc) amount-- new/obj/item/stack/light_w(user.loc) if(amount <= 0) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index 19384a21064..8a59c2730ec 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -67,10 +67,10 @@ qdel(src) return - if (mineralType == "metal") - var/obj/item/stack/sheet/metal/new_item = new(user.loc) - user.visible_message("[user.name] shaped [src] into metal with the welding tool.", \ - "You shaped [src] into metal with the welding tool.", \ + if (mineralType == "iron") + var/obj/item/stack/sheet/iron/new_item = new(user.loc) + user.visible_message("[user.name] shaped [src] into iron with the welding tool.", \ + "You shaped [src] into iron with the welding tool.", \ "You hear welding.") var/obj/item/stack/rods/R = src src = null @@ -399,12 +399,12 @@ throwforce = 10 flags_1 = CONDUCT_1 turf_type = /turf/open/floor/plasteel - mineralType = "metal" + mineralType = "iron" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 70) resistance_flags = FIRE_PROOF matter_amount = 1 cost = 125 - source = /datum/robot_energy_storage/metal + source = /datum/robot_energy_storage/iron merge_type = /obj/item/stack/tile/plasteel /obj/item/stack/tile/plastic diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 4d26b9f9abc..aa30f08f7b2 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -1052,7 +1052,7 @@ /obj/item/storage/box/dishdrive/PopulateContents() var/static/items_inside = list( - /obj/item/stack/sheet/metal/five = 1, + /obj/item/stack/sheet/iron/five = 1, /obj/item/stack/cable_coil/five = 1, /obj/item/circuitboard/machine/dish_drive = 1, /obj/item/stack/sheet/glass = 1, @@ -1068,7 +1068,7 @@ /obj/item/storage/box/material/PopulateContents() //less uranium because radioactive var/static/items_inside = list( - /obj/item/stack/sheet/metal/fifty=1,\ + /obj/item/stack/sheet/iron/fifty=1,\ /obj/item/stack/sheet/glass/fifty=1,\ /obj/item/stack/sheet/rglass=50,\ /obj/item/stack/sheet/plasmaglass=50,\ @@ -1302,13 +1302,13 @@ /obj/item/storage/box/plumbing name = "box of plumbing supplies" - desc = "Contains a small supply of pipes, water recyclers, and metal to connect to the rest of the station." + desc = "Contains a small supply of pipes, water recyclers, and iron to connect to the rest of the station." /obj/item/storage/box/plumbing/PopulateContents() var/list/items_inside = list( /obj/item/stock_parts/water_recycler = 2, /obj/item/stack/ducts/fifty = 1, - /obj/item/stack/sheet/metal/ten = 1, + /obj/item/stack/sheet/iron/ten = 1, ) generate_items_inside(items_inside, src) diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm index cdc65794569..2b82770554e 100644 --- a/code/game/objects/structures/barsigns.dm +++ b/code/game/objects/structures/barsigns.dm @@ -47,7 +47,7 @@ broken = TRUE /obj/structure/sign/barsign/deconstruct(disassembled = TRUE) - new /obj/item/stack/sheet/metal(drop_location(), 2) + new /obj/item/stack/sheet/iron(drop_location(), 2) new /obj/item/stack/cable_coil(drop_location(), 2) qdel(src) diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index b57f7e73e85..db91cd838d2 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -18,7 +18,7 @@ resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 0.35 - var/buildstacktype = /obj/item/stack/sheet/metal + var/buildstacktype = /obj/item/stack/sheet/iron var/buildstackamount = 2 var/bolts = TRUE diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index ffd4f00a391..1da318c6999 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -11,7 +11,7 @@ integrity_failure = 0.1 custom_materials = list(/datum/material/iron = 2000) layer = OBJ_LAYER - var/buildstacktype = /obj/item/stack/sheet/metal + var/buildstacktype = /obj/item/stack/sheet/iron var/buildstackamount = 1 var/item_chair = /obj/item/chair // if null it can't be picked up diff --git a/code/game/objects/structures/chess.dm b/code/game/objects/structures/chess.dm index 9044dafd73e..8f904219db0 100644 --- a/code/game/objects/structures/chess.dm +++ b/code/game/objects/structures/chess.dm @@ -11,7 +11,7 @@ to_chat(user, "You start to take apart the chess piece.") if(!do_after(user, 0.5 SECONDS, target = src)) return TRUE - var/obj/item/stack/sheet/metal/metal_sheets = new (drop_location(), 2) + var/obj/item/stack/sheet/iron/metal_sheets = new (drop_location(), 2) metal_sheets.add_fingerprint(user) tool.play_tool_sound(src) qdel(src) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 384795735b4..73854e8a95f 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -32,7 +32,7 @@ var/close_sound = 'sound/machines/closet_close.ogg' var/open_sound_volume = 35 var/close_sound_volume = 50 - var/material_drop = /obj/item/stack/sheet/metal + var/material_drop = /obj/item/stack/sheet/iron var/material_drop_amount = 2 var/delivery_icon = "deliverycloset" //which icon to use when packagewrapped. null to be unwrappable. var/anchorable = TRUE diff --git a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm index 977f15f0201..f3633f79429 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/misc.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/misc.dm @@ -58,7 +58,7 @@ /obj/structure/closet/secure_closet/ert_engi/PopulateContents() ..() new /obj/item/stack/sheet/plasteel(src, 50) - new /obj/item/stack/sheet/metal(src, 50) + new /obj/item/stack/sheet/iron(src, 50) new /obj/item/stack/sheet/glass(src, 50) new /obj/item/stack/sheet/mineral/sandbags(src, 30) new /obj/item/clothing/shoes/magboots(src) diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm index 4ee1d106bf2..dfa8da0eea7 100644 --- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm +++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm @@ -49,9 +49,9 @@ P.name = "\improper IOU" P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!" - //Metal (common ore) + //Iron (common ore) if(pickednum >= 2) - new /obj/item/stack/sheet/metal(src, rand(common_min, common_max)) + new /obj/item/stack/sheet/iron(src, rand(common_min, common_max)) //Glass (common ore) if(pickednum >= 5) @@ -98,7 +98,7 @@ /obj/structure/closet/syndicate/resources/everything/PopulateContents() var/list/resources = list( - /obj/item/stack/sheet/metal, + /obj/item/stack/sheet/iron, /obj/item/stack/sheet/glass, /obj/item/stack/sheet/mineral/gold, /obj/item/stack/sheet/mineral/silver, diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 17d2c49b384..c50114f84e9 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -17,7 +17,7 @@ var/heat_proof_finished = 0 //whether to heat-proof the finished airlock var/previous_assembly = /obj/structure/door_assembly var/noglass = FALSE //airlocks with no glass version, also cannot be modified with sheets - var/material_type = /obj/item/stack/sheet/metal + var/material_type = /obj/item/stack/sheet/iron var/material_amt = 4 /obj/structure/door_assembly/Initialize() diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 5fd75a6e75a..ebfc4f1fefa 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -147,7 +147,7 @@ if(disassembled) new /obj/item/wallframe/extinguisher_cabinet(loc) else - new /obj/item/stack/sheet/metal (loc, 2) + new /obj/item/stack/sheet/iron (loc, 2) if(stored_extinguisher) stored_extinguisher.forceMove(loc) stored_extinguisher = null diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 67f190a1b9d..fad3b8c8e3c 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -19,7 +19,7 @@ CanAtmosPass = ATMOS_PASS_DENSITY flags_1 = RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1 rad_insulation = RAD_MEDIUM_INSULATION - var/mineral = /obj/item/stack/sheet/metal + var/mineral = /obj/item/stack/sheet/iron var/mineral_amount = 2 var/walltype = /turf/closed/wall var/girder_type = /obj/structure/girder/displaced diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index afee2a03d32..2678accc999 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -95,7 +95,7 @@ if(fireaxe && loc) fireaxe.forceMove(loc) fireaxe = null - new /obj/item/stack/sheet/metal(loc, 2) + new /obj/item/stack/sheet/iron(loc, 2) qdel(src) /obj/structure/fireaxecabinet/blob_act(obj/structure/blob/B) diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm index f1d7f9b0aac..6219a6892ac 100644 --- a/code/game/objects/structures/fluff.dm +++ b/code/game/objects/structures/fluff.dm @@ -17,7 +17,7 @@ if(I.use_tool(src, user, 50)) user.visible_message("[user] disassembles [src]!", "You break down [src] into scrap metal.") playsound(user, 'sound/items/deconstruct.ogg', 50, TRUE) - new/obj/item/stack/sheet/metal(drop_location()) + new/obj/item/stack/sheet/iron(drop_location()) qdel(src) return ..() diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 3b5e562cadd..94ee3c24216 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -1,7 +1,7 @@ /obj/structure/girder name = "girder" icon_state = "girder" - desc = "A large structural assembly made out of metal; It requires a layer of metal before it can be considered a wall." + desc = "A large structural assembly made out of metal; It requires a layer of iron before it can be considered a wall." anchored = TRUE density = TRUE var/state = GIRDER_NORMAL @@ -40,7 +40,7 @@ to_chat(user, "You start slicing apart the girder...") if(W.use_tool(src, user, 40, volume=100)) to_chat(user, "You slice apart the girder.") - var/obj/item/stack/sheet/metal/M = new (loc, 2) + var/obj/item/stack/sheet/iron/M = new (loc, 2) M.add_fingerprint(user) qdel(src) @@ -90,10 +90,10 @@ return var/obj/item/stack/sheet/S = W - if(istype(S, /obj/item/stack/sheet/metal)) + if(istype(S, /obj/item/stack/sheet/iron)) if(state == GIRDER_DISPLACED) if(S.get_amount() < 2) - to_chat(user, "You need two sheets of metal to create a false wall!") + to_chat(user, "You need two sheets of iron to create a false wall!") return to_chat(user, "You start building a false wall...") if(do_after(user, 20*platingmodifier, target = src)) @@ -105,11 +105,11 @@ transfer_fingerprints_to(F) qdel(src) else if(state == GIRDER_REINF) - to_chat(user, "You can't finish a reinforced girder with regular metal. You need a plasteel sheet for that.") + to_chat(user, "You can't finish a reinforced girder with regular iron. You need a plasteel sheet for that.") return else if(S.get_amount() < 2) - to_chat(user, "You need two sheets of metal to finish a wall!") + to_chat(user, "You need two sheets of iron to finish a wall!") return to_chat(user, "You start adding plating...") if (do_after(user, 40*platingmodifier, target = src)) @@ -234,7 +234,7 @@ return state = GIRDER_DISASSEMBLED to_chat(user, "You disassemble the girder.") - var/obj/item/stack/sheet/metal/M = new (loc, 2) + var/obj/item/stack/sheet/iron/M = new (loc, 2) M.add_fingerprint(user) qdel(src) return TRUE @@ -305,7 +305,7 @@ /obj/structure/girder/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - var/remains = pick(/obj/item/stack/rods, /obj/item/stack/sheet/metal) + var/remains = pick(/obj/item/stack/rods, /obj/item/stack/sheet/iron) new remains(loc) qdel(src) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 1a8e110107c..a2b498c18c3 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -1,5 +1,5 @@ /obj/structure/grille - desc = "A flimsy framework of metal rods." + desc = "A flimsy framework of iron rods." name = "grille" icon = 'icons/obj/structures.dmi' icon_state = "grille" diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index bf348b1d260..4c66f4939a4 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -30,7 +30,7 @@ visible_message("[user] slices apart \the [src].", "You cut \the [src] apart with \the [I].", "You hear welding.") - new /obj/item/stack/sheet/metal(src.loc, 4) + new /obj/item/stack/sheet/iron(src.loc, 4) qdel(src) return else @@ -142,7 +142,7 @@ var/obj/F = new /obj/structure/kitchenspike_frame(src.loc) transfer_fingerprints_to(F) else - new /obj/item/stack/sheet/metal(src.loc, 4) + new /obj/item/stack/sheet/iron(src.loc, 4) new /obj/item/stack/rods(loc, 4) qdel(src) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index c4db8c84820..55c5f28d3ba 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -2,7 +2,7 @@ //machineryness /obj/structure/mineral_door - name = "metal door" + name = "iron door" density = TRUE anchored = TRUE opacity = TRUE @@ -23,7 +23,7 @@ var/openSound = 'sound/effects/stonedoor_openclose.ogg' var/closeSound = 'sound/effects/stonedoor_openclose.ogg' - var/sheetType = /obj/item/stack/sheet/metal //what we're made of + var/sheetType = /obj/item/stack/sheet/iron //what we're made of var/sheetAmount = 7 //how much we drop when deconstructed /obj/structure/mineral_door/Initialize() diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 6e86804bcc6..73e3d8534e2 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -102,7 +102,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an /obj/structure/bodycontainer/deconstruct(disassembled = TRUE) if (!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal (loc, 5) + new /obj/item/stack/sheet/iron (loc, 5) recursive_organ_check(src) qdel(src) @@ -327,7 +327,7 @@ GLOBAL_LIST_EMPTY(crematoriums) return ..() /obj/structure/tray/deconstruct(disassembled = TRUE) - new /obj/item/stack/sheet/metal (loc, 2) + new /obj/item/stack/sheet/iron (loc, 2) qdel(src) /obj/structure/tray/attack_paw(mob/user) diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 7122f417980..c39162fad83 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -86,7 +86,7 @@ /obj/structure/noticeboard/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal (loc, 1) + new /obj/item/stack/sheet/iron (loc, 1) qdel(src) // Notice boards for the heads of staff (plus the qm) diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index f70c559236e..774be92e78d 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -10,9 +10,9 @@ var/finished = FALSE var/admin = FALSE //Can't be rotated or deconstructed var/can_rotate = TRUE - var/framebuildstacktype = /obj/item/stack/sheet/metal + var/framebuildstacktype = /obj/item/stack/sheet/iron var/framebuildstackamount = 5 - var/buildstacktype = /obj/item/stack/sheet/metal + var/buildstacktype = /obj/item/stack/sheet/iron var/buildstackamount = 0 var/list/allowed_projectile_typecache = list(/obj/projectile/beam) var/rotation_angle = -1 diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm index 086dd036ead..b8d0c3c192b 100644 --- a/code/game/objects/structures/showcase.dm +++ b/code/game/objects/structures/showcase.dm @@ -122,7 +122,7 @@ if(W.tool_behaviour == TOOL_CROWBAR && deconstruction_state == SHOWCASE_SCREWDRIVERED) if(W.use_tool(src, user, 20, volume=100)) to_chat(user, "You start to crowbar the showcase apart...") - new /obj/item/stack/sheet/metal(drop_location(), 4) + new /obj/item/stack/sheet/iron(drop_location(), 4) qdel(src) if(deconstruction_state == SHOWCASE_CONSTRUCTED && default_unfasten_wrench(user, W)) diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 744c389114f..e17322ff778 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -165,7 +165,7 @@ return PROCESS_KILL /obj/machinery/shower/deconstruct(disassembled = TRUE) - new /obj/item/stack/sheet/metal(drop_location(), 3) + new /obj/item/stack/sheet/iron(drop_location(), 3) qdel(src) /obj/machinery/shower/proc/check_heat(mob/living/L) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index ad8572fc6f2..1abb4b7084b 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -14,7 +14,7 @@ /obj/structure/table name = "table" - desc = "A square piece of metal standing on four metal legs. It can not move." + desc = "A square piece of iron standing on four metal legs. It can not move." icon = 'icons/obj/smooth_structures/table.dmi' icon_state = "table-0" base_icon_state = "table" @@ -24,7 +24,7 @@ layer = TABLE_LAYER var/frame = /obj/structure/table_frame var/framestack = /obj/item/stack/rods - var/buildstack = /obj/item/stack/sheet/metal + var/buildstack = /obj/item/stack/sheet/iron var/busy = FALSE var/buildstackamount = 1 var/framestackamount = 2 @@ -693,7 +693,7 @@ /obj/item/rack_parts/attackby(obj/item/W, mob/user, params) if (W.tool_behaviour == TOOL_WRENCH) - new /obj/item/stack/sheet/metal(user.loc) + new /obj/item/stack/sheet/iron(user.loc) qdel(src) else . = ..() diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index a8cf55105cd..042dea1e7c9 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -108,7 +108,7 @@ for(var/X in src) var/obj/item/I = X I.forceMove(loc) - new /obj/item/stack/sheet/metal (loc, 2) + new /obj/item/stack/sheet/iron (loc, 2) qdel(src) #undef TANK_DISPENSER_CAPACITY diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 57b908f5e7e..76b819883d5 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -9,7 +9,7 @@ var/cistern = 0 //if the cistern bit is open var/w_items = 0 //the combined w_class of all the items in the cistern var/mob/living/swirlie = null //the mob being given a swirlie - var/buildstacktype = /obj/item/stack/sheet/metal //they're metal now, shut up + var/buildstacktype = /obj/item/stack/sheet/iron //they're iron now, shut up var/buildstackamount = 1 /obj/structure/toilet/Initialize() @@ -255,7 +255,7 @@ ///What kind of reagent is produced by this sink by default? (We now have actual plumbing, Arcane, August 2020) var/dispensedreagent = /datum/reagent/water ///Material to drop when broken or deconstructed. - var/buildstacktype = /obj/item/stack/sheet/metal + var/buildstacktype = /obj/item/stack/sheet/iron ///Number of sheets of material to drop when broken or deconstructed. var/buildstackamount = 1 ///Does the sink have a water recycler to recollect it's water supply? diff --git a/code/game/turfs/closed/_closed.dm b/code/game/turfs/closed/_closed.dm index 49079e6bf88..81fc874bc7b 100644 --- a/code/game/turfs/closed/_closed.dm +++ b/code/game/turfs/closed/_closed.dm @@ -240,8 +240,8 @@ return TRUE /turf/closed/indestructible/iron - name = "impervious metal wall" - desc = "A wall with tough metal plating." + name = "impervious iron wall" + desc = "A wall with tough iron plating." icon = 'icons/turf/walls/iron_wall.dmi' icon_state = "iron_wall-0" base_icon_state = "iron_wall" diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm index 4cab1dd0994..ce0a33d5246 100644 --- a/code/game/turfs/closed/wall/mineral_walls.dm +++ b/code/game/turfs/closed/wall/mineral_walls.dm @@ -180,8 +180,8 @@ hardness = 50 /turf/closed/wall/mineral/iron - name = "rough metal wall" - desc = "A wall with rough metal plating." + name = "rough iron wall" + desc = "A wall with rough iron plating." icon = 'icons/turf/walls/iron_wall.dmi' icon_state = "iron_wall-0" base_icon_state = "iron_wall" diff --git a/code/game/turfs/closed/wall/reinf_walls.dm b/code/game/turfs/closed/wall/reinf_walls.dm index f1567fb2912..3c4dafdd7a7 100644 --- a/code/game/turfs/closed/wall/reinf_walls.dm +++ b/code/game/turfs/closed/wall/reinf_walls.dm @@ -36,7 +36,7 @@ /turf/closed/wall/r_wall/devastate_wall() new sheet_type(src, sheet_amount) - new /obj/item/stack/sheet/metal(src, 2) + new /obj/item/stack/sheet/iron(src, 2) /turf/closed/wall/r_wall/attack_animal(mob/living/simple_animal/M) M.changeNext_move(CLICK_CD_MELEE) diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index 5b95d0acbea..21341e771e2 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -2,7 +2,7 @@ /turf/closed/wall name = "wall" - desc = "A huge chunk of metal used to separate rooms." + desc = "A huge chunk of iron used to separate rooms." icon = 'icons/turf/walls/wall.dmi' icon_state = "wall-0" base_icon_state = "wall" @@ -22,7 +22,7 @@ ///lower numbers are harder. Used to determine the probability of a hulk smashing through. var/hardness = 40 var/slicing_duration = 100 //default time taken to slice the wall - var/sheet_type = /obj/item/stack/sheet/metal + var/sheet_type = /obj/item/stack/sheet/iron var/sheet_amount = 2 var/girder_type = /obj/structure/girder @@ -85,7 +85,7 @@ /turf/closed/wall/proc/devastate_wall() new sheet_type(src, sheet_amount) if(girder_type) - new /obj/item/stack/sheet/metal(src) + new /obj/item/stack/sheet/iron(src) /turf/closed/wall/ex_act(severity, target) if(target == src) diff --git a/code/game/turfs/open/chasm.dm b/code/game/turfs/open/chasm.dm index 453a329c860..2e36760d3c7 100644 --- a/code/game/turfs/open/chasm.dm +++ b/code/game/turfs/open/chasm.dm @@ -81,7 +81,7 @@ else to_chat(user, "You need one floor tile to build a floor!") else - to_chat(user, "The plating is going to need some support! Place metal rods first.") + to_chat(user, "The plating is going to need some support! Place iron rods first.") // Chasms for Lavaland, with planetary atmos and lava glow /turf/open/chasm/lavaland diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index 95827083d95..9db34ce4e45 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -82,7 +82,7 @@ else ScrapeAway(2, flags = CHANGETURF_INHERIT_AIR) if(prob(33)) - new /obj/item/stack/sheet/metal(src) + new /obj/item/stack/sheet/iron(src) if(2) ScrapeAway(2, flags = CHANGETURF_INHERIT_AIR) if(3) @@ -92,7 +92,7 @@ break_tile() hotspot_expose(1000,CELL_VOLUME) if(prob(33)) - new /obj/item/stack/sheet/metal(src) + new /obj/item/stack/sheet/iron(src) if(3) if (prob(50)) src.break_tile() diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm index 681b9a58c31..4ebe36bbebf 100644 --- a/code/game/turfs/open/floor/plating/misc_plating.dm +++ b/code/game/turfs/open/floor/plating/misc_plating.dm @@ -191,7 +191,7 @@ /turf/open/floor/plating/ironsand gender = PLURAL name = "iron sand" - desc = "Like sand, but more metal." + desc = "Like sand, but more iron." icon_state = "ironsand1" base_icon_state = "ironsand1" footstep = FOOTSTEP_SAND diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm index 1761593c3de..fe36c6ce1ee 100644 --- a/code/game/turfs/open/openspace.dm +++ b/code/game/turfs/open/openspace.dm @@ -123,7 +123,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr else to_chat(user, "You need one floor tile to build a floor!") else - to_chat(user, "The plating is going to need some support! Place metal rods first.") + to_chat(user, "The plating is going to need some support! Place iron rods first.") /turf/open/openspace/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) if(!CanBuildHere()) diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index a3650df81f6..227e41b619e 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -552,7 +552,7 @@ . = ..() -//Construction: Converts 50 metal to a construct shell, plasteel to runed metal, airlock to brittle runed airlock, a borg to a construct, or borg shell to a construct shell +//Construction: Converts 50 iron to a construct shell, plasteel to runed metal, airlock to brittle runed airlock, a borg to a construct, or borg shell to a construct shell /obj/item/melee/blood_magic/construction name = "Twisting Aura" desc = "Corrupts certain metalic objects on contact." @@ -564,7 +564,7 @@ . = ..() . += {"A sinister spell used to convert:\n Plasteel into runed metal\n - [METAL_TO_CONSTRUCT_SHELL_CONVERSION] metal into a construct shell\n + [IRON_TO_CONSTRUCT_SHELL_CONVERSION] iron into a construct shell\n Living cyborgs into constructs after a delay\n Cyborg shells into construct shells\n Airlocks into brittle runed airlocks after a delay (harm intent)"} @@ -575,15 +575,15 @@ to_chat(user, "You are already invoking twisted construction!") return var/turf/T = get_turf(target) - if(istype(target, /obj/item/stack/sheet/metal)) + if(istype(target, /obj/item/stack/sheet/iron)) var/obj/item/stack/sheet/candidate = target - if(candidate.use(METAL_TO_CONSTRUCT_SHELL_CONVERSION)) + if(candidate.use(IRON_TO_CONSTRUCT_SHELL_CONVERSION)) uses-- - to_chat(user, "A dark cloud emanates from your hand and swirls around the metal, twisting it into a construct shell!") + to_chat(user, "A dark cloud emanates from your hand and swirls around the iron, twisting it into a construct shell!") new /obj/structure/constructshell(T) SEND_SOUND(user, sound('sound/effects/magic.ogg',0,1,25)) else - to_chat(user, "You need [METAL_TO_CONSTRUCT_SHELL_CONVERSION] metal to produce a construct shell!") + to_chat(user, "You need [IRON_TO_CONSTRUCT_SHELL_CONVERSION] iron to produce a construct shell!") return else if(istype(target, /obj/item/stack/sheet/plasteel)) var/obj/item/stack/sheet/plasteel/candidate = target diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 8cb5fe5976e..2fbf832ea07 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -134,7 +134,7 @@ else to_chat(user, "You fail to load the plutonium core into [core_box]. [core_box] has already been used!") return - if(istype(I, /obj/item/stack/sheet/metal)) + if(istype(I, /obj/item/stack/sheet/iron)) if(!I.tool_start_check(user, amount=20)) return diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index f7705cb4e3a..7083c6de15e 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -861,7 +861,7 @@ /obj/machinery/airalarm/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal(loc, 2) + new /obj/item/stack/sheet/iron(loc, 2) var/obj/item/I = new /obj/item/electronics/airalarm(loc) if(!disassembled) I.obj_integrity = I.max_integrity * 0.5 diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 5ab375300cb..d4d627b4cb5 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -386,16 +386,16 @@ if(disassembled) switch(mode) if(CANISTER_TIER_1) - new /obj/item/stack/sheet/metal (loc, 10) + new /obj/item/stack/sheet/iron (loc, 10) if(CANISTER_TIER_2) - new /obj/item/stack/sheet/metal (loc, 10) + new /obj/item/stack/sheet/iron (loc, 10) new /obj/item/stack/sheet/plasteel (loc, 5) if(CANISTER_TIER_3) - new /obj/item/stack/sheet/metal (loc, 10) + new /obj/item/stack/sheet/iron (loc, 10) new /obj/item/stack/sheet/plasteel (loc, 5) new /obj/item/stack/sheet/bluespace_crystal (loc, 1) else - new /obj/item/stack/sheet/metal (loc, 5) + new /obj/item/stack/sheet/iron (loc, 5) qdel(src) /obj/machinery/portable_atmospherics/canister/welder_act(mob/living/user, obj/item/I) diff --git a/code/modules/cargo/exports.dm b/code/modules/cargo/exports.dm index a58894544d8..7232815846c 100644 --- a/code/modules/cargo/exports.dm +++ b/code/modules/cargo/exports.dm @@ -11,9 +11,9 @@ Crate cost is 500cr for a regular plasteel crate and 100cr for a large wooden on This is to avoid easy cargo points dupes. Credit dupes that require a lot of manual work shouldn't be removed, unless they yield too much profit for too little work. -For example, if some player buys metal and glass sheets and uses them to make and sell reinforced glass: +For example, if some player buys iron and glass sheets and uses them to make and sell reinforced glass: -100 glass + 50 metal -> 100 reinforced glass +100 glass + 50 iron-> 100 reinforced glass 1500cr -> 1600cr) Then the player gets the profit from selling his own wasted time. diff --git a/code/modules/cargo/exports/materials.dm b/code/modules/cargo/exports/materials.dm index 123c2326dc5..e434bc127c5 100644 --- a/code/modules/cargo/exports/materials.dm +++ b/code/modules/cargo/exports/materials.dm @@ -89,12 +89,12 @@ message = "cm3 of runite" material_id = /datum/material/runite -/datum/export/material/metal +/datum/export/material/iron cost = CARGO_CRATE_VALUE * 0.01 - message = "cm3 of metal" + message = "cm3 of iron" material_id = /datum/material/iron export_types = list( - /obj/item/stack/sheet/metal, /obj/item/stack/tile/plasteel, + /obj/item/stack/sheet/iron, /obj/item/stack/tile/plasteel, /obj/item/stack/rods, /obj/item/stack/ore, /obj/item/coin) /datum/export/material/glass diff --git a/code/modules/cargo/exports/sheets.dm b/code/modules/cargo/exports/sheets.dm index aa88cafd792..cc256a987bb 100644 --- a/code/modules/cargo/exports/sheets.dm +++ b/code/modules/cargo/exports/sheets.dm @@ -60,11 +60,11 @@ // For base materials, see materials.dm /datum/export/stack/plasteel - cost = CARGO_CRATE_VALUE * 0.41 // 2000u of plasma + 2000u of metal. + cost = CARGO_CRATE_VALUE * 0.41 // 2000u of plasma + 2000u of iron. message = "of plasteel" export_types = list(/obj/item/stack/sheet/plasteel) -// 1 glass + 0.5 metal, cost is rounded up. +// 1 glass + 0.5 iron, cost is rounded up. /datum/export/stack/rglass cost = CARGO_CRATE_VALUE * 0.02 message = "of reinforced glass" diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 83a3132ad5c..1105a2d669c 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -997,12 +997,12 @@ contains = list(/obj/item/stack/sheet/glass/fifty) crate_name = "glass sheets crate" -/datum/supply_pack/materials/metal50 - name = "50 Metal Sheets" - desc = "Any construction project begins with a good stack of fifty metal sheets!" +/datum/supply_pack/materials/iron50 + name = "50 Iron Sheets" + desc = "Any construction project begins with a good stack of fifty iron sheets!" cost = CARGO_CRATE_VALUE * 2 - contains = list(/obj/item/stack/sheet/metal/fifty) - crate_name = "metal sheets crate" + contains = list(/obj/item/stack/sheet/iron/fifty) + crate_name = "iron sheets crate" /datum/supply_pack/materials/plasteel20 name = "20 Plasteel Sheets" diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index 32ace428b09..35f44b644a5 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -393,7 +393,7 @@ suit_store = null l_hand = /obj/item/areaeditor/blueprints backpack_contents = list(/obj/item/storage/box/survival/engineer=1,\ - /obj/item/stack/sheet/metal/fifty=1,\ + /obj/item/stack/sheet/iron/fifty=1,\ /obj/item/stack/sheet/glass/fifty=1,\ /obj/item/stack/sheet/plasteel/twenty=1,\ /obj/item/etherealballdeployer=1,\ diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index 7972cea5d46..3c9322195bd 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -111,7 +111,7 @@ /obj/machinery/grill/deconstruct(disassembled = TRUE) finish_grill() if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal(loc, 5) + new /obj/item/stack/sheet/iron(loc, 5) new /obj/item/stack/rods(loc, 5) ..() diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm index c60cbb47447..30f66cd9477 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm @@ -277,7 +277,7 @@ /obj/machinery/icecream_vat/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal(loc, 4) + new /obj/item/stack/sheet/iron(loc, 4) qdel(src) /obj/machinery/icecream_vat/AltClick(mob/living/user) diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 9b148bc2d9e..a8288ea788e 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -227,7 +227,7 @@ desc = "A large machine releasing a constant gust of air." anchored = TRUE density = TRUE - var/buildstacktype = /obj/item/stack/sheet/metal + var/buildstacktype = /obj/item/stack/sheet/iron var/buildstackamount = 5 CanAtmosPass = ATMOS_PASS_NO diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index f6096c6edc0..3e3639cada2 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -87,7 +87,7 @@ singular_name = "iron ore chunk" points = 1 mats_per_unit = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT) - refined_type = /obj/item/stack/sheet/metal + refined_type = /obj/item/stack/sheet/iron mine_experience = 1 scan_state = "rock_Iron" spreadChance = 20 diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 1a73ec2bf8e..dbc0a80bc1b 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -247,7 +247,7 @@ /obj/item/assembly/signaler/cyborg, /obj/item/areaeditor/blueprints/cyborg, /obj/item/electroadaptive_pseudocircuit, - /obj/item/stack/sheet/metal, + /obj/item/stack/sheet/iron, /obj/item/stack/sheet/glass, /obj/item/stack/sheet/rglass/cyborg, /obj/item/stack/rods/cyborg, @@ -586,7 +586,7 @@ /obj/item/crowbar/cyborg, /obj/item/wirecutters/cyborg, /obj/item/multitool/cyborg, - /obj/item/stack/sheet/metal, + /obj/item/stack/sheet/iron, /obj/item/stack/sheet/glass, /obj/item/stack/sheet/rglass/cyborg, /obj/item/stack/rods/cyborg, @@ -659,8 +659,8 @@ /datum/robot_energy_storage/proc/add_charge(amount) energy = min(energy + amount, max_energy) -/datum/robot_energy_storage/metal - name = "Metal Synthesizer" +/datum/robot_energy_storage/iron + name = "Iron Synthesizer" /datum/robot_energy_storage/glass name = "Glass Synthesizer" diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index 5aee9228832..6d03c5444c6 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -480,7 +480,7 @@ return if(I.tool_behaviour == TOOL_WRENCH) //Deconstruct if(I.use_tool(src, user, 0, volume=40)) - new /obj/item/stack/sheet/metal(Tsec, 2) + new /obj/item/stack/sheet/iron(Tsec, 2) to_chat(user, "You disconnect the hygienebot assembly.") qdel(src) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm index d05319814e9..34be37cdb80 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm @@ -159,7 +159,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa //RESOURCE SWARMER: -//Similar to the original Player-Swarmers, these dismantle things to obtain the metal inside +//Similar to the original Player-Swarmers, these dismantle things to obtain the iron inside //They then use this medal to produce more swarmers or traps/barricades /mob/living/simple_animal/hostile/swarmer/ai/resource diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index a13492ab9d4..583ead83aef 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -460,7 +460,7 @@ if(all_components.len) to_chat(user, "Remove all components from \the [src] before disassembling it.") return - new /obj/item/stack/sheet/metal( get_turf(src.loc), steel_sheet_cost ) + new /obj/item/stack/sheet/iron( get_turf(src.loc), steel_sheet_cost ) physical.visible_message("\The [src] is disassembled by [user].") relay_qdel() qdel(src) diff --git a/code/modules/modular_computers/computers/item/computer_damage.dm b/code/modules/modular_computers/computers/item/computer_damage.dm index e31797cba5f..c91e958c614 100644 --- a/code/modules/modular_computers/computers/item/computer_damage.dm +++ b/code/modules/modular_computers/computers/item/computer_damage.dm @@ -20,7 +20,7 @@ if(!(flags_1 & NODECONSTRUCT_1)) physical.visible_message("\The [src] breaks apart!") var/turf/newloc = get_turf(src) - new /obj/item/stack/sheet/metal(newloc, round(steel_sheet_cost/2)) + new /obj/item/stack/sheet/iron(newloc, round(steel_sheet_cost/2)) for(var/C in all_components) var/obj/item/computer_hardware/H = all_components[C] if(QDELETED(H)) diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index c2cdbbe1172..0bfaa1aef46 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -40,7 +40,7 @@ /obj/structure/filingcabinet/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal(loc, 2) + new /obj/item/stack/sheet/iron(loc, 2) for(var/obj/item/I in src) I.forceMove(loc) qdel(src) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index d962c9cf1b1..2dcaba07f07 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -539,7 +539,7 @@ "You hear welding.") if(W.use_tool(src, user, 50, volume=50, amount=3)) if ((machine_stat & BROKEN) || opened==APC_COVER_REMOVED) - new /obj/item/stack/sheet/metal(loc) + new /obj/item/stack/sheet/iron(loc) user.visible_message("[user.name] cuts [src] apart with [W].",\ "You disassembled the broken APC frame.") else diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index f2624474538..1e93139b815 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -140,7 +140,7 @@ else to_chat(user, "You begin deconstructing [src]...") if (W.use_tool(src, user, 30, volume=50)) - new /obj/item/stack/sheet/metal(drop_location(), sheets_refunded) + new /obj/item/stack/sheet/iron(drop_location(), sheets_refunded) user.visible_message("[user.name] deconstructs [src].", \ "You deconstruct [src].", "You hear a ratchet.") playsound(src, 'sound/items/deconstruct.ogg', 75, TRUE) @@ -197,7 +197,7 @@ /obj/structure/light_construct/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal(loc, sheets_refunded) + new /obj/item/stack/sheet/iron(loc, sheets_refunded) qdel(src) /obj/structure/light_construct/small diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 553f33cc74e..d8b029e33d1 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -740,10 +740,10 @@ /datum/reagent/copper/expose_obj(obj/exposed_obj, reac_volume) . = ..() - if(!istype(exposed_obj, /obj/item/stack/sheet/metal)) + if(!istype(exposed_obj, /obj/item/stack/sheet/iron)) return - var/obj/item/stack/sheet/metal/M = exposed_obj + var/obj/item/stack/sheet/iron/M = exposed_obj reac_volume = min(reac_volume, M.amount) new/obj/item/stack/tile/bronze(get_turf(M), reac_volume) M.use(reac_volume) diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index 322297f4ad4..4dc292b5375 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -70,7 +70,7 @@ /datum/chemical_reaction/slime/slimemetal/on_reaction(datum/reagents/holder) var/turf/location = get_turf(holder.my_atom) new /obj/item/stack/sheet/plasteel(location, 5) - new /obj/item/stack/sheet/metal(location, 15) + new /obj/item/stack/sheet/iron(location, 15) ..() /datum/chemical_reaction/slime/slimeglass diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index 8623b88620d..1c51a2217f0 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -19,7 +19,7 @@ /obj/structure/reagent_dispensers/examine(mob/user) . = ..() if(can_be_tanked) - . += "Use a sheet of metal to convert this into a plumbing-compatible tank." + . += "Use a sheet of iron to convert this into a plumbing-compatible tank." /obj/structure/reagent_dispensers/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) . = ..() @@ -30,8 +30,8 @@ /obj/structure/reagent_dispensers/attackby(obj/item/W, mob/user, params) if(W.is_refillable()) return FALSE //so we can refill them via their afterattack. - if(istype(W, /obj/item/stack/sheet/metal) && can_be_tanked) - var/obj/item/stack/sheet/metal/metal_stack = W + if(istype(W, /obj/item/stack/sheet/iron) && can_be_tanked) + var/obj/item/stack/sheet/iron/metal_stack = W metal_stack.use(1) var/obj/structure/reagent_dispensers/plumbed/storage/new_tank = new /obj/structure/reagent_dispensers/plumbed/storage(drop_location()) new_tank.reagents.maximum_volume = reagents.maximum_volume diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 85477d2510f..a3f128c098f 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -8,11 +8,11 @@ you use one of the material IDs below. These are NOT ids in the usual sense (the they are simply references used as part of a "has materials?" type proc. They all start with a $ to denote that they aren't reagents. The currently supporting non-reagent materials. All material amounts are set as the define MINERAL_MATERIAL_AMOUNT, which defaults to 2000 -Don't add new keyword/IDs if they are made from an existing one (such as rods which are made from metal). Only add raw materials. +Don't add new keyword/IDs if they are made from an existing one (such as rods which are made from iron). Only add raw materials. Design Guidelines - When adding new designs, check rdreadme.dm to see what kind of things have already been made and where new stuff is needed. -- A single sheet of anything is 2000 units of material. Materials besides metal/glass require help from other jobs (mining for +- A single sheet of anything is 2000 units of material. Materials besides iron/glass require help from other jobs (mining for other types of metals and chemistry for reagents). - Add the AUTOLATHE tag to */ @@ -27,7 +27,7 @@ other types of metals and chemistry for reagents). var/desc = "Desc" /// The ID of the design. Used for quick reference. Alphanumeric, lower-case, no symbols var/id = DESIGN_ID_IGNORE - /// Bitflags indicating what machines this design is compatable with. ([IMPRINTER]|[PROTOLATHE]|[AUTOLATHE]|[CRAFTLATHE]|[MECHFAB]|[BIOGENERATOR]|[LIMBGROWER]|[SMELTER]|[NANITE_COMPILER]) + /// Bitflags indicating what machines this design is compatable with. ([IMPRINTER]|[PROTOLATHE]|[AUTOLATHE]|[MECHFAB]|[BIOGENERATOR]|[LIMBGROWER]|[SMELTER]|[NANITE_COMPILER]) var/build_type = null /// List of materials required to create one unit of the product. Format is (typepath or caregory) -> amount var/list/materials = list() diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 60c22cc0a6a..6f0716b7e43 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -299,12 +299,12 @@ category = list("initial","Misc","Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO -/datum/design/metal - name = "Metal" - id = "metal" +/datum/design/iron + name = "Iron" + id = "iron" build_type = AUTOLATHE materials = list(/datum/material/iron = MINERAL_MATERIAL_AMOUNT) - build_path = /obj/item/stack/sheet/metal + build_path = /obj/item/stack/sheet/iron category = list("initial","Construction") maxstack = 50 @@ -327,7 +327,7 @@ maxstack = 50 /datum/design/rods - name = "Metal Rod" + name = "Iron Rod" id = "rods" build_type = AUTOLATHE materials = list(/datum/material/iron = 1000) @@ -867,7 +867,7 @@ name = "Foam Riot Dart" id = "riot_dart" build_type = AUTOLATHE - materials = list(/datum/material/iron = 1000) //Discount for making individually - no box = less metal! + materials = list(/datum/material/iron = 1000) //Discount for making individually - no box = less iron! build_path = /obj/item/ammo_casing/caseless/foam_dart/riot category = list("hacked", "Security") diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index e8bb1943017..15e6c109b34 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -307,7 +307,7 @@ departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING /datum/design/lavarods - name = "Lava-Resistant Metal Rods" + name = "Lava-Resistant Iron Rods" id = "lava_rods" build_type = PROTOLATHE materials = list(/datum/material/iron=1000, /datum/material/plasma=500, /datum/material/titanium=2000) diff --git a/code/modules/research/designs/smelting_designs.dm b/code/modules/research/designs/smelting_designs.dm index 35f40fb422f..4bebd6e72ee 100644 --- a/code/modules/research/designs/smelting_designs.dm +++ b/code/modules/research/designs/smelting_designs.dm @@ -32,7 +32,7 @@ maxstack = 50 /datum/design/plasmarglass_alloy - name = "Plasma + Metal + Glass alloy" + name = "Plasma + Iron + Glass alloy" id = "plasmareinforcedglass" build_type = SMELTER | PROTOLATHE materials = list(/datum/material/plasma = MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/iron = MINERAL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = MINERAL_MATERIAL_AMOUNT) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 4efaa0b3d95..8f89119e49f 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -508,7 +508,7 @@ Nothing else in the console has ID requirements. autolathe_friendly = FALSE D.category -= "Imported" - if(D.build_type & (AUTOLATHE|PROTOLATHE|CRAFTLATHE)) // Specifically excludes circuit imprinter and mechfab + if(D.build_type & (AUTOLATHE|PROTOLATHE)) // Specifically excludes circuit imprinter and mechfab D.build_type = autolathe_friendly ? (D.build_type | AUTOLATHE) : D.build_type D.category |= "Imported" d_disk.blueprints[slot] = D diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm index b7f66858dc3..ffe03db73a3 100644 --- a/code/modules/research/xenobiology/crossbreeding/charged.dm +++ b/code/modules/research/xenobiology/crossbreeding/charged.dm @@ -70,7 +70,7 @@ Charged extracts: effect_desc = "Produces a bunch of metal and plasteel." /obj/item/slimecross/charged/metal/do_effect(mob/user) - new /obj/item/stack/sheet/metal(get_turf(user), 25) + new /obj/item/stack/sheet/iron(get_turf(user), 25) new /obj/item/stack/sheet/plasteel(get_turf(user), 10) user.visible_message("[src] grows into a plethora of metals!") ..() diff --git a/code/modules/research/xenobiology/crossbreeding/industrial.dm b/code/modules/research/xenobiology/crossbreeding/industrial.dm index 8326906e93f..d106ad033e0 100644 --- a/code/modules/research/xenobiology/crossbreeding/industrial.dm +++ b/code/modules/research/xenobiology/crossbreeding/industrial.dm @@ -77,9 +77,9 @@ Industrial extracts: /obj/item/slimecross/industrial/metal colour = "metal" - effect_desc = "Produces metal sheets." + effect_desc = "Produces iron sheets." plasmarequired = 3 - itempath = /obj/item/stack/sheet/metal/ten + itempath = /obj/item/stack/sheet/iron/ten /obj/item/slimecross/industrial/yellow colour = "yellow" diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index b154188846a..428d5fcae28 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -189,7 +189,7 @@ return 150 if(SLIME_ACTIVATE_MAJOR) - var/obj/item/stack/sheet/metal/O = new(null, 5) + var/obj/item/stack/sheet/iron/O = new(null, 5) if(!user.put_in_active_hand(O)) O.forceMove(user.drop_location()) playsound(user, 'sound/effects/splat.ogg', 50, TRUE) diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index dacf118806f..a1bb0f14a5c 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -58,7 +58,7 @@ /obj/item/golem_shell/attackby(obj/item/I, mob/user, params) ..() var/static/list/golem_shell_species_types = list( - /obj/item/stack/sheet/metal = /datum/species/golem, + /obj/item/stack/sheet/iron = /datum/species/golem, /obj/item/stack/sheet/glass = /datum/species/golem/glass, /obj/item/stack/sheet/plasteel = /datum/species/golem/plasteel, /obj/item/stack/sheet/mineral/sandstone = /datum/species/golem/sand, diff --git a/code/modules/swarmers/swarmer.dm b/code/modules/swarmers/swarmer.dm index 4fc64d049ea..b15c301830f 100644 --- a/code/modules/swarmers/swarmer.dm +++ b/code/modules/swarmers/swarmer.dm @@ -270,7 +270,7 @@ if(do_mob(src, target, 100)) to_chat(src, "Dismantling complete.") var/atom/target_loc = target.drop_location() - new /obj/item/stack/sheet/metal(target_loc, 5) + new /obj/item/stack/sheet/iron(target_loc, 5) for(var/p in target.component_parts) var/obj/item/part = p part.forceMove(target_loc) diff --git a/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm b/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm index af0b51e9037..5f7e5847046 100644 --- a/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm +++ b/code/modules/vehicles/mecha/equipment/weapons/mecha_ammo.dm @@ -25,7 +25,7 @@ return to_chat(user, "You fold [src] flat.") - var/trash = new /obj/item/stack/sheet/metal(user.loc) + var/trash = new /obj/item/stack/sheet/iron(user.loc) qdel(src) user.put_in_hands(trash) diff --git a/code/modules/vehicles/mecha/mecha_construction_paths.dm b/code/modules/vehicles/mecha/mecha_construction_paths.dm index 348b2a8a7a7..198ac970fab 100644 --- a/code/modules/vehicles/mecha/mecha_construction_paths.dm +++ b/code/modules/vehicles/mecha/mecha_construction_paths.dm @@ -270,7 +270,7 @@ circuit_control = /obj/item/circuitboard/mecha/ripley/main circuit_periph = /obj/item/circuitboard/mecha/ripley/peripherals - inner_plating=/obj/item/stack/sheet/metal + inner_plating=/obj/item/stack/sheet/iron inner_plating_amount = 5 outer_plating=/obj/item/stack/rods @@ -414,7 +414,7 @@ circuit_periph = /obj/item/circuitboard/mecha/gygax/peripherals circuit_weapon = /obj/item/circuitboard/mecha/gygax/targeting - inner_plating = /obj/item/stack/sheet/metal + inner_plating = /obj/item/stack/sheet/iron inner_plating_amount = 5 outer_plating=/obj/item/mecha_parts/part/gygax_armor @@ -836,7 +836,7 @@ circuit_periph = /obj/item/circuitboard/mecha/durand/peripherals circuit_weapon = /obj/item/circuitboard/mecha/durand/targeting - inner_plating = /obj/item/stack/sheet/metal + inner_plating = /obj/item/stack/sheet/iron inner_plating_amount = 5 outer_plating = /obj/item/mecha_parts/part/durand_armor @@ -1222,7 +1222,7 @@ circuit_control = /obj/item/circuitboard/mecha/odysseus/main circuit_periph = /obj/item/circuitboard/mecha/odysseus/peripherals - inner_plating = /obj/item/stack/sheet/metal + inner_plating = /obj/item/stack/sheet/iron inner_plating_amount = 5 outer_plating = /obj/item/stack/sheet/plasteel diff --git a/code/modules/vehicles/mecha/mecha_wreckage.dm b/code/modules/vehicles/mecha/mecha_wreckage.dm index cbd7efd07d2..9e5d5703722 100644 --- a/code/modules/vehicles/mecha/mecha_wreckage.dm +++ b/code/modules/vehicles/mecha/mecha_wreckage.dm @@ -10,7 +10,7 @@ density = TRUE anchored = FALSE opacity = FALSE - var/list/welder_salvage = list(/obj/item/stack/sheet/plasteel, /obj/item/stack/sheet/metal, /obj/item/stack/rods) + var/list/welder_salvage = list(/obj/item/stack/sheet/plasteel, /obj/item/stack/sheet/iron, /obj/item/stack/rods) var/salvage_num = 5 var/list/crowbar_salvage = list() var/wires_removed = FALSE diff --git a/code/modules/vehicles/motorized_wheelchair.dm b/code/modules/vehicles/motorized_wheelchair.dm index 14c2a006013..41e0138bf0a 100644 --- a/code/modules/vehicles/motorized_wheelchair.dm +++ b/code/modules/vehicles/motorized_wheelchair.dm @@ -106,7 +106,7 @@ if(I.use_tool(src, user, 40, volume=50)) to_chat(user, "You detach the wheels and deconstruct the chair.") new /obj/item/stack/rods(drop_location(), 8) - new /obj/item/stack/sheet/metal(drop_location(), 10) + new /obj/item/stack/sheet/iron(drop_location(), 10) var/turf/T = get_turf(src) for(var/c in contents) var/atom/movable/thing = c diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm index 9cd32565520..de6b8d87d15 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -185,13 +185,13 @@ //CONSTRUCTION /obj/item/scooter_frame name = "scooter frame" - desc = "A metal frame for building a scooter. Looks like you'll need to add some metal to make wheels." + desc = "A metal frame for building a scooter. Looks like you'll need to add some iron to make wheels." icon = 'icons/obj/vehicles.dmi' icon_state = "scooter_frame" w_class = WEIGHT_CLASS_NORMAL /obj/item/scooter_frame/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/stack/sheet/metal)) + if(istype(I, /obj/item/stack/sheet/iron)) if(!I.tool_start_check(user, amount=5)) return to_chat(user, "You begin to add wheels to [src].") @@ -235,7 +235,7 @@ to_chat(user, "You begin to deconstruct and remove the wheels on [src]...") if(I.use_tool(src, user, 20, volume=50)) to_chat(user, "You deconstruct the wheels on [src].") - new /obj/item/stack/sheet/metal(drop_location(), 5) + new /obj/item/stack/sheet/iron(drop_location(), 5) new /obj/item/scooter_frame(drop_location()) if(has_buckled_mobs()) var/mob/living/carbon/H = buckled_mobs[1] diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index bd8ec96fe17..06821d7b6d6 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -24,7 +24,7 @@ /obj/vehicle/ridden/wheelchair/obj_destruction(damage_flag) new /obj/item/stack/rods(drop_location(), 1) - new /obj/item/stack/sheet/metal(drop_location(), 1) + new /obj/item/stack/sheet/iron(drop_location(), 1) ..() /obj/vehicle/ridden/wheelchair/Destroy() @@ -59,7 +59,7 @@ if(I.use_tool(src, user, 40, volume=50)) to_chat(user, "You detach the wheels and deconstruct the chair.") new /obj/item/stack/rods(drop_location(), 6) - new /obj/item/stack/sheet/metal(drop_location(), 4) + new /obj/item/stack/sheet/iron(drop_location(), 4) qdel(src) return TRUE diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index efb7944ad7c..29785491208 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -237,7 +237,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/machinery/vending/deconstruct(disassembled = TRUE) if(!refill_canister) //the non constructable vendors drop metal instead of a machine frame. if(!(flags_1 & NODECONSTRUCT_1)) - new /obj/item/stack/sheet/metal(loc, 3) + new /obj/item/stack/sheet/iron(loc, 3) qdel(src) else ..() diff --git a/strings/ion_laws.json b/strings/ion_laws.json index b93a2168c66..f9f1fa8ff0a 100644 --- a/strings/ion_laws.json +++ b/strings/ion_laws.json @@ -654,6 +654,7 @@ "HORNS", "ID CARDS", "INSULATED GLOVES", + "IRON SHEETS", "JETPACKS", "JUMPSUITS", "LASERS", @@ -665,7 +666,6 @@ "MEDKITS", "MEDICAL TOOLS", "MESONS", - "METAL SHEETS", "MINING TOOLS", "MIME CLOTHES", "MULTITOOLS", diff --git a/strings/tips.txt b/strings/tips.txt index ade4cfed358..1c311d1257e 100644 --- a/strings/tips.txt +++ b/strings/tips.txt @@ -7,7 +7,7 @@ Clicking on a windoor rather then bumping into it will keep it open, you can cli You can spray a fire extinguisher, throw items or fire a gun while floating through space to change your direction. Simply fire opposite to where you want to go. You can change the control scheme by pressing tab. One is WASD, the other is the arrow keys. Keep in mind that hotkeys are also changed with this. Firesuits and winter coats offer mild protection from the cold, allowing you to spend longer periods of time near breaches and space than if wearing nothing at all. -Glass shards can be welded to make glass, and metal rods can be welded to make metal. Ores can be welded too, but this takes a lot of fuel. +Glass shards can be welded to make glass, and iron rods can be welded to make iron. Ores can be welded too, but this takes a lot of fuel. If you need to drag multiple people either to safety or to space, bring a locker or crate over and stuff them all in before hauling them off. You can grab someone by clicking on them with the grab intent, then upgrade the grab by clicking on them once more. An aggressive grab will momentarily stun someone, allow you to place them on a table by clicking on it, or throw them by toggling on throwing. Holding alt and left clicking a tile will allow you to see its contents in the top right window pane, which is much faster than right clicking. @@ -110,7 +110,7 @@ As an Engineer, you can use radiation collectors to generate research points. Lo As an Engineer, don't underestimate the humble P.A.C.M.A.N. generators. With upgraded parts, a couple units working in tandem are sufficient to take over for an exploded engine or shattered solars. As an Engineer, your departmental protolathe and circuit printer can manufacture the necessary circuit boards and components to build just about anything. Make extra medical machinery everywhere! Build a gibber for security! Set up an array of emitters pointing down the hall! The possibilities are endless! As an Engineer, you can pry open secure storage blast doors by disabling the engine room APC's main breaker. This is obviously a bad idea if the engine is running. -As an Engineer, your RCD can be reloaded with metal, glass or plasteel sheets instead of just compressed matter cartridges. +As an Engineer, your RCD can be reloaded with iron, glass or plasteel sheets instead of just compressed matter cartridges. As an Engineer, the Supermatter Monitoring Program on modular computers give you a detailed report on the Supermatter's condition, and the contents of the air inside of the chamber, allowing you to both diagnose and monitor programs from afar! As an Atmospheric Technician, you can unwrench a pipe regardless of the pressures of the gases inside, but if they're too high they can burst out and injure you! As an Atmospheric Technician, look into replacing your gas pumps with volumetric gas pumps, as those move air in flat numerical amounts, rather than percentages which leave trace gases.