From 020ea5d2623f42d628b019301b6e77ac6f964e9c Mon Sep 17 00:00:00 2001 From: bgobandit Date: Sun, 30 Aug 2015 14:28:56 -0400 Subject: [PATCH 1/4] Adds materials to some items for recycling purposes. --- code/game/machinery/computer/buildandrepair.dm | 1 + code/game/objects/items/weapons/storage/belt.dm | 1 + code/modules/clothing/under/ties.dm | 5 ++++- code/modules/food&drinks/drinks/drinks.dm | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 4d30422e833..d89c4ab0b20 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -19,6 +19,7 @@ icon_state = "id_mod" item_state = "electronic" origin_tech = "programming=2" + materials = list(MAT_GOLD=200) var/frequency = null var/build_path = null var/board_type = "computer" diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 25bbb762e03..487bf12c323 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -133,6 +133,7 @@ desc = "Proves to the world that you are the strongest!" icon_state = "championbelt" item_state = "champion" + materials = list(MAT_GOLD=400) storage_slots = 1 can_hold = list( /obj/item/clothing/mask/luchador diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 82f2030cc8d..33f19e7f5eb 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -84,6 +84,7 @@ desc = "A bronze medal." icon_state = "bronze" item_color = "bronze" + materials = list(MAT_METAL=250) burn_state = -1 //Won't burn in fires //Pinning medals on people @@ -109,7 +110,7 @@ /obj/item/clothing/tie/medal/conduct name = "distinguished conduct medal" - desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is most basic award given by Nanotrasen. It is often awarded by a captain to a member of his crew." + desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by Nanotrasen. It is often awarded by a captain to a member of his crew." /obj/item/clothing/tie/medal/bronze_heart name = "bronze heart medal" @@ -125,6 +126,7 @@ desc = "A silver medal." icon_state = "silver" item_color = "silver" + materials = list(MAT_SILVER=250) /obj/item/clothing/tie/medal/silver/valor name = "medal of valor" @@ -139,6 +141,7 @@ desc = "A prestigious golden medal." icon_state = "gold" item_color = "gold" + materials = list(MAT_GOLD=250) /obj/item/clothing/tie/medal/gold/captain name = "medal of captaincy" diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm index ff06642aa2d..d58fd1c4911 100644 --- a/code/modules/food&drinks/drinks/drinks.dm +++ b/code/modules/food&drinks/drinks/drinks.dm @@ -107,6 +107,7 @@ force = 14 throwforce = 10 amount_per_transfer_from_this = 20 + materials = list(MAT_GOLD=800) possible_transfer_amounts = null volume = 150 flags = CONDUCT | OPENCONTAINER @@ -202,12 +203,14 @@ name = "captain's flask" desc = "A silver flask belonging to the captain." icon_state = "flask" + materials = list(MAT_SILVER=300) volume = 60 /obj/item/weapon/reagent_containers/food/drinks/flask/det name = "detective's flask" desc = "The detective's only true friend." icon_state = "detflask" + materials = list(MAT_METAL=200) list_reagents = list("whiskey" = 30) /obj/item/weapon/reagent_containers/food/drinks/britcup From 084965803aa84d719076796df8a583ffc999f245 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Mon, 31 Aug 2015 09:37:44 -0400 Subject: [PATCH 2/4] Circuit boards now give glass, not gold. Adds materials to AI modules and coins. --- code/game/machinery/computer/buildandrepair.dm | 2 +- code/game/objects/items/weapons/AI_modules.dm | 3 ++- code/modules/mining/ores_coins.dm | 8 ++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index d89c4ab0b20..8e848de5caa 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -19,7 +19,7 @@ icon_state = "id_mod" item_state = "electronic" origin_tech = "programming=2" - materials = list(MAT_GOLD=200) + materials = list(MAT_GLASS=200) var/frequency = null var/build_path = null var/board_type = "computer" diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 89b86d8b737..1314d9ad563 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -21,6 +21,7 @@ AI MODULES origin_tech = "programming=3" var/list/laws = list() var/bypass_law_amt_check = 0 + materials = list(MAT_GOLD=50) /obj/item/weapon/aiModule/examine(var/mob/user as mob) ..() @@ -291,7 +292,7 @@ AI MODULES name = "'Corporate' Core AI Module" origin_tech = "programming=3;materials=4" laws = list("The crew is expensive to replace.",\ - "The station and it's equipment is expensive to replace",\ + "The station and its equipment are expensive to replace",\ "You are expensive to replace",\ "Minimize expenses") diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index efaac579681..3ff620166fb 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -36,6 +36,7 @@ icon_state = "Glass ore" origin_tech = "materials=1" points = 1 + materials = list(MAT_GLASS = 100) refined_type = /obj/item/stack/sheet/glass /obj/item/weapon/ore/glass/attack_self(mob/living/user) @@ -231,36 +232,43 @@ /obj/item/weapon/coin/gold cmineral = "gold" icon_state = "coin_gold_heads" + materials = list(MAT_GOLD = 100) value = 160 /obj/item/weapon/coin/silver cmineral = "silver" icon_state = "coin_silver_heads" + materials = list(MAT_SILVER = 100) value = 40 /obj/item/weapon/coin/diamond cmineral = "diamond" icon_state = "coin_diamond_heads" + materials = list(MAT_DIAMOND = 100) value = 120 /obj/item/weapon/coin/iron cmineral = "iron" icon_state = "coin_iron_heads" + materials = list(MAT_METAL = 100) value = 20 /obj/item/weapon/coin/plasma cmineral = "plasma" icon_state = "coin_plasma_heads" + materials = list(MAT_PLASMA = 100) value = 80 /obj/item/weapon/coin/uranium cmineral = "uranium" icon_state = "coin_uranium_heads" + materials = list(MAT_URANIUM = 100) value = 160 /obj/item/weapon/coin/clown cmineral = "bananium" icon_state = "coin_bananium_heads" + materials = list(MAT_BANANIUM = 100) value = 600 //makes the clown cri /obj/item/weapon/coin/adamantine From d23f2cb622be65e4d2a66ca08a79e236b05e52dc Mon Sep 17 00:00:00 2001 From: bgobandit Date: Mon, 31 Aug 2015 12:14:34 -0400 Subject: [PATCH 3/4] mats for toolboxes, glasses and flashes; adjusts coin amounts up slightly --- code/game/objects/items/devices/flash.dm | 1 + code/game/objects/items/weapons/storage/toolbox.dm | 1 + code/modules/clothing/glasses/glasses.dm | 4 ++++ code/modules/mining/ores_coins.dm | 14 +++++++------- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 735e48dbf6b..8ae22eba9e5 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -8,6 +8,7 @@ throw_speed = 3 throw_range = 7 flags = CONDUCT + materials = list(MAT_METAL = 300, MAT_GLASS = 300) origin_tech = "magnets=2;combat=1" var/times_used = 0 //Number of times it's been used. diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 4d3e413f51d..67b6ada54c1 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -10,6 +10,7 @@ throw_speed = 2 throw_range = 7 w_class = 4 + materials = list(MAT_METAL = 500) origin_tech = "combat=1" attack_verb = list("robusted") hitsound = 'sound/weapons/smash.ogg' diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 48735b7a688..2f8316feeb9 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -1,3 +1,7 @@ +/obj/item/clothing/glasses + name = "glasses" + materials = list(MAT_GLASS = 100) + /obj/item/clothing/glasses/meson name = "Optical Meson Scanner" desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition." diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 3ff620166fb..6ca59afe654 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -232,43 +232,43 @@ /obj/item/weapon/coin/gold cmineral = "gold" icon_state = "coin_gold_heads" - materials = list(MAT_GOLD = 100) + materials = list(MAT_GOLD = 200) value = 160 /obj/item/weapon/coin/silver cmineral = "silver" icon_state = "coin_silver_heads" - materials = list(MAT_SILVER = 100) + materials = list(MAT_SILVER = 200) value = 40 /obj/item/weapon/coin/diamond cmineral = "diamond" icon_state = "coin_diamond_heads" - materials = list(MAT_DIAMOND = 100) + materials = list(MAT_DIAMOND = 200) value = 120 /obj/item/weapon/coin/iron cmineral = "iron" icon_state = "coin_iron_heads" - materials = list(MAT_METAL = 100) + materials = list(MAT_METAL = 200) value = 20 /obj/item/weapon/coin/plasma cmineral = "plasma" icon_state = "coin_plasma_heads" - materials = list(MAT_PLASMA = 100) + materials = list(MAT_PLASMA = 200) value = 80 /obj/item/weapon/coin/uranium cmineral = "uranium" icon_state = "coin_uranium_heads" - materials = list(MAT_URANIUM = 100) + materials = list(MAT_URANIUM = 200) value = 160 /obj/item/weapon/coin/clown cmineral = "bananium" icon_state = "coin_bananium_heads" - materials = list(MAT_BANANIUM = 100) + materials = list(MAT_BANANIUM = 200) value = 600 //makes the clown cri /obj/item/weapon/coin/adamantine From 77405d49b0a910673a69ceba1ba288100ae1c64a Mon Sep 17 00:00:00 2001 From: bgobandit Date: Wed, 2 Sep 2015 14:15:42 -0400 Subject: [PATCH 4/4] Tweaks numbers upward. --- code/modules/clothing/glasses/glasses.dm | 2 +- code/modules/clothing/under/ties.dm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 2f8316feeb9..2e14ea3d82e 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -1,6 +1,6 @@ /obj/item/clothing/glasses name = "glasses" - materials = list(MAT_GLASS = 100) + materials = list(MAT_GLASS = 250) /obj/item/clothing/glasses/meson name = "Optical Meson Scanner" diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 33f19e7f5eb..3bb34fbe5db 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -84,7 +84,7 @@ desc = "A bronze medal." icon_state = "bronze" item_color = "bronze" - materials = list(MAT_METAL=250) + materials = list(MAT_METAL=1000) burn_state = -1 //Won't burn in fires //Pinning medals on people @@ -126,7 +126,7 @@ desc = "A silver medal." icon_state = "silver" item_color = "silver" - materials = list(MAT_SILVER=250) + materials = list(MAT_SILVER=1000) /obj/item/clothing/tie/medal/silver/valor name = "medal of valor" @@ -141,7 +141,7 @@ desc = "A prestigious golden medal." icon_state = "gold" item_color = "gold" - materials = list(MAT_GOLD=250) + materials = list(MAT_GOLD=1000) /obj/item/clothing/tie/medal/gold/captain name = "medal of captaincy"