From bb348295df936c9eb1a4a131c74aabf2c634fb27 Mon Sep 17 00:00:00 2001 From: Mickyan Date: Sun, 5 Apr 2020 01:57:22 +0200 Subject: [PATCH 1/2] curtain --- code/game/objects/structures/watercloset.dm | 16 ++++++++++++++-- icons/obj/watercloset.dmi | Bin 25473 -> 25902 bytes 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 2036ee603e7..efe3e2e459a 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -416,9 +416,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 @@ -430,12 +432,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)) @@ -490,3 +494,11 @@ icon_state = "bounty-open" color = null alpha = 255 + opaque_closed = TRUE + +/obj/structure/curtain/fancy + icon_type = "cur_fancy" + icon_state = "cur_fancy-open" + color = null + alpha = 255 + opaque_closed = TRUE diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi index 31e85ee7e9b8d35dd2255664e5615d8dcaa082c6..3678135e259c1934984a74d785c5500fd2c470a6 100644 GIT binary patch delta 3797 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 LNkvXXu0mjf6@OD> delta 3367 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 From 218dc6f6afe832ccc358e67f874f5a43f3194e2b Mon Sep 17 00:00:00 2001 From: Mickyan Date: Sun, 5 Apr 2020 15:36:39 +0200 Subject: [PATCH 2/2] crafting --- code/datums/components/crafting/recipes.dm | 6 ++++++ code/game/objects/structures/watercloset.dm | 13 ++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) 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 efe3e2e459a..bd9bc21f52c 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -496,9 +496,16 @@ alpha = 255 opaque_closed = TRUE -/obj/structure/curtain/fancy - icon_type = "cur_fancy" - icon_state = "cur_fancy-open" +/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"