cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 07:20:09 +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/game/objects/items/stacks/nanopaste.dm
+1 -1
View File
@@ -7,7 +7,7 @@
origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3)
amount = 10
var/list/construction_cost = list(DEFAULT_WALL_MATERIAL = 7000, "glass" = 7000)
var/list/construction_cost = list(DEFAULT_WALL_MATERIAL = 7000, MATERIAL_GLASS = 7000)
/obj/item/stack/nanopaste/update_icon()
var/amount = round(get_amount() / 2)
code/game/objects/items/stacks/tiles/tile_types.dm
+13 -13
View File
@@ -101,7 +101,7 @@
throw_range = 20
flags = 0
drop_sound = 'sound/items/drop/clothing.ogg'
matter = list("plastic" = 937.5)
matter = list(MATERIAL_PLASTIC = 937.5)
/obj/item/stack/tile/lino_grey
name = "linoleum"
@@ -114,7 +114,7 @@
throw_range = 20
flags = 0
drop_sound = 'sound/items/drop/clothing.ogg'
matter = list("plastic" = 937.5)
matter = list(MATERIAL_PLASTIC = 937.5)
/*
* Circuits
@@ -126,7 +126,7 @@
desc = "An advanced tile covered in various circuitry and wiring."
icon_state = "tile_bcircuit"
force = 6.0
matter = list(DEFAULT_WALL_MATERIAL = 937.5,"glass" = 937.5)
matter = list(DEFAULT_WALL_MATERIAL = 937.5, MATERIAL_GLASS = 937.5)
throwforce = 15.0
throw_speed = 5
throw_range = 20
@@ -138,7 +138,7 @@
desc = "An advanced tile covered in various circuitry and wiring."
icon_state = "tile_gcircuit"
force = 6.0
matter = list(DEFAULT_WALL_MATERIAL = 937.5,"glass" = 937.5)
matter = list(DEFAULT_WALL_MATERIAL = 937.5, MATERIAL_GLASS = 937.5)
throwforce = 15.0
throw_speed = 5
throw_range = 20
@@ -170,13 +170,13 @@
name = "steel floor tile"
singular_name = "steel floor tile"
icon_state = "tile_steel"
matter = list("plasteel" = 937.5)
matter = list(MATERIAL_PLASTEEL = 937.5)
/obj/item/stack/tile/floor_white
name = "white floor tile"
singular_name = "white floor tile"
icon_state = "tile_white"
matter = list("plastic" = 937.5)
matter = list(MATERIAL_PLASTIC = 937.5)
/obj/item/stack/tile/floor_yellow
name = "yellow floor tile"
@@ -188,43 +188,43 @@
name = "dark floor tile"
singular_name = "dark floor tile"
icon_state = "fr_tile"
matter = list("plasteel" = 937.5)
matter = list(MATERIAL_PLASTEEL = 937.5)
/obj/item/stack/tile/floor_freezer
name = "freezer floor tile"
singular_name = "freezer floor tile"
icon_state = "tile_freezer"
matter = list("plastic" = 937.5)
matter = list(MATERIAL_PLASTIC = 937.5)
/obj/item/stack/tile/silver
name = "silver floor tile"
singular_name = "silver floor tile"
icon_state = "tile_silver"
matter = list("silver" = 937.5)
matter = list(MATERIAL_SILVER = 937.5)
/obj/item/stack/tile/gold
name = "golden floor tile"
singular_name = "golden floor tile"
icon_state = "tile_gold"
matter = list("gold" = 937.5)
matter = list(MATERIAL_GOLD = 937.5)
/obj/item/stack/tile/uranium
name = "uranium floor tile"
singular_name = "uranium floor tile"
icon_state = "tile_uranium"
matter = list("uranium" = 937.5)
matter = list(MATERIAL_URANIUM = 937.5)
/obj/item/stack/tile/phoron
name = "phoron floor tile"
singular_name = "phoron floor tile"
icon_state = "tile_plasma"
matter = list("phoron" = 937.5)
matter = list(MATERIAL_PHORON = 937.5)
/obj/item/stack/tile/diamond
name = "diamond floor tile"
singular_name = "diamond floor tile"
icon_state = "tile_diamond"
matter = list("diamond" = 937.5)
matter = list(MATERIAL_DIAMOND = 937.5)
/*
* Cyborg modules