Merge pull request #46978 from willox/duplicate-variable-stuff

removed a bunch of duplicate member variable definitions and entirely duplicated types
This commit is contained in:
Rob Bailey
2019-10-12 03:44:15 -07:00
committed by GitHub
52 changed files with 26 additions and 148 deletions
+2 -2
View File
@@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/glass/basalt
name = "volcanic ash"
icon_state = "volcanic_sand"
icon_state = "volcanic_sand"
item_state = "volcanic_sand"
singular_name = "volcanic ash pile"
/obj/item/stack/ore/plasma
@@ -152,7 +152,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/gold
name = "gold ore"
icon_state = "Gold ore"
icon_state = "Gold ore"
item_state = "Gold ore"
singular_name = "gold ore chunk"
points = 18
custom_materials = list(/datum/material/gold=MINERAL_MATERIAL_AMOUNT)