diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index ab03bf3e829..bacabb5c5a0 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -482,6 +482,12 @@ result = /obj/item/stack/tile/carpet/black/fifty category = CAT_MISC +/datum/crafting_recipe/curtain + name = "Curtains" + reqs = list(/obj/item/stack/sheet/cloth = 4, /obj/item/stack/rods = 1) + result = /obj/structure/curtain/cloth + category = CAT_MISC + /datum/crafting_recipe/showercurtain name = "Shower Curtains" reqs = list(/obj/item/stack/sheet/cloth = 2, /obj/item/stack/sheet/plastic = 2, /obj/item/stack/rods = 1) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 21bef56a0ab..ad70d2f8c82 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -422,9 +422,11 @@ alpha = 200 //Mappers can also just set this to 255 if they want curtains that can't be seen through layer = SIGN_LAYER anchored = TRUE - opacity = 0 + opacity = FALSE density = FALSE var/open = TRUE + /// if it can be seen through when closed + var/opaque_closed = FALSE /obj/structure/curtain/proc/toggle() open = !open @@ -436,12 +438,14 @@ layer = WALL_OBJ_LAYER density = TRUE open = FALSE - + if(opaque_closed) + opacity = TRUE else icon_state = "[icon_type]-open" layer = SIGN_LAYER density = FALSE open = TRUE + opacity = FALSE /obj/structure/curtain/attackby(obj/item/W, mob/user) if (istype(W, /obj/item/toy/crayon)) @@ -496,3 +500,18 @@ icon_state = "bounty-open" color = null alpha = 255 + opaque_closed = TRUE + +/obj/structure/curtain/cloth/ + color = null + alpha = 255 + opaque_closed = TRUE + +/obj/structure/curtain/cloth/deconstruct(disassembled = TRUE) + new /obj/item/stack/sheet/cloth (loc, 4) + new /obj/item/stack/rods (loc, 1) + qdel(src) + +/obj/structure/curtain/cloth/fancy + icon_type = "cur_fancy" + icon_state = "cur_fancy-open" diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi index 31e85ee7e9b..3678135e259 100644 Binary files a/icons/obj/watercloset.dmi and b/icons/obj/watercloset.dmi differ