From 8d54f835ae61b4f6de2a6216628863a40ab43549 Mon Sep 17 00:00:00 2001 From: c0 Date: Tue, 22 Sep 2015 00:18:37 +0300 Subject: [PATCH] Materials - final solution --- code/game/objects/items/stacks/tiles/tile_mineral.dm | 6 ++++++ code/modules/research/xenobiology/xenobiology.dm | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm index f3b5a01f848..89b6b09bfa6 100644 --- a/code/game/objects/items/stacks/tiles/tile_mineral.dm +++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm @@ -6,6 +6,7 @@ origin_tech = "plasma=1" turf_type = /turf/simulated/floor/mineral/plasma mineralType = "plasma" + materials = list(MAT_PLASMA=500) /obj/item/stack/tile/mineral/uranium name = "uranium tile" @@ -15,6 +16,7 @@ origin_tech = "material=1" turf_type = /turf/simulated/floor/mineral/uranium mineralType = "uranium" + materials = list(MAT_URANIUM=500) /obj/item/stack/tile/mineral/gold name = "gold tile" @@ -24,6 +26,7 @@ origin_tech = "material=1" turf_type = /turf/simulated/floor/mineral/gold mineralType = "gold" + materials = list(MAT_GOLD=500) /obj/item/stack/tile/mineral/silver name = "silver tile" @@ -33,6 +36,7 @@ origin_tech = "material=1" turf_type = /turf/simulated/floor/mineral/silver mineralType = "silver" + materials = list(MAT_SILVER=500) /obj/item/stack/tile/mineral/diamond name = "diamond tile" @@ -42,6 +46,7 @@ origin_tech = "material=2" turf_type = /turf/simulated/floor/mineral/diamond mineralType = "diamond" + materials = list(MAT_DIAMOND=500) /obj/item/stack/tile/mineral/bananium name = "bananium tile" @@ -51,4 +56,5 @@ origin_tech = "material=1" turf_type = /turf/simulated/floor/mineral/bananium mineralType = "bananium" + materials = list(MAT_BANANIUM=500) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 4792688be1f..d6054126e53 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -478,7 +478,7 @@ icon_state = "tile-bluespace" w_class = 3 force = 6 - materials = list(MAT_METAL=937.5) + materials = list(MAT_METAL=500) throwforce = 10 throw_speed = 3 throw_range = 7 @@ -501,7 +501,7 @@ icon_state = "tile-sepia" w_class = 3 force = 6 - materials = list(MAT_METAL=937.5) + materials = list(MAT_METAL=500) throwforce = 10 throw_speed = 3 throw_range = 7