Fixes #6567, tidying up glass code and #6575, #6577 (#6576)

This commit is contained in:
alsoandanswer
2019-06-25 17:39:04 +02:00
committed by Werner
parent cede754944
commit 53c5ff67a5
18 changed files with 160 additions and 105 deletions
+7 -1
View File
@@ -211,6 +211,12 @@
icon_has_variants = TRUE
drop_sound = 'sound/items/drop/glass.ogg'
/obj/item/stack/material/glass/wired
name = "wired glass"
icon = 'icons/obj/stacks/tiles.dmi'
icon_state = "glass_wire"
default_type = "wired glass"
/obj/item/stack/material/glass/reinforced
name = "reinforced glass"
icon_state = "sheet-rglass"
@@ -240,4 +246,4 @@
name = "titanium"
icon_state = "sheet-titanium"
default_type = "titanium"
icon_has_variants = TRUE
icon_has_variants = TRUE
+23 -3
View File
@@ -124,7 +124,6 @@ var/list/name_to_material
//What golem species is created with this material
var/golem = null
// Placeholders for light tiles and rglass.
/material/proc/build_rod_product(var/mob/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack)
if(!rod_product)
to_chat(user, "<span class='warning'>You cannot make anything out of \the [target_stack]</span>")
@@ -134,6 +133,7 @@ var/list/name_to_material
return
used_stack.use(1)
target_stack.use(1)
to_chat(user, "<span class='notice'>You attach a rod to the [display_name].</span>")
var/obj/item/stack/S = new rod_product(get_turf(user))
S.add_fingerprint(user)
S.add_to_stacks(user)
@@ -148,7 +148,7 @@ var/list/name_to_material
used_stack.use(5)
target_stack.use(1)
to_chat(user, "<span class='notice'>You attach wire to the [name].</span>")
to_chat(user, "<span class='notice'>You attach wires to the [display_name].</span>")
var/obj/item/product = new wire_product(get_turf(user))
if(!(user.l_hand && user.r_hand))
user.put_in_hands(product)
@@ -457,6 +457,7 @@ var/list/name_to_material
destruction_desc = "shatters"
window_options = list("One Direction" = 1, "Full Window" = 4)
created_window = /obj/structure/window/basic
wire_product = /obj/item/stack/material/glass/wired
rod_product = /obj/item/stack/material/glass/reinforced
golem = "Glass Golem"
@@ -532,6 +533,25 @@ var/list/name_to_material
/material/glass/proc/is_reinforced()
return (hardness > 35) //todo
/material/glass/wired
name = "wired glass"
display_name = "wired glass"
stack_type = /obj/item/stack/material/glass/wired
flags = MATERIAL_BRITTLE
icon_colour = "#00E1FF"
opacity = 0.3
integrity = 100
shard_type = SHARD_SHARD
tableslam_noise = 'sound/effects/Glasshit.ogg'
hardness = 40
weight = 30
stack_origin_tech = list(TECH_MATERIAL = 2)
composite_material = list(DEFAULT_WALL_MATERIAL = 1875,"glass" = 3750)
window_options = list()
created_window = null
wire_product = null
rod_product = null
/material/glass/reinforced
name = "rglass"
display_name = "reinforced glass"
@@ -960,4 +980,4 @@ var/list/name_to_material
hardness = 80
weight = 23
protectiveness = 20 // 50%
conductivity = 10
conductivity = 10