mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-28 07:39:13 +01:00
[MIRROR] Makes material costs use sheets amount define (#12887)
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com> Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Guti
Cameron Lennox
parent
16fda18c8c
commit
435bb3079d
@@ -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'
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -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?
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user