Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881

[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.

code/game/objects/structures/table_frames.dm

@@ -61,6 +61,14 @@
 		to_chat(user, "<span class='notice'>You start adding [S] to [src]...</span>")
 		if(do_after(user, 20, target = src) && S.use(1))
 			make_new_table(/obj/structure/table/optable)
+	else if(istype(I, /obj/item/stack/tile/carpet/black))
+		var/obj/item/stack/tile/carpet/black/C = I
+		if(C.get_amount() < 1)
+			to_chat(user, "<span class='warning'>You need one  black carpet sheet to do this!</span>")
+			return
+		to_chat(user, "<span class='notice'>You start adding [C] to [src]...</span>")
+		if(do_after(user, 20, target = src) && C.use(1))
+			make_new_table(/obj/structure/table/wood/fancy/black)
 	else if(istype(I, /obj/item/stack/tile/carpet))
 		var/obj/item/stack/tile/carpet/C = I
 		if(C.get_amount() < 1)

code/game/objects/structures/tables_racks.dm

@@ -271,12 +271,20 @@
 	frame = /obj/structure/table_frame
 	framestack = /obj/item/stack/rods
 	buildstack = /obj/item/stack/tile/carpet
-	canSmoothWith = list(/obj/structure/table/wood/fancy)
+	canSmoothWith = list(/obj/structure/table/wood/fancy,/obj/structure/table/wood/fancy/black)
 
 /obj/structure/table/wood/fancy/New()
 	icon = 'icons/obj/smooth_structures/fancy_table.dmi' //so that the tables place correctly in the map editor
 	..()
 
+/obj/structure/table/wood/fancy/black
+	icon_state = "fancy_table_black"
+	buildstack = /obj/item/stack/tile/carpet/black
+
+/obj/structure/table/wood/fancy/black/New()
+	..()
+	icon = 'icons/obj/smooth_structures/fancy_table_black.dmi'
+
 /*
  * Reinforced tables
  */

code/game/objects/structures/watercloset.dm

@@ -11,10 +11,10 @@
 	var/mob/living/swirlie = null	//the mob being given a swirlie
 
 
-/obj/structure/toilet/New()
+/obj/structure/toilet/Initialize()
+	. = ..()
 	open = round(rand(0, 1))
 	update_icon()
-	..()
 
 
 /obj/structure/toilet/attack_hand(mob/living/user)
@@ -104,6 +104,21 @@
 	else
 		return ..()
 
+/obj/structure/toilet/secret
+	var/obj/item/secret
+	var/secret_type = null
+
+/obj/structure/toilet/secret/Initialize(mapload)
+	. = ..()
+	if (secret_type)
+		secret = new secret_type(src)
+		secret.desc += " It's a secret!"
+		w_items += secret.w_class
+		contents += secret
+
+
+
+
 /obj/structure/urinal
 	name = "urinal"
 	desc = "The HU-452, an experimental urinal. Comes complete with experimental urinal cake."
@@ -239,7 +254,7 @@
 		qdel(mymist)
 
 	if(on)
-		add_overlay(mutable_appearance('icons/obj/watercloset.dmi', "water", MOB_LAYER + 1))
+		add_overlay(mutable_appearance('icons/obj/watercloset.dmi', "water", ABOVE_MOB_LAYER))
 		if(watertemp == "freezing")
 			return
 		if(!ismist)
@@ -552,7 +567,7 @@
 	icon_state = "open"
 	color = "#ACD1E9" //Default color, didn't bother hardcoding other colors, mappers can and should easily change it.
 	alpha = 200 //Mappers can also just set this to 255 if they want curtains that can't be seen through
-	layer = WALL_OBJ_LAYER
+	layer = SIGN_LAYER
 	anchored = 1
 	opacity = 0
 	density = 0
@@ -575,13 +590,48 @@
 		density = 0
 		open = TRUE
 
+/obj/structure/curtain/attackby(obj/item/W, mob/user)
+	if (istype(W, /obj/item/toy/crayon))
+		color = input(user,"Choose Color") as color
+	else if(istype(W, /obj/item/weapon/screwdriver))
+		if(anchored)
+			playsound(src.loc, W.usesound, 100, 1)
+			user.visible_message("<span class='warning'>[user] unscrews [src] from the floor.</span>", "<span class='notice'>You start to unscrew [src] from the floor...</span>", "You hear rustling noises.")
+			if(do_after(user, 50*W.toolspeed, target = src))
+				if(!anchored)
+					return
+				anchored = FALSE
+				to_chat(user, "<span class='notice'>You unscrew [src] from the floor.</span>")
+		else
+			playsound(src.loc, W.usesound, 100, 1)
+			user.visible_message("<span class='warning'>[user] screws [src] to the floor.</span>", "<span class='notice'>You start to screw [src] to the floor...</span>", "You hear rustling noises.")
+			if(do_after(user, 50*W.toolspeed, target = src))
+				if(anchored)
+					return
+				anchored = TRUE
+				to_chat(user, "<span class='notice'>You screw [src] to the floor.</span>")
+	else if(istype(W, /obj/item/weapon/wirecutters))
+		if(!anchored)
+			playsound(src.loc, W.usesound, 100, 1)
+			user.visible_message("<span class='warning'>[user] cuts apart [src].</span>", "<span class='notice'>You start to cut apart [src].</span>", "You hear cutting.")
+			if(do_after(user, 50*W.toolspeed, target = src))
+				if(anchored)
+					return
+				to_chat(user, "<span class='notice'>You cut apart [src].</span>")
+				deconstruct()
+	else
+		. = ..()
+
+
 /obj/structure/curtain/attack_hand(mob/user)
 	playsound(loc, 'sound/effects/curtain.ogg', 50, 1)
 	toggle()
 	..()
 
 /obj/structure/curtain/deconstruct(disassembled = TRUE)
-	new /obj/item/stack/sheet/cloth (loc, 3)
+	new /obj/item/stack/sheet/cloth (loc, 2)
+	new /obj/item/stack/sheet/plastic (loc, 2)
+	new /obj/item/stack/rods (loc, 1)
 	qdel(src)
 
 /obj/structure/curtain/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)