Merge pull request #8815 from PsiOmegaDelta/CultPorting

Ports /tg/vg/'s Nas-Sie remake

code/game/objects/effects/landmarks.dm

@@ -79,6 +79,14 @@
 			xeno_spawn += loc
 			del(src)
 
+		if("endgame_exit")
+			endgame_safespawns += loc
+			del(src)
+
+		if("bluespacerift")
+			endgame_exits += loc
+			del(src)
+
 	landmarks_list += src
 	return 1
 

code/game/objects/effects/overlays.dm

@@ -2,7 +2,7 @@
 	name = "overlay"
 	unacidable = 1
 	var/i_attached//Added for possible image attachments to objects. For hallucinations and the like.
-	
+
 /obj/effect/overlay/Destroy()
 	PlaceInPool(src)
 	return 1 //cancels the GCing
@@ -35,4 +35,10 @@
 /obj/effect/overlay/coconut
 	name = "Coconuts"
 	icon = 'icons/misc/beach.dmi'
-	icon_state = "coconuts"
+	icon_state = "coconuts"
+
+/obj/effect/overlay/bluespacify
+	name = "Bluespace"
+	icon = 'icons/turf/space.dmi'
+	icon_state = "bluespacify"
+	layer = LIGHTING_LAYER

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -146,7 +146,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
 	new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \
 	new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
 	new/datum/stack_recipe("table parts", /obj/item/weapon/table_parts/wood, 2), \
-	new/datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("wooden chair", /obj/structure/bed/chair/wood, 3, time = 10, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1), \
 	new/datum/stack_recipe("crossbow frame", /obj/item/weapon/crossbowframe, 5, time = 25, one_per_turf = 0, on_floor = 0), \
 	new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \

code/game/objects/structures/barsign.dm

@@ -2,6 +2,7 @@
 	icon = 'icons/obj/barsigns.dmi'
 	icon_state = "empty"
 	anchored = 1
+	var/cult = 0
 	New()
 		ChangeSign(pick("pinkflamingo", "magmasea", "limbo", "rustyaxe", "armokbar", "brokendrum", "meadbay", "thedamnwall", "thecavern", "cindikate", "theorchard", "thesaucyclown", "theclownshead", "whiskeyimplant", "carpecarp", "robustroadhouse", "greytide", "theredshirt"))
 		return
@@ -12,6 +13,9 @@
 		return
 
 /obj/structure/sign/double/barsign/attackby(obj/item/I, mob/user)
+	if(cult)
+		return
+
 	if(istype(I, /obj/item/weapon/card/id))
 		var/obj/item/weapon/card/id/card = I
 		if(access_bar in card.GetAccess())

code/game/objects/structures/grille.dm

@@ -22,6 +22,11 @@
 /obj/structure/grille/meteorhit(var/obj/M)
 	del(src)
 
+/obj/structure/grille/update_icon()
+	if(destroyed)
+		icon_state = "[initial(icon_state)]-b"
+	else
+		icon_state = initial(icon_state)
 
 /obj/structure/grille/Bumped(atom/user)
 	if(ismob(user)) shock(user, 70)
@@ -165,9 +170,9 @@
 /obj/structure/grille/proc/healthcheck()
 	if(health <= 0)
 		if(!destroyed)
-			icon_state = "brokengrille"
 			density = 0
 			destroyed = 1
+			update_icon()
 			new /obj/item/stack/rods(loc)
 
 		else
@@ -215,3 +220,14 @@
 	health -= damage
 	spawn(1) healthcheck()
 	return 1
+
+/obj/structure/grille/cult
+	name = "cult grille"
+	desc = "A matrice built out of an unknown material, with some sort of force field blocking air around it"
+	icon_state = "grillecult"
+	health = 40 //Make it strong enough to avoid people breaking in too easily
+
+/obj/structure/grille/cult/CanPass(atom/movable/mover, turf/target, height = 1.5, air_group = 0)
+	if(air_group)
+		return 0 //Make sure air doesn't drain
+	..()

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

@@ -67,15 +67,13 @@
 		return
 
 // Chair types
-/obj/structure/bed/chair/wood/normal
+/obj/structure/bed/chair/wood
 	icon_state = "wooden_chair"
 	name = "wooden chair"
 	desc = "Old is never too old to not be in fashion."
 
 /obj/structure/bed/chair/wood/wings
 	icon_state = "wooden_chair_wings"
-	name = "wooden chair"
-	desc = "Old is never too old to not be in fashion."
 
 /obj/structure/bed/chair/wood/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/wrench))