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

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

@@ -495,7 +495,25 @@
 	icon_state = "sofamiddle"
 	icon = 'icons/obj/sofa.dmi'
 	buildstackamount = 1
-	item_chair = null
+	var/mutable_appearance/armrest
+
+/obj/structure/chair/sofa/Initialize()
+	armrest = mutable_appearance(icon, "[icon_state]_armrest")
+	return ..()
+
+/obj/structure/chair/sofa/post_buckle_mob(mob/living/M)
+	. = ..()
+	update_armrest()
+
+/obj/structure/chair/sofa/proc/update_armrest()
+	if(has_buckled_mobs())
+		add_overlay(armrest)
+	else
+		cut_overlay(armrest)
+
+/obj/structure/chair/sofa/post_unbuckle_mob()
+	. = ..()
+	update_armrest()
 
 /obj/structure/chair/sofa/left
 	icon_state = "sofaend_left"
@@ -504,4 +522,7 @@
 	icon_state = "sofaend_right"
 
 /obj/structure/chair/sofa/corner
-	icon_state = "sofacorner"
+	icon_state = "sofacorner"
+
+/obj/structure/chair/sofa/corner/handle_layer() //only the armrest/back of this chair should cover the mob.
+	return

code/game/objects/structures/traps.dm

@@ -65,6 +65,8 @@
 		var/mob/M = AM
 		if(M.mind in immune_minds)
 			return
+		if(M.anti_magic_check())
+			flare()
 	if(charges <= 0)
 		return
 	flare()