mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-22 16:12:19 +00:00
Curtain and Flap material fix (#10997)
This commit is contained in:
@@ -11,6 +11,11 @@
|
|||||||
anchored = TRUE //curtains start secured in place
|
anchored = TRUE //curtains start secured in place
|
||||||
build_amt = 2
|
build_amt = 2
|
||||||
var/manipulating = FALSE //prevents queuing up multiple deconstructs and returning a bunch of cloth
|
var/manipulating = FALSE //prevents queuing up multiple deconstructs and returning a bunch of cloth
|
||||||
|
var/curtain_material = MATERIAL_CLOTH
|
||||||
|
|
||||||
|
/obj/structure/curtain/Initialize()
|
||||||
|
. = ..()
|
||||||
|
material = SSmaterials.get_material_by_name(curtain_material)
|
||||||
|
|
||||||
/obj/structure/curtain/open
|
/obj/structure/curtain/open
|
||||||
icon_state = "open"
|
icon_state = "open"
|
||||||
@@ -76,12 +81,14 @@
|
|||||||
color = "#B8F5E3"
|
color = "#B8F5E3"
|
||||||
anchored = FALSE
|
anchored = FALSE
|
||||||
alpha = 200
|
alpha = 200
|
||||||
|
curtain_material = MATERIAL_PLASTIC
|
||||||
|
|
||||||
/obj/structure/curtain/open/medical
|
/obj/structure/curtain/open/medical
|
||||||
name = "plastic curtain"
|
name = "plastic curtain"
|
||||||
color = "#B8F5E3"
|
color = "#B8F5E3"
|
||||||
anchored = FALSE
|
anchored = FALSE
|
||||||
alpha = 200
|
alpha = 200
|
||||||
|
curtain_material = MATERIAL_PLASTIC
|
||||||
|
|
||||||
/obj/structure/curtain/open/bed
|
/obj/structure/curtain/open/bed
|
||||||
name = "bed curtain"
|
name = "bed curtain"
|
||||||
|
|||||||
@@ -15,6 +15,10 @@
|
|||||||
/mob/living/silicon/robot/drone
|
/mob/living/silicon/robot/drone
|
||||||
)
|
)
|
||||||
|
|
||||||
|
/obj/structure/plasticflaps/Initialize()
|
||||||
|
. = ..()
|
||||||
|
material = SSmaterials.get_material_by_name(MATERIAL_PLASTIC)
|
||||||
|
|
||||||
/obj/structure/plasticflaps/CanPass(atom/A, turf/T)
|
/obj/structure/plasticflaps/CanPass(atom/A, turf/T)
|
||||||
if(istype(A) && A.checkpass(PASSGLASS))
|
if(istype(A) && A.checkpass(PASSGLASS))
|
||||||
return prob(60)
|
return prob(60)
|
||||||
|
|||||||
@@ -872,6 +872,7 @@
|
|||||||
|
|
||||||
/material/cloth
|
/material/cloth
|
||||||
name = MATERIAL_CLOTH
|
name = MATERIAL_CLOTH
|
||||||
|
stack_type = /obj/item/stack/material/cloth
|
||||||
stack_origin_tech = list(TECH_MATERIAL = 2)
|
stack_origin_tech = list(TECH_MATERIAL = 2)
|
||||||
door_icon_base = "wood"
|
door_icon_base = "wood"
|
||||||
ignition_point = T0C+232
|
ignition_point = T0C+232
|
||||||
|
|||||||
6
html/changelogs/doxxmedearly - curtain_material_fix.yml
Normal file
6
html/changelogs/doxxmedearly - curtain_material_fix.yml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
author: Doxxmedearly
|
||||||
|
|
||||||
|
delete-after: True
|
||||||
|
|
||||||
|
changes:
|
||||||
|
- bugfix: "Disassembled curtains and plastic flaps now produce the correct materials, instead of steel sheets."
|
||||||
Reference in New Issue
Block a user