Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines

code/modules/mining/mine_items.dm

@@ -333,8 +333,28 @@
 		new /obj/effect/effect/harmless_smoke(get_turf(src))
 		qdel(src)
 
+/obj/item/weapon/survivalcapsule/luxury
+	name = "luxury bluespace shelter capsule"
+	desc = "An exorbitantly expensive luxury suite stored within a pocket of bluespace."
+	origin_tech = "engineering=3;bluespace=4"
+	template_id = "shelter_beta"
+
 //Pod turfs and objects
 
+//Window
+/obj/structure/window/reinforced/survival_pod
+	name = "pod window"
+	icon = 'icons/obj/lavaland/survival_pod.dmi'
+	icon_state = "pwindow"
+
+// This override can be removed whenever we get rid of the stupid fucking `dir = 9` = full tile!!!! shit
+/obj/structure/window/reinforced/survival_pod/CanPass(atom/movable/mover, turf/target, height=0)
+	if(istype(mover) && mover.checkpass(PASSGLASS))
+		return 1
+	if(get_dir(loc, target) == dir)
+		return !density
+	else
+		return 1
 
 //Floors
 /turf/simulated/floor/pod
@@ -364,6 +384,12 @@
 	base_icon_state = "survival_pod"
 	glass_type = "/survival_pod"
 
+//Windoor
+/obj/machinery/door/window/survival_pod
+	icon = 'icons/obj/lavaland/survival_pod.dmi'
+	icon_state = "windoor"
+	base_state = "windoor"
+
 //Table
 /obj/structure/table/survival_pod
 	icon = 'icons/obj/lavaland/survival_pod.dmi'
@@ -536,3 +562,31 @@
 			new /obj/item/stack/rods(loc)
 			qdel(src)
 			return ..()
+
+/obj/item/fakeartefact
+	name = "expensive forgery"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "x2"
+	var/possible = list(/obj/item/ship_in_a_bottle,
+						/obj/item/weapon/gun/energy/pulse,
+						/obj/item/weapon/sleeping_carp_scroll,
+						/obj/item/weapon/shield/changeling,
+						/obj/item/weapon/lava_staff,
+						/obj/item/weapon/katana/energy,
+						/obj/item/weapon/storage/toolbox/green/memetic,
+						/obj/item/weapon/gun/projectile/automatic/l6_saw,
+						/obj/item/weapon/gun/magic/staff/chaos,
+						/obj/item/weapon/gun/magic/staff/spellblade,
+						/obj/item/weapon/gun/magic/wand/death,
+						/obj/item/weapon/gun/magic/wand/fireball,
+						/obj/item/stack/telecrystal,
+						/obj/item/weapon/banhammer)
+
+/obj/item/fakeartefact/New()
+	. = ..()
+	var/obj/item/I = pick(possible)
+	name = initial(I.name)
+	icon = initial(I.icon)
+	desc = initial(I.desc)
+	icon_state = initial(I.icon_state)
+	item_state = initial(I.item_state)

code/modules/mining/shelters.dm

@@ -40,3 +40,17 @@
 /datum/map_template/shelter/alpha/New()
 	. = ..()
 	whitelisted_turfs = typecacheof(/turf/simulated/mineral)
+
+/datum/map_template/shelter/beta
+	name = "Shelter Beta"
+	shelter_id = "shelter_beta"
+	description = "An extremly luxurious shelter, containing all \
+		the amenities of home, including carpeted floors, hot and cold \
+		running water, a gourmet three course meal, cooking facilities, \
+		and a deluxe companion to keep you from getting lonely during \
+		an ash storm."
+	mappath = "_maps/map_files/templates/shelter_2.dmm"
+
+/datum/map_template/shelter/beta/New()
+	. = ..()
+	whitelisted_turfs = typecacheof(/turf/simulated/mineral)