cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 06:58:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use material defines more

Browse Source
This commit is contained in:
Aronai Sieyes
2021-07-03 18:18:05 -04:00
parent 4b52bf232f
commit b71c7e7271
206 changed files with 908 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/weapon.dm
+39 -39
View File
@@ -131,7 +131,7 @@
item_state = "radio"
throw_speed = 4
throw_range = 20
matter = list("metal" = 100
matter = list(MAT_STEEL = 100)
origin_tech = list(TECH_MAGNET = 2, TECH_ILLEGAL = 3)*/
/obj/item/weapon/SWF_uplink
@@ -150,7 +150,7 @@
w_class = ITEMSIZE_SMALL
throw_speed = 4
throw_range = 20
matter = list(DEFAULT_WALL_MATERIAL = 100)
matter = list(MAT_STEEL = 100)
origin_tech = list(TECH_MAGNET = 1)
drop_sound = 'sound/items/drop/device.ogg'
pickup_sound = 'sound/items/pickup/device.ogg'
@@ -215,7 +215,7 @@
icon_state = "power_mod"
item_state = "std_mod"
desc = "Heavy-duty switching circuits for power control."
matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
/obj/item/weapon/module/id_auth
name = "\improper ID authentication module"
@@ -378,14 +378,14 @@
desc = "Used in the construction of computers and other devices with a interactive console."
icon_state = "screen"
origin_tech = list(TECH_MATERIAL = 1)
matter = list("glass" = 200)
matter = list(MAT_GLASS = 200)
/obj/item/weapon/stock_parts/capacitor
name = "capacitor"
desc = "A basic capacitor used in the construction of a variety of devices."
icon_state = "capacitor"
origin_tech = list(TECH_POWER = 1)
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 50)
matter = list(MAT_STEEL = 50,MAT_GLASS = 50)
var/charge = 0
var/max_charge = 1000
@@ -410,28 +410,28 @@
desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "scan_module"
origin_tech = list(TECH_MAGNET = 1)
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20)
matter = list(MAT_STEEL = 50,MAT_GLASS = 20)
/obj/item/weapon/stock_parts/manipulator
name = "micro-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "micro_mani"
origin_tech = list(TECH_MATERIAL = 1, TECH_DATA = 1)
matter = list(DEFAULT_WALL_MATERIAL = 30)
matter = list(MAT_STEEL = 30)
/obj/item/weapon/stock_parts/micro_laser
name = "micro-laser"
desc = "A tiny laser used in certain devices."
icon_state = "micro_laser"
origin_tech = list(TECH_MAGNET = 1)
matter = list(DEFAULT_WALL_MATERIAL = 10,"glass" = 20)
matter = list(MAT_STEEL = 10,MAT_GLASS = 20)
/obj/item/weapon/stock_parts/matter_bin
name = "matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "matter_bin"
origin_tech = list(TECH_MATERIAL = 1)
matter = list(DEFAULT_WALL_MATERIAL = 80)
matter = list(MAT_STEEL = 80)
//Rank 2
@@ -441,7 +441,7 @@
icon_state = "capacitor_adv"
origin_tech = list(TECH_POWER = 3)
rating = 2
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 50)
matter = list(MAT_STEEL = 50,MAT_GLASS = 50)
/obj/item/weapon/stock_parts/scanning_module/adv
name = "advanced scanning module"
@@ -449,7 +449,7 @@
icon_state = "scan_module_adv"
origin_tech = list(TECH_MAGNET = 3)
rating = 2
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20)
matter = list(MAT_STEEL = 50,MAT_GLASS = 20)
/obj/item/weapon/stock_parts/manipulator/nano
name = "nano-manipulator"
@@ -457,7 +457,7 @@
icon_state = "nano_mani"
origin_tech = list(TECH_MATERIAL = 3, TECH_DATA = 2)
rating = 2
matter = list(DEFAULT_WALL_MATERIAL = 30)
matter = list(MAT_STEEL = 30)
/obj/item/weapon/stock_parts/micro_laser/high
name = "high-power micro-laser"
@@ -465,7 +465,7 @@
icon_state = "high_micro_laser"
origin_tech = list(TECH_MAGNET = 3)
rating = 2
matter = list(DEFAULT_WALL_MATERIAL = 10,"glass" = 20)
matter = list(MAT_STEEL = 10,MAT_GLASS = 20)
/obj/item/weapon/stock_parts/matter_bin/adv
name = "advanced matter bin"
@@ -473,7 +473,7 @@
icon_state = "advanced_matter_bin"
origin_tech = list(TECH_MATERIAL = 3)
rating = 2
matter = list(DEFAULT_WALL_MATERIAL = 80)
matter = list(MAT_STEEL = 80)
//Rating 3
@@ -483,7 +483,7 @@
icon_state = "capacitor_super"
origin_tech = list(TECH_POWER = 5, TECH_MATERIAL = 4)
rating = 3
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 50)
matter = list(MAT_STEEL = 50,MAT_GLASS = 50)
/obj/item/weapon/stock_parts/scanning_module/phasic
name = "phasic scanning module"
@@ -491,7 +491,7 @@
icon_state = "scan_module_phasic"
origin_tech = list(TECH_MAGNET = 5)
rating = 3
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20)
matter = list(MAT_STEEL = 50,MAT_GLASS = 20)
/obj/item/weapon/stock_parts/manipulator/pico
name = "pico-manipulator"
@@ -499,7 +499,7 @@
icon_state = "pico_mani"
origin_tech = list(TECH_MATERIAL = 5, TECH_DATA = 2)
rating = 3
matter = list(DEFAULT_WALL_MATERIAL = 30)
matter = list(MAT_STEEL = 30)
/obj/item/weapon/stock_parts/micro_laser/ultra
name = "ultra-high-power micro-laser"
@@ -507,7 +507,7 @@
desc = "A tiny laser used in certain devices."
origin_tech = list(TECH_MAGNET = 5)
rating = 3
matter = list(DEFAULT_WALL_MATERIAL = 10,"glass" = 20)
matter = list(MAT_STEEL = 10,MAT_GLASS = 20)
/obj/item/weapon/stock_parts/matter_bin/super
name = "super matter bin"
@@ -515,7 +515,7 @@
icon_state = "super_matter_bin"
origin_tech = list(TECH_MATERIAL = 5)
rating = 3
matter = list(DEFAULT_WALL_MATERIAL = 80)
matter = list(MAT_STEEL = 80)
// Rating 4 - Anomaly
@@ -525,7 +525,7 @@
icon_state = "capacitor_hyper"
origin_tech = list(TECH_POWER = 6, TECH_MATERIAL = 5, TECH_BLUESPACE = 1, TECH_ARCANE = 1)
rating = 4
matter = list(DEFAULT_WALL_MATERIAL = 80, MAT_GLASS = 40)
matter = list(MAT_STEEL = 80, MAT_GLASS = 40)
/obj/item/weapon/stock_parts/scanning_module/hyper
name = "quantum scanning module"
@@ -533,7 +533,7 @@
icon_state = "scan_module_hyper"
origin_tech = list(TECH_MAGNET = 6, TECH_BLUESPACE = 1, TECH_ARCANE = 1)
rating = 4
matter = list(DEFAULT_WALL_MATERIAL = 100,"glass" = 40)
matter = list(MAT_STEEL = 100,MAT_GLASS = 40)
/obj/item/weapon/stock_parts/manipulator/hyper
name = "planck-manipulator"
@@ -541,7 +541,7 @@
icon_state = "hyper_mani"
origin_tech = list(TECH_MATERIAL = 6, TECH_DATA = 3, TECH_ARCANE = 1)
rating = 4
matter = list(DEFAULT_WALL_MATERIAL = 30)
matter = list(MAT_STEEL = 30)
/obj/item/weapon/stock_parts/micro_laser/hyper
name = "hyper-power micro-laser"
@@ -549,7 +549,7 @@
desc = "A tiny laser used in certain devices."
origin_tech = list(TECH_MAGNET = 6, TECH_ARCANE = 1)
rating = 4
matter = list(DEFAULT_WALL_MATERIAL = 30, MAT_GLASS = 40)
matter = list(MAT_STEEL = 30, MAT_GLASS = 40)
/obj/item/weapon/stock_parts/matter_bin/hyper
name = "hyper matter bin"
@@ -557,7 +557,7 @@
icon_state = "hyper_matter_bin"
origin_tech = list(TECH_MATERIAL = 6, TECH_ARCANE = 1)
rating = 4
matter = list(DEFAULT_WALL_MATERIAL = 100)
matter = list(MAT_STEEL = 100)
// Rating 5 - Precursor
@@ -567,7 +567,7 @@
icon_state = "capacitor_omni"
origin_tech = list(TECH_POWER = 7, TECH_MATERIAL = 6, TECH_BLUESPACE = 3, TECH_PRECURSOR = 1)
rating = 5
matter = list(DEFAULT_WALL_MATERIAL = 80, MAT_GLASS = 40)
matter = list(MAT_STEEL = 80, MAT_GLASS = 40)
/obj/item/weapon/stock_parts/scanning_module/omni
name = "omni-scanning module"
@@ -575,7 +575,7 @@
icon_state = "scan_module_omni"
origin_tech = list(TECH_MAGNET = 7, TECH_BLUESPACE = 3, TECH_PRECURSOR = 1)
rating = 5
matter = list(DEFAULT_WALL_MATERIAL = 100,"glass" = 40)
matter = list(MAT_STEEL = 100,MAT_GLASS = 40)
/obj/item/weapon/stock_parts/manipulator/omni
name = "omni-manipulator"
@@ -583,7 +583,7 @@
icon_state = "omni_mani"
origin_tech = list(TECH_MATERIAL = 7, TECH_DATA = 4, TECH_PRECURSOR = 1)
rating = 5
matter = list(DEFAULT_WALL_MATERIAL = 30)
matter = list(MAT_STEEL = 30)
/obj/item/weapon/stock_parts/micro_laser/omni
name = "omni-power micro-laser"
@@ -591,7 +591,7 @@
desc = "A strange laser used in certain devices."
origin_tech = list(TECH_MAGNET = 7, TECH_PRECURSOR = 1)
rating = 5
matter = list(DEFAULT_WALL_MATERIAL = 30, MAT_GLASS = 40)
matter = list(MAT_STEEL = 30, MAT_GLASS = 40)
/obj/item/weapon/stock_parts/matter_bin/omni
name = "omni-matter bin"
@@ -599,7 +599,7 @@
icon_state = "omni_matter_bin"
origin_tech = list(TECH_MATERIAL = 7, TECH_PRECURSOR = 1)
rating = 5
matter = list(DEFAULT_WALL_MATERIAL = 100)
matter = list(MAT_STEEL = 100)
// Subspace stock parts
@@ -609,49 +609,49 @@
icon_state = "subspace_ansible"
desc = "A compact module capable of sensing extradimensional activity."
origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 5 ,TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10)
matter = list(MAT_STEEL = 30,MAT_GLASS = 10)
/obj/item/weapon/stock_parts/subspace/sub_filter
name = "hyperwave filter"
icon_state = "hyperwave_filter"
desc = "A tiny device capable of filtering and converting super-intense radiowaves."
origin_tech = list(TECH_DATA = 4, TECH_MAGNET = 2)
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10)
matter = list(MAT_STEEL = 30,MAT_GLASS = 10)
/obj/item/weapon/stock_parts/subspace/amplifier
name = "subspace amplifier"
icon_state = "subspace_amplifier"
desc = "A compact micro-machine capable of amplifying weak subspace transmissions."
origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10)
matter = list(MAT_STEEL = 30,MAT_GLASS = 10)
/obj/item/weapon/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."
origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 2, TECH_MATERIAL = 5, TECH_BLUESPACE = 2)
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10)
matter = list(MAT_STEEL = 30,MAT_GLASS = 10)
/obj/item/weapon/stock_parts/subspace/analyzer
name = "subspace wavelength analyzer"
icon_state = "wavelength_analyzer"
desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
origin_tech = list(TECH_DATA = 3, TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 10)
matter = list(MAT_STEEL = 30,MAT_GLASS = 10)
/obj/item/weapon/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."
origin_tech = list(TECH_MAGNET = 4, TECH_MATERIAL = 4, TECH_BLUESPACE = 2)
matter = list("glass" = 50)
matter = list(MAT_GLASS = 50)
/obj/item/weapon/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."
origin_tech = list(TECH_MAGNET = 5, TECH_MATERIAL = 5, TECH_BLUESPACE = 3)
matter = list(DEFAULT_WALL_MATERIAL = 50)
matter = list(MAT_STEEL = 50)
/obj/item/weapon/ectoplasm
name = "ectoplasm"
@@ -675,7 +675,7 @@
icon = 'icons/obj/stock_parts.dmi'
icon_state = "gear"
origin_tech = list(TECH_ENGINEERING = 1)
matter = list(DEFAULT_WALL_MATERIAL = 50)
matter = list(MAT_STEEL = 50)
/obj/item/weapon/stock_parts/motor
name = "motor"
@@ -683,7 +683,7 @@
icon = 'icons/obj/stock_parts.dmi'
icon_state = "motor"
origin_tech = list(TECH_ENGINEERING = 1)
matter = list(DEFAULT_WALL_MATERIAL = 60, "glass" = 10)
matter = list(MAT_STEEL = 60, MAT_GLASS = 10)
/obj/item/weapon/stock_parts/spring
name = "spring"
@@ -691,4 +691,4 @@
icon = 'icons/obj/stock_parts.dmi'
icon_state = "spring"
origin_tech = list(TECH_ENGINEERING = 1)
matter = list(DEFAULT_WALL_MATERIAL = 40)
matter = list(MAT_STEEL = 40)