cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 07:08:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Makes material costs use sheets amount define (#12887)

Browse Source 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-07-09 19:17:37 -04:00
committed by GitHub
co-authored by Guti Cameron Lennox
parent 16fda18c8c
commit 435bb3079d
167 changed files with 1637 additions and 1634 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/AI_modules.dm
+1 -1
View File
@@ -17,7 +17,7 @@ AI MODULES
throw_speed = 3
throw_range = 15
preserve_item = 1
matter = list(MAT_STEEL = 30, MAT_GLASS = 10)
matter = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.005))
var/datum/ai_laws/laws = null
/obj/item/aiModule/examine(mob/user)
code/game/objects/items/weapons/RCD.dm
+2 -2
View File
@@ -312,11 +312,11 @@
icon_state = "rcd"
item_state = "rcdammo"
w_class = ITEMSIZE_SMALL
matter = list(DEFAULT_WALL_MATERIAL = 30000,MAT_GLASS = 15000)
matter = list(DEFAULT_WALL_MATERIAL = 30000,MAT_GLASS = MATERIAL_COST(7.5))
var/remaining = RCD_MAX_CAPACITY / 0.75 //CHOMPEdit
/obj/item/rcd_ammo/large
name = "high-capacity matter cartridge"
desc = "Do not ingest."
matter = list(DEFAULT_WALL_MATERIAL = 45000,MAT_GLASS = 22500)
matter = list(DEFAULT_WALL_MATERIAL = 45000,MAT_GLASS = MATERIAL_COST(11.25))
remaining = RCD_MAX_CAPACITY * 2 //CHOMPEdit
code/game/objects/items/weapons/RPD_vr.dm
+1 -1
View File
@@ -23,7 +23,7 @@
throw_speed = 1
throw_range = 5
w_class = ITEMSIZE_NORMAL
matter = list(MAT_STEEL = 50000, MAT_GLASS = 25000)
matter = list(MAT_STEEL = MATERIAL_COST(25), MAT_GLASS = MATERIAL_COST(12.5))
var/datum/effect/effect/system/spark_spread/spark_system
var/p_dir = NORTH // Next pipe will be built with this dir
var/p_flipped = FALSE // If the next pipe should be built flipped
code/game/objects/items/weapons/canes.dm
+1 -1
View File
@@ -10,7 +10,7 @@
force = 5.0
throwforce = 7.0
w_class = ITEMSIZE_NORMAL
matter = list(MAT_STEEL = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.025))
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
/obj/item/cane/crutch
code/game/objects/items/weapons/circuitboards/computer/camera_monitor.dm
+1 -1
View File
@@ -38,7 +38,7 @@
name = T_BOARD("entertainment camera monitor")
build_path = /obj/machinery/computer/security/telescreen/entertainment
board_type = new /datum/frame/frame_types/display
matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025))
/obj/item/circuitboard/security/telescreen/entertainment/Initialize(mapload)
. = ..()
code/game/objects/items/weapons/circuitboards/machinery/engineering.dm
+1 -1
View File
@@ -6,7 +6,7 @@
name = T_BOARD("pipe layer")
build_path = /obj/machinery/pipelayer
board_type = new /datum/frame/frame_types/machine
matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025))
req_components = list(
/obj/item/stock_parts/motor = 1,
/obj/item/stock_parts/gear = 1,
code/game/objects/items/weapons/ecigs.dm
+1 -1
View File
@@ -153,7 +153,7 @@
w_class = ITEMSIZE_TINY
icon = 'icons/obj/ecig.dmi'
icon_state = "ecartridge"
matter = list(MAT_STEEL = 50, MAT_GLASS = 10)
matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.005))
volume = 20
flags = OPENCONTAINER
max_transfer_amount = null
code/game/objects/items/weapons/extinguisher.dm
+1 -1
View File
@@ -10,7 +10,7 @@
throw_speed = 2
throw_range = 10
force = 10
matter = list(MAT_STEEL = 90)
matter = list(MAT_STEEL = MATERIAL_COST(0.045))
attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
drop_sound = 'sound/items/drop/gascan.ogg'
pickup_sound = 'sound/items/pickup/gascan.ogg'
code/game/objects/items/weapons/flamethrower.dm
+1 -1
View File
@@ -16,7 +16,7 @@
throw_speed = 1
throw_range = 5
w_class = ITEMSIZE_NORMAL
matter = list(MAT_STEEL = 500)
matter = list(MAT_STEEL = MATERIAL_COST(0.25))
var/status = FALSE
var/throw_amount = THROWER_MIN
var/lit = FALSE //on or off
code/game/objects/items/weapons/handcuffs.dm
+1 -1
View File
@@ -9,7 +9,7 @@
w_class = ITEMSIZE_SMALL
throw_speed = 2
throw_range = 5
matter = list(MAT_STEEL = 500)
matter = list(MAT_STEEL = MATERIAL_COST(0.25))
drop_sound = 'sound/items/drop/accessory.ogg'
pickup_sound = 'sound/items/pickup/accessory.ogg'
var/elastic
code/game/objects/items/weapons/implants/implanter.dm
+1 -1
View File
@@ -6,7 +6,7 @@
throw_speed = 1
throw_range = 5
w_class = ITEMSIZE_SMALL
matter = list(MAT_STEEL = 1000, MAT_GLASS = 1000)
matter = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.5))
var/obj/item/implant/imp = null
var/active = 1
///Var for attack_self chain
code/game/objects/items/weapons/material/knives.dm
+1 -1
View File
@@ -71,7 +71,7 @@
sharp = TRUE
edge = TRUE
force_divisor = 0.15 // 9 when wielded with hardness 60 (steel)
matter = list(MAT_STEEL = 12000)
matter = list(MAT_STEEL = MATERIAL_COST(6))
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
drop_sound = 'sound/items/drop/knife.ogg'
code/game/objects/items/weapons/paint.dm
+1 -1
View File
@@ -7,7 +7,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "paint_neutral"
item_state = "paintcan"
matter = list(MAT_STEEL = 200)
matter = list(MAT_STEEL = MATERIAL_COST(0.1))
w_class = ITEMSIZE_NORMAL
amount_per_transfer_from_this = 10
max_transfer_amount = 60
code/game/objects/items/weapons/shields.dm
+1 -1
View File
@@ -67,7 +67,7 @@
throw_speed = 1
throw_range = 4
w_class = ITEMSIZE_LARGE
matter = list(MAT_GLASS = 7500, MAT_STEEL = 1000)
matter = list(MAT_GLASS = MATERIAL_COST(3.75), MAT_STEEL = MATERIAL_COST(0.5))
attack_verb = list("shoved", "bashed")
var/cooldown = 0 //shield bash cooldown. based on world.time
code/game/objects/items/weapons/surgery_tools.dm
+7 -7
View File
@@ -44,7 +44,7 @@
name = "retractor"
desc = "Retracts stuff."
icon_state = "retractor"
matter = list(MAT_STEEL = 10000, MAT_GLASS = 5000)
matter = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(2.5))
drop_sound = 'sound/items/drop/scrap.ogg'
/*
@@ -54,7 +54,7 @@
name = "hemostat"
desc = "You think you have seen this before."
icon_state = "hemostat"
matter = list(MAT_STEEL = 5000, MAT_GLASS = 2500)
matter = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.25))
attack_verb = list("attacked", "pinched")
hitsound = 'sound/items/wirecutter.ogg'
drop_sound = 'sound/items/drop/scrap.ogg'
@@ -66,7 +66,7 @@
name = "cautery"
desc = "This stops bleeding."
icon_state = "cautery"
matter = list(MAT_STEEL = 5000, MAT_GLASS = 2500)
matter = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.25))
attack_verb = list("burnt")
drop_sound = 'sound/items/drop/scrap.ogg'
@@ -78,7 +78,7 @@
desc = "You can drill using this item. You dig?"
icon_state = "drill"
hitsound = 'sound/weapons/circsawhit.ogg'
matter = list(MAT_STEEL = 15000, MAT_GLASS = 10000)
matter = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_GLASS = MATERIAL_COST(5))
force = 15.0
w_class = ITEMSIZE_NORMAL
attack_verb = list("drilled")
@@ -99,7 +99,7 @@
throwforce = 5.0
throw_speed = 3
throw_range = 5
matter = list(MAT_STEEL = 10000, MAT_GLASS = 5000)
matter = list(MAT_STEEL = MATERIAL_COST(5), MAT_GLASS = MATERIAL_COST(2.5))
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
drop_sound = 'sound/items/drop/knife.ogg'
@@ -163,7 +163,7 @@
throwforce = 9.0
throw_speed = 3
throw_range = 5
matter = list(MAT_STEEL = 20000,MAT_GLASS = 10000)
matter = list(MAT_STEEL = MATERIAL_COST(10),MAT_GLASS = MATERIAL_COST(5))
attack_verb = list("attacked", "slashed", "sawed", "cut")
sharp = TRUE
edge = TRUE
@@ -176,7 +176,7 @@
hitsound = 'sound/weapons/emitter2.ogg'
damtype = SEARING
w_class = ITEMSIZE_NORMAL
matter = list(MAT_STEEL = 25000,MAT_GLASS = 20000)
matter = list(MAT_STEEL = MATERIAL_COST(12.5),MAT_GLASS = MATERIAL_COST(10))
attack_verb = list("attacked", "slashed", "seared", "cut")
toolspeed = 0.75
code/game/objects/items/weapons/teleportation.dm
+2 -2
View File
@@ -20,7 +20,7 @@
item_state = "electronic"
throw_speed = 4
throw_range = 20
matter = list(MAT_STEEL = 400)
matter = list(MAT_STEEL = MATERIAL_COST(0.2))
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
@@ -130,7 +130,7 @@ Frequency:
w_class = ITEMSIZE_SMALL
throw_speed = 3
throw_range = 5
matter = list(MAT_STEEL = 10000)
matter = list(MAT_STEEL = MATERIAL_COST(5))
preserve_item = 1
/obj/item/hand_tele/attack_self(mob/user)
code/game/objects/items/weapons/tools/brass.dm
+1 -1
View File
@@ -30,4 +30,4 @@
desc = "A welder made from brass fittings."
icon_state = "brasswelder"
max_fuel = 20
matter = list(MAT_STEEL = 70, MAT_GLASS = 60)
matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.03))
code/game/objects/items/weapons/tools/crowbar.dm
+2 -2
View File
@@ -12,7 +12,7 @@
pry = 1
item_state = "crowbar"
w_class = ITEMSIZE_SMALL
matter = list(MAT_STEEL = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.025))
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
usesound = 'sound/items/crowbar.ogg'
drop_sound = 'sound/items/drop/crowbar.ogg'
@@ -84,7 +84,7 @@
throwforce = 5
pry = 1
w_class = ITEMSIZE_SMALL
matter = list(MAT_STEEL = 30)
matter = list(MAT_STEEL = MATERIAL_COST(0.015))
attack_verb = list("whapped", "smacked", "swatted", "thwacked", "hit")
usesound = 'sound/items/crowbar.ogg'
toolspeed = 1
code/game/objects/items/weapons/tools/screwdriver.dm
+1 -1
View File
@@ -19,7 +19,7 @@
usesound = 'sound/items/screwdriver.ogg'
drop_sound = 'sound/items/drop/screwdriver.ogg'
pickup_sound = 'sound/items/pickup/screwdriver.ogg'
matter = list(MAT_STEEL = 75)
matter = list(MAT_STEEL = MATERIAL_COST(0.0375))
attack_verb = list("stabbed")
sharp = TRUE
toolspeed = 1
code/game/objects/items/weapons/tools/transforming.dm
+2 -2
View File
@@ -42,7 +42,7 @@
icon = 'icons/obj/tools.dmi'
icon_state = "jaws_pry"
item_state = "jawsoflife"
matter = list(MAT_METAL=150, MAT_SILVER=50)
matter = list(MAT_METAL=150, MAT_SILVER = MATERIAL_COST(0.025))
usesound = 'sound/items/jaws_pry.ogg'
force = 15
toolspeed = 0.25
@@ -78,7 +78,7 @@
icon = 'icons/obj/tools.dmi'
icon_state = "drill_bolt"
item_state = "drill"
matter = list(MAT_STEEL = 150, MAT_SILVER = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.075), MAT_SILVER = MATERIAL_COST(0.025))
hitsound = 'sound/items/drill_hit.ogg'
usesound = 'sound/items/drill_use.ogg'
force = 8
code/game/objects/items/weapons/tools/weldingtool.dm
+5 -5
View File
@@ -17,7 +17,7 @@
w_class = ITEMSIZE_SMALL
//Cost to make in the autolathe
matter = list(MAT_STEEL = 70, MAT_GLASS = 30)
matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.015))
//R&D tech level
@@ -363,7 +363,7 @@
desc = "A slightly larger welder with a larger tank."
icon_state = "indwelder"
max_fuel = 40
matter = list(MAT_STEEL = 70, MAT_GLASS = 60)
matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.03))
/obj/item/weldingtool/hugetank
name = "upgraded welding tool"
@@ -371,7 +371,7 @@
icon_state = "upindwelder"
max_fuel = 80
w_class = ITEMSIZE_NORMAL
matter = list(MAT_STEEL = 70, MAT_GLASS = 120)
matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.06))
/obj/item/weldingtool/mini
name = "emergency welding tool"
@@ -379,7 +379,7 @@
icon_state = "miniwelder"
max_fuel = 10
w_class = ITEMSIZE_SMALL
matter = list(MAT_METAL = 30, MAT_GLASS = 10)
matter = list(MAT_METAL = 30, MAT_GLASS = MATERIAL_COST(0.005))
change_icons = 0
toolspeed = 2
eye_safety_modifier = 1 // Safer on eyes.
@@ -434,7 +434,7 @@
icon_state = "exwelder"
max_fuel = 40
w_class = ITEMSIZE_NORMAL
matter = list(MAT_STEEL = 70, MAT_GLASS = 120)
matter = list(MAT_STEEL = MATERIAL_COST(0.035), MAT_GLASS = MATERIAL_COST(0.06))
toolspeed = 0.5
change_icons = 0
flame_intensity = 3
code/game/objects/items/weapons/tools/wirecutters.dm
+1 -1
View File
@@ -15,7 +15,7 @@
throw_speed = 2
throw_range = 9
w_class = ITEMSIZE_SMALL
matter = list(MAT_STEEL = 80)
matter = list(MAT_STEEL = MATERIAL_COST(0.04))
attack_verb = list("pinched", "nipped")
hitsound = 'sound/items/wirecutter.ogg'
usesound = 'sound/items/wirecutter.ogg'
code/game/objects/items/weapons/tools/wrench.dm
+1 -1
View File
@@ -10,7 +10,7 @@
force = 6
throwforce = 7
w_class = ITEMSIZE_SMALL
matter = list(MAT_STEEL = 150)
matter = list(MAT_STEEL = MATERIAL_COST(0.075))
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
usesound = 'sound/items/ratchet.ogg'
toolspeed = 1
code/game/objects/items/weapons/traps.dm
+1 -1
View File
@@ -17,7 +17,7 @@
center_of_mass_y = 0
throwforce = 0
w_class = ITEMSIZE_NORMAL
matter = list(MAT_STEEL = 18750)
matter = list(MAT_STEEL = MATERIAL_COST(9.375))
var/deployed = 0
var/camo_net = FALSE
var/stun_length = 0.25 SECONDS
code/game/objects/items/weapons/trays.dm
+1 -1
View File
@@ -11,7 +11,7 @@
throw_speed = 1
throw_range = 5
w_class = ITEMSIZE_NORMAL
matter = list(MAT_STEEL = 3000)
matter = list(MAT_STEEL = MATERIAL_COST(1.5))
var/list/carrying = list() // List of things on the tray. - Doohl
var/max_carry = 10
var/min_bonus_damage = 3