cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 06:40:08 +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/__defines/materials.dm
+9 -2
View File
@@ -146,5 +146,12 @@
#define OPTIMAL_COST(cost)(max(1, round(cost)))
/// Default circuitboard material list
#define DEFAULT_CIRCUIT_MATERIALS list(MAT_GLASS = 2000)
#define RECYCLE_CIRCUIT_MATERIALS list(MAT_GLASS = 40)
#define DEFAULT_CIRCUIT_MATERIALS list(MAT_GLASS = MATERIAL_COST(1))
#define RECYCLE_CIRCUIT_MATERIALS list(MAT_GLASS = MATERIAL_COST(0.02))
#define MATERIAL_COST(x) (SHEET_MATERIAL_AMOUNT * x)
/// Amount of material in one sheet
#define SHEET_MATERIAL_AMOUNT 2000
/// Max size of sheet stacks
#define MAX_STACK_SIZE 50
code/__defines/research.dm
-3
View File
@@ -1,6 +1,3 @@
#define SHEET_MATERIAL_AMOUNT 2000
#define MAX_STACK_SIZE 50
#define IMPRINTER 0x0001 //For circuits. Uses glass/chemicals.
#define PROTOLATHE 0x0002 //New stuff. Uses glass/metal/chemicals
#define MECHFAB 0x0004 //Mechfab
code/defines/obj/weapon.dm
+38 -38
View File
@@ -129,7 +129,7 @@
item_state = "radio"
throw_speed = 4
throw_range = 20
matter = list(MAT_STEEL = 100)*/
matter = list(MAT_STEEL = MATERIAL_COST(0.05))*/
/obj/item/SWF_uplink
name = "station-bounced radio"
@@ -147,7 +147,7 @@
w_class = ITEMSIZE_SMALL
throw_speed = 4
throw_range = 20
matter = list(MAT_STEEL = 100)
matter = list(MAT_STEEL = MATERIAL_COST(0.05))
drop_sound = 'sound/items/drop/device.ogg'
pickup_sound = 'sound/items/pickup/device.ogg'
@@ -324,13 +324,13 @@
name = "console screen"
desc = "Used in the construction of computers and other devices with a interactive console."
icon_state = "screen"
matter = list(MAT_GLASS = 200)
matter = list(MAT_GLASS = MATERIAL_COST(0.1))
/obj/item/stock_parts/capacitor
name = "capacitor"
desc = "A basic capacitor used in the construction of a variety of devices."
icon_state = "capacitor"
matter = list(MAT_STEEL = 50,MAT_GLASS = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.025))
var/charge = 0
var/max_charge = 1000
@@ -354,25 +354,25 @@
name = "scanning module"
desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "scan_module"
matter = list(MAT_STEEL = 50,MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01))
/obj/item/stock_parts/manipulator
name = "micro-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "micro_mani"
matter = list(MAT_STEEL = 30)
matter = list(MAT_STEEL = MATERIAL_COST(0.015))
/obj/item/stock_parts/micro_laser
name = "micro-laser"
desc = "A tiny laser used in certain devices."
icon_state = "micro_laser"
matter = list(MAT_STEEL = 10,MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.005),MAT_GLASS = MATERIAL_COST(0.01))
/obj/item/stock_parts/matter_bin
name = "matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "matter_bin"
matter = list(MAT_STEEL = 80)
matter = list(MAT_STEEL = MATERIAL_COST(0.04))
//Rank 2
@@ -381,35 +381,35 @@
desc = "An advanced capacitor used in the construction of a variety of devices."
icon_state = "capacitor_adv"
rating = 2
matter = list(MAT_STEEL = 50,MAT_GLASS = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.025))
/obj/item/stock_parts/scanning_module/adv
name = "advanced scanning module"
desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "scan_module_adv"
rating = 2
matter = list(MAT_STEEL = 50,MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01))
/obj/item/stock_parts/manipulator/nano
name = "nano-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "nano_mani"
rating = 2
matter = list(MAT_STEEL = 30)
matter = list(MAT_STEEL = MATERIAL_COST(0.015))
/obj/item/stock_parts/micro_laser/high
name = "high-power micro-laser"
desc = "A tiny laser used in certain devices."
icon_state = "high_micro_laser"
rating = 2
matter = list(MAT_STEEL = 10,MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.005),MAT_GLASS = MATERIAL_COST(0.01))
/obj/item/stock_parts/matter_bin/adv
name = "advanced matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "advanced_matter_bin"
rating = 2
matter = list(MAT_STEEL = 80)
matter = list(MAT_STEEL = MATERIAL_COST(0.04))
//Rating 3
@@ -418,35 +418,35 @@
desc = "A super-high capacity capacitor used in the construction of a variety of devices."
icon_state = "capacitor_super"
rating = 3
matter = list(MAT_STEEL = 50,MAT_GLASS = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.025))
/obj/item/stock_parts/scanning_module/phasic
name = "phasic scanning module"
desc = "A compact, high resolution phasic scanning module used in the construction of certain devices."
icon_state = "scan_module_phasic"
rating = 3
matter = list(MAT_STEEL = 50,MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01))
/obj/item/stock_parts/manipulator/pico
name = "pico-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "pico_mani"
rating = 3
matter = list(MAT_STEEL = 30)
matter = list(MAT_STEEL = MATERIAL_COST(0.015))
/obj/item/stock_parts/micro_laser/ultra
name = "ultra-high-power micro-laser"
icon_state = "ultra_high_micro_laser"
desc = "A tiny laser used in certain devices."
rating = 3
matter = list(MAT_STEEL = 10,MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.005),MAT_GLASS = MATERIAL_COST(0.01))
/obj/item/stock_parts/matter_bin/super
name = "super matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "super_matter_bin"
rating = 3
matter = list(MAT_STEEL = 80)
matter = list(MAT_STEEL = MATERIAL_COST(0.04))
// Rating 4 - Anomaly
@@ -455,35 +455,35 @@
desc = "A hyper-capacity capacitor used in the construction of a variety of devices."
icon_state = "capacitor_hyper"
rating = 4
matter = list(MAT_STEEL = 80, MAT_GLASS = 40)
matter = list(MAT_STEEL = MATERIAL_COST(0.04), MAT_GLASS = MATERIAL_COST(0.02))
/obj/item/stock_parts/scanning_module/hyper
name = "quantum scanning module"
desc = "A compact, near-perfect resolution quantum scanning module used in the construction of certain devices."
icon_state = "scan_module_hyper"
rating = 4
matter = list(MAT_STEEL = 100,MAT_GLASS = 40)
matter = list(MAT_STEEL = MATERIAL_COST(0.05),MAT_GLASS = MATERIAL_COST(0.02))
/obj/item/stock_parts/manipulator/hyper
name = "planck-manipulator"
desc = "A miniscule manipulator used in the construction of certain devices."
icon_state = "hyper_mani"
rating = 4
matter = list(MAT_STEEL = 30)
matter = list(MAT_STEEL = MATERIAL_COST(0.015))
/obj/item/stock_parts/micro_laser/hyper
name = "hyper-power micro-laser"
icon_state = "hyper_micro_laser"
desc = "A tiny laser used in certain devices."
rating = 4
matter = list(MAT_STEEL = 30, MAT_GLASS = 40)
matter = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.02))
/obj/item/stock_parts/matter_bin/hyper
name = "hyper matter bin"
desc = "A container for holding compressed matter awaiting re-construction."
icon_state = "hyper_matter_bin"
rating = 4
matter = list(MAT_STEEL = 100)
matter = list(MAT_STEEL = MATERIAL_COST(0.05))
// Rating 5 - Precursor
@@ -492,35 +492,35 @@
desc = "A capacitor of immense capacity used in the construction of a variety of devices."
icon_state = "capacitor_omni"
rating = 5
matter = list(MAT_STEEL = 80, MAT_GLASS = 40)
matter = list(MAT_STEEL = MATERIAL_COST(0.04), MAT_GLASS = MATERIAL_COST(0.02))
/obj/item/stock_parts/scanning_module/omni
name = "omni-scanning module"
desc = "A compact, perfect resolution temporospatial scanning module used in the construction of certain devices."
icon_state = "scan_module_omni"
rating = 5
matter = list(MAT_STEEL = 100,MAT_GLASS = 40)
matter = list(MAT_STEEL = MATERIAL_COST(0.05),MAT_GLASS = MATERIAL_COST(0.02))
/obj/item/stock_parts/manipulator/omni
name = "omni-manipulator"
desc = "A strange, infinitesimal manipulator used in the construction of certain devices."
icon_state = "omni_mani"
rating = 5
matter = list(MAT_STEEL = 30)
matter = list(MAT_STEEL = MATERIAL_COST(0.015))
/obj/item/stock_parts/micro_laser/omni
name = "omni-power micro-laser"
icon_state = "omni_micro_laser"
desc = "A strange laser used in certain devices."
rating = 5
matter = list(MAT_STEEL = 30, MAT_GLASS = 40)
matter = list(MAT_STEEL = MATERIAL_COST(0.015), MAT_GLASS = MATERIAL_COST(0.02))
/obj/item/stock_parts/matter_bin/omni
name = "omni-matter bin"
desc = "A strange container for holding compressed matter awaiting re-construction."
icon_state = "omni_matter_bin"
rating = 5
matter = list(MAT_STEEL = 100)
matter = list(MAT_STEEL = MATERIAL_COST(0.05))
// Subspace stock parts
@@ -529,43 +529,43 @@
name = "subspace ansible"
icon_state = "subspace_ansible"
desc = "A compact module capable of sensing extradimensional activity."
matter = list(MAT_STEEL = 30,MAT_GLASS = 10)
matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.005))
/obj/item/stock_parts/subspace/sub_filter
name = "hyperwave filter"
icon_state = "hyperwave_filter"
desc = "A tiny device capable of filtering and converting super-intense radiowaves."
matter = list(MAT_STEEL = 30,MAT_GLASS = 10)
matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.005))
/obj/item/stock_parts/subspace/amplifier
name = "subspace amplifier"
icon_state = "subspace_amplifier"
desc = "A compact micro-machine capable of amplifying weak subspace transmissions."
matter = list(MAT_STEEL = 30,MAT_GLASS = 10)
matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.005))
/obj/item/stock_parts/subspace/treatment
name = "subspace treatment disk"
icon_state = "treatment_disk"
desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves."
matter = list(MAT_STEEL = 30,MAT_GLASS = 10)
matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.005))
/obj/item/stock_parts/subspace/analyzer
name = "subspace wavelength analyzer"
icon_state = "wavelength_analyzer"
desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
matter = list(MAT_STEEL = 30,MAT_GLASS = 10)
matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.005))
/obj/item/stock_parts/subspace/crystal
name = "ansible crystal"
icon_state = "ansible_crystal"
desc = "A crystal made from pure glass used to transmit laser databursts to subspace."
matter = list(MAT_GLASS = 50)
matter = list(MAT_GLASS = MATERIAL_COST(0.025))
/obj/item/stock_parts/subspace/transmitter
name = "subspace transmitter"
icon_state = "subspace_transmitter"
desc = "A large piece of equipment used to open a window into the subspace dimension."
matter = list(MAT_STEEL = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.025))
/obj/item/ectoplasm
name = "ectoplasm"
@@ -581,21 +581,21 @@
desc = "A gear used for construction."
icon = 'icons/obj/stock_parts.dmi'
icon_state = "gear"
matter = list(MAT_STEEL = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.025))
/obj/item/stock_parts/motor
name = "motor"
desc = "A motor used for construction."
icon = 'icons/obj/stock_parts.dmi'
icon_state = "motor"
matter = list(MAT_STEEL = 60, MAT_GLASS = 10)
matter = list(MAT_STEEL = MATERIAL_COST(0.03), MAT_GLASS = MATERIAL_COST(0.005))
/obj/item/stock_parts/spring
name = "spring"
desc = "A spring used for construction."
icon = 'icons/obj/stock_parts.dmi'
icon_state = "spring"
matter = list(MAT_STEEL = 40)
matter = list(MAT_STEEL = MATERIAL_COST(0.02))
/obj/effect/spawner/parts
name = "nondescript parts bundle that shouldn't exist"
code/game/gamemodes/nuclear/pinpointer.dm
+1 -1
View File
@@ -7,7 +7,7 @@
item_state = "electronic"
throw_speed = 4
throw_range = 20
matter = list(MAT_STEEL = 500)
matter = list(MAT_STEEL = MATERIAL_COST(0.25))
preserve_item = 1
var/obj/item/disk/nuclear/the_disk = null
var/active = 0
code/game/machinery/camera/camera_assembly.dm
+1 -1
View File
@@ -6,7 +6,7 @@
w_class = ITEMSIZE_SMALL
anchored = FALSE
matter = list(MAT_STEEL = 700,MAT_GLASS = 300)
matter = list(MAT_STEEL = MATERIAL_COST(0.35),MAT_GLASS = MATERIAL_COST(0.15))
// Motion, EMP-Proof, X-Ray
var/list/obj/item/possible_upgrades = list(/obj/item/assembly/prox_sensor, /obj/item/stack/material/osmium, /obj/item/stock_parts/scanning_module)
code/game/machinery/doors/airlock_electronics.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "door_electronics"
w_class = ITEMSIZE_SMALL //It should be tiny! -Agouri
matter = list(MAT_STEEL = 50,MAT_GLASS = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.025))
req_one_access = list(ACCESS_ENGINE, ACCESS_TALON_ENGINEER) // Access to unlock the device, ignored if emagged //VOREStation Edit - Add talon
var/list/apply_any_access = list(ACCESS_ENGINE) // Can apply any access, not just their own
code/game/machinery/floor_light.dm
+1 -1
View File
@@ -5,7 +5,7 @@ GLOBAL_LIST_EMPTY(floor_light_cache)
desc = "A backlit floor panel, ready for installation!"
icon = 'icons/obj/machines/floor_light.dmi'
icon_state = "item"
matter = list(MAT_STEEL = 2500, MAT_GLASS = 2750)
matter = list(MAT_STEEL = MATERIAL_COST(1.25), MAT_GLASS = MATERIAL_COST(1.375))
/obj/item/floor_light/attack_self(mob/user)
. = ..(user)
code/game/mecha/equipment/tools/tools.dm
+1 -1
View File
@@ -1,3 +1,3 @@
/obj/item/mecha_parts/mecha_equipment/tool
matter = list(MAT_STEEL = 5000, MAT_GLASS = 3000)
matter = list(MAT_STEEL = MATERIAL_COST(2.5), MAT_GLASS = MATERIAL_COST(1.5))
equip_type = EQUIP_UTILITY
code/game/mecha/equipment/weapons/weapons.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/item/mecha_parts/mecha_equipment/weapon
name = "mecha weapon"
range = RANGED
matter = list(MAT_STEEL = 6000, MAT_GLASS = 3000)
matter = list(MAT_STEEL = MATERIAL_COST(3), MAT_GLASS = MATERIAL_COST(1.5))
var/projectile //Type of projectile fired.
var/projectiles = 1 //Amount of projectiles loaded.
var/projectiles_per_shot = 1 //Amount of projectiles fired per single shot.
code/game/mecha/mecha_parts.dm
+7 -7
View File
@@ -188,37 +188,37 @@
name="Phazon Torso"
icon_state = "phazon_harness"
//construction_time = 300
//construction_cost = list(MAT_STEEL=35000,MAT_GLASS=10000,MAT_PHORON=20000)
//construction_cost = list(MAT_STEEL = MATERIAL_COST(17.5),MAT_GLASS = MATERIAL_COST(5),MAT_PHORON = MATERIAL_COST(10))
/obj/item/mecha_parts/part/phazon_head
name="Phazon Head"
icon_state = "phazon_head"
//construction_time = 200
//construction_cost = list(MAT_STEEL=15000,MAT_GLASS=5000,MAT_PHORON=10000)
//construction_cost = list(MAT_STEEL = MATERIAL_COST(7.5),MAT_GLASS = MATERIAL_COST(2.5),MAT_PHORON = MATERIAL_COST(5))
/obj/item/mecha_parts/part/phazon_left_arm
name="Phazon Left Arm"
icon_state = "phazon_l_arm"
//construction_time = 200
//construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000)
//construction_cost = list(MAT_STEEL = MATERIAL_COST(10),MAT_PHORON = MATERIAL_COST(5))
/obj/item/mecha_parts/part/phazon_right_arm
name="Phazon Right Arm"
icon_state = "phazon_r_arm"
//construction_time = 200
//construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000)
//construction_cost = list(MAT_STEEL = MATERIAL_COST(10),MAT_PHORON = MATERIAL_COST(5))
/obj/item/mecha_parts/part/phazon_left_leg
name="Phazon Left Leg"
icon_state = "phazon_l_leg"
//construction_time = 200
//construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000)
//construction_cost = list(MAT_STEEL = MATERIAL_COST(10),MAT_PHORON = MATERIAL_COST(5))
/obj/item/mecha_parts/part/phazon_right_leg
name="Phazon Right Leg"
icon_state = "phazon_r_leg"
//construction_time = 200
//construction_cost = list(MAT_STEEL=20000,MAT_PHORON=10000)
//construction_cost = list(MAT_STEEL = MATERIAL_COST(10),MAT_PHORON = MATERIAL_COST(5))
///////// Odysseus
@@ -263,7 +263,7 @@
name="Odysseus Carapace"
icon_state = "odysseus_armour"
construction_time = 200
construction_cost = list(MAT_STEEL=15000)*/
construction_cost = list(MAT_STEEL = MATERIAL_COST(7.5))*/
////////// Janus
code/game/objects/items.dm
+1 -1
View File
@@ -4,7 +4,7 @@
w_class = ITEMSIZE_NORMAL
blocks_emissive = EMISSIVE_BLOCK_GENERIC
//matter = list(MAT_STEEL = 1)
//matter = list(MAT_STEEL = MATERIAL_COST(0.0005))
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
code/game/objects/items/apc_frame.dm
+1 -1
View File
@@ -7,7 +7,7 @@
icon_state = "apc_frame"
refund_amt = 2
build_wall_only = TRUE
matter = list(MAT_STEEL = 100, MAT_GLASS = 30)
matter = list(MAT_STEEL = MATERIAL_COST(0.05), MAT_GLASS = MATERIAL_COST(0.015))
/obj/item/frame/apc/try_build(turf/on_wall, mob/user as mob)
if (get_dist(on_wall, user)>1)
code/game/objects/items/bells.dm
+1 -1
View File
@@ -6,7 +6,7 @@
force = 2
throwforce = 2
w_class = ITEMSIZE_SMALL
matter = list(MAT_STEEL = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.025))
var/broken
attack_verb = list("annoyed")
var/static/radial_examine = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_examine")
code/game/objects/items/devices/advnifrepair.dm
+1 -1
View File
@@ -10,7 +10,7 @@
w_class = ITEMSIZE_SMALL
throw_speed = 5
throw_range = 10
matter = list(MAT_STEEL = 4000, MAT_GLASS = 6000)
matter = list(MAT_STEEL = MATERIAL_COST(2), MAT_GLASS = MATERIAL_COST(3))
var/datum/reagents/supply
var/efficiency = 15 //How many units reagent per 1 unit nanopaste
pickup_sound = 'sound/items/pickup/device.ogg'
code/game/objects/items/devices/binoculars.dm
+1 -1
View File
@@ -11,7 +11,7 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
//matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
//matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.025))
/obj/item/binoculars/attack_self(mob/user)
. = ..(user)
code/game/objects/items/devices/body_snatcher_vr.dm
+1 -1
View File
@@ -7,7 +7,7 @@
item_state = "healthanalyzer"
slot_flags = SLOT_BELT
w_class = ITEMSIZE_SMALL
matter = list(MAT_STEEL = 200)
matter = list(MAT_STEEL = MATERIAL_COST(0.1))
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
flags = NOBLUDGEON
code/game/objects/items/devices/communicator/communicator.dm
+1 -1
View File
@@ -23,7 +23,7 @@
slot_flags = SLOT_ID | SLOT_BELT
show_messages = 1
matter = list(MAT_STEEL = 30,MAT_GLASS = 10)
matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.005))
var/video_range = 3
var/obj/machinery/camera/communicator/video_source // Their camera
code/game/objects/items/devices/debugger.dm
+1 -1
View File
@@ -18,7 +18,7 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
matter = list(MAT_STEEL = 50,MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01))
var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
/obj/item/debugger/is_used_on(obj/O, mob/user)
code/game/objects/items/devices/flashlight.dm
+2 -2
View File
@@ -19,7 +19,7 @@
icon_state = "flashlight"
w_class = ITEMSIZE_SMALL
slot_flags = SLOT_BELT
matter = list(MAT_STEEL = 50,MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01))
actions_types = list(/datum/action/item_action/toggle_flashlight)
light_system = MOVABLE_LIGHT_DIRECTIONAL
@@ -345,7 +345,7 @@
slot_flags = SLOT_BELT
w_class = ITEMSIZE_SMALL
attack_verb = list ("smacked", "thwacked", "thunked")
matter = list(MAT_STEEL = 200,MAT_GLASS = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.1),MAT_GLASS = MATERIAL_COST(0.025))
hitsound = "swing_hit"
/obj/item/flashlight/drone
code/game/objects/items/devices/gps.dm
+1 -1
View File
@@ -7,7 +7,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
icon_state = "gps-gen"
w_class = ITEMSIZE_TINY
slot_flags = SLOT_BELT
matter = list(MAT_STEEL = 500)
matter = list(MAT_STEEL = MATERIAL_COST(0.25))
var/gps_tag = "GEN0"
var/emped = FALSE
code/game/objects/items/devices/laserpointer.dm
+1 -1
View File
@@ -6,7 +6,7 @@
item_state = "pen"
var/pointer_icon_state
slot_flags = SLOT_BELT
matter = list(MAT_GLASS = 500, MAT_STEEL = 500)
matter = list(MAT_GLASS = MATERIAL_COST(0.25), MAT_STEEL = MATERIAL_COST(0.25))
w_class = ITEMSIZE_SMALL //Increased to 2, because diodes are w_class 2. Conservation of matter.
var/turf/pointer_loc
var/energy = 8
code/game/objects/items/devices/lightreplacer.dm
+1 -1
View File
@@ -237,7 +237,7 @@
color = "#bbbbff"
slot_flags = SLOT_BELT
matter = list(MAT_STEEL = 5000,MAT_GLASS = 1500)
matter = list(MAT_STEEL = MATERIAL_COST(2.5),MAT_GLASS = MATERIAL_COST(0.75))
var/static/dcolor = "#e0eff0"
var/static/dnightcolor = "#efcc86"
code/game/objects/items/devices/multitool.dm
+1 -1
View File
@@ -18,7 +18,7 @@
drop_sound = 'sound/items/drop/multitool.ogg'
pickup_sound = 'sound/items/pickup/multitool.ogg'
matter = list(MAT_STEEL = 50,MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.025),MAT_GLASS = MATERIAL_COST(0.01))
var/mode_index = 1
var/toolmode = MULTITOOL_MODE_STANDARD
code/game/objects/items/devices/powersink.dm
+1 -1
View File
@@ -10,7 +10,7 @@
throw_speed = 1
throw_range = 2
matter = list(MAT_STEEL = 750)
matter = list(MAT_STEEL = MATERIAL_COST(0.375))
var/drain_rate = 1500000 // amount of power to drain per tick
var/apc_drain_rate = 5000 // Max. amount drained from single APC. In Watts.
code/game/objects/items/devices/radio/electropack.dm
+1 -1
View File
@@ -11,7 +11,7 @@
slot_flags = SLOT_BACK
w_class = ITEMSIZE_HUGE
matter = list(MAT_STEEL = 10000,MAT_GLASS = 2500)
matter = list(MAT_STEEL = MATERIAL_COST(5),MAT_GLASS = MATERIAL_COST(1.25))
var/code = 2
electric_pack = TRUE
code/game/objects/items/devices/radio/headset.dm
+1 -1
View File
@@ -4,7 +4,7 @@
var/radio_desc = ""
icon_state = "headset"
item_state = null //To remove the radio's state
matter = list(MAT_STEEL = 75)
matter = list(MAT_STEEL = MATERIAL_COST(0.0375))
subspace_transmission = TRUE
canhear_range = 0 // can't hear headsets from very far away
slot_flags = SLOT_EARS
code/game/objects/items/devices/radio/radio.dm
+1 -1
View File
@@ -36,7 +36,7 @@
var/bs_tx_preload_id
var/bs_rx_preload_id
matter = list(MAT_GLASS = 25,MAT_STEEL = 75)
matter = list(MAT_GLASS = MATERIAL_COST(0.0125),MAT_STEEL = MATERIAL_COST(0.0375))
var/const/FREQ_LISTENING = 1
var/list/internal_channels
code/game/objects/items/devices/scanners/gas.dm
+1 -1
View File
@@ -10,7 +10,7 @@
throw_speed = 4
throw_range = 20
matter = list(MAT_STEEL = 30,MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01))
pickup_sound = 'sound/items/pickup/device.ogg'
code/game/objects/items/devices/scanners/health.dm
+1 -1
View File
@@ -11,7 +11,7 @@
w_class = ITEMSIZE_SMALL
throw_speed = 5
throw_range = 10
matter = list(MAT_STEEL = 200)
matter = list(MAT_STEEL = MATERIAL_COST(0.1))
var/mode = 1;
var/advscan = SCANNABLE_BENEFICIAL
var/showadvscan = 1
code/game/objects/items/devices/scanners/mass_spectrometer.dm
+1 -1
View File
@@ -10,7 +10,7 @@
throw_speed = 4
throw_range = 20
matter = list(MAT_STEEL = 30,MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01))
var/details = 0
var/recent_fail = 0
code/game/objects/items/devices/scanners/motion_tracker.dm
+1 -1
View File
@@ -10,7 +10,7 @@
throw_speed = 4
throw_range = 20
matter = list(MAT_STEEL = 30,MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01))
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
code/game/objects/items/devices/scanners/reagents.dm
+1 -1
View File
@@ -9,7 +9,7 @@
throwforce = 5
throw_speed = 4
throw_range = 20
matter = list(MAT_STEEL = 30,MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01))
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
code/game/objects/items/devices/scanners/sleevemate.dm
+1 -1
View File
@@ -12,7 +12,7 @@ GLOBAL_DATUM(sleevemate_mob, /mob/living/carbon/human/dummy/mannequin)
w_class = ITEMSIZE_SMALL
throw_speed = 5
throw_range = 10
matter = list(MAT_STEEL = 200)
matter = list(MAT_STEEL = MATERIAL_COST(0.1))
var/datum/mind/stored_mind
code/game/objects/items/devices/scanners/slime.dm
+1 -1
View File
@@ -7,7 +7,7 @@
throwforce = 0
throw_speed = 3
throw_range = 7
matter = list(MAT_STEEL = 30,MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.015),MAT_GLASS = MATERIAL_COST(0.01))
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
code/game/objects/items/devices/suit_cooling.dm
+1 -1
View File
@@ -14,7 +14,7 @@
throw_range = 4
actions_types = list(/datum/action/item_action/toggle_heatsink)
matter = list(MAT_STEEL = 15000, MAT_GLASS = 3500)
matter = list(MAT_STEEL = MATERIAL_COST(7.5), MAT_GLASS = MATERIAL_COST(1.75))
var/on = 0 //is it turned on?
var/cover_open = 0 //is the cover open?
code/game/objects/items/devices/t_scanner.dm
+3 -3
View File
@@ -8,7 +8,7 @@
item_state = "t-ray"
slot_flags = SLOT_BELT
w_class = ITEMSIZE_SMALL
matter = list(MAT_STEEL = 150)
matter = list(MAT_STEEL = MATERIAL_COST(0.075))
var/scan_range = 1
@@ -142,13 +142,13 @@
/obj/item/t_scanner/upgraded
name = "Upgraded T-ray Scanner"
desc = "An upgraded version of the terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
matter = list(MAT_STEEL = 500, PHORON = 150)
matter = list(MAT_STEEL = MATERIAL_COST(0.25), PHORON = 150)
scan_range = 3
/obj/item/t_scanner/advanced
name = "Advanced T-ray Scanner"
desc = "An advanced version of the terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
matter = list(MAT_STEEL = 1500, PHORON = 200, SILVER = 250)
matter = list(MAT_STEEL = MATERIAL_COST(0.75), PHORON = 200, SILVER = 250)
scan_range = 7
code/game/objects/items/devices/taperecorder.dm
+2 -2
View File
@@ -6,7 +6,7 @@
item_state = "analyzer"
w_class = ITEMSIZE_SMALL
matter = list(MAT_STEEL = 60,MAT_GLASS = 30)
matter = list(MAT_STEEL = MATERIAL_COST(0.03),MAT_GLASS = MATERIAL_COST(0.015))
var/emagged = 0.0
var/recording = 0.0
@@ -379,7 +379,7 @@
icon_state = "tape_white"
item_state = "analyzer"
w_class = ITEMSIZE_TINY
matter = list(MAT_STEEL=20, MAT_GLASS=5)
matter = list(MAT_STEEL = MATERIAL_COST(0.01), MAT_GLASS = MATERIAL_COST(0.0025))
force = 1
throwforce = 0
var/max_capacity = 1800
code/game/objects/items/ghost_hunting/ammo.dm
+2 -2
View File
@@ -24,7 +24,7 @@
caliber = ".357"
icon_state = "r-casing"
projectile_type = /obj/item/projectile/bullet/spectral/strong
matter = list(MAT_STEEL = 210)
matter = list(MAT_STEEL = MATERIAL_COST(0.105))
//38
/obj/item/ammo_magazine/s38/spectral
@@ -60,7 +60,7 @@
caliber = ".44"
icon_state = "r-casing"
projectile_type = /obj/item/projectile/bullet/spectral/strong
matter = list(MAT_STEEL = 210)
matter = list(MAT_STEEL = MATERIAL_COST(0.105))
//The actual spectral bullet.
/obj/item/projectile/bullet/spectral
code/game/objects/items/glassjar.dm
+2 -2
View File
@@ -10,7 +10,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "jar"
w_class = ITEMSIZE_SMALL
matter = list(MAT_GLASS = 200)
matter = list(MAT_GLASS = MATERIAL_COST(0.1))
flags = NOBLUDGEON
var/list/accept_mobs = list(/mob/living/simple_mob/animal/passive/lizard, /mob/living/simple_mob/animal/passive/mouse, /mob/living/simple_mob/animal/sif/leech, /mob/living/simple_mob/animal/sif/frostfly, /mob/living/simple_mob/animal/sif/glitterfly)
var/contains = 0 // 0 = nothing, 1 = money, 2 = animal, 3 = spiderling
@@ -224,7 +224,7 @@
/obj/item/glass_jar/fish/plastic
name = "plastic tank"
desc = "A large plastic tank."
matter = list(MAT_PLASTIC = 4000)
matter = list(MAT_PLASTIC = MATERIAL_COST(2))
#undef JAR_NOTHING
#undef JAR_MONEY
code/game/objects/items/trash.dm
+1 -1
View File
@@ -8,7 +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)
matter = list(MAT_STEEL = MATERIAL_COST(0.015))
var/age = 0
/obj/item/trash/Initialize(mapload, _age)
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
code/game/turfs/simulated/floor_types_eris.dm
+10 -10
View File
@@ -349,46 +349,46 @@
singular_name = "cafe floor tile"
desc = "A chekered pattern, an ancient style for a familiar feeling."
icon_state = "tile_cafe"
matter = list(MAT_PLASTIC = 1)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.0005))
// Circuit
/obj/item/stack/tile/floor/eris/bcircuit
name = "circuit floor tile"
singular_name = "circuit floor tile"
icon_state = "tile_techmaint" // No sprite for this...
matter = list(MAT_STEEL = 1)
matter = list(MAT_STEEL = MATERIAL_COST(0.0005))
// Derelict
/obj/item/stack/tile/floor/eris/derelict1
name = "derelict floor tile"
singular_name = "derelict floor tile"
icon_state = "tile_techmaint" // No sprite for this...
matter = list(MAT_STEEL = 1)
matter = list(MAT_STEEL = MATERIAL_COST(0.0005))
/obj/item/stack/tile/floor/eris/derelict2
name = "derelict floor tile"
singular_name = "derelict floor tile"
icon_state = "tile_techmaint" // No sprite for this...
matter = list(MAT_STEEL = 1)
matter = list(MAT_STEEL = MATERIAL_COST(0.0005))
/obj/item/stack/tile/floor/eris/derelict3
name = "derelict floor tile"
singular_name = "derelict floor tile"
icon_state = "tile_techmaint" // No sprite for this...
matter = list(MAT_STEEL = 1)
matter = list(MAT_STEEL = MATERIAL_COST(0.0005))
/obj/item/stack/tile/floor/eris/derelict4
name = "derelict floor tile"
singular_name = "derelict floor tile"
icon_state = "tile_techmaint" // No sprite for this...
matter = list(MAT_STEEL = 1)
matter = list(MAT_STEEL = MATERIAL_COST(0.0005))
// Techmaint
/obj/item/stack/tile/floor/eris/techmaint
name = "maint floor tile"
singular_name = "maint floor tile"
icon_state = "tile_techmaint"
matter = list(MAT_STEEL = 1)
matter = list(MAT_STEEL = MATERIAL_COST(0.0005))
/obj/item/stack/tile/floor/eris/techmaint/perforated
name = "perforated maint floor tile"
@@ -412,7 +412,7 @@
name = "steel floor tile"
singular_name = "steel floor tile"
icon_state = "tile_steel"
matter = list(MAT_STEEL = 1)
matter = list(MAT_STEEL = MATERIAL_COST(0.0005))
/obj/item/stack/tile/floor/eris/steel/panels
name = "steel panel tile"
@@ -512,7 +512,7 @@
singular_name = "white floor tile"
desc = "Appears to be made out of a lighter mat."
icon_state = "tile_white"
matter = list(MAT_PLASTIC = 1)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.0005))
/obj/item/stack/tile/floor/eris/white/panels
name = "white panel tile"
@@ -596,7 +596,7 @@
name = "dark floor tile"
singular_name = "dark floor tile"
icon_state = "tile_dark"
matter = list(MAT_STEEL = 1)
matter = list(MAT_STEEL = MATERIAL_COST(0.0005))
/obj/item/stack/tile/floor/eris/dark/panels
name = "dark panel tile"
code/modules/anomalies/anomaly.dm
+1 -1
View File
@@ -74,7 +74,7 @@
w_class = ITEMSIZE_SMALL
throw_speed = 5
throw_range = 10
matter = list(MAT_STEEL = 200)
matter = list(MAT_STEEL = MATERIAL_COST(0.1))
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
code/modules/assembly/assembly.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = ""
w_class = ITEMSIZE_SMALL
matter = list(MAT_STEEL = 100)
matter = list(MAT_STEEL = MATERIAL_COST(0.05))
throwforce = 2
throw_speed = 3
throw_range = 10
code/modules/assembly/igniter.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "igniter"
desc = "A small electronic device able to ignite combustable substances."
icon_state = "igniter"
matter = list(MAT_STEEL = 500, MAT_GLASS = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.025))
secured = 1
wires = WIRE_RECEIVE
code/modules/assembly/infrared.dm
+1 -1
View File
@@ -4,7 +4,7 @@
name = "infrared emitter"
desc = "Emits a visible or invisible beam and is triggered when the beam is interrupted."
icon_state = "infrared"
matter = list(MAT_STEEL = 1000, MAT_GLASS = 500)
matter = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.25))
wires = WIRE_PULSE
code/modules/assembly/mousetrap.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "mousetrap"
desc = "A handy little spring-loaded trap for catching pesty rodents."
icon_state = "mousetrap"
matter = list(MAT_STEEL = 100)
matter = list(MAT_STEEL = MATERIAL_COST(0.05))
var/armed = 0
special_handling = TRUE
code/modules/assembly/proximity.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "proximity sensor"
desc = "Used for scanning and alerting when someone enters a certain proximity."
icon_state = "prox"
matter = list(MAT_STEEL = 800, MAT_GLASS = 200)
matter = list(MAT_STEEL = MATERIAL_COST(0.4), MAT_GLASS = MATERIAL_COST(0.1))
wires = WIRE_PULSE
secured = 0
code/modules/assembly/signaler.dm
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "Used to remotely activate devices. Tap against another secured signaler to transfer configuration."
icon_state = "signaller"
item_state = "signaler"
matter = list(MAT_STEEL = 1000, MAT_GLASS = 200)
matter = list(MAT_STEEL = MATERIAL_COST(0.5), MAT_GLASS = MATERIAL_COST(0.1))
wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE
secured = TRUE
code/modules/assembly/timer.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "timer"
desc = "Used to time things. Works well with contraptions which has to count down. Tick tock."
icon_state = "timer"
matter = list(MAT_STEEL = 500, MAT_GLASS = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.025))
wires = WIRE_PULSE
code/modules/assembly/voice.dm
+1 -1
View File
@@ -2,7 +2,7 @@
name = "voice analyzer"
desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated."
icon_state = "voice"
matter = list(MAT_STEEL = 500, MAT_GLASS = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.025))
var/listening = 0
var/recorded //the activation message
special_handling = TRUE
code/modules/clothing/accessories/accessory_vr.dm
+1 -1
View File
@@ -281,7 +281,7 @@
icon_state = "collar_holo"
item_state = "collar_holo"
overlay_state = "collar_holo"
matter = list(MAT_STEEL = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.025))
/obj/item/clothing/accessory/collar/holo/indigestible
desc = "A special variety of the holo-collar that seems to be made of a very durable fabric that fits around the neck."
code/modules/clothing/accessories/hands.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "knuckledusters"
slot = ACCESSORY_SLOT_RING
slot_flags = SLOT_GLOVES
matter = list(MAT_STEEL = 500)
matter = list(MAT_STEEL = MATERIAL_COST(0.25))
attack_verb = list("punched", "beaten", "struck")
siemens_coefficient = 1
force = 10 //base punch strength is 5
code/modules/clothing/glasses/glasses.dm
+1 -1
View File
@@ -385,7 +385,7 @@ BLIND // can't see anything
icon_state = "welding-g"
item_state_slots = list(slot_r_hand_str = "welding-g", slot_l_hand_str = "welding-g")
actions_types = list(/datum/action/item_action/flip_welding_goggles)
matter = list(MAT_STEEL = 1500, MAT_GLASS = 1000)
matter = list(MAT_STEEL = MATERIAL_COST(0.75), MAT_GLASS = MATERIAL_COST(0.5))
item_flags = AIRTIGHT
var/up = 0
flash_protection = FLASH_PROTECTION_MAJOR
code/modules/clothing/head/misc.dm
+1 -1
View File
@@ -52,7 +52,7 @@
name = "magnetic 'pin'"
addblends = null
desc = "Finally, a hair pin even a Morpheus chassis can use."
matter = list(MAT_STEEL = 10)
matter = list(MAT_STEEL = MATERIAL_COST(0.005))
/obj/item/clothing/head/pin/flower
name = "red flower pin"
code/modules/clothing/head/misc_special.dm
+1 -1
View File
@@ -18,7 +18,7 @@
desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye."
icon_state = "welding"
item_state_slots = list(slot_r_hand_str = "welding", slot_l_hand_str = "welding")
matter = list(MAT_STEEL = 3000, MAT_GLASS = 1000)
matter = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_GLASS = MATERIAL_COST(0.5))
var/up = 0
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE)
code/modules/clothing/spacesuits/rig/modules/modules.dm
+1 -1
View File
@@ -13,7 +13,7 @@
desc = "It looks pretty sciency."
icon = 'icons/obj/rig_modules.dmi'
icon_state = "module"
matter = list(MAT_STEEL = 20000, MAT_PLASTIC = 30000, MAT_GLASS = 5000)
matter = list(MAT_STEEL = MATERIAL_COST(10), MAT_PLASTIC = MATERIAL_COST(15), MAT_GLASS = MATERIAL_COST(2.5))
var/damage = 0
var/obj/item/rig/holder
code/modules/detectivework/tools/uvlight.dm
+1 -1
View File
@@ -7,7 +7,7 @@
w_class = ITEMSIZE_SMALL
item_state = "electronic"
actions_types = list(/datum/action/item_action/toggle_uv_light)
matter = list(MAT_STEEL = 150)
matter = list(MAT_STEEL = MATERIAL_COST(0.075))
var/list/scanned = list()
var/list/stored_alpha = list()
code/modules/economy/coins.dm
+16 -16
View File
@@ -23,25 +23,25 @@
name = MAT_GOLD + " coin"
desc = "A shiny " + MAT_GOLD + " coin. Just like in the old movies with pirates!"
icon_state = "coin_gold"
matter = list(MAT_GOLD = 250)
matter = list(MAT_GOLD = MATERIAL_COST(0.125))
/obj/item/coin/silver
name = MAT_SILVER + " coin"
desc = "A shiny " + MAT_SILVER + " coin. You can almost see your reflection in it. Unless you're a vampire."
icon_state = "coin_silver"
matter = list(MAT_SILVER = 250)
matter = list(MAT_SILVER = MATERIAL_COST(0.125))
/obj/item/coin/copper
name = MAT_COPPER + " coin"
desc = "A sturdy " + MAT_COPPER + " coin. The preferred tender of people who like to make other people count a lot."
icon_state = "coin_copper"
matter = list(MAT_COPPER = 250)
matter = list(MAT_COPPER = MATERIAL_COST(0.125))
/obj/item/coin/diamond
name = MAT_DIAMOND + " coin"
desc = "A coin made of solid " + MAT_DIAMOND + ". Carbon, really, but who's counting?" // me, I'm counting
icon_state = "coin_diamond"
matter = list(MAT_DIAMOND = 250)
matter = list(MAT_DIAMOND = MATERIAL_COST(0.125))
/obj/item/coin/graphite
name = MAT_GRAPHITE + " coin"
@@ -53,49 +53,49 @@
name = MAT_IRON + " coin"
desc = "A dull " + MAT_IRON + " coin. Not that it's boring, it's just a bit plain."
icon_state = "coin_iron"
matter = list(MAT_IRON = 250)
matter = list(MAT_IRON = MATERIAL_COST(0.125))
/obj/item/coin/steel
name = MAT_STEEL + " coin"
desc = "A plain " + MAT_STEEL + " coin. You'd think they'd make more coins out of this, considering how plentiful it is."
icon_state = "coin_steel"
matter = list(MAT_STEEL = 250)
matter = list(MAT_STEEL = MATERIAL_COST(0.125))
/obj/item/coin/durasteel
name = MAT_DURASTEEL + " coin"
desc = "A shiny " + MAT_DURASTEEL + " coin. Keep it in your breast pocket, maybe it'll stop a bullet someday."
icon_state = "coin_durasteel"
matter = list(MAT_DURASTEEL = 250)
matter = list(MAT_DURASTEEL = MATERIAL_COST(0.125))
/obj/item/coin/plasteel
name = MAT_PLASTEEL + " coin"
desc = "Someone made a coin out of " + MAT_PLASTEEL + ". Now why would they do that?"
icon_state = "coin_plasteel"
matter = list(MAT_PLASTEEL = 250)
matter = list(MAT_PLASTEEL = MATERIAL_COST(0.125))
/obj/item/coin/titanium
name = MAT_TITANIUM + " coin"
desc = "A shiny " + MAT_TITANIUM + " coin with some commemorative markings."
icon_state = "coin_titanium"
matter = list(MAT_TITANIUM = 250)
matter = list(MAT_TITANIUM = MATERIAL_COST(0.125))
/obj/item/coin/lead
name = MAT_LEAD + " coin"
desc = "A heavy coin indeed. Shame it's worthless as anything other than a paperweight."
icon_state = "coin_lead"
matter = list(MAT_LEAD = 250)
matter = list(MAT_LEAD = MATERIAL_COST(0.125))
/obj/item/coin/phoron
name = "solid " + MAT_PHORON + " coin"
desc = "Solid " + MAT_PHORON + ", pressed into a coin and laminated for safety. Go ahead, lick it."
icon_state = "coin_phoron"
matter = list(MAT_PHORON = 250)
matter = list(MAT_PHORON = MATERIAL_COST(0.125))
/obj/item/coin/uranium
name = MAT_URANIUM + " coin"
desc = "A " + MAT_URANIUM + " coin. You probably don't want to store this in your pants pocket..."
icon_state = "coin_uranium"
matter = list(MAT_URANIUM = 250)
matter = list(MAT_URANIUM = MATERIAL_COST(0.125))
var/last_event = 0
var/active = 0
@@ -133,25 +133,25 @@
name = MAT_PLATINUM + " coin"
desc = "A shiny " + MAT_PLATINUM + " coin. Truth is, the game was rigged from the start."
icon_state = "coin_platinum"
matter = list(MAT_GOLD = 250)
matter = list(MAT_GOLD = MATERIAL_COST(0.125))
/obj/item/coin/morphium
name = MAT_MORPHIUM + " coin"
desc = "Solid " + MAT_MORPHIUM + ", made into a coin. Extravagant is putting it lightly."
icon_state = "coin_morphium"
matter = list(MAT_MORPHIUM = 250)
matter = list(MAT_MORPHIUM = MATERIAL_COST(0.125))
/obj/item/coin/aluminium
name = MAT_ALUMINIUM + " coin"
desc = "Someone decided to make a coin out of" + MAT_ALUMINIUM + ". Now your wallet can be lighter than ever."
icon_state = "coin_aluminium"
matter = list(MAT_ALUMINIUM = 250)
matter = list(MAT_ALUMINIUM = MATERIAL_COST(0.125))
/obj/item/coin/verdantium
name = MAT_VERDANTIUM + " coin"
desc = "Shiny green " + MAT_VERDANTIUM + ", pressed into a coin. It almost seems to glimmer under starlight."
icon_state = "coin_verdantium"
matter = list(MAT_VERDANTIUM = 250)
matter = list(MAT_VERDANTIUM = MATERIAL_COST(0.125))
/obj/item/coin/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/stack/cable_coil))
code/modules/food/drinkingglass/drinkingglass.dm
+1 -1
View File
@@ -21,7 +21,7 @@
min_transfer_amount = 1
flags = OPENCONTAINER
matter = list(MAT_GLASS = 60)
matter = list(MAT_GLASS = MATERIAL_COST(0.03))
/obj/item/reagent_containers/food/drinks/glass2/examine(mob/M as mob)
. = ..()
code/modules/food/drinkingglass/glass_types.dm
+8 -8
View File
@@ -8,7 +8,7 @@
volume = 30
max_transfer_amount = 30
rim_pos = list(23,13,20) // y, x0, x1
matter = list(MAT_GLASS = 60)
matter = list(MAT_GLASS = MATERIAL_COST(0.03))
/obj/item/reagent_containers/food/drinks/glass2/rocks
name = "rocks glass"
@@ -19,7 +19,7 @@
volume = 20
max_transfer_amount = 20
rim_pos = list(21, 10, 23)
matter = list(MAT_GLASS = 40)
matter = list(MAT_GLASS = MATERIAL_COST(0.02))
/obj/item/reagent_containers/food/drinks/glass2/shake
name = "milkshake glass"
@@ -30,7 +30,7 @@
volume = 30
max_transfer_amount = 30
rim_pos = list(25, 13, 21)
matter = list(MAT_GLASS = 30)
matter = list(MAT_GLASS = MATERIAL_COST(0.015))
/obj/item/reagent_containers/food/drinks/glass2/cocktail
name = "cocktail glass"
@@ -41,7 +41,7 @@
volume = 15
max_transfer_amount = 15
rim_pos = list(22, 13, 21)
matter = list(MAT_GLASS = 30)
matter = list(MAT_GLASS = MATERIAL_COST(0.015))
/obj/item/reagent_containers/food/drinks/glass2/shot
name = "shot glass"
@@ -52,7 +52,7 @@
volume = 5
max_transfer_amount = 5
rim_pos = list(17, 13, 21)
matter = list(MAT_GLASS = 10)
matter = list(MAT_GLASS = MATERIAL_COST(0.005))
/obj/item/reagent_containers/food/drinks/glass2/pint
name = "pint glass"
@@ -63,7 +63,7 @@
volume = 60
max_transfer_amount = 60
rim_pos = list(25, 12, 21)
matter = list(MAT_GLASS = 120)
matter = list(MAT_GLASS = MATERIAL_COST(0.06))
/obj/item/reagent_containers/food/drinks/glass2/mug
name = "glass mug"
@@ -74,7 +74,7 @@
volume = 40
max_transfer_amount = 40
rim_pos = list(22, 12, 20)
matter = list(MAT_GLASS = 80)
matter = list(MAT_GLASS = MATERIAL_COST(0.04))
/obj/item/reagent_containers/food/drinks/glass2/wine
name = "wine glass"
@@ -85,4 +85,4 @@
volume = 25
max_transfer_amount = 25
rim_pos = list(25, 12, 21)
matter = list(MAT_GLASS = 50)
matter = list(MAT_GLASS = MATERIAL_COST(0.025))
code/modules/food/drinkingglass/metaglass.dm
+1 -1
View File
@@ -7,7 +7,7 @@
unacidable = TRUE //glass
center_of_mass_x = 16
center_of_mass_y = 10
matter = list(MAT_GLASS = 500)
matter = list(MAT_GLASS = MATERIAL_COST(0.25))
icon = 'icons/obj/drinks.dmi'
/obj/item/reagent_containers/food/drinks/metaglass/metapint
code/modules/food/drinkingglass/serving_glasses.dm
+2 -2
View File
@@ -7,7 +7,7 @@
filling_states = list(10, 20, 30, 40, 50, 60, 70, 80, 90, 100)
volume = 120
max_transfer_amount = 60
matter = list(MAT_GLASS = 50)
matter = list(MAT_GLASS = MATERIAL_COST(0.025))
/obj/item/reagent_containers/food/drinks/glass2/pitcher
name = "plastic pitcher"
@@ -18,4 +18,4 @@
filling_states = list(15, 30, 50, 70, 85, 100)
volume = 120
max_transfer_amount = 60
matter = list(MAT_PLASTIC = 50)
matter = list(MAT_PLASTIC = MATERIAL_COST(0.025))
code/modules/food/drinkingglass/shaker.dm
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "fitness-cup_black"
base_icon = "fitness-cup"
volume = 100
matter = list(MAT_PLASTIC = 2000)
matter = list(MAT_PLASTIC = MATERIAL_COST(1))
filling_states = list(10,20,30,40,50,60,70,80)
max_transfer_amount = 50
rim_pos = null // no fruit slices
code/modules/food/food/drinks/drinkingglass.dm
+3 -3
View File
@@ -11,7 +11,7 @@
unacidable = TRUE //glass
center_of_mass_x = 16
center_of_mass_y = 10
matter = list(MAT_GLASS = 500)
matter = list(MAT_GLASS = MATERIAL_COST(0.25))
/obj/item/reagent_containers/food/drinks/drinkingglass/on_reagent_change()
if (!length(reagents?.reagent_list))
@@ -116,7 +116,7 @@
icon_state = "shotglass"
amount_per_transfer_from_this = 10
volume = 10
matter = list(MAT_GLASS = 175)
matter = list(MAT_GLASS = MATERIAL_COST(0.0875))
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change()
cut_overlays()
@@ -140,7 +140,7 @@
desc = "Big enough to contain enough protein to get perfectly swole. Don't mind the bits."
icon_state = "fitness-cup_black"
volume = 100
matter = list(MAT_PLASTIC = 2000)
matter = list(MAT_PLASTIC = MATERIAL_COST(1))
/obj/item/reagent_containers/food/drinks/drinkingglass/fitnessflask/Initialize(mapload)
. = ..()
code/modules/food/kitchen/cooking_machines/foodsynthesizer.dm
+2 -2
View File
@@ -699,7 +699,7 @@
desc = "The circuitboard for a Food Synthesizer."
build_path = /obj/machinery/synthesizer
board_type = new /datum/frame/frame_types/foodsynthesizer
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/manipulator = 1,
/obj/item/stock_parts/scanning_module = 1)
@@ -709,7 +709,7 @@
desc = "The circuitboard for a compact food synthesizer."
build_path = /obj/machinery/synthesizer/mini
board_type = new /datum/frame/frame_types/foodsynthesizer/mini
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/manipulator = 1,
/obj/item/stock_parts/scanning_module = 1)
code/modules/mining/drilling/scanner.dm
+2 -2
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "deep_scan_device"
item_state = "electronic"
matter = list(MAT_STEEL = 150)
matter = list(MAT_STEEL = MATERIAL_COST(0.075))
var/scan_time = 2 SECONDS
var/range = 2
var/exact = FALSE
@@ -107,7 +107,7 @@
name = "advanced ore detector"
desc = "An advanced device used to locate ore deep underground."
description_info = "This scanner has variable range, you can use the Set Scanner Range verb, or alt+click the device. Drills dig in 5x5."
matter = list(MAT_STEEL = 150)
matter = list(MAT_STEEL = MATERIAL_COST(0.075))
scan_time = 0.5 SECONDS
exact = TRUE
code/modules/mining/mine_items.dm
+8 -8
View File
@@ -19,7 +19,7 @@
icon_state = "pickaxe"
item_state = "pickaxe"
w_class = ITEMSIZE_LARGE
matter = list(MAT_STEEL = 2500)
matter = list(MAT_STEEL = MATERIAL_COST(1.25))
var/digspeed = 36 //moving the delay to an item var so R&D can make improved picks. --NEO
var/sand_dig = FALSE // does this thing dig sand?
attack_verb = list("hit", "pierced", "sliced", "attacked")
@@ -63,7 +63,7 @@
item_state = "jackhammer"
digspeed = 30 //Only slighty better than a pickaxe
sand_dig = TRUE
matter = list(MAT_STEEL = 3750)
matter = list(MAT_STEEL = MATERIAL_COST(1.875))
desc = "The most basic of mining drills, for short excavations and small mineral extractions."
drill_verb = "drilling"
@@ -73,7 +73,7 @@
item_state = "jackhammer"
digspeed = 27
sand_dig = TRUE
matter = list(MAT_STEEL = 4000, MAT_PLASTEEL = 2500)
matter = list(MAT_STEEL = MATERIAL_COST(2), MAT_PLASTEEL = MATERIAL_COST(1.25))
desc = "Yours is the drill that will pierce through the rock walls."
drill_verb = "drilling"
@@ -83,7 +83,7 @@
item_state = "jackhammer"
digspeed = 4 //Digs through walls, girders, and can dig up sand
sand_dig = TRUE
matter = list(MAT_STEEL = 4500, MAT_PLASTEEL = 3000, MAT_DIAMONDS = 1000)
matter = list(MAT_STEEL = MATERIAL_COST(2.25), MAT_PLASTEEL = MATERIAL_COST(1.5), MAT_DIAMONDS = 1000)
desc = "Yours is the drill that will pierce the heavens!"
drill_verb = "drilling"
@@ -114,7 +114,7 @@
w_class = ITEMSIZE_NORMAL //it is smaller than the pickaxe
damtype = BURN
digspeed = 18 //Can slice though normal walls, all girders, or be used in reinforced wall deconstruction/light thermite on fire
matter = list(MAT_STEEL = 3000, MAT_PLASTEEL = 1500, MAT_DIAMONDS = 500, MAT_PHORON = 500)
matter = list(MAT_STEEL = MATERIAL_COST(1.5), MAT_PLASTEEL = MATERIAL_COST(0.75), MAT_DIAMONDS = 500, MAT_PHORON = MATERIAL_COST(0.25))
drill_verb = "cutting"
drill_sound = 'sound/items/Welder.ogg'
sharp = TRUE
@@ -136,7 +136,7 @@
force = 8.0
throwforce = 4.0
w_class = ITEMSIZE_NORMAL
matter = list(MAT_STEEL = 50)
matter = list(MAT_STEEL = MATERIAL_COST(0.025))
attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
sharp = FALSE
edge = TRUE
@@ -186,7 +186,7 @@
slot_flags = SLOT_BELT
item_state = "woodshovel"
w_class = ITEMSIZE_NORMAL
matter = list(MAT_WOOD = 50)
matter = list(MAT_WOOD = MATERIAL_COST(0.025))
sharp = 0
edge = 1
@@ -198,7 +198,7 @@
desc = "A sharp tool for climbers and hikers to break up ice and keep themselves from slipping on a steep slope."
icon_state = "icepick"
item_state = "icepick"
matter = list(MAT_STEEL = 12000) //Same as a knife
matter = list(MAT_STEEL = MATERIAL_COST(6)) //Same as a knife
force = 15 //increasing force for icepick/axe, cause it's a freaking iceaxe.
throwforce = 0
code/modules/mob/living/silicon/robot/analyzer.dm
+1 -1
View File
@@ -13,7 +13,7 @@
w_class = ITEMSIZE_SMALL
throw_speed = 5
throw_range = 10
matter = list(MAT_STEEL = 500, MAT_GLASS = 200)
matter = list(MAT_STEEL = MATERIAL_COST(0.25), MAT_GLASS = MATERIAL_COST(0.1))
var/mode = 1;
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
code/modules/mob/living/silicon/robot/component.dm
+1 -1
View File
@@ -237,7 +237,7 @@
name = "broken component"
icon = 'icons/obj/robot_component.dmi'
icon_state = "broken"
matter = list(MAT_STEEL = 1000)
matter = list(MAT_STEEL = MATERIAL_COST(0.5))
/obj/item/broken_device/random
var/list/possible_icons = list("binradio_broken",
code/modules/organs/subtypes/nano.dm
+1 -1
View File
@@ -112,7 +112,7 @@
organ_tag = O_FACT
parent_organ = BP_TORSO
var/list/materials = list(MAT_STEEL = 0)
var/list/materials = list(MAT_STEEL = MATERIAL_COST(0))
var/max_storage = 10000
organ_verbs = list(
/mob/living/carbon/human/proc/reagent_purge
code/modules/paperwork/pen.dm
+1 -1
View File
@@ -26,7 +26,7 @@
w_class = ITEMSIZE_TINY
throw_speed = 7
throw_range = 15
matter = list(MAT_STEEL = 10)
matter = list(MAT_STEEL = MATERIAL_COST(0.005))
var/colour = "black" //what colour the ink is!
pressure_resistance = 2
drop_sound = 'sound/items/drop/accessory.ogg'
code/modules/paperwork/photography.dm
+1 -1
View File
@@ -132,7 +132,7 @@ GLOBAL_VAR_INIT(photo_count, 0)
item_state = "camera"
w_class = ITEMSIZE_SMALL
slot_flags = SLOT_BELT
matter = list(MAT_STEEL = 2000)
matter = list(MAT_STEEL = MATERIAL_COST(1))
var/pictures_max = 10
var/pictures_left = 10
var/on = 1
code/modules/paperwork/stamps.dm
+1 -1
View File
@@ -9,7 +9,7 @@
slot_flags = SLOT_HOLSTER
throw_speed = 7
throw_range = 15
matter = list(MAT_STEEL = 60)
matter = list(MAT_STEEL = MATERIAL_COST(0.03))
pressure_resistance = 2
attack_verb = list("stamped")
drop_sound = 'sound/items/drop/device.ogg'
code/modules/power/antimatter/shielding.dm
+1 -1
View File
@@ -197,7 +197,7 @@
throwforce = 5
throw_speed = 1
throw_range = 2
matter = list(MAT_STEEL = 100)
matter = list(MAT_STEEL = MATERIAL_COST(0.05))
/obj/item/am_shielding_container/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/multitool) && istype(src.loc,/turf))
code/modules/power/cable.dm
+2 -2
View File
@@ -516,7 +516,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list(
w_class = ITEMSIZE_SMALL
throw_speed = 2
throw_range = 5
matter = list(MAT_STEEL = 50, MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.01))
slot_flags = SLOT_BELT
item_state = "coil"
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
@@ -945,7 +945,7 @@ GLOBAL_LIST_INIT(possible_cable_coil_colours, list(
w_class = ITEMSIZE_SMALL
throw_speed = 2
throw_range = 5
matter = list(MAT_STEEL = 50, MAT_GLASS = 20)
matter = list(MAT_STEEL = MATERIAL_COST(0.025), MAT_GLASS = MATERIAL_COST(0.01))
slot_flags = SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
stacktype = null

Some files were not shown because too many files have changed in this diff Show More