Merge branch 'master' into hangryrat

code/game/objects/structures/bedsheet_bin.dm

@@ -32,7 +32,7 @@ LINEN BINS
 		if(do_after(user, 50))
 			user << "<span class='notice'>You cut [src] into pieces!</span>"
 			for(var/i in 1 to rand(2,5))
-				new /obj/item/weapon/reagent_containers/glass/rag(src.loc)
+				new /obj/item/weapon/reagent_containers/glass/rag(drop_location())
 			qdel(src)
 		return
 	..()

code/game/objects/structures/signs.dm

@@ -387,6 +387,18 @@
 	icon = 'icons/obj/christmas.dmi'
 	icon_state = "doorwreath"
 
+/obj/structure/sign/hostilefauna
+	icon = 'icons/obj/decals_vr.dmi'
+	name = "\improper Caution: Hostile fauna"
+	desc = "This sign warns of hostile life forms in the area."
+	icon_state = "h_fauna"
+
+/obj/structure/sign/graffiti/pisoff
+	icon = 'icons/obj/decals_vr.dmi'
+	name = "\improper PIS OFF"
+	desc = "This sign bears some rather rude looking graffiti instructing you to PIS OFF."
+	icon_state = "pisoff"
+
 //Eris signs
 
 /obj/structure/sign/ironhammer

code/game/objects/structures/simple_doors.dm

@@ -198,4 +198,14 @@
 	..(newloc, MAT_SIFWOOD)
 
 /obj/structure/simple_door/resin/New(var/newloc,var/material_name)
-	..(newloc, "resin")
+	..(newloc, "resin")
+
+/obj/structure/simple_door/cult/New(var/newloc,var/material_name)
+	..(newloc, "cult")
+
+/obj/structure/simple_door/cult/TryToSwitchState(atom/user)
+	if(isliving(user))
+		var/mob/living/L = user
+		if(!iscultist(L) && !istype(L, /mob/living/simple_animal/construct))
+			return
+	..()