Merge pull request #4912 from Heroman3003/fiftyspawners-use

Replaces the full stacks of materials around station with fiftyspawners
This commit is contained in:
Novacat
2019-04-07 12:42:05 -04:00
committed by GitHub
5 changed files with 43 additions and 147 deletions
+4 -12
View File
@@ -8108,9 +8108,7 @@
icon_state = "bordercolor";
dir = 5
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/fiftyspawner/steel,
/turf/simulated/floor/tiled/techmaint,
/area/engineering/atmos)
"asp" = (
@@ -31225,15 +31223,9 @@
pixel_y = 30
},
/obj/structure/table/standard,
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/glass{
amount = 50
},
/obj/fiftyspawner/steel,
/obj/fiftyspawner/steel,
/obj/fiftyspawner/glass,
/turf/simulated/floor/tiled,
/area/engineering/atmos)
"vad" = (
+4 -18
View File
@@ -6552,11 +6552,7 @@
dir = 5
},
/obj/structure/table/steel,
/obj/item/stack/material/glass{
amount = 50;
pixel_x = 3;
pixel_y = 3
},
/obj/fiftyspawner/glass,
/turf/simulated/floor/tiled/techfloor,
/area/rnd/workshop)
"oo" = (
@@ -7326,14 +7322,8 @@
/obj/structure/table/standard{
name = "plastic table frame"
},
/obj/item/stack/material/glass{
amount = 50;
pixel_x = 3;
pixel_y = 3
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/fiftyspawner/glass,
/obj/fiftyspawner/steel,
/obj/item/clothing/glasses/welding,
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -9815,11 +9805,7 @@
dir = 10
},
/obj/structure/table/steel,
/obj/item/stack/material/glass{
amount = 50;
pixel_x = 3;
pixel_y = 3
},
/obj/fiftyspawner/glass,
/turf/simulated/floor/tiled/techfloor,
/area/rnd/workshop)
"vh" = (
+9 -35
View File
@@ -19192,41 +19192,15 @@
/obj/structure/closet{
name = "materials"
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/glass{
amount = 50;
pixel_x = -2;
pixel_y = 2
},
/obj/item/stack/material/glass{
amount = 50;
pixel_x = -2;
pixel_y = 2
},
/obj/item/stack/material/glass{
amount = 50;
pixel_x = -2;
pixel_y = 2
},
/obj/item/stack/material/glass{
amount = 50;
pixel_x = -2;
pixel_y = 2
},
/obj/fiftyspawner/steel,
/obj/fiftyspawner/steel,
/obj/fiftyspawner/steel,
/obj/fiftyspawner/steel,
/obj/fiftyspawner/steel,
/obj/fiftyspawner/glass,
/obj/fiftyspawner/glass,
/obj/fiftyspawner/glass,
/obj/fiftyspawner/glass,
/obj/item/stack/material/plasteel{
amount = 10
},
+18 -58
View File
@@ -5777,12 +5777,8 @@
/area/holodeck_control)
"aoX" = (
/obj/structure/table/reinforced,
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/glass{
amount = 50
},
/obj/fiftyspawner/steel,
/obj/fiftyspawner/glass,
/turf/simulated/floor/tiled,
/area/engineering/atmos/backup)
"aoZ" = (
@@ -8877,21 +8873,11 @@
/area/maintenance/station/bridge)
"axO" = (
/obj/structure/table/reinforced,
/obj/item/stack/material/glass{
amount = 50
},
/obj/item/stack/material/glass{
amount = 50
},
/obj/item/stack/material/glass{
amount = 50
},
/obj/item/stack/material/glass{
amount = 50
},
/obj/item/stack/material/glass{
amount = 50
},
/obj/fiftyspawner/glass,
/obj/fiftyspawner/glass,
/obj/fiftyspawner/glass,
/obj/fiftyspawner/glass,
/obj/fiftyspawner/glass,
/obj/machinery/alarm{
dir = 1;
icon_state = "alarm0";
@@ -8902,21 +8888,11 @@
/area/engineering/workshop)
"axP" = (
/obj/structure/table/reinforced,
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/fiftyspawner/steel,
/obj/fiftyspawner/steel,
/obj/fiftyspawner/steel,
/obj/fiftyspawner/steel,
/obj/fiftyspawner/steel,
/obj/machinery/firealarm{
dir = 1;
pixel_y = -24
@@ -17034,20 +17010,10 @@
"bkx" = (
/obj/structure/table/reinforced,
/obj/item/stack/material/plasteel{
amount = 10
},
/obj/item/stack/material/plasteel{
amount = 10
},
/obj/item/stack/material/plasteel{
amount = 10
},
/obj/item/stack/material/plastic{
amount = 50
},
/obj/item/stack/material/plastic{
amount = 50
amount = 30
},
/obj/fiftyspawner/plastic,
/obj/fiftyspawner/plastic,
/turf/simulated/floor/tiled,
/area/engineering/workshop)
"bky" = (
@@ -21381,18 +21347,12 @@
/area/vacant/vacant_restaurant_lower)
"bZc" = (
/obj/structure/table/reinforced,
/obj/item/stack/rods{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/fiftyspawner/rods,
/obj/fiftyspawner/rods,
/obj/item/stack/material/glass/phoronrglass{
amount = 20
},
/obj/item/stack/material/wood{
amount = 50
},
/obj/fiftyspawner/wood,
/obj/machinery/camera/network/engineering{
dir = 1
},
+8 -24
View File
@@ -9933,15 +9933,9 @@
/area/ai_monitored/storage/eva)
"rK" = (
/obj/structure/table/reinforced,
/obj/item/stack/material/glass{
amount = 50
},
/obj/item/stack/material/glass{
amount = 50
},
/obj/item/stack/material/glass{
amount = 50
},
/obj/fiftyspawner/glass,
/obj/fiftyspawner/glass,
/obj/fiftyspawner/glass,
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
@@ -10304,12 +10298,8 @@
/obj/machinery/camera/network/security{
dir = 8
},
/obj/item/stack/material/glass/reinforced{
amount = 50
},
/obj/item/stack/rods{
amount = 50
},
/obj/fiftyspawner/rglass,
/obj/fiftyspawner/rods,
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
@@ -10560,15 +10550,9 @@
/obj/item/stack/material/plasteel{
amount = 10
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/item/stack/material/steel{
amount = 50
},
/obj/fiftyspawner/steel,
/obj/fiftyspawner/steel,
/obj/fiftyspawner/steel,
/obj/effect/floor_decal/industrial/warning{
dir = 4
},