From a80c317cbec1020e92b88c72f1198f516b607967 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 8 Jun 2014 01:39:49 +0930 Subject: [PATCH] More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron. Conflicts: code/game/objects/items/stacks/sheets/mineral.dm code/game/supplyshuttle.dm --- .../objects/items/stacks/sheets/mineral.dm | 42 ++++++++++++------- .../items/stacks/sheets/sheet_types.dm | 1 - code/game/supplyshuttle.dm | 17 ++++++-- code/modules/mining/coins.dm | 4 ++ code/modules/power/port_gen.dm | 2 +- 5 files changed, 47 insertions(+), 19 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 6b95c515885..7bc285f5e87 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -8,8 +8,11 @@ Mineral Sheets - Gold - Silver - Clown - Others: - Enriched Uranium + - Platinum + - Metallic Hydrogen + - Tritium + - Osmium */ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \ @@ -51,6 +54,11 @@ var/global/list/datum/stack_recipe/clown_recipes = list ( \ new/datum/stack_recipe("bananium grenade casing", /obj/item/weapon/grenade/bananade/casing, 4, on_floor = 1), \ ) +var/global/list/datum/stack_recipe/iron_recipes = list ( \ + new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = 1, on_floor = 1), \ + null, \ +) + /obj/item/stack/sheet/mineral force = 5.0 throwforce = 5 @@ -63,6 +71,18 @@ var/global/list/datum/stack_recipe/clown_recipes = list ( \ pixel_x = rand(0,4)-4 pixel_y = rand(0,4)-4 +obj/item/stack/sheet/mineral/iron + name = "iron" + icon_state = "sheet-silver" + origin_tech = "materials=1" + sheettype = "iron" + color = "#333333" + perunit = 3750 + +obj/item/stack/sheet/mineral/iron/New() + ..() + recipes = iron_recipes + /obj/item/stack/sheet/mineral/sandstone name = "sandstone brick" desc = "This appears to be a combination of both sand and stone." @@ -165,22 +185,28 @@ var/global/list/datum/stack_recipe/clown_recipes = list ( \ origin_tech = "materials=5" perunit = 1000 +//Valuable resource, cargo can sell it. /obj/item/stack/sheet/mineral/platinum name = "platinum" icon_state = "sheet-adamantine" + origin_tech = "materials=2" sheettype = "platinum" perunit = 2000 +//Extremely valuable to Research. /obj/item/stack/sheet/mineral/mhydrogen name = "metallic hydrogen" icon_state = "sheet-mythril" + origin_tech = "materials=6;powerstorage=5;magnets=5" sheettype = "mhydrogen" perunit = 2000 +//Fuel for MRSPACMAN generator. /obj/item/stack/sheet/mineral/tritium name = "tritium" icon_state = "sheet-silver" sheettype = "tritium" + origin_tech = "materials=5" color = "#777777" perunit = 2000 @@ -188,18 +214,6 @@ var/global/list/datum/stack_recipe/clown_recipes = list ( \ name = "osmium" icon_state = "sheet-silver" sheettype = "osmium" + origin_tech = "materials=5" color = "#9999FF" perunit = 2000 - -obj/item/stack/sheet/mineral/iron - name = "iron" - icon_state = "sheet-silver" - sheettype = "iron" - color = "#333333" - perunit = 3750 - - - - - - diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 510af1d62c3..ab871de3b32 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -70,7 +70,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ new/datum/stack_recipe("air alarm frame", /obj/item/alarm_frame, 2), \ new/datum/stack_recipe("fire alarm frame", /obj/item/firealarm_frame, 2), \ null, \ - new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = 1, on_floor = 1), \ ) /obj/item/stack/sheet/metal diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 34281568259..2277e85a064 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -135,7 +135,8 @@ var/list/mechtoys = list( var/points_per_process = 1 var/points_per_slip = 2 var/points_per_crate = 5 - var/plasma_per_point = 2 // 2 plasma for 1 point + var/points_per_platinum = 5 // 5 points per sheet + var/points_per_plasma = 5 //control var/ordernum var/list/shoppinglist = list() @@ -217,6 +218,7 @@ var/list/mechtoys = list( if(!shuttle) return var/plasma_count = 0 + var/plat_count = 0 for(var/atom/movable/MA in shuttle) if(MA.anchored) continue @@ -238,14 +240,23 @@ var/list/mechtoys = list( find_slip = 0 continue - // Sell plasma + // Sell phoron if(istype(A, /obj/item/stack/sheet/mineral/plasma)) var/obj/item/stack/sheet/mineral/plasma/P = A plasma_count += P.amount + + // Sell platinum + if(istype(A, /obj/item/stack/sheet/mineral/platinum)) + var/obj/item/stack/sheet/mineral/platinum/P = A + plat_count += P.amount + del(MA) if(plasma_count) - points += Floor(plasma_count / plasma_per_point) + points += plasma_count * points_per_plasma + + if(plat_count) + points += plat_count * points_per_platinum //Buyin proc/buy() diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index 07a027424f9..04f89bd6d7e 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -52,6 +52,10 @@ credits = 1000 +/obj/item/weapon/coin/platinum + name = "platinum coin" + icon_state = "coin_adamantine" + /obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/stack/cable_coil) ) var/obj/item/stack/cable_coil/CC = W diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index f345e4d33e1..6584e7ea1a7 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -337,7 +337,7 @@ display round(lastgen) and plasmatank amount /obj/machinery/power/port_gen/pacman/mrs name = "M.R.S.P.A.C.M.A.N.-type Portable Generator" icon_state = "portgen2" - sheet_path = /obj/item/stack/sheet/mineral/diamond + sheet_path = /obj/item/stack/sheet/mineral/tritium power_gen = 40000 time_per_sheet = 80 board_path = "/obj/item/weapon/circuitboard/pacman/mrs"