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

Steel renamed to plasteel.

Browse Source 
Having more than 100 burn damage and being dead now makes you a husk.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2925 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uporotiy
2012-01-07 21:02:56 +00:00
parent c5e0033a77
commit 85157b5a68
21 changed files with 102 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mining/machine_processing.dm
View File

@@ -304,8 +304,8 @@
if (ore_iron > 0 && ore_plasma > 0)
ore_iron--;
ore_plasma--;
new /obj/item/stack/sheet/r_metal(output.loc)
feedback_inc("mining_steel_produced",1)
new /obj/item/stack/sheet/plasteel(output.loc)
feedback_inc("mining_steel_produced",1) //should be plasteel, but that'd break Erro's stat logging -- Urist
else
on = 0
continue

26
code/modules/mining/machine_stacking.dm
View File

@@ -26,8 +26,8 @@
if(machine.ore_iron)
dat += text("Iron: [machine.ore_iron] <A href='?src=\ref[src];release=iron'>Release</A><br>")
if(machine.ore_steel)
dat += text("Steel: [machine.ore_steel] <A href='?src=\ref[src];release=steel'>Release</A><br>")
if(machine.ore_plasteel)
dat += text("Plasteel: [machine.ore_plasteel] <A href='?src=\ref[src];release=plasteel'>Release</A><br>")
if(machine.ore_glass)
dat += text("Glass: [machine.ore_glass] <A href='?src=\ref[src];release=glass'>Release</A><br>")
if(machine.ore_rglass)
@@ -106,12 +106,12 @@
G.amount = machine.ore_iron
G.loc = machine.output.loc
machine.ore_iron = 0
if ("steel")
if (machine.ore_steel > 0)
var/obj/item/stack/sheet/r_metal/G = new /obj/item/stack/sheet/r_metal
G.amount = machine.ore_steel
if ("plasteel")
if (machine.ore_plasteel > 0)
var/obj/item/stack/sheet/plasteel/G = new /obj/item/stack/sheet/plasteel
G.amount = machine.ore_plasteel
G.loc = machine.output.loc
machine.ore_steel = 0
machine.ore_plasteel = 0
if ("clown")
if (machine.ore_clown > 0)
var/obj/item/stack/sheet/clown/G = new /obj/item/stack/sheet/clown
@@ -151,7 +151,7 @@
var/ore_clown = 0;
var/ore_glass = 0;
var/ore_rglass = 0;
var/ore_steel = 0;
var/ore_plasteel = 0;
var/ore_adamantine = 0;
var/stack_amt = 50; //ammount to stack before releassing
@@ -209,8 +209,8 @@
ore_rglass+= O:amount
del(O)
continue
if (istype(O,/obj/item/stack/sheet/r_metal))
ore_steel+= O:amount
if (istype(O,/obj/item/stack/sheet/plasteel))
ore_plasteel+= O:amount
del(O)
continue
if (istype(O,/obj/item/stack/sheet/adamantine))
@@ -275,11 +275,11 @@
G.loc = output.loc
ore_rglass -= stack_amt
return
if (ore_steel >= stack_amt)
var/obj/item/stack/sheet/r_metal/G = new /obj/item/stack/sheet/r_metal
if (ore_plasteel >= stack_amt)
var/obj/item/stack/sheet/plasteel/G = new /obj/item/stack/sheet/plasteel
G.amount = stack_amt
G.loc = output.loc
ore_steel -= stack_amt
ore_plasteel -= stack_amt
return
if (ore_adamantine >= stack_amt)
var/obj/item/stack/sheet/adamantine/G = new /obj/item/stack/sheet/adamantine