Updated ashtrays and mineral doors.

This commit is contained in:
Zuhayr
2015-05-17 03:02:03 +09:30
parent 8f6666a32e
commit ae3ad84634
17 changed files with 300 additions and 397 deletions
+2 -27
View File
@@ -5,8 +5,9 @@
/material/proc/generate_recipes()
recipes = list()
recipes += new/datum/stack_recipe("[display_name] door", /obj/structure/simple_door, 10, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
recipes += new/datum/stack_recipe("[display_name] barricade", /obj/structure/barricade, 5, time = 50, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
recipes += new/datum/stack_recipe("[display_name] ashtray", /obj/item/ashtray/plastic, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
recipes += new/datum/stack_recipe("[display_name] ashtray", /obj/item/ashtray, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
recipes += new/datum/stack_recipe("[display_name] fork", /obj/item/weapon/material/kitchen/utensil/fork/plastic, 1, on_floor = 1, supplied_material = "[name]")
recipes += new/datum/stack_recipe("[display_name] spoon", /obj/item/weapon/material/kitchen/utensil/spoon/plastic, 1, on_floor = 1, supplied_material = "[name]")
recipes += new/datum/stack_recipe("[display_name] knife", /obj/item/weapon/material/kitchen/utensil/knife/plastic, 1, on_floor = 1, supplied_material = "[name]")
@@ -82,27 +83,6 @@
/material/sandstone/generate_recipes()
..()
recipes += new/datum/stack_recipe("pile of dirt", /obj/machinery/portable_atmospherics/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1)
recipes += new/datum/stack_recipe("sandstone door", /obj/structure/mineral_door/sandstone, 10, one_per_turf = 1, on_floor = 1)
/material/silver/generate_recipes()
..()
recipes += new/datum/stack_recipe("silver door", /obj/structure/mineral_door/silver, 10, one_per_turf = 1, on_floor = 1)
/material/diamond/generate_recipes()
..()
recipes += new/datum/stack_recipe("diamond door", /obj/structure/mineral_door/transparent/diamond, 10, one_per_turf = 1, on_floor = 1)
/material/uranium/generate_recipes()
..()
recipes += new/datum/stack_recipe("uranium door", /obj/structure/mineral_door/uranium, 10, one_per_turf = 1, on_floor = 1)
/material/gold/generate_recipes()
..()
recipes += new/datum/stack_recipe("golden door", /obj/structure/mineral_door/gold, 10, one_per_turf = 1, on_floor = 1)
/material/phoron/generate_recipes()
..()
recipes += new/datum/stack_recipe("phoron door", /obj/structure/mineral_door/transparent/phoron, 10, one_per_turf = 1, on_floor = 1)
/material/plastic/generate_recipes()
..()
@@ -113,17 +93,12 @@
recipes += new/datum/stack_recipe("reagent dispenser cartridge (med)", /obj/item/weapon/reagent_containers/chem_disp_cartridge/medium, 3, on_floor=0) // 250u
recipes += new/datum/stack_recipe("reagent dispenser cartridge (small)", /obj/item/weapon/reagent_containers/chem_disp_cartridge/small, 1, on_floor=0) // 100u
/material/iron/generate_recipes()
..()
recipes += new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = 1, on_floor = 1)
/material/wood/generate_recipes()
..()
recipes += new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1)
recipes += new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20)
recipes += new/datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood, 3, time = 10, one_per_turf = 1, on_floor = 1)
recipes += new/datum/stack_recipe("crossbow frame", /obj/item/weapon/crossbowframe, 5, time = 25, one_per_turf = 0, on_floor = 0)
recipes += new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1)
recipes += new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1)
/material/cardboard/generate_recipes()
@@ -79,6 +79,7 @@ obj/item/stack/material/iron
name = "iron"
icon_state = "sheet-silver"
default_type = "iron"
apply_colour = 1
/obj/item/stack/material/sandstone
name = "sandstone brick"
+31
View File
@@ -21,6 +21,12 @@ var/list/name_to_material
metal
solid
cult
Valid door icons:
stone
metal
resin
wood
*/
/material
@@ -31,6 +37,7 @@ var/list/name_to_material
// Shards/tables/structures
var/tableslam_noise = 'sound/weapons/tablehit1.ogg'
var/dooropen_noise = 'sound/effects/stonedoor_openclose.ogg'
var/shard_type = SHARD_SHRAPNEL
var/shard_icon
var/shard_can_repair = 1
@@ -39,6 +46,7 @@ var/list/name_to_material
// Icons
var/icon_colour
var/icon_base = "metal"
var/door_icon_base = "metal"
var/icon_reinf = "reinf_metal"
var/stack_type = /obj/item/stack/material/steel
var/stack_origin_tech = "materials=1"
@@ -67,6 +75,9 @@ var/list/name_to_material
/material/proc/get_blunt_damage()
return weight //todo
/material/proc/can_open_material_door(var/mob/living/user)
return 1
/material/proc/get_edge_damage()
return round(hardness/4) //todo
@@ -106,6 +117,7 @@ var/list/name_to_material
icon_colour = "#007A00"
weight = 22
stack_origin_tech = "materials=5"
door_icon_base = "stone"
/material/diamond
name = "diamond"
@@ -145,6 +157,7 @@ var/list/name_to_material
shard_type = SHARD_SHARD
hardness = 30
stack_origin_tech = "phorontech=2;materials=2"
door_icon_base = "stone"
/material/sandstone
name = "sandstone"
@@ -155,6 +168,7 @@ var/list/name_to_material
shard_type = SHARD_STONE_PIECE
weight = 22
hardness = 55
door_icon_base = "stone"
/material/steel
name = DEFAULT_WALL_MATERIAL
@@ -194,6 +208,7 @@ var/list/name_to_material
tableslam_noise = 'sound/effects/Glasshit.ogg'
hardness = 15
weight = 15
door_icon_base = "stone"
/material/glass/phoron
name = "phoron glass"
@@ -281,6 +296,8 @@ var/list/name_to_material
hardness = 15
weight = 18
stack_origin_tech = "materials=1;biotech=1"
dooropen_noise = 'sound/effects/doorcreaky.ogg'
door_icon_base = "wood"
/material/wood/holographic
name = "holographic wood"
@@ -298,10 +315,12 @@ var/list/name_to_material
hardness = 1
weight = 1
stack_origin_tech = "materials=1"
door_icon_base = "wood"
/material/cloth //todo
name = "cloth"
stack_origin_tech = "materials=2"
door_icon_base = "wood"
/material/cult
name = "cult"
@@ -323,3 +342,15 @@ var/list/name_to_material
/material/cult/reinf/place_dismantled_product(var/turf/target)
new /obj/effect/decal/remains/human(target)
/material/resin
name = "resin"
icon_colour = "#E85DD8"
dooropen_noise = 'sound/effects/attackblob.ogg'
door_icon_base = "resin"
/material/resin/can_open_material_door(var/mob/living/user)
var/mob/living/carbon/M = user
if(istype(M) && locate(/obj/item/organ/xenos/hivenode) in M.internal_organs)
return 1
return 0