cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mech Fabricator now accepts materials that aren't metal or glass. BS'd some values for what you get per-unit on nonstandard ores, since the standard "one sheet = 3750" that glass and metal use seems a bit excessive for things like diamonds.

Browse Source 
Diamond/enriched uranium: 1000 units per sheet
Gold/Silver/bananium/uranium/plasma: 2000 units per sheet

Numbers can be tweaked if needed.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1126 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
n3ophyt3@gmail.com
2011-02-25 01:25:33 +00:00
parent 2c4af1d80f
commit 9cb797c382
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/mining.dm
+7
View File
@@ -2525,6 +2525,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
throw_speed = 3
throw_range = 3
origin_tech = "materials=4"
perunit = 2000
/obj/item/stack/sheet/gold/New()
pixel_x = rand(0,4)-4
@@ -2539,6 +2540,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
throw_speed = 3
throw_range = 3
origin_tech = "materials=3"
perunit = 2000
/obj/item/stack/sheet/silver/New()
pixel_x = rand(0,4)-4
@@ -2552,6 +2554,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
w_class = 3.0
throw_range = 3
origin_tech = "materials=6"
perunit = 1000
/obj/item/stack/sheet/diamond/New()
pixel_x = rand(0,4)-4
@@ -2566,6 +2569,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
throw_speed = 3
throw_range = 3
origin_tech = "materials=5"
perunit = 2000
/obj/item/stack/sheet/enruranium
name = "Enriched Uranium block"
@@ -2576,6 +2580,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
throw_speed = 3
throw_range = 3
origin_tech = "materials=5"
perunit = 1000
/obj/item/stack/sheet/plasma
name = "solid plasma"
@@ -2586,6 +2591,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
throw_speed = 3
throw_range = 3
origin_tech = "plasmatech=2;materials=2"
perunit = 2000
/obj/item/stack/sheet/clown
name = "bananium"
@@ -2596,6 +2602,7 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list(
throw_speed = 3
throw_range = 3
origin_tech = "materials=4"
perunit = 2000
/obj/item/stack/sheet/clown/New()
pixel_x = rand(0,4)-4
code/defines/obj.dm
+1
View File
@@ -898,6 +898,7 @@
flags = FPRINT | TABLEPASS
w_class = 3.0
max_amount = 50
var/perunit = 3750
/obj/item/stack/sheet/glass
name = "glass"
code/game/mecha/mech_fabricator.dm
+8 -8
View File
@@ -225,25 +225,25 @@
var/amnt
if(istype(W, /obj/item/stack/sheet/gold))
material = "gold"
amnt = "g_amt"
amnt = W:perunit
else if(istype(W, /obj/item/stack/sheet/silver))
material = "silver"
amnt = "g_amt"
amnt = W:perunit
else if(istype(W, /obj/item/stack/sheet/diamond))
material = "diamond"
amnt = "g_amt"
amnt = W:perunit
else if(istype(W, /obj/item/stack/sheet/plasma))
material = "plasma"
amnt = "g_amt"
amnt = W:perunit
else if(istype(W, /obj/item/stack/sheet/metal))
material = "metal"
amnt = "m_amt"
amnt = W:perunit
else if(istype(W, /obj/item/stack/sheet/glass))
material = "glass"
amnt = "g_amt"
amnt = W:perunit
else if(istype(W, /obj/item/stack/sheet/clown))
material = "bananium"
amnt = "g_amt"
amnt = W:perunit
else
return ..()
@@ -257,7 +257,7 @@
spawn(10)
if(W && W.amount)
while(src.resources[material] < res_max_amount && W)
src.resources[material] += W.vars[amnt]
src.resources[material] += amnt
W.use(1)
count++
flick("mechfab2", src)