cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

The stacking machine in the mining colony no longer devours stacks larger than 1 that are fed into it.

Browse Source 
The assorted mining-related machines that have input and output sections no longer require them to be in specific directions to hook up (but it still needs to be a cardinal direction, not diagonal) The unloading machine in the mining dock that feeds a conveyor belt to the cargo bay now works as a result.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1105 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
n3ophyt3@gmail.com
2011-02-23 23:28:30 +00:00
parent 00a7e43c37
commit a03f35b1da
1 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
code/WorkInProgress/mining.dm
View File

@@ -1934,8 +1934,12 @@ proc/move_mining_shuttle()
/obj/machinery/mineral/purifier/New()
..()
spawn( 5 )
src.input = locate(/obj/machinery/mineral/input, get_step(src, WEST))
src.output = locate(/obj/machinery/mineral/output, get_step(src, EAST))
for (var/dir in cardinal)
src.input = locate(/obj/machinery/mineral/input, get_step(src, dir))
if(src.input) break
for (var/dir in cardinal)
src.output = locate(/obj/machinery/mineral/output, get_step(src, dir))
if(src.output) break
return
return
@@ -2167,8 +2171,12 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
/obj/machinery/mineral/processing_unit/New()
..()
spawn( 5 )
src.input = locate(/obj/machinery/mineral/input, get_step(src, NORTH))
src.output = locate(/obj/machinery/mineral/output, get_step(src, SOUTH))
for (var/dir in cardinal)
src.input = locate(/obj/machinery/mineral/input, get_step(src, dir))
if(src.input) break
for (var/dir in cardinal)
src.output = locate(/obj/machinery/mineral/output, get_step(src, dir))
if(src.output) break
processing_items.Add(src)
return
return
@@ -2483,8 +2491,12 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
/obj/machinery/mineral/stacking_machine/New()
..()
spawn( 5 )
src.input = locate(/obj/machinery/mineral/input, get_step(src, EAST))
src.output = locate(/obj/machinery/mineral/output, get_step(src, WEST))
for (var/dir in cardinal)
src.input = locate(/obj/machinery/mineral/input, get_step(src, dir))
if(src.input) break
for (var/dir in cardinal)
src.output = locate(/obj/machinery/mineral/output, get_step(src, dir))
if(src.output) break
processing_items.Add(src)
return
return
@@ -2495,39 +2507,39 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
while (locate(/obj/item, input.loc))
O = locate(/obj/item, input.loc)
if (istype(O,/obj/item/stack/sheet/metal))
ore_iron++;
ore_iron+= O:amount;
del(O)
continue
if (istype(O,/obj/item/stack/sheet/diamond))
ore_diamond++;
ore_diamond+= O:amount;
del(O)
continue
if (istype(O,/obj/item/stack/sheet/plasma))
ore_plasma++
ore_plasma+= O:amount
del(O)
continue
if (istype(O,/obj/item/stack/sheet/gold))
ore_gold++
ore_gold+= O:amount
del(O)
continue
if (istype(O,/obj/item/stack/sheet/silver))
ore_silver++
ore_silver+= O:amount
del(O)
continue
if (istype(O,/obj/item/stack/sheet/clown))
ore_clown++
ore_clown+= O:amount
del(O)
continue
if (istype(O,/obj/item/stack/sheet/glass))
ore_glass++
ore_glass+= O:amount
del(O)
continue
if (istype(O,/obj/item/stack/sheet/rglass))
ore_rglass++
ore_rglass+= O:amount
del(O)
continue
if (istype(O,/obj/item/stack/sheet/r_metal))
ore_steel++
ore_steel+= O:amount
del(O)
continue
if (istype(O,/obj/item/weapon/ore/slag))
@@ -2607,8 +2619,12 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
/obj/machinery/mineral/unloading_machine/New()
..()
spawn( 5 )
src.input = locate(/obj/machinery/mineral/input, get_step(src, SOUTH))
src.output = locate(/obj/machinery/mineral/output, get_step(src, NORTH))
for (var/dir in cardinal)
src.input = locate(/obj/machinery/mineral/input, get_step(src, dir))
if(src.input) break
for (var/dir in cardinal)
src.output = locate(/obj/machinery/mineral/output, get_step(src, dir))
if(src.output) break
processing_items.Add(src)
return
return
@@ -2663,8 +2679,12 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
/obj/machinery/mineral/mint/New()
..()
spawn( 5 )
src.input = locate(/obj/machinery/mineral/input, get_step(src, NORTH))
src.output = locate(/obj/machinery/mineral/output, get_step(src, SOUTH))
for (var/dir in cardinal)
src.input = locate(/obj/machinery/mineral/input, get_step(src, dir))
if(src.input) break
for (var/dir in cardinal)
src.output = locate(/obj/machinery/mineral/output, get_step(src, dir))
if(src.output) break
processing_items.Add(src)
return
return
@@ -3021,8 +3041,12 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
/obj/machinery/mineral/gasextractor/New()
..()
spawn( 5 )
src.input = locate(/obj/machinery/mineral/input, get_step(src, NORTH))
src.output = locate(/obj/machinery/mineral/output, get_step(src, SOUTH))
for (var/dir in cardinal)
src.input = locate(/obj/machinery/mineral/input, get_step(src, dir))
if(src.input) break
for (var/dir in cardinal)
src.output = locate(/obj/machinery/mineral/output, get_step(src, dir))
if(src.output) break
return
return