cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename metal sheets to iron sheets (#56643)

Browse Source 
It's a specific type of metal, it shouldnt just be called generic "metal".
The reagent, ore and material datum are already called iron.
This commit is contained in:
Fikou
2021-02-05 15:48:00 +00:00
committed by GitHub
parent 039abf2b07
commit 8d586a7cb0
155 changed files with 505 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+1 -1
View File
@@ -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
},
_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+2 -2
View File
@@ -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
},
_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
+20 -20
View File
@@ -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" = (
_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+4 -4
View File
@@ -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)
_maps/RandomRuins/SpaceRuins/bus.dmm
+1 -1
View File
@@ -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" = (
_maps/RandomRuins/SpaceRuins/caravanambush.dmm
+2 -2
View File
@@ -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" = (
_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+5 -5
View File
@@ -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
},
_maps/RandomRuins/SpaceRuins/derelict6.dmm
+10 -10
View File
@@ -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"
},
_maps/RandomRuins/SpaceRuins/forgottenship.dmm
+4 -4
View File
@@ -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
},
_maps/RandomRuins/SpaceRuins/hellfactory.dmm
+1 -1
View File
@@ -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)
_maps/RandomRuins/SpaceRuins/listeningstation.dmm
+1 -1
View File
@@ -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
},
_maps/RandomRuins/SpaceRuins/mechtransport.dmm
+1 -1
View File
@@ -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" = (
_maps/RandomRuins/SpaceRuins/oldstation.dmm
+6 -6
View File
@@ -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,
_maps/RandomRuins/SpaceRuins/onehalf.dmm
+2 -2
View File
@@ -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" = (
_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+2 -2
View File
@@ -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
},
_maps/RandomZLevels/Academy.dmm
+2 -2
View File
@@ -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" = (
_maps/RandomZLevels/caves.dmm
+3 -3
View File
@@ -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" = (
_maps/RandomZLevels/moonoutpost19.dmm
+1 -1
View File
@@ -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,
_maps/RandomZLevels/research.dmm
+3 -3
View File
@@ -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
},
_maps/RandomZLevels/snowdin.dmm
+6 -6
View File
@@ -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
},
_maps/RandomZLevels/spacebattle.dmm
+9 -9
View File
@@ -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" = (
_maps/RandomZLevels/undergroundoutpost45.dmm
+3 -3
View File
@@ -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{
_maps/map_files/Deltastation/DeltaStation2.dmm
+29 -29
View File
@@ -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)
_maps/map_files/IceBoxStation/IceBoxStation.dmm
+29 -29
View File
@@ -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
_maps/map_files/KiloStation/KiloStation.dmm
+25 -25
View File
@@ -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"
_maps/map_files/MetaStation/MetaStation.dmm
+32 -32
View File
@@ -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,
_maps/map_files/generic/CentCom.dmm
+5 -5
View File
@@ -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
},
_maps/shuttles/emergency_cere.dmm
+1 -1
View File
@@ -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
},
_maps/shuttles/emergency_construction.dmm
+2 -2
View File
@@ -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
},
_maps/shuttles/emergency_medisim.dmm
+1 -1
View File
@@ -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
_maps/shuttles/emergency_monastery.dmm
+1 -1
View File
@@ -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
},
_maps/shuttles/emergency_narnar.dmm
+3 -3
View File
@@ -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" = (
_maps/shuttles/emergency_raven.dmm
+1 -1
View File
@@ -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
},
_maps/shuttles/infiltrator_advanced.dmm
+1 -1
View File
@@ -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
},
_maps/shuttles/ruin_caravan_victim.dmm
+3 -3
View File
@@ -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" = (
_maps/shuttles/ruin_pirate_cutter.dmm
+1 -1
View File
@@ -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
},
_maps/shuttles/ruin_syndicate_dropship.dmm
+1 -1
View File
@@ -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
},
_maps/shuttles/whiteship_cere.dmm
+2 -2
View File
@@ -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,
_maps/shuttles/whiteship_delta.dmm
+4 -4
View File
@@ -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
},
_maps/shuttles/whiteship_donut.dmm
+4 -4
View File
@@ -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,
_maps/shuttles/whiteship_kilo.dmm
+3 -3
View File
@@ -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" = (
_maps/shuttles/whiteship_meta.dmm
+2 -2
View File
@@ -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
},
code/__DEFINES/cult.dm
+1 -1
View File
@@ -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"
code/__DEFINES/machines.dm
+7 -8
View File
@@ -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
code/__DEFINES/materials.dm
+1 -1
View File
@@ -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
code/_globalvars/lists/maintenance_loot.dm
+1 -1
View File
@@ -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,
code/datums/components/crafting/recipes.dm
+14 -14
View File
@@ -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
)
code/datums/materials/basemats.dm
+1 -1
View File
@@ -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)
code/game/gamemodes/sandbox/h_sandbox.dm
+1 -1
View File
@@ -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)
code/game/machinery/autolathe.dm
+1 -1
View File
@@ -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
code/game/machinery/bounty_board.dm
+1 -1
View File
@@ -47,7 +47,7 @@ GLOBAL_LIST_EMPTY(request_list)
playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
if(machine_stat & BROKEN)
to_chat(user, "<span class='warning'>The broken remains of [src] fall on the ground.</span>")
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, "<span class='notice'>You [anchored ? "un" : ""]secure [name].</span>")
code/game/machinery/camera/camera_assembly.dm
+1 -1
View File
@@ -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)
code/game/machinery/canister_frame.dm
+2 -2
View File
@@ -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
code/game/machinery/computer/buildandrepair.dm
+1 -1
View File
@@ -21,7 +21,7 @@
to_chat(user, "<span class='notice'>You start deconstructing the frame...</span>")
if(P.use_tool(src, user, 20, volume=50))
to_chat(user, "<span class='notice'>You deconstruct the frame.</span>")
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
code/game/machinery/constructable_frame.dm
+2 -2
View File
@@ -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, "<span class='notice'>You disassemble the frame.</span>")
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
code/game/machinery/doors/airlock.dm
+15 -15
View File
@@ -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, "<span class='warning'>You need at least 2 metal sheets to reinforce [src].</span>")
to_chat(user, "<span class='warning'>You need at least 2 iron sheets to reinforce [src].</span>")
return
to_chat(user, "<span class='notice'>You start reinforcing [src].</span>")
if(do_after(user, 2 SECONDS, src))
if(!panel_open || !S.use(2))
return
user.visible_message("<span class='notice'>[user] reinforces \the [src] with metal.</span>",
"<span class='notice'>You reinforce \the [src] with metal.</span>")
security_level = AIRLOCK_SECURITY_METAL
user.visible_message("<span class='notice'>[user] reinforces \the [src] with iron.</span>",
"<span class='notice'>You reinforce \the [src] with iron.</span>")
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 @@
"<span class='notice'>You cut through \the [src]'s shielding.</span>",
"<span class='hear'>You hear welding.</span>")
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
code/game/machinery/doors/firedoor.dm
+1 -1
View File
@@ -366,7 +366,7 @@
user.visible_message("<span class='notice'>[user] cuts apart [src]!</span>", \
"<span class='notice'>You cut [src] into metal.</span>")
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)
code/game/machinery/droneDispenser.dm
+11 -11
View File
@@ -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
code/game/machinery/firealarm.dm
+1 -1
View File
@@ -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)
code/game/machinery/flasher.dm
+1 -1
View File
@@ -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()
code/game/machinery/iv_drip.dm
+1 -1
View File
@@ -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)
code/game/machinery/newscaster.dm
+2 -2
View File
@@ -728,7 +728,7 @@ GLOBAL_LIST_EMPTY(allCasters)
playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
if(machine_stat & BROKEN)
to_chat(user, "<span class='warning'>The broken remains of [src] fall on the ground.</span>")
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)
code/game/machinery/porta_turret/portable_turret.dm
+1 -1
View File
@@ -296,7 +296,7 @@ DEFINE_BITFIELD(turret_flags, list(
stored_gun = null
to_chat(user, "<span class='notice'>You remove the turret and salvage some components.</span>")
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
code/game/machinery/porta_turret/portable_turret_construct.dm
+9 -9
View File
@@ -33,19 +33,19 @@
else if(I.tool_behaviour == TOOL_CROWBAR && !anchored)
I.play_tool_sound(src, 75)
to_chat(user, "<span class='notice'>You dismantle the turret construction.</span>")
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, "<span class='notice'>You add some metal armor to the interior frame.</span>")
build_step = PTURRET_START_INTERNAL_ARMOUR
icon_state = "turret_frame2"
else
to_chat(user, "<span class='warning'>You need two sheets of metal to continue construction!</span>")
to_chat(user, "<span class='warning'>You need two sheets of iron to continue construction!</span>")
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, "<span class='notice'>You remove the turret's interior metal armor.</span>")
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, "<span class='notice'>You add some metal armor to the exterior frame.</span>")
build_step = PTURRET_START_EXTERNAL_ARMOUR
else
to_chat(user, "<span class='warning'>You need two sheets of metal to continue construction!</span>")
to_chat(user, "<span class='warning'>You need two sheets of iron to continue construction!</span>")
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, "<span class='notice'>You pry off the turret's exterior armor.</span>")
new /obj/item/stack/sheet/metal(loc, 2)
new /obj/item/stack/sheet/iron(loc, 2)
build_step = PTURRET_CLOSED
return
code/game/machinery/suit_storage_unit.dm
+1 -1
View File
@@ -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)
code/game/machinery/washing_machine.dm
+1 -1
View File
@@ -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)
code/game/objects/items/RCD.dm
+5 -5
View File
@@ -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'
code/game/objects/items/apc_frame.dm
+1 -1
View File
@@ -72,7 +72,7 @@
if(W.tool_behaviour == TOOL_WRENCH && (metal_amt || glass_amt))
to_chat(user, "<span class='notice'>You dismantle [src].</span>")
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)
code/game/objects/items/food/misc.dm
+1 -1
View File
@@ -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, "<span class='warning'>You do not have enough metal to put [src] on a stick!</span>")
to_chat(user, "<span class='warning'>You do not have enough iron to put [src] on a stick!</span>")
return ..()
to_chat(user, "<span class='notice'>You stick the rod into the stick of butter.</span>")
var/obj/item/food/butter/on_a_stick/new_item = new(usr.loc)
code/game/objects/items/handcuffs.dm
+3 -3
View File
@@ -163,10 +163,10 @@
else
to_chat(user, "<span class='warning'>You need one rod to make a wired rod!</span>")
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, "<span class='warning'>You need at least six metal sheets to make good enough weights!</span>")
to_chat(user, "<span class='warning'>You need at least six iron sheets to make good enough weights!</span>")
return
to_chat(user, "<span class='notice'>You begin to apply [I] to [src]...</span>")
if(do_after(user, 35, target = src))
code/game/objects/items/manuals.dm
+2 -2
View File
@@ -97,10 +97,10 @@
<li>Secure the mainboard with a screwdriver.</li>
<li>Install the peripherals control module (Not included. Use supplied datadisk to create one).</li>
<li>Secure the peripherals control module with a screwdriver</li>
<li>Install the internal armor plating (Not included due to Nanotrasen regulations. Can be made using 5 metal sheets.)</li>
<li>Install the internal armor plating (Not included due to Nanotrasen regulations. Can be made using 5 iron sheets.)</li>
<li>Secure the internal armor plating with a wrench</li>
<li>Weld the internal armor plating to the chassis</li>
<li>Install the external reinforced armor plating (Not included due to Nanotrasen regulations. Can be made using 5 reinforced metal sheets.)</li>
<li>Install the external reinforced armor plating (Not included due to Nanotrasen regulations. Can be made using 5 reinforced iron sheets.)</li>
<li>Secure the external reinforced armor plating with a wrench</li>
<li>Weld the external reinforced armor plating to the chassis</li>
</ol>
code/game/objects/items/robot/robot_parts.dm
+3 -3
View File
@@ -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, "<span class='warning'>You need one sheet of metal to start building ED-209!</span>")
to_chat(user, "<span class='warning'>You need one sheet of iron to start building ED-209!</span>")
return
else if(istype(W, /obj/item/bodypart/l_leg/robot))
if(l_leg)
code/game/objects/items/shields.dm
+1 -1
View File
@@ -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"
code/game/objects/items/stacks/rods.dm
+7 -7
View File
@@ -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("<span class='notice'>[user.name] shaped [src] into metal with [W].</span>", \
"<span class='notice'>You shape [src] into metal with [W].</span>", \
var/obj/item/stack/sheet/iron/new_item = new(usr.loc)
user.visible_message("<span class='notice'>[user.name] shaped [src] into iron sheets with [W].</span>", \
"<span class='notice'>You shape [src] into iron sheets with [W].</span>", \
"<span class='hear'>You hear welding.</span>")
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"
code/game/objects/items/stacks/sheets/glass.dm
+1 -1
View File
@@ -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
code/game/objects/items/stacks/sheets/light.dm
+3 -3
View File
@@ -15,15 +15,15 @@
merge_type = /obj/item/stack/light_w
/obj/item/stack/light_w/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/stack/sheet/metal))
var/obj/item/stack/sheet/metal/M = O
if(istype(O, /obj/item/stack/sheet/iron))
var/obj/item/stack/sheet/iron/M = O
if (M.use(1))
var/obj/item/L = new /obj/item/stack/tile/light(user.drop_location())
to_chat(user, "<span class='notice'>You make a light tile.</span>")
L.add_fingerprint(user)
use(1)
else
to_chat(user, "<span class='warning'>You need one metal sheet to finish the light tile!</span>")
to_chat(user, "<span class='warning'>You need one iron sheet to finish the light tile!</span>")
else
return ..()
code/game/objects/items/stacks/sheets/sheet_types.dm
+16 -16
View File
@@ -1,6 +1,6 @@
/* Diffrent misc types of sheets
* Contains:
* Metal
* Iron
* Plasteel
* Wood
* Cloth
@@ -12,7 +12,7 @@
*/
/*
* Metal
* Iron
*/
GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE), \
@@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("canister frame", /obj/structure/canister_frame/machine/frame_tier_0, 5, time = 8, one_per_turf = TRUE, on_floor = TRUE), \
null, \
new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20), \
new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \
new/datum/stack_recipe("iron rod", /obj/item/stack/rods, 1, 2, 60), \
null, \
new/datum/stack_recipe("wall girders", /obj/structure/girder, 2, time = 40, one_per_turf = TRUE, on_floor = TRUE, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75), \
null, \
@@ -114,46 +114,46 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new/datum/stack_recipe("shower frame", /obj/structure/showerframe, 2, time= 2 SECONDS)
))
/obj/item/stack/sheet/metal
name = "metal"
desc = "Sheets made out of metal."
singular_name = "metal sheet"
/obj/item/stack/sheet/iron
name = "iron"
desc = "Sheets made out of iron."
singular_name = "iron sheet"
icon_state = "sheet-metal"
inhand_icon_state = "sheet-metal"
mats_per_unit = list(/datum/material/iron=MINERAL_MATERIAL_AMOUNT)
throwforce = 10
flags_1 = CONDUCT_1
resistance_flags = FIRE_PROOF
merge_type = /obj/item/stack/sheet/metal
merge_type = /obj/item/stack/sheet/iron
grind_results = list(/datum/reagent/iron = 20)
point_value = 2
tableVariant = /obj/structure/table
material_type = /datum/material/iron
matter_amount = 4
cost = 500
source = /datum/robot_energy_storage/metal
source = /datum/robot_energy_storage/iron
/obj/item/stack/sheet/metal/narsie_act()
/obj/item/stack/sheet/iron/narsie_act()
new /obj/item/stack/sheet/runed_metal(loc, amount)
qdel(src)
/obj/item/stack/sheet/metal/fifty
/obj/item/stack/sheet/iron/fifty
amount = 50
/obj/item/stack/sheet/metal/twenty
/obj/item/stack/sheet/iron/twenty
amount = 20
/obj/item/stack/sheet/metal/ten
/obj/item/stack/sheet/iron/ten
amount = 10
/obj/item/stack/sheet/metal/five
/obj/item/stack/sheet/iron/five
amount = 5
/obj/item/stack/sheet/metal/get_main_recipes()
/obj/item/stack/sheet/iron/get_main_recipes()
. = ..()
. += GLOB.metal_recipes
/obj/item/stack/sheet/metal/suicide_act(mob/living/carbon/user)
/obj/item/stack/sheet/iron/suicide_act(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user] begins whacking [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return BRUTELOSS
code/game/objects/items/stacks/tiles/light.dm
+1 -1
View File
@@ -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)
code/game/objects/items/stacks/tiles/tile_types.dm
+6 -6
View File
@@ -67,10 +67,10 @@
qdel(src)
return
if (mineralType == "metal")
var/obj/item/stack/sheet/metal/new_item = new(user.loc)
user.visible_message("<span class='notice'>[user.name] shaped [src] into metal with the welding tool.</span>", \
"<span class='notice'>You shaped [src] into metal with the welding tool.</span>", \
if (mineralType == "iron")
var/obj/item/stack/sheet/iron/new_item = new(user.loc)
user.visible_message("<span class='notice'>[user.name] shaped [src] into iron with the welding tool.</span>", \
"<span class='notice'>You shaped [src] into iron with the welding tool.</span>", \
"<span class='hear'>You hear welding.</span>")
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
code/game/objects/items/storage/boxes.dm
+4 -4
View File
@@ -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)
code/game/objects/structures/barsigns.dm
+1 -1
View File
@@ -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)
code/game/objects/structures/beds_chairs/bed.dm
+1 -1
View File
@@ -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
code/game/objects/structures/beds_chairs/chair.dm
+1 -1
View File
@@ -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
code/game/objects/structures/chess.dm
+1 -1
View File
@@ -11,7 +11,7 @@
to_chat(user, "<span class='notice'>You start to take apart the chess piece.</span>")
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)
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -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
code/game/objects/structures/crates_lockers/closets/secure/misc.dm
+1 -1
View File
@@ -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)
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+3 -3
View File
@@ -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,
code/game/objects/structures/door_assembly.dm
+1 -1
View File
@@ -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()
code/game/objects/structures/extinguisher.dm
+1 -1
View File
@@ -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
code/game/objects/structures/false_walls.dm
+1 -1
View File
@@ -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
code/game/objects/structures/fireaxe.dm
+1 -1
View File
@@ -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)
code/game/objects/structures/fluff.dm
+1 -1
View File
@@ -17,7 +17,7 @@
if(I.use_tool(src, user, 50))
user.visible_message("<span class='notice'>[user] disassembles [src]!</span>", "<span class='notice'>You break down [src] into scrap metal.</span>")
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
..()
code/game/objects/structures/girders.dm
+8 -8
View File
@@ -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, "<span class='notice'>You start slicing apart the girder...</span>")
if(W.use_tool(src, user, 40, volume=100))
to_chat(user, "<span class='notice'>You slice apart the girder.</span>")
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, "<span class='warning'>You need two sheets of metal to create a false wall!</span>")
to_chat(user, "<span class='warning'>You need two sheets of iron to create a false wall!</span>")
return
to_chat(user, "<span class='notice'>You start building a false wall...</span>")
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, "<span class='warning'>You can't finish a reinforced girder with regular metal. You need a plasteel sheet for that.</span>")
to_chat(user, "<span class='warning'>You can't finish a reinforced girder with regular iron. You need a plasteel sheet for that.</span>")
return
else
if(S.get_amount() < 2)
to_chat(user, "<span class='warning'>You need two sheets of metal to finish a wall!</span>")
to_chat(user, "<span class='warning'>You need two sheets of iron to finish a wall!</span>")
return
to_chat(user, "<span class='notice'>You start adding plating...</span>")
if (do_after(user, 40*platingmodifier, target = src))
@@ -234,7 +234,7 @@
return
state = GIRDER_DISASSEMBLED
to_chat(user, "<span class='notice'>You disassemble the girder.</span>")
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)
code/game/objects/structures/grille.dm
+1 -1
View File
@@ -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"
code/game/objects/structures/kitchen_spike.dm
+2 -2
View File
@@ -30,7 +30,7 @@
visible_message("<span class='notice'>[user] slices apart \the [src].</span>",
"<span class='notice'>You cut \the [src] apart with \the [I].</span>",
"<span class='hear'>You hear welding.</span>")
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)
code/game/objects/structures/mineral_doors.dm
+2 -2
View File
@@ -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()
code/game/objects/structures/morgue.dm
+2 -2
View File
@@ -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)
code/game/objects/structures/noticeboard.dm
+1 -1
View File
@@ -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)
code/game/objects/structures/reflector.dm
+2 -2
View File
@@ -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
code/game/objects/structures/showcase.dm
+1 -1
View File
@@ -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, "<span class='notice'>You start to crowbar the showcase apart...</span>")
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))

Some files were not shown because too many files have changed in this diff Show More