From d32f71020ac6db7abcd5000311985af713314ed4 Mon Sep 17 00:00:00 2001 From: MistakeNot4892 Date: Fri, 3 Sep 2021 12:19:29 +1000 Subject: [PATCH 1/2] Merge pull request #8252 from lbnesquik/Kot-material-costs Expands the material values of certain items. --- code/game/objects/items.dm | 2 ++ code/game/objects/items/apc_frame.dm | 1 + code/game/objects/items/bells.dm | 1 + code/game/objects/items/trash.dm | 1 + code/game/objects/items/weapons/AI_modules.dm | 1 + code/game/objects/items/weapons/circuitboards/circuitboard.dm | 1 + 6 files changed, 7 insertions(+) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 3d84691bf9..8ab331a6f3 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -4,6 +4,8 @@ w_class = ITEMSIZE_NORMAL blocks_emissive = EMISSIVE_BLOCK_GENERIC + matter = list(MAT_STEEL = 1) + var/image/blood_overlay = null //this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite var/randpixel = 6 var/abstract = 0 diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index b54ea59fc2..ccde6e9c60 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -6,6 +6,7 @@ icon = 'icons/obj/apc_repair.dmi' icon_state = "apc_frame" refund_amt = 2 + matter = list(MAT_STEEL = 100, MAT_GLASS = 30) /obj/item/frame/apc/try_build(turf/on_wall, mob/user as mob) if (get_dist(on_wall, user)>1) diff --git a/code/game/objects/items/bells.dm b/code/game/objects/items/bells.dm index c05c7d2686..e9219957e4 100644 --- a/code/game/objects/items/bells.dm +++ b/code/game/objects/items/bells.dm @@ -6,6 +6,7 @@ force = 2 throwforce = 2 w_class = 2.0 + matter = list(MAT_STEEL = 50) var/broken attack_verb = list("annoyed") var/static/radial_examine = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_examine") diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 356edb5341..775b27cc08 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -8,6 +8,7 @@ desc = "This is rubbish." drop_sound = 'sound/items/drop/wrapper.ogg' pickup_sound = 'sound/items/pickup/wrapper.ogg' + matter = list(MAT_STEEL = 30) var/age = 0 /obj/item/trash/New(var/newloc, var/_age) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 58c91b5b46..e366a3e8ee 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -18,6 +18,7 @@ AI MODULES throw_range = 15 origin_tech = list(TECH_DATA = 3) preserve_item = 1 + matter = list(MAT_STEEL = 30, MAT_GLASS = 10) var/datum/ai_laws/laws = null /obj/item/weapon/aiModule/proc/install(var/atom/movable/AM, var/mob/living/user) diff --git a/code/game/objects/items/weapons/circuitboards/circuitboard.dm b/code/game/objects/items/weapons/circuitboards/circuitboard.dm index c1989902a2..a083027713 100644 --- a/code/game/objects/items/weapons/circuitboards/circuitboard.dm +++ b/code/game/objects/items/weapons/circuitboards/circuitboard.dm @@ -16,6 +16,7 @@ throwforce = 5.0 throw_speed = 3 throw_range = 15 + matter = list(MAT_STEEL = 30, MAT_GLASS = 10) var/build_path = null var/board_type = new /datum/frame/frame_types/computer var/list/req_components = null