Material door updates: lock and damage (#5659)

-ported locks and keys from baystation
-fixed the simple door damage interaction, now you can properly destroy it and etc
This commit is contained in:
Alberyk
2018-12-08 21:40:06 +01:00
committed by Werner
parent b91ad62fe8
commit 59be553606
15 changed files with 288 additions and 45 deletions
+3 -1
View File
@@ -13,11 +13,12 @@
recipes += new/datum/stack_recipe("[display_name] armor plate", /obj/item/weapon/material/armor_plating, 3, time = 20, on_floor = 1, supplied_material = "[name]")
if(integrity>=50)
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] door", /obj/structure/simple_door, 10, time = 50, 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] stool", /obj/item/weapon/stool, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
recipes += new/datum/stack_recipe("[display_name] chair", /obj/structure/bed/chair, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
recipes += new/datum/stack_recipe("[display_name] bed", /obj/structure/bed, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
recipes += new/datum/stack_recipe("[display_name] lock",/obj/item/weapon/material/lock_construct, 1, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]")
if(hardness>=10)
recipes += new/datum/stack_recipe("[display_name] ashtray", /obj/item/weapon/material/ashtray, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]")
if(hardness>50)
@@ -44,6 +45,7 @@
new/datum/stack_recipe("green comfy chair", /obj/structure/bed/chair/comfy/green, 2, one_per_turf = 1, on_floor = 1), \
))
recipes += new/datum/stack_recipe("key", /obj/item/weapon/key, 1, time = 10, one_per_turf = 0, on_floor = 1)
recipes += new/datum/stack_recipe("table frame", /obj/structure/table, 1, time = 10, one_per_turf = 1, on_floor = 1)
recipes += new/datum/stack_recipe("custodial cart", /obj/structure/janitorialcart, 15, time = 120, one_per_turf = 1, on_floor = 1)
recipes += new/datum/stack_recipe("rack", /obj/structure/table/rack, 1, time = 5, one_per_turf = 1, on_floor = 1)
+7
View File
@@ -114,6 +114,8 @@ var/list/name_to_material
var/tableslam_noise = 'sound/weapons/tablehit1.ogg'
// Noise made when a simple door made of this material opens or closes.
var/dooropen_noise = 'sound/effects/stonedoor_openclose.ogg'
// Noise made when you hit structure made of this material.
var/hitsound = 'sound/weapons/genhit.ogg'
// Path to resulting stacktype. Todo remove need for this.
var/stack_type
// Wallrot crumble message.
@@ -280,6 +282,7 @@ var/list/name_to_material
conductivity = 1
shard_type = SHARD_SHARD
tableslam_noise = 'sound/effects/Glasshit.ogg'
hitsound = 'sound/effects/Glasshit.ogg'
hardness = 100
stack_origin_tech = list(TECH_MATERIAL = 6)
golem = "Diamond Golem"
@@ -384,6 +387,7 @@ var/list/name_to_material
icon_reinf = "reinf_over"
icon_colour = "#666666"
golem = "Steel Golem"
hitsound = 'sound/weapons/smash.ogg'
/material/diona
name = "biomass"
@@ -420,6 +424,7 @@ var/list/name_to_material
stack_origin_tech = list(TECH_MATERIAL = 2)
composite_material = list(DEFAULT_WALL_MATERIAL = 3750, "platinum" = 3750) //todo
golem = "Plasteel Golem"
hitsound = 'sound/weapons/smash.ogg'
/material/plasteel/titanium
name = "titanium"
@@ -636,6 +641,7 @@ var/list/name_to_material
sheet_singular_name = "ingot"
sheet_plural_name = "ingots"
golem = "Iron Golem"
hitsound = 'sound/weapons/smash.ogg'
// Adminspawn only, do not let anyone get this.
/material/voxalloy
@@ -677,6 +683,7 @@ var/list/name_to_material
sheet_singular_name = "plank"
sheet_plural_name = "planks"
golem = "Wood Golem"
hitsound = 'sound/effects/woodhit.ogg'
/material/rust
name = "rust"