Merge remote-tracking branch 'citadel/master' into combat_v7

code/modules/mining/equipment/survival_pod.dm

@@ -8,6 +8,10 @@
 	area_flags = BLOBS_ALLOWED | UNIQUE_AREA
 	flags_1 = CAN_BE_DIRTY_1
 
+/area/survivalpod/nonpowered
+	name = "\proper Emergency Shelter"
+	requires_power = TRUE
+
 //Survival Capsule
 /obj/item/survivalcapsule
 	name = "bluespace shelter capsule"
@@ -81,6 +85,10 @@
 	desc = "A luxury bar in a capsule. Bartender required and not included."
 	template_id = "shelter_charlie"
 
+/obj/item/survivalcapsule/luxury/empty
+	name = "large empty capsule"
+	desc = "An extremly large capsule which requires power. Useful for projects all over."
+	template_id = "shelter_delta"
 //Pod objects
 
 //Window