Merge pull request #3767 from Tastyfish/silence

Tranquillité, Prospérité & Mimeré
This commit is contained in:
TheDZD
2016-03-08 19:32:29 -05:00
41 changed files with 837 additions and 361 deletions
@@ -8,6 +8,7 @@ Mineral Sheets
- Gold
- Silver
- Bananium
- Tranqillite
- Enriched Uranium
- Platinum
- Metallic Hydrogen
@@ -62,6 +63,11 @@ var/global/list/datum/stack_recipe/bananium_recipes = list ( \
new/datum/stack_recipe("bananium grenade casing", /obj/item/weapon/grenade/bananade/casing, 4, on_floor = 1), \
)
var/global/list/datum/stack_recipe/mime_recipes = list ( \
new/datum/stack_recipe("silent tile", /obj/item/stack/tile/silent, 1, 4, 20), \
new/datum/stack_recipe("invisible wall", /obj/structure/barricade/mime, 5, one_per_turf = 1, on_floor = 1, time = 50), \
)
/obj/item/stack/sheet/mineral
force = 5.0
throwforce = 5
@@ -169,6 +175,18 @@ var/global/list/datum/stack_recipe/bananium_recipes = list ( \
..()
recipes = bananium_recipes
/obj/item/stack/sheet/mineral/tranquillite
name = "tranquillite"
singular_name = "beret"
icon_state = "sheet-mime"
origin_tech = "materials=4"
sheettype = "mime"
materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/sheet/mineral/tranquillite/New(var/loc, var/amount=null)
..()
recipes = mime_recipes
/obj/item/stack/sheet/mineral/enruranium
name = "enriched uranium"
icon_state = "sheet-enruranium"
@@ -116,3 +116,12 @@
/obj/item/stack/tile/noslip/loaded
amount = 20
/obj/item/stack/tile/silent
name = "silent tile"
singular_name = "silent floor tile"
desc = "A tile made out of tranquillite, SHHHHHHHHH!"
icon_state = "tile-silent"
origin_tech = "materials=1"
turf_type = /turf/simulated/floor/silent
mineralType = "tranquillite"
materials = list(MAT_TRANQUILLITE=500)