Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit382

code/game/objects/structures/beds_chairs/bed.dm

@@ -23,9 +23,9 @@
 	var/bolts = TRUE
 
 /obj/structure/bed/examine(mob/user)
-	..()
+	. = ..()
 	if(bolts)
-		to_chat(user, "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>")
+		. += "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>"
 
 /obj/structure/bed/deconstruct(disassembled = TRUE)
 	if(!(flags_1 & NODECONSTRUCT_1))
@@ -148,8 +148,8 @@
 	..()
 
 /obj/item/roller/robo/examine(mob/user)
-	..()
-	to_chat(user, "The dock is [loaded ? "loaded" : "empty"].")
+	. = ..()
+	. += "The dock is [loaded ? "loaded" : "empty"]."
 
 /obj/item/roller/robo/deploy_roller(mob/user, atom/location)
 	if(loaded)

code/game/objects/structures/beds_chairs/chair.dm

@@ -15,10 +15,10 @@
 	layer = OBJ_LAYER
 
 /obj/structure/chair/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>")
+	. = ..()
+	. += "<span class='notice'>It's held together by a couple of <b>bolts</b>.</span>"
 	if(!has_buckled_mobs())
-		to_chat(user, "<span class='notice'>Drag your sprite to sit in it.</span>")
+		. += "<span class='notice'>Drag your sprite to sit in it.</span>"
 
 /obj/structure/chair/Initialize()
 	. = ..()
@@ -471,6 +471,9 @@
 	item_chair = null
 	var/turns = 0
 
+/obj/structure/chair/brass/ComponentInitialize()
+	return //it spins with the power of ratvar, not components.
+
 /obj/structure/chair/brass/Destroy()
 	STOP_PROCESSING(SSfastprocess, src)
 	. = ..()
@@ -486,6 +489,7 @@
 	return
 
 /obj/structure/chair/brass/AltClick(mob/living/user)
+	. = ..()
 	turns = 0
 	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
 		return
@@ -497,6 +501,7 @@
 		user.visible_message("<span class='notice'>[user] stops [src]'s uncontrollable spinning.</span>", \
 		"<span class='notice'>You grab [src] and stop its wild spinning.</span>")
 		STOP_PROCESSING(SSfastprocess, src)
+	return TRUE
 
 /obj/structure/chair/bronze
 	name = "brass chair"
@@ -520,7 +525,7 @@
 	var/mutable_appearance/armrest
 
 /obj/structure/chair/sofa/Initialize()
-	armrest = mutable_appearance(icon, "[icon_state]_armrest")
+	armrest = mutable_appearance(icon, "[icon_state]_armrest", ABOVE_MOB_LAYER)
 	return ..()
 
 /obj/structure/chair/sofa/post_buckle_mob(mob/living/M)

code/game/objects/structures/beds_chairs/pew.dm

@@ -0,0 +1,72 @@
+/obj/structure/chair/pew
+	name = "wooden pew"
+	desc = "Kneel here and pray."
+	icon = 'icons/obj/sofa.dmi'
+	icon_state = "pewmiddle"
+	resistance_flags = FLAMMABLE
+	max_integrity = 70
+	buildstacktype = /obj/item/stack/sheet/mineral/wood
+	buildstackamount = 3
+	item_chair = null
+
+/obj/structure/chair/pew/left
+	name = "left wooden pew end"
+	icon_state = "pewend_left"
+	var/mutable_appearance/leftpewarmrest
+
+/obj/structure/chair/pew/left/Initialize()
+	leftpewarmrest = GetLeftPewArmrest()
+	leftpewarmrest.layer = ABOVE_MOB_LAYER
+	return ..()
+
+/obj/structure/chair/pew/left/proc/GetLeftPewArmrest()
+	return mutable_appearance('icons/obj/sofa.dmi', "pewend_left_armrest")
+
+/obj/structure/chair/pew/left/Destroy()
+	QDEL_NULL(leftpewarmrest)
+	return ..()
+
+/obj/structure/chair/pew/left/post_buckle_mob(mob/living/M)
+	. = ..()
+	update_leftpewarmrest()
+
+/obj/structure/chair/pew/left/proc/update_leftpewarmrest()
+	if(has_buckled_mobs())
+		add_overlay(leftpewarmrest)
+	else
+		cut_overlay(leftpewarmrest)
+
+/obj/structure/chair/pew/left/post_unbuckle_mob()
+	. = ..()
+	update_leftpewarmrest()
+
+/obj/structure/chair/pew/right
+	name = "left wooden pew end"
+	icon_state = "pewend_right"
+	var/mutable_appearance/rightpewarmrest
+
+/obj/structure/chair/pew/right/Initialize()
+	rightpewarmrest = GetRightPewArmrest()
+	rightpewarmrest.layer = ABOVE_MOB_LAYER
+	return ..()
+
+/obj/structure/chair/pew/right/proc/GetRightPewArmrest()
+	return mutable_appearance('icons/obj/sofa.dmi', "pewend_right_armrest")
+
+/obj/structure/chair/pew/right/Destroy()
+	QDEL_NULL(rightpewarmrest)
+	return ..()
+
+/obj/structure/chair/pew/right/post_buckle_mob(mob/living/M)
+	. = ..()
+	update_rightpewarmrest()
+
+/obj/structure/chair/pew/right/proc/update_rightpewarmrest()
+	if(has_buckled_mobs())
+		add_overlay(rightpewarmrest)
+	else
+		cut_overlay(rightpewarmrest)
+
+/obj/structure/chair/pew/right/post_unbuckle_mob()
+	. = ..()
+	update_rightpewarmrest()