Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

# Conflicts:
#	code/__HELPERS/unsorted.dm
#	code/_globalvars/lists/objects.dm
#	code/controllers/verbs.dm
#	code/game/gamemodes/cult/ritual.dm
#	code/game/gamemodes/cult/runes.dm
#	code/game/objects/items/stacks/sheets/sheet_types.dm
#	code/modules/mob/spirit/mask/mask.dm
#	code/modules/mob/spirit/viewpoint.dm
#	icons/effects/96x96.dmi
#	icons/effects/effects.dmi
#	icons/mob/actions.dmi
#	icons/obj/weapons.dmi
#	icons/obj/wizard.dmi
#	icons/turf/floors.dmi

code/game/objects/structures/door_assembly.dm

@@ -144,6 +144,20 @@ obj/structure/door_assembly/multi_tile/Move()
 		bound_width = world.icon_size
 		bound_height = width * world.icon_size
 
+/obj/structure/door_assembly/door_assembly_cult
+	icon = 'icons/obj/doors/Doorcult.dmi'
+	base_icon_state = "construction"
+	base_name = "engraved airlock"
+	airlock_type = "/cult"
+	glass = -1
+
+
+/obj/structure/door_assembly/door_assembly_cultruned
+	icon = 'icons/obj/doors/Doorcultruned.dmi'
+	base_icon_state = "construction"
+	base_name = "runed airlock"
+	airlock_type = "/cult/runed"
+	glass = -1
 
 
 /obj/structure/door_assembly/attackby(obj/item/W as obj, mob/user as mob, params)

code/game/objects/structures/girders.dm

@@ -188,6 +188,11 @@
 	if(prob(40))
 		qdel(src)
 
+/obj/structure/girder/narsie_act()
+	if(prob(25))
+		new /obj/structure/cultgirder(loc)
+		qdel(src)
+
 /obj/structure/girder/bullet_act(var/obj/item/projectile/Proj)
 	if(istype(Proj ,/obj/item/projectile/beam/pulse))
 		src.ex_act(2)

code/game/objects/structures/musician.dm

@@ -122,7 +122,7 @@
 		ui.open()
 		ui.set_auto_update(1)
 
-/datum/song/ui_data(mob/user, datum/topic_state/state = default_state)
+/datum/song/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
 	var/data[0]
 
 	data["lines"] = lines
@@ -296,8 +296,8 @@
 
 	song.ui_interact(user, ui_key, ui, force_open)
 
-/obj/structure/piano/ui_data(mob/user, datum/topic_state/state = default_state)
-	return song.ui_data(user, state)
+/obj/structure/piano/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
+	return song.ui_data(user, ui_key, state)
 
 /obj/structure/piano/Topic(href, href_list)
 	song.Topic(href, href_list)

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -13,6 +13,12 @@
 		handle_rotation()
 	return
 
+/obj/structure/stool/bed/chair/narsie_act()
+	if(prob(20))
+		var/obj/structure/stool/bed/chair/wood/W = new/obj/structure/stool/bed/chair/wood(get_turf(src))
+		W.dir = dir
+		qdel(src)
+
 /obj/structure/stool/bed/chair/Move(atom/newloc, direct)
 	..()
 	handle_rotation()
@@ -81,6 +87,9 @@
 	burntime = 20
 	// TODO:  Special ash subtype that looks like charred chair legs
 
+/obj/structure/stool/bed/chair/wood/narsie_act()
+	return
+
 /obj/structure/stool/bed/chair/wood/normal
 	icon_state = "wooden_chair"
 	name = "wooden chair"

code/game/objects/structures/tables_racks.dm

@@ -41,6 +41,10 @@
 	density = 0
 	qdel(src)
 
+/obj/structure/table/narsie_act()
+	if(prob(20))
+		new /obj/structure/table/woodentable(loc)
+
 /obj/structure/table/update_icon()
 	if(smooth && !flipped)
 		icon_state = ""
@@ -386,6 +390,10 @@
 
 	return 1
 
+
+/obj/structure/table/woodentable/narsie_act()
+	return
+
 /obj/structure/table/woodentable/poker //No specialties, Just a mapping object.
 	name = "gambling table"
 	desc = "A seedy table for seedy dealings in seedy places."
@@ -398,6 +406,9 @@
 	new /obj/item/stack/tile/grass(loc)
 	..()
 
+/obj/structure/table/woodentable/poker/narsie_act()
+	return
+
 /obj/structure/glasstable_frame
 	name = "glass table frame"
 	desc = "A metal frame for a glass table."

code/game/objects/structures/window.dm

@@ -76,6 +76,9 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 /obj/structure/window/blob_act()
 	destroy()
 
+/obj/structure/window/narsie_act()
+	color = "#7D1919"
+
 /obj/structure/window/singularity_pull(S, current_size)
 	if(current_size >= STAGE_FIVE)
 		destroy()