diff --git a/_maps/map_files/templates/shelter_1.dmm b/_maps/map_files/templates/shelter_1.dmm
new file mode 100644
index 00000000000..19071ada955
--- /dev/null
+++ b/_maps/map_files/templates/shelter_1.dmm
@@ -0,0 +1,23 @@
+"a" = (/turf/simulated/wall/survival,/area/survivalpod)
+"b" = (/obj/structure/sign/mining/survival{tag = "icon-survival (NORTH)"; icon_state = "survival"; dir = 1},/turf/simulated/wall/survival,/area/survivalpod)
+"c" = (/obj/structure/fans,/turf/simulated/floor/pod,/area/survivalpod)
+"d" = (/obj/machinery/smartfridge/survival_pod/loaded,/turf/simulated/floor/pod,/area/survivalpod)
+"e" = (/obj/item/device/gps/computer,/turf/simulated/floor/pod,/area/survivalpod)
+"f" = (/obj/structure/sign/mining/survival{dir = 8},/turf/simulated/wall/survival,/area/survivalpod)
+"g" = (/obj/machinery/sleeper/survival_pod,/turf/simulated/floor/pod,/area/survivalpod)
+"h" = (/turf/simulated/floor/pod,/area/survivalpod)
+"i" = (/obj/structure/stool/bed/pod,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/pod,/area/survivalpod)
+"j" = (/obj/structure/sign/mining/survival{tag = "icon-survival (EAST)"; icon_state = "survival"; dir = 4},/turf/simulated/wall/survival,/area/survivalpod)
+"k" = (/obj/structure/table/survival_pod,/turf/simulated/floor/pod,/area/survivalpod)
+"l" = (/obj/structure/tubes,/obj/structure/stool/bed/chair/comfy/black{dir = 8},/turf/simulated/floor/pod,/area/survivalpod)
+"m" = (/obj/structure/sign/mining/survival,/turf/simulated/wall/survival,/area/survivalpod)
+"n" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/survival_pod,/turf/simulated/floor/pod,/area/survivalpod)
+"o" = (/obj/structure/sign/mining,/turf/simulated/wall/survival,/area/survivalpod)
+
+(1,1,1) = {"
+aabaa
+acdea
+fghij
+akhla
+amnoa
+"}
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index ab1357a5833..f8ac8d0176f 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -281,4 +281,11 @@
// Sound
#define SOUND_MINIMUM_PRESSURE 10
-#define FALLOFF_SOUNDS 0.5
\ No newline at end of file
+#define FALLOFF_SOUNDS 0.5
+
+
+// Bluespace shelter deploy checks
+#define SHELTER_DEPLOY_ALLOWED "allowed"
+#define SHELTER_DEPLOY_BAD_TURFS "bad turfs"
+#define SHELTER_DEPLOY_BAD_AREA "bad area"
+#define SHELTER_DEPLOY_ANCHORED_OBJECTS "anchored objects"
\ No newline at end of file
diff --git a/code/_globalvars/mapping.dm b/code/_globalvars/mapping.dm
index abc81f9d52a..44b678a8f67 100644
--- a/code/_globalvars/mapping.dm
+++ b/code/_globalvars/mapping.dm
@@ -52,3 +52,4 @@ var/list/datum/map_template/map_templates = list()
var/list/datum/map_template/ruins_templates = list()
var/list/datum/map_template/space_ruins_templates = list()
//var/list/datum/map_template/lava_ruins_templates = list()
+var/list/datum/map_template/shelter_templates = list()
\ No newline at end of file
diff --git a/code/datums/helper_datums/map_template.dm b/code/datums/helper_datums/map_template.dm
index 8b61be7d12b..0d52cdc9463 100644
--- a/code/datums/helper_datums/map_template.dm
+++ b/code/datums/helper_datums/map_template.dm
@@ -116,7 +116,7 @@
if(!config.disable_space_ruins) // so we don't unnecessarily clutter start-up
preloadRuinTemplates()
- //preloadShuttleTemplates()
+ preloadShelterTemplates()
/proc/preloadRuinTemplates()
// Still supporting bans by filename
@@ -147,15 +147,12 @@
if(istype(R, /datum/map_template/ruin/space))
space_ruins_templates[R.name] = R
-/*
-/proc/preloadShuttleTemplates()
- for(var/item in subtypesof(/datum/map_template/shuttle))
- var/datum/map_template/shuttle/shuttle_type = item
- if(!(initial(shuttle_type.suffix)))
+/proc/preloadShelterTemplates()
+ for(var/item in subtypesof(/datum/map_template/shelter))
+ var/datum/map_template/shelter/shelter_type = item
+ if(!(initial(shelter_type.mappath)))
continue
+ var/datum/map_template/shelter/S = new shelter_type()
- var/datum/map_template/shuttle/S = new shuttle_type()
-
- shuttle_templates[S.shuttle_id] = S
- map_templates[S.shuttle_id] = S
-*/
+ shelter_templates[S.shelter_id] = S
+ map_templates[S.shelter_id] = S
\ No newline at end of file
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index a0b3f147b46..60e650691e5 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -577,4 +577,17 @@
light_color = LIGHT_COLOR_DARKRED
+/obj/machinery/sleeper/syndie/New()
+ ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/circuitboard/sleeper/syndicate(null)
+ var/obj/item/weapon/stock_parts/matter_bin/B = new(null)
+ B.rating = initial_bin_rating
+ component_parts += B
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
+ component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
+ component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
+ component_parts += new /obj/item/stack/cable_coil(null, 1)
+ RefreshParts()
+
#undef ADDICTION_SPEEDUP_TIME
\ No newline at end of file
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 2defdbf4623..2c6740ffbb3 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -744,6 +744,15 @@ obj/item/weapon/circuitboard/rdserver
/obj/item/stack/cable_coil = 1,
/obj/item/weapon/stock_parts/console_screen = 2)
+/obj/item/weapon/circuitboard/sleeper/syndicate
+ name = "circuit board (Sleeper Syndicate)"
+ build_path = /obj/machinery/sleeper/syndie
+
+/obj/item/weapon/circuitboard/sleeper/survival
+ name = "circuit board (Sleeper Survival Pod)"
+ build_path = /obj/machinery/sleeper/survival_pod
+
+
/obj/item/weapon/circuitboard/bodyscanner
name = "circuit board (Body Scanner)"
build_path = /obj/machinery/bodyscanner
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 518304fda5f..b003d9ef1d6 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -386,6 +386,8 @@ Class Procs:
I.crit_fail = 1
I.forceMove(loc)
qdel(src)
+ return 1
+ return 0
/obj/machinery/proc/default_deconstruction_screwdriver(var/mob/user, var/icon_state_open, var/icon_state_closed, var/obj/item/weapon/screwdriver/S)
if(istype(S))
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index bfbd0a4ccb6..f5b3650c5bb 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -129,3 +129,11 @@
turf_type = /turf/simulated/floor/silent
mineralType = "tranquillite"
materials = list(MAT_TRANQUILLITE=500)
+
+//Pod floor
+/obj/item/stack/tile/pod
+ name = "pod floor tile"
+ singular_name = "pod floor tile"
+ desc = "A grooved floor tile."
+ icon_state = "tile_pod"
+ turf_type = /turf/simulated/floor/pod
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm
index 0b090581595..6399a11c291 100644
--- a/code/game/objects/items/weapons/dice.dm
+++ b/code/game/objects/items/weapons/dice.dm
@@ -1,16 +1,49 @@
-/obj/item/weapon/dice
- name = "d6"
+/obj/item/weapon/storage/pill_bottle/dice
+ name = "bag of dice"
+ desc = "Contains all the luck you'll ever need."
+ icon = 'icons/obj/dice.dmi'
+ icon_state = "dicebag"
+
+/obj/item/weapon/storage/pill_bottle/dice/New()
+ ..()
+ var/special_die = pick("1","2","fudge","00","100")
+ if(special_die == "1")
+ new /obj/item/weapon/dice/d1(src)
+ if(special_die == "2")
+ new /obj/item/weapon/dice/d2(src)
+ new /obj/item/weapon/dice/d4(src)
+ new /obj/item/weapon/dice/d6(src)
+ if(special_die == "fudge")
+ new /obj/item/weapon/dice/fudge(src)
+ new /obj/item/weapon/dice/d8(src)
+ new /obj/item/weapon/dice/d10(src)
+ if(special_die == "00")
+ new /obj/item/weapon/dice/d00(src)
+ new /obj/item/weapon/dice/d12(src)
+ new /obj/item/weapon/dice/d20(src)
+ if(special_die == "100")
+ new /obj/item/weapon/dice/d100(src)
+
+/obj/item/weapon/dice //depreciated d6, use /obj/item/weapon/dice/d6 if you actually want a d6
+ name = "die"
desc = "A die with six sides. Basic and servicable."
icon = 'icons/obj/dice.dmi'
icon_state = "d6"
w_class = 1
var/sides = 6
var/result = null
+ var/list/special_faces = list() //entries should match up to sides var if used
/obj/item/weapon/dice/New()
result = rand(1, sides)
update_icon()
+/obj/item/weapon/dice/d1
+ name = "d1"
+ desc = "A die with one side. Deterministic!"
+ icon_state = "d1"
+ sides = 1
+
/obj/item/weapon/dice/d2
name = "d2"
desc = "A die with two sides. Coins are undignified!"
@@ -23,6 +56,16 @@
icon_state = "d4"
sides = 4
+/obj/item/weapon/dice/d6
+ name = "d6"
+
+/obj/item/weapon/dice/fudge
+ name = "fudge die"
+ desc = "A die with six sides but only three results. Is this a plus or a minus? Your mind is drawing a blank..."
+ sides = 3 //shhh
+ icon_state = "fudge"
+ special_faces = list("minus","blank","plus")
+
/obj/item/weapon/dice/d8
name = "d8"
desc = "A die with eight sides. It feels... lucky."
@@ -53,6 +96,15 @@
icon_state = "d20"
sides = 20
+/obj/item/weapon/dice/d100
+ name = "d100"
+ desc = "A die with one hundred sides! Probably not fairly weighted..."
+ icon_state = "d100"
+ sides = 100
+
+/obj/item/weapon/dice/d100/update_icon()
+ return
+
/obj/item/weapon/dice/d20/e20
var/triggered = 0
@@ -64,8 +116,9 @@
return
diceroll(user)
-/obj/item/weapon/dice/proc/diceroll(mob/user as mob)
+/obj/item/weapon/dice/proc/diceroll(mob/user)
result = rand(1, sides)
+ var/fake_result = rand(1, sides)//Daredevil isn't as good as he used to be
var/comment = ""
if(sides == 20 && result == 20)
comment = "Nat 20!"
@@ -74,20 +127,14 @@
update_icon()
if(initial(icon_state) == "d00")
result = (result - 1)*10
+ if(special_faces.len == sides)
+ result = special_faces[result]
if(user != null) //Dice was rolled in someone's hand
user.visible_message("[user] has thrown [src]. It lands on [result]. [comment]", \
"You throw [src]. It lands on [result]. [comment]", \
- "You hear [src] landing on [result]. [comment]")
+ "You hear [src] rolling, it sounds like a [fake_result].")
else if(src.throwing == 0) //Dice was thrown and is coming to rest
visible_message("[src] rolls to a stop, landing on [result]. [comment]")
-/*
-/obj/item/weapon/dice/d4/Crossed(var/mob/living/carbon/human/H)
- if(istype(H) && !H.shoes)
- to_chat(H, "You step on the D4!")
- H.apply_damage(4,BRUTE,(pick("l_leg", "r_leg")))
- H.Weaken(3)
-*///ew.
-
/obj/item/weapon/dice/d20/e20/diceroll(mob/user as mob, thrown)
if(triggered)
@@ -112,6 +159,7 @@
/obj/item/weapon/dice/update_icon()
overlays.Cut()
overlays += "[src.icon_state][src.result]"
+
/obj/item/weapon/storage/box/dice
name = "Box of dice"
desc = "ANOTHER ONE!? FUCK!"
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index 03ba6bed54b..67d44c53b2d 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -276,16 +276,6 @@
new /obj/item/weapon/reagent_containers/food/pill/charcoal( src )
new /obj/item/weapon/reagent_containers/food/pill/charcoal( src )
-/obj/item/weapon/storage/pill_bottle/dice
- name = "pack of dice"
- desc = "It's a small container with dice inside."
-
- New()
- ..()
- new /obj/item/weapon/dice( src )
- new /obj/item/weapon/dice/d20( src )
-
-
/obj/item/weapon/storage/pill_bottle/painkillers
name = "Pill Bottle (Salicylic Acid)"
desc = "Contains various pills for minor pain relief."
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index a012afa74f9..d403b4aae4b 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -779,6 +779,17 @@
Post_Consume(mob/living/M)
M.reagents.add_reagent("omnizine", 15)
+/obj/item/weapon/reagent_containers/food/snacks/warmdonkpocket_weak
+ name = "Lightly Warm Donk-pocket"
+ desc = "The food of choice for the seasoned traitor. This one is lukewarm."
+ icon_state = "donkpocket"
+ filling_color = "#DEDEAB"
+
+/obj/item/weapon/reagent_containers/food/snacks/warmdonkpocket_weak/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("weak_omnizine", 3)
+
/obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket
name = "Donk-pocket"
desc = "This donk-pocket is emitting a small amount of heat."
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 9a670e42d7a..c6f7e54a003 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -49,6 +49,8 @@
/obj/machinery/smartfridge/Destroy()
qdel(wires)
wires = null
+ for(var/atom/movable/A in contents)
+ A.forceMove(loc)
return ..()
/obj/machinery/smartfridge/proc/accept_check(var/obj/item/O as obj)
@@ -207,7 +209,8 @@
power_change()
return
- default_deconstruction_crowbar(O)
+ if(default_deconstruction_crowbar(O))
+ return
if(istype(O, /obj/item/device/multitool)||istype(O, /obj/item/weapon/wirecutters))
if(panel_open)
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index e774ef23924..1b1e4755e9b 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -263,6 +263,198 @@
icon_state = "mobcap[colorindex]"
update_icon()
+/*****************************Survival Pod********************************/
+
+
+/area/survivalpod
+ name = "\improper Emergency Shelter"
+ icon_state = "away"
+ requires_power = 0
+ has_gravity = 1
+
+/obj/item/weapon/survivalcapsule
+ name = "bluespace shelter capsule"
+ desc = "An emergency shelter stored within a pocket of bluespace."
+ icon_state = "capsule"
+ icon = 'icons/obj/mining.dmi'
+ w_class = 1
+ origin_tech = "engineering=3;bluespace=3"
+ var/template_id = "shelter_alpha"
+ var/datum/map_template/shelter/template
+ var/used = FALSE
+
+/obj/item/weapon/survivalcapsule/proc/get_template()
+ if(template)
+ return
+ template = shelter_templates[template_id]
+ if(!template)
+ log_runtime("Shelter template ([template_id]) not found!", src)
+ qdel(src)
+
+/obj/item/weapon/survivalcapsule/examine(mob/user)
+ . = ..()
+ get_template()
+ to_chat(user, "This capsule has the [template.name] stored.")
+ to_chat(user, template.description)
+
+/obj/item/weapon/survivalcapsule/attack_self()
+ // Can't grab when capsule is New() because templates aren't loaded then
+ get_template()
+ if(used == FALSE)
+ loc.visible_message("[src] begins to shake. Stand back!")
+ used = TRUE
+ sleep(50)
+ var/turf/deploy_location = get_turf(src)
+ var/status = template.check_deploy(deploy_location)
+ switch(status)
+ if(SHELTER_DEPLOY_BAD_AREA)
+ loc.visible_message("[src] will not function in this area.")
+ if(SHELTER_DEPLOY_BAD_TURFS, SHELTER_DEPLOY_ANCHORED_OBJECTS)
+ var/width = template.width
+ var/height = template.height
+ loc.visible_message("[src] doesn't have room to deploy! You need to clear a [width]x[height] area!")
+
+ if(status != SHELTER_DEPLOY_ALLOWED)
+ used = FALSE
+ return
+
+ playsound(get_turf(src), 'sound/effects/phasein.ogg', 100, 1)
+
+ var/turf/T = deploy_location
+ if(!is_mining_level(T.z))//only report capsules away from the mining/lavaland level
+ message_admins("[key_name_admin(usr)] (?) (FLW) activated a bluespace capsule away from the mining level! (JMP)")
+ log_admin("[key_name(usr)] activated a bluespace capsule away from the mining level at [T.x], [T.y], [T.z]")
+ template.load(deploy_location, centered = TRUE)
+ new /obj/effect/effect/harmless_smoke(get_turf(src))
+ qdel(src)
+
+//Pod turfs and objects
+
+
+//Floors
+/turf/simulated/floor/pod
+ name = "pod floor"
+ icon_state = "podfloor"
+ icon_regular_floor = "podfloor"
+ floor_tile = /obj/item/stack/tile/pod
+
+//Walls
+/turf/simulated/wall/survival
+ name = "pod wall"
+ desc = "An easily-compressable wall used for temporary shelter."
+ icon = 'icons/turf/walls/survival_pod_walls.dmi'
+ icon_state = "smooth"
+ walltype = "shuttle"
+ smooth = SMOOTH_MORE // To Do: Add in Diagnaol Smooth Support
+ canSmoothWith = list(/turf/simulated/wall/survival, /obj/machinery/door/airlock/survival_pod)
+
+//Door
+/obj/machinery/door/airlock/survival_pod
+ name = "Airlock"
+ icon = 'icons/obj/doors/survival.dmi'
+ assembly_type = /obj/structure/door_assembly/door_assembly_pod
+ opacity = 0
+ glass = 1
+
+/obj/structure/door_assembly/door_assembly_pod
+ base_icon_state = "survival_pod"
+ glass_type = "/survival_pod"
+
+//Table
+/obj/structure/table/survival_pod
+ icon = 'icons/obj/lavaland/survival_pod.dmi'
+ icon_state = "table"
+ smooth = SMOOTH_FALSE
+
+//Sleeper
+/obj/machinery/sleeper/survival_pod
+ icon = 'icons/obj/lavaland/survival_pod.dmi'
+ icon_state = "sleeper-open"
+ density = 0
+
+/obj/machinery/sleeper/survival_pod/New()
+ ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/circuitboard/sleeper/survival(null)
+ var/obj/item/weapon/stock_parts/matter_bin/B = new(null)
+ B.rating = initial_bin_rating
+ component_parts += B
+ component_parts += new /obj/item/weapon/stock_parts/manipulator(null)
+ component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
+ component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
+ component_parts += new /obj/item/stack/cable_coil(null, 1)
+ RefreshParts()
+
+//Computer
+/obj/item/device/gps/computer
+ name = "pod computer"
+ icon_state = "pod_computer"
+ icon = 'icons/obj/lavaland/pod_computer.dmi'
+ anchored = 1
+ density = 1
+ pixel_y = -32
+
+/obj/item/device/gps/computer/attackby(obj/item/weapon/W, mob/user, params)
+ if(istype(W, /obj/item/weapon/wrench))
+ playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user.visible_message("[user] disassembles the gps.", \
+ "You start to disassemble the gps...", "You hear clanking and banging noises.")
+ if(do_after(user, 20, target = src))
+ new /obj/item/device/gps(loc)
+ qdel(src)
+ return ..()
+
+/obj/item/device/gps/computer/attack_hand(mob/user)
+ attack_self(user)
+
+//Bed
+/obj/structure/stool/bed/pod
+ icon = 'icons/obj/lavaland/survival_pod.dmi'
+ icon_state = "bed"
+
+//Survival Storage Unit
+/obj/machinery/smartfridge/survival_pod
+ name = "survival pod storage"
+ desc = "A heated storage unit."
+ icon_state = "donkvendor"
+ icon = 'icons/obj/lavaland/donkvendor.dmi'
+ icon_on = "donkvendor"
+ icon_off = "donkvendor"
+ light_range = 8
+ max_n_of_items = 10
+ pixel_y = -4
+
+/obj/item/weapon/circuitboard/smartfridge/survival
+ name = "circuit board (Smartfridge Survival)"
+ build_path = /obj/machinery/smartfridge/survival_pod
+
+/obj/item/weapon/circuitboard/smartfridge/attackby(obj/item/I, mob/user, params)
+ return
+
+/obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O)
+ if(istype(O, /obj/item))
+ return 1
+ return 0
+
+/obj/machinery/smartfridge/survival_pod/New()
+ ..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/circuitboard/smartfridge/survival(null)
+ component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
+ RefreshParts()
+
+/obj/machinery/smartfridge/survival_pod/loaded/New()
+ ..()
+ for(var/i in 1 to 5)
+ var/obj/item/weapon/reagent_containers/food/snacks/warmdonkpocket_weak/W = new(src)
+ load(W)
+ if(prob(50))
+ var/obj/item/weapon/storage/pill_bottle/dice/D = new(src)
+ load(D)
+ else
+ var/obj/item/device/guitar/G = new(src)
+ load(G)
+
//Fans
/obj/structure/fans
icon = 'icons/obj/lavaland/survival_pod.dmi'
@@ -307,4 +499,36 @@
return ..()
/obj/structure/fans/CanAtmosPass(turf/T)
- return !arbitraryatmosblockingvar
\ No newline at end of file
+ return !arbitraryatmosblockingvar
+
+//Signs
+/obj/structure/sign/mining
+ name = "nanotrasen mining corps sign"
+ desc = "A sign of relief for weary miners, and a warning for would-be competitors to Nanotrasen's mining claims."
+ icon = 'icons/turf/walls/survival_pod_walls.dmi'
+ icon_state = "ntpod"
+
+/obj/structure/sign/mining/survival
+ name = "shelter sign"
+ desc = "A high visibility sign designating a safe shelter."
+ icon = 'icons/turf/walls/survival_pod_walls.dmi'
+ icon_state = "survival"
+
+//Fluff
+/obj/structure/tubes
+ icon_state = "tubes"
+ icon = 'icons/obj/lavaland/survival_pod.dmi'
+ name = "tubes"
+ anchored = 1
+ layer = MOB_LAYER - 0.2
+ density = 0
+
+/obj/structure/tubes/attackby(obj/item/weapon/W, mob/user, params)
+ if(istype(W, /obj/item/weapon/wrench))
+ playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user.visible_message("[user] disassembles [src].", \
+ "You start to disassemble [src]...", "You hear clanking and banging noises.")
+ if(do_after(user, 20, target = src))
+ new /obj/item/stack/rods(loc)
+ qdel(src)
+ return ..()
\ No newline at end of file
diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm
new file mode 100644
index 00000000000..38750b12d19
--- /dev/null
+++ b/code/modules/mining/shelters.dm
@@ -0,0 +1,42 @@
+/datum/map_template/shelter
+ var/shelter_id
+ var/description
+ var/blacklisted_turfs
+ var/whitelisted_turfs
+ var/banned_areas
+
+/datum/map_template/shelter/New()
+ . = ..()
+ blacklisted_turfs = typecacheof(list(/turf/simulated/wall, /turf/simulated/mineral, /turf/simulated/shuttle/wall))
+ whitelisted_turfs = list()
+ banned_areas = typecacheof(/area/shuttle)
+
+/datum/map_template/shelter/proc/check_deploy(turf/deploy_location)
+ var/affected = get_affected_turfs(deploy_location, centered=TRUE)
+ for(var/turf/T in affected)
+ var/area/A = get_area(T)
+ if(is_type_in_typecache(A, banned_areas))
+ return SHELTER_DEPLOY_BAD_AREA
+
+ var/banned = is_type_in_typecache(T, blacklisted_turfs)
+ var/permitted = is_type_in_typecache(T, whitelisted_turfs)
+ if(banned && !permitted)
+ return SHELTER_DEPLOY_BAD_TURFS
+
+ for(var/obj/O in T)
+ if(O.density && O.anchored)
+ return SHELTER_DEPLOY_ANCHORED_OBJECTS
+ return SHELTER_DEPLOY_ALLOWED
+
+/datum/map_template/shelter/alpha
+ name = "Shelter Alpha"
+ shelter_id = "shelter_alpha"
+ description = "A cosy self-contained pressurized shelter, with \
+ built-in navigation, entertainment, medical facilities and a \
+ sleeping area! Order now, and we'll throw in a TINY FAN, \
+ absolutely free!"
+ mappath = "_maps/map_files/templates/shelter_1.dmm"
+
+/datum/map_template/shelter/alpha/New()
+ . = ..()
+ whitelisted_turfs = typecacheof(/turf/simulated/mineral)
diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm
index e5e7af93b66..c9cb554b64f 100644
--- a/code/modules/reagents/newchem/medicine.dm
+++ b/code/modules/reagents/newchem/medicine.dm
@@ -1007,4 +1007,55 @@
M.adjustToxLoss(-5*REM)
M.adjustBrainLoss(-15*REM)
M.adjustCloneLoss(-3*REM)
- ..()
\ No newline at end of file
+ ..()
+
+
+/datum/reagent/omnizine_diluted
+ name = "Diluted Omnizine"
+ id = "weak_omnizine"
+ description = "Slowly heals all damage types. A far weaker substitute than actual omnizine."
+ reagent_state = LIQUID
+ color = "#DCDCDC"
+ overdose_threshold = 30
+ metabolization_rate = 0.1
+
+/datum/reagent/omnizine_diluted/on_mob_life(mob/living/M)
+ M.adjustToxLoss(-0.5*REM)
+ M.adjustOxyLoss(-0.5*REM)
+ M.adjustBruteLoss(-0.5*REM)
+ M.adjustFireLoss(-0.5*REM)
+ ..()
+
+/datum/reagent/omnizine_diluted/overdose_process(mob/living/M, severity)
+ var/effect = ..()
+ if(severity == 1) //lesser
+ M.stuttering += 1
+ if(effect <= 1)
+ M.visible_message("[M] suddenly cluches their gut!")
+ M.emote("scream")
+ M.Stun(4)
+ M.Weaken(4)
+ else if(effect <= 3)
+ M.visible_message("[M] completely spaces out for a moment.")
+ M.confused += 15
+ else if(effect <= 5)
+ M.visible_message("[M] stumbles and staggers.")
+ M.Dizzy(5)
+ M.Weaken(3)
+ else if(effect <= 7)
+ M.visible_message("[M] shakes uncontrollably.")
+ M.Jitter(30)
+ else if(severity == 2) // greater
+ if(effect <= 2)
+ M.visible_message("[M] suddenly cluches their gut!")
+ M.emote("scream")
+ M.Stun(7)
+ M.Weaken(7)
+ else if(effect <= 5)
+ M.visible_message("[M] jerks bolt upright, then collapses!")
+ M.Paralyse(5)
+ M.Weaken(4)
+ else if(effect <= 8)
+ M.visible_message("[M] stumbles and staggers.")
+ M.Dizzy(5)
+ M.Weaken(3)
\ No newline at end of file
diff --git a/icons/obj/dice.dmi b/icons/obj/dice.dmi
index d1a2dde4550..9ec030df05e 100644
Binary files a/icons/obj/dice.dmi and b/icons/obj/dice.dmi differ
diff --git a/icons/obj/doors/door_assembly.dmi b/icons/obj/doors/door_assembly.dmi
index 2c927cb8047..232a54da317 100644
Binary files a/icons/obj/doors/door_assembly.dmi and b/icons/obj/doors/door_assembly.dmi differ
diff --git a/icons/obj/doors/survival.dmi b/icons/obj/doors/survival.dmi
new file mode 100644
index 00000000000..fcc10adaa17
Binary files /dev/null and b/icons/obj/doors/survival.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 863c25a7aee..d0c6f7591ac 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/lavaland/donkvendor.dmi b/icons/obj/lavaland/donkvendor.dmi
new file mode 100644
index 00000000000..0b78a5168e4
Binary files /dev/null and b/icons/obj/lavaland/donkvendor.dmi differ
diff --git a/icons/obj/lavaland/pod_computer.dmi b/icons/obj/lavaland/pod_computer.dmi
new file mode 100644
index 00000000000..8417cfb8802
Binary files /dev/null and b/icons/obj/lavaland/pod_computer.dmi differ
diff --git a/icons/obj/lavaland/survival_pod.dmi b/icons/obj/lavaland/survival_pod.dmi
index 62aad7854d2..fae242d524f 100644
Binary files a/icons/obj/lavaland/survival_pod.dmi and b/icons/obj/lavaland/survival_pod.dmi differ
diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi
index c39dbef36a8..ef7ea2ddac7 100644
Binary files a/icons/obj/mining.dmi and b/icons/obj/mining.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 98e01f18cfa..cacec24168c 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/icons/turf/walls/survival_pod_walls.dmi b/icons/turf/walls/survival_pod_walls.dmi
new file mode 100644
index 00000000000..12dc44e9ea2
Binary files /dev/null and b/icons/turf/walls/survival_pod_walls.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 883e8908d01..9e0e34dabc1 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1412,6 +1412,7 @@
#include "code\modules\mining\money_bag.dm"
#include "code\modules\mining\ore.dm"
#include "code\modules\mining\satchel_ore_boxdm.dm"
+#include "code\modules\mining\shelters.dm"
#include "code\modules\mining\laborcamp\laborminerals.dm"
#include "code\modules\mining\laborcamp\laborshuttle.dm"
#include "code\modules\mining\laborcamp\laborstacker.dm"