Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891

code/modules/crafting/recipes.dm

@@ -379,6 +379,19 @@
 	result = /obj/item/toy/sword
 	category = CAT_MISC
 
+/datum/crafting_recipe/blackcarpet
+	name = "Black Carpet"
+	reqs = list(/obj/item/stack/tile/carpet = 50, /obj/item/toy/crayon/black = 1)
+	result = /obj/item/stack/tile/carpet/black
+	category = CAT_MISC
+
+/datum/crafting_recipe/showercurtain
+	name = "Shower Curtains"
+	reqs = 	list(/obj/item/stack/sheet/cloth = 2, /obj/item/stack/sheet/plastic = 2, /obj/item/stack/rods = 1)
+	result = /obj/structure/curtain
+	category = CAT_MISC
+
+
 /datum/crafting_recipe/chemical_payload
 	name = "Chemical Payload (C4)"
 	result = /obj/item/weapon/bombcore/chemical

code/modules/mining/machine_vending.dm

@@ -39,6 +39,7 @@
 		new /datum/data/mining_equipment("Mining Hardsuit",		/obj/item/clothing/suit/space/hardsuit/mining,							2000),
 		new /datum/data/mining_equipment("Diamond Pickaxe",		/obj/item/weapon/pickaxe/diamond,										2000),
 		new /datum/data/mining_equipment("Super Resonator",		/obj/item/weapon/resonator/upgraded,									2500),
+		new /datum/data/mining_equipment("Luxury Shelter Capsule",	/obj/item/weapon/survivalcapsule/luxury,							3000),
 		new /datum/data/mining_equipment("KA White Tracer Rounds",	/obj/item/borg/upgrade/modkit/tracer,								100),
 		new /datum/data/mining_equipment("KA Adjustable Tracer Rounds",	/obj/item/borg/upgrade/modkit/tracer/adjustable,				150),
 		new /datum/data/mining_equipment("KA Super Chassis",	/obj/item/borg/upgrade/modkit/chassis_mod,								250),

code/modules/mining/shelters.dm

@@ -40,3 +40,18 @@
 /datum/map_template/shelter/alpha/New()
 	. = ..()
 	whitelisted_turfs = typecacheof(/turf/closed/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/templates/shelter_2.dmm"
+
+/datum/map_template/shelter/beta/New()
+	. = ..()
+	whitelisted_turfs = typecacheof(/turf/closed/mineral)