cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 06:54:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Materials subsystem, material defines instead of strings, structure materials. (#8447)

Browse Source 
The shitcode crusade begins.
This commit is contained in:
Matt Atlas
2020-03-18 20:19:11 +01:00
committed by GitHub
parent d952493ca0
commit 82437acd43
127 changed files with 687 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cable.dm
+1 -1
View File
@@ -481,7 +481,7 @@ obj/structure/cable/proc/cableColor(var/colorC)
w_class = 2.0
throw_speed = 2
throw_range = 5
matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20)
flags = CONDUCT
slot_flags = SLOT_BELT
item_state = "coil"
code/modules/power/lights/bulbs.dm
+3 -3
View File
@@ -23,7 +23,7 @@
desc = "A replacement light tube."
icon_state = "ltube_preset"//preset state for mapping
item_state = "c_tube"
matter = list("glass" = 100)
matter = list(MATERIAL_GLASS = 100)
brightness_range = 8
brightness_power = 0.8
lighttype = "tube"
@@ -64,7 +64,7 @@
desc = "A replacement light bulb."
icon_state = "lbulb_preset"//preset state for mapping
item_state = "contvapour"
matter = list("glass" = 100)
matter = list(MATERIAL_GLASS = 100)
brightness_range = 5
brightness_power = 0.75
brightness_color = LIGHT_COLOR_TUNGSTEN
@@ -103,7 +103,7 @@
desc = "A replacement fire bulb."
icon_state = "flight"
item_state = "egg_red"
matter = list("glass" = 100)
matter = list(MATERIAL_GLASS = 100)
brightness_range = 8
brightness_power = 0.8
randomize_range = FALSE