cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 20:17:15 +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/modules/power/antimatter/shielding.dm
+1 -1
View File
@@ -194,7 +194,7 @@
throwforce = 5
throw_speed = 1
throw_range = 2
matter = list(DEFAULT_WALL_MATERIAL = 100)
matter = list(MAT_STEEL = 100)
/obj/item/device/am_shielding_container/attackby(var/obj/item/I, var/mob/user)
if(istype(I, /obj/item/device/multitool) && istype(src.loc,/turf))
code/modules/power/cable.dm
+2 -2
View File
@@ -503,7 +503,7 @@ var/list/possible_cable_coil_colours = list(
w_class = ITEMSIZE_SMALL
throw_speed = 2
throw_range = 5
matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20)
matter = list(MAT_STEEL = 50, MAT_GLASS = 20)
slot_flags = SLOT_BELT
item_state = "coil"
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
@@ -948,7 +948,7 @@ var/list/possible_cable_coil_colours = list(
w_class = ITEMSIZE_SMALL
throw_speed = 2
throw_range = 5
matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20)
matter = list(MAT_STEEL = 50, MAT_GLASS = 20)
slot_flags = SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
stacktype = null
code/modules/power/cell.dm
+1 -1
View File
@@ -24,7 +24,7 @@
var/charge_amount = 25 // How much power to give, if self_recharge is true. The number is in absolute cell charge, as it gets divided by CELLRATE later.
var/last_use = 0 // A tracker for use in self-charging
var/charge_delay = 0 // How long it takes for the cell to start recharging after last use
matter = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50)
matter = list(MAT_STEEL = 700, MAT_GLASS = 50)
drop_sound = 'sound/items/drop/component.ogg'
pickup_sound = 'sound/items/pickup/component.ogg'
code/modules/power/cells/device_cells.dm
+1 -1
View File
@@ -10,7 +10,7 @@
throw_range = 7
maxcharge = 480
charge_amount = 5
matter = list("metal" = 350, "glass" = 50)
matter = list(MAT_STEEL = 350, MAT_GLASS = 50)
preserve_item = 1
/obj/item/weapon/cell/device/weapon
code/modules/power/cells/esoteric_cells.dm
+1 -1
View File
@@ -5,7 +5,7 @@
origin_tech = list(TECH_POWER = 2)
icon_state = "spikecell"
maxcharge = 10000
matter = list(DEFAULT_WALL_MATERIAL = 1000, MAT_GLASS = 80, MAT_SILVER = 100)
matter = list(MAT_STEEL = 1000, MAT_GLASS = 80, MAT_SILVER = 100)
self_recharge = TRUE
charge_amount = 150
code/modules/power/cells/power_cells.dm
+8 -8
View File
@@ -3,7 +3,7 @@
desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
origin_tech = list(TECH_POWER = 0)
maxcharge = 500
matter = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 40)
matter = list(MAT_STEEL = 700, MAT_GLASS = 40)
/obj/item/weapon/cell/crap/empty/New()
..()
@@ -13,7 +13,7 @@
name = "security borg rechargable D battery"
origin_tech = list(TECH_POWER = 0)
maxcharge = 600 //600 max charge / 100 charge per shot = six shots
matter = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 40)
matter = list(MAT_STEEL = 700, MAT_GLASS = 40)
/obj/item/weapon/cell/secborg/empty/New()
..()
@@ -24,14 +24,14 @@
name = "heavy-duty power cell"
origin_tech = list(TECH_POWER = 1)
maxcharge = 5000
matter = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50)
matter = list(MAT_STEEL = 700, MAT_GLASS = 50)
/obj/item/weapon/cell/high
name = "high-capacity power cell"
origin_tech = list(TECH_POWER = 2)
icon_state = "hcell"
maxcharge = 10000
matter = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 60)
matter = list(MAT_STEEL = 700, MAT_GLASS = 60)
/obj/item/weapon/cell/high/empty/New()
..()
@@ -43,7 +43,7 @@
origin_tech = list(TECH_POWER = 5)
icon_state = "scell"
maxcharge = 20000
matter = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 70)
matter = list(MAT_STEEL = 700, MAT_GLASS = 70)
/obj/item/weapon/cell/super/empty/New()
..()
@@ -55,7 +55,7 @@
origin_tech = list(TECH_POWER = 6)
icon_state = "hpcell"
maxcharge = 30000
matter = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 80)
matter = list(MAT_STEEL = 700, MAT_GLASS = 80)
/obj/item/weapon/cell/hyper/empty/New()
..()
@@ -72,7 +72,7 @@
icon_state = "icell"
origin_tech = null
maxcharge = 30000 //determines how badly mobs get shocked
matter = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 80)
matter = list(MAT_STEEL = 700, MAT_GLASS = 80)
/obj/item/weapon/cell/infinite/check_charge()
return 1
@@ -143,7 +143,7 @@
name = "miniature power cell"
desc = "A tiny power cell with a very low power capacity. Used in light fixtures to power them in the event of an outage."
maxcharge = 120 //Emergency lights use 0.2 W per tick, meaning ~10 minutes of emergency power from a cell
matter = list("glass" = 20)
matter = list(MAT_GLASS = 20)
w_class = ITEMSIZE_TINY
/obj/item/weapon/cell/emergency_light/Initialize()
code/modules/power/lighting.dm
+4 -4
View File
@@ -893,7 +893,7 @@ var/global/list/light_type_cache = list()
force = 2
throwforce = 5
w_class = ITEMSIZE_TINY
matter = list(DEFAULT_WALL_MATERIAL = 60)
matter = list(MAT_STEEL = 60)
///LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN
var/status = LIGHT_OK
@@ -930,7 +930,7 @@ var/global/list/light_type_cache = list()
icon_state = "ltube"
base_state = "ltube"
item_state = "c_tube"
matter = list("glass" = 100)
matter = list(MAT_GLASS = 100)
brightness_range = 7
brightness_power = 2
@@ -949,7 +949,7 @@ var/global/list/light_type_cache = list()
icon_state = "lbulb"
base_state = "lbulb"
item_state = "contvapour"
matter = list("glass" = 100)
matter = list(MAT_GLASS = 100)
brightness_range = 5
brightness_power = 1
brightness_color = LIGHT_COLOR_INCANDESCENT_BULB
@@ -981,7 +981,7 @@ var/global/list/light_type_cache = list()
icon_state = "fbulb"
base_state = "fbulb"
item_state = "egg4"
matter = list("glass" = 100)
matter = list(MAT_GLASS = 100)
// update the icon state and description of the light
/obj/item/weapon/light/update_icon()
code/modules/power/singularity/emitter.dm
+1 -1
View File
@@ -209,7 +209,7 @@
update_icon() // VOREStation Add
return
if(istype(W, /obj/item/stack/material) && W.get_material_name() == DEFAULT_WALL_MATERIAL)
if(istype(W, /obj/item/stack/material) && W.get_material_name() == MAT_STEEL)
var/amt = CEILING(( initial(integrity) - integrity)/10, 1)
if(!amt)
to_chat(user, "<span class='notice'>\The [src] is already fully repaired.</span>")
code/modules/power/tesla/telsa_construction.dm
+1 -1
View File
@@ -23,7 +23,7 @@
name = T_BOARD("grounding rod")
build_path = /obj/machinery/power/grounding_rod
board_type = new /datum/frame/frame_types/machine
matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
matter = list(MAT_STEEL = 50, MAT_GLASS = 50)
req_components = list()
/datum/category_item/autolathe/engineering/grounding_rod