diff --git a/code/datums/action.dm b/code/datums/action.dm
index 31b62e868dc..0fb6276944a 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -381,6 +381,13 @@
/datum/action/item_action/remove_badge
name = "Remove Holobadge"
+// Jump boots
+/datum/action/item_action/bhop
+ name = "Activate Jump Boots"
+ desc = "Activates the jump boot's internal propulsion system, allowing the user to dash over 4-wide gaps."
+ icon_icon = 'icons/mob/actions/actions.dmi'
+ button_icon_state = "jetboot"
+
///prset for organ actions
/datum/action/item_action/organ_action
check_flags = AB_CHECK_CONSCIOUS
diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 2d3f01a139d..37d8310ba95 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -364,6 +364,7 @@
SSthrowing.processing[src] = TT
TT.tick()
+ return TRUE
//Overlays
/atom/movable/overlay
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index a328332e2e4..dc225a157e5 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -172,6 +172,14 @@
force = 15
throwforce = 15
+/obj/item/kitchen/knife/combat/survival/bone
+ name = "bone dagger"
+ item_state = "bone_dagger"
+ icon_state = "bone_dagger"
+ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/items_righthand.dmi'
+ desc = "A sharpened bone. The bare minimum in survival."
+
/obj/item/kitchen/knife/combat/cyborg
name = "cyborg knife"
icon = 'icons/obj/items_cyborg.dmi'
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index abf68deb765..e5232343936 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -727,3 +727,52 @@
new /obj/item/analyzer(src)
new /obj/item/healthanalyzer(src)
+
+/obj/item/storage/belt/mining
+ name = "explorer's webbing"
+ desc = "A versatile chest rig, cherished by miners and hunters alike."
+ icon_state = "explorer1"
+ item_state = "explorer1"
+ storage_slots = 6
+ max_w_class = WEIGHT_CLASS_BULKY
+ use_item_overlays = 0
+ can_hold = list(
+ /obj/item/crowbar,
+ /obj/item/screwdriver,
+ /obj/item/weldingtool,
+ /obj/item/wirecutters,
+ /obj/item/wrench,
+ /obj/item/multitool,
+ /obj/item/flashlight,
+ /obj/item/stack/cable_coil,
+ /obj/item/analyzer,
+ /obj/item/extinguisher/mini,
+ /obj/item/radio,
+ /obj/item/clothing/gloves,
+ /obj/item/resonator,
+ /obj/item/mining_scanner,
+ /obj/item/pickaxe,
+ /obj/item/stack/sheet/animalhide,
+ /obj/item/stack/sheet/sinew,
+ /obj/item/stack/sheet/bone,
+ /obj/item/lighter,
+ /obj/item/storage/fancy/cigarettes,
+ /obj/item/reagent_containers/food/drinks/bottle,
+ /obj/item/stack/medical,
+ /obj/item/kitchen/knife,
+ /obj/item/reagent_containers/hypospray,
+ /obj/item/gps,
+ /obj/item/storage/bag/ore,
+ /obj/item/survivalcapsule,
+ /obj/item/t_scanner/adv_mining_scanner,
+ /obj/item/reagent_containers/food/pill,
+ /obj/item/stack/ore,
+ /obj/item/reagent_containers/food/drinks,
+ /obj/item/organ/internal/hivelord_core,
+ /obj/item/wormhole_jaunter,
+ /obj/item/storage/bag/plants,
+ /obj/item/stack/marker_beacon)
+
+/obj/item/storage/belt/bluespace/sandbox/New()
+ ..()
+ new /obj/item/survivalcapsule(src)
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 29f2c2dd488..cb4d9706569 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -192,6 +192,15 @@
var/obj/structure/grille/G = A
G.take_damage(40, BRUTE, "melee", 0)
+/obj/item/twohanded/fireaxe/boneaxe // Blatant imitation of the fireaxe, but made out of bone.
+ icon_state = "bone_axe0"
+ name = "bone axe"
+ desc = "A large, vicious axe crafted out of several sharpened bone plates and crudely tied together. Made of monsters, by killing monsters, for killing monsters."
+ force_wielded = 23
+
+/obj/item/twohanded/fireaxe/boneaxe/update_icon()
+ icon_state = "bone_axe[wielded]"
+
/*
* Double-Bladed Energy Swords - Cheridan
*/
@@ -347,6 +356,19 @@
explosive.prime()
qdel(src)
+/obj/item/twohanded/spear/bonespear //Blatant imitation of spear, but made out of bone. Not valid for explosive modification.
+ icon_state = "bone_spear0"
+ name = "bone spear"
+ desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology."
+ force = 11
+ force_unwielded = 11
+ force_wielded = 20 //I have no idea how to balance
+ throwforce = 22
+ armour_penetration = 15 //Enhanced armor piercing
+
+/obj/item/twohanded/spear/bonespear/update_icon()
+ icon_state = "bone_spear[wielded]"
+
//GREY TIDE
/obj/item/twohanded/spear/grey_tide
icon_state = "spearglass0"
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index f3a2efed260..3f1d6746f71 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -113,6 +113,12 @@
can_cut_open = 1
icon_state = "workboots"
+/obj/item/clothing/shoes/workboots/mining
+ name = "mining boots"
+ desc = "Steel-toed mining boots for mining in hazardous environments. Very good at keeping toes uncrushed."
+ icon_state = "explorer"
+ resistance_flags = FIRE_PROOF
+
/obj/item/clothing/shoes/winterboots
name = "winter boots"
desc = "Boots lined with 'synthetic' animal fur."
@@ -263,3 +269,34 @@
force = 0
silence_steps = TRUE
w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/clothing/shoes/bhop
+ name = "jump boots"
+ desc = "A specialized pair of combat boots with a built-in propulsion system for rapid foward movement."
+ icon_state = "jetboots"
+ item_state = "jetboots"
+ item_color = "hosred"
+ resistance_flags = FIRE_PROOF
+ actions_types = list(/datum/action/item_action/bhop)
+ permeability_coefficient = 0.05
+ var/jumpdistance = 5 //-1 from to see the actual distance, e.g 4 goes over 3 tiles
+ var/jumpspeed = 3
+ var/recharging_rate = 60 //default 6 seconds between each dash
+ var/recharging_time = 0 //time until next dash
+
+/obj/item/clothing/shoes/bhop/ui_action_click(mob/user, action)
+ if(!isliving(user))
+ return
+
+ if(recharging_time > world.time)
+ to_chat(user, "The boot's internal propulsion needs to recharge still!")
+ return
+
+ var/atom/target = get_edge_target_turf(user, user.dir) //gets the user's direction
+
+ if (user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE))
+ playsound(src, 'sound/effects/stealthoff.ogg', 50, 1, 1)
+ user.visible_message("[usr] dashes forward into the air!")
+ recharging_time = world.time + recharging_rate
+ else
+ to_chat(user, "Something prevents you from dashing forward!")
\ No newline at end of file
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 87d79e5f5ff..33ab89eb241 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -476,4 +476,66 @@
heat_protection = UPPER_TORSO|LOWER_TORSO
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
burn_state = FIRE_PROOF
- armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
\ No newline at end of file
+ armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
+
+//LAVALAND!
+
+/obj/item/clothing/suit/hooded/drake
+ name = "drake armour"
+ icon_state = "dragon"
+ item_state = "dragon"
+ desc = "A suit of armour fashioned from the remains of an ash drake."
+ allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/twohanded/spear)
+ armor = list("melee" = 70, "bullet" = 30, "laser" = 50, "energy" = 40, "bomb" = 70, "bio" = 60, "rad" = 50, "fire" = 100, "acid" = 100)
+ hoodtype = /obj/item/clothing/head/hooded/drake
+ heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+ max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
+ resistance_flags = FIRE_PROOF
+
+/obj/item/clothing/head/hooded/drake
+ name = "drake helmet"
+ icon_state = "dragon"
+ item_state = "dragon"
+ desc = "The skull of a dragon."
+ armor = list("melee" = 70, "bullet" = 30, "laser" = 50, "energy" = 40, "bomb" = 70, "bio" = 60, "rad" = 50, "fire" = 100, "acid" = 100)
+ heat_protection = HEAD
+ max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
+ resistance_flags = FIRE_PROOF
+
+/obj/item/clothing/suit/hooded/goliath
+ name = "goliath cloak"
+ icon_state = "goliath_cloak"
+ item_state = "goliath_cloak"
+ desc = "A staunch, practical cape made out of numerous monster materials, it is coveted amongst exiles & hermits."
+ allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/twohanded/spear)
+ armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot
+ hoodtype = /obj/item/clothing/head/hooded/goliath
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+
+/obj/item/clothing/head/hooded/goliath
+ name = "goliath cloak hood"
+ icon_state = "golhood"
+ item_state = "golhood"
+ desc = "A protective & concealing hood."
+ armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
+ flags = BLOCKHAIR
+ flags_cover = HEADCOVERSEYES
+
+/obj/item/clothing/suit/armor/bone
+ name = "bone armor"
+ desc = "A tribal armor plate, crafted from animal bone."
+ icon_state = "bonearmor"
+ item_state = "bonearmor"
+ blood_overlay_type = "armor"
+ armor = list("melee" = 35, "bullet" = 25, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
+
+/obj/item/clothing/head/skullhelmet
+ name = "skull helmet"
+ desc = "An intimidating tribal helmet, it doesn't look very comfortable."
+ flags = BLOCKHAIR
+ flags_cover = HEADCOVERSEYES
+ armor = list("melee" = 25, "bullet" = 25, "laser" = 25, "energy" = 10, "bomb" = 10, "bio" = 5, "rad" = 20, "fire" = 40, "acid" = 20)
+ icon_state = "skull"
+ item_state = "skull"
\ No newline at end of file
diff --git a/code/modules/clothing/suits/hood.dm b/code/modules/clothing/suits/hood.dm
index 3718a16602c..5b2266bb53b 100644
--- a/code/modules/clothing/suits/hood.dm
+++ b/code/modules/clothing/suits/hood.dm
@@ -23,6 +23,12 @@
/obj/item/clothing/head/berserkerhood
flags = NODROP
+/obj/item/clothing/head/hooded/drake
+ flags = NODROP
+
+/obj/item/clothing/head/hooded/goliath
+ flags = NODROP
+
/obj/item/clothing/suit/hooded/New()
MakeHood()
..()
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 535d863b2fd..dc0115dc73f 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -382,8 +382,22 @@
name = "gold necklace"
desc = "Damn, it feels good to be a gangster."
icon_state = "bling"
+ item_state = "bling"
item_color = "bling"
- item_color = "bling"
+
+/obj/item/clothing/accessory/necklace/skullcodpiece
+ name = "skull codpiece"
+ desc = "A skull shaped ornament, intended to protect the important things in life."
+ icon_state = "skull"
+ item_state = "skull"
+ item_color = "skull"
+
+/obj/item/clothing/accessory/necklace/talisman
+ name = "bone talisman"
+ desc = "A hunter's talisman, some say the old gods smile on those who wear it."
+ icon_state = "talisman"
+ item_state = "talisman"
+ item_color = "talisman"
/obj/item/clothing/accessory/necklace/locket
name = "gold locket"
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 4b1588f09cf..bf9d9a4569b 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -217,6 +217,13 @@
item_color = "miner"
flags_size = ONESIZEFITSALL
+/obj/item/clothing/under/rank/miner/lavaland
+ desc = "A green uniform for operating in hazardous environments."
+ name = "shaft miner's jumpsuit"
+ icon_state = "explorer"
+ item_state = "explorer"
+ item_color = "explorer"
+
/obj/item/clothing/under/barber
desc = "It's a barber's uniform."
name = "barber's uniform"
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 5116abf32e6..c3878aebfb8 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -391,6 +391,77 @@
reqs = list(/obj/item/grown/log = 5)
result = /obj/structure/bonfire
category = CAT_PRIMAL
+
+/datum/crafting_recipe/boneaxe
+ name = "Bone Axe"
+ result = /obj/item/twohanded/fireaxe/boneaxe
+ time = 50
+ reqs = list(/obj/item/stack/sheet/bone = 6,
+ /obj/item/stack/sheet/sinew = 3)
+ category = CAT_PRIMAL
+
+/datum/crafting_recipe/bonespear
+ name = "Bone Spear"
+ result = /obj/item/twohanded/spear/bonespear
+ time = 30
+ reqs = list(/obj/item/stack/sheet/bone = 4,
+ /obj/item/stack/sheet/sinew = 1)
+ category = CAT_PRIMAL
+
+/datum/crafting_recipe/bonedagger
+ name = "Bone Dagger"
+ result = /obj/item/kitchen/knife/combat/survival/bone
+ time = 20
+ reqs = list(/obj/item/stack/sheet/bone = 2)
+ category = CAT_PRIMAL
+
+/datum/crafting_recipe/bonecodpiece
+ name = "Skull Codpiece"
+ result = /obj/item/clothing/accessory/necklace/skullcodpiece
+ time = 20
+ reqs = list(/obj/item/stack/sheet/bone = 2,
+ /obj/item/stack/sheet/animalhide/goliath_hide = 1)
+ category = CAT_PRIMAL
+
+/datum/crafting_recipe/bonetalisman
+ name = "Bone Talisman"
+ result = /obj/item/clothing/accessory/necklace/talisman
+ time = 20
+ reqs = list(/obj/item/stack/sheet/bone = 2,
+ /obj/item/stack/sheet/sinew = 1)
+ category = CAT_PRIMAL
+
+/datum/crafting_recipe/bonearmor
+ name = "Bone Armor"
+ result = /obj/item/clothing/suit/armor/bone
+ time = 30
+ reqs = list(/obj/item/stack/sheet/bone = 6)
+ category = CAT_PRIMAL
+
+/datum/crafting_recipe/skullhelm
+ name = "Skull Helmet"
+ result = /obj/item/clothing/head/skullhelmet
+ time = 30
+ reqs = list(/obj/item/stack/sheet/bone = 4)
+ category = CAT_PRIMAL
+
+/datum/crafting_recipe/goliathcloak
+ name = "Goliath Cloak"
+ result = /obj/item/clothing/suit/hooded/goliath
+ time = 50
+ reqs = list(/obj/item/stack/sheet/leather = 2,
+ /obj/item/stack/sheet/sinew = 2,
+ /obj/item/stack/sheet/animalhide/goliath_hide = 2)
+ category = CAT_PRIMAL
+
+/datum/crafting_recipe/drakecloak
+ name = "Ash Drake Armour"
+ result = /obj/item/clothing/suit/hooded/drake
+ time = 60
+ reqs = list(/obj/item/stack/sheet/bone = 10,
+ /obj/item/stack/sheet/sinew = 2,
+ /obj/item/stack/sheet/animalhide/ashdrake = 5)
+ category = CAT_PRIMAL
/datum/crafting_recipe/guillotine
name = "Guillotine"
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 484e4836ae6..f0c942f08b1 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -441,6 +441,23 @@
new /datum/data/mining_equipment("Point Transfer Card", /obj/item/card/mining_point_card, 500),
)
+/obj/machinery/mineral/equipment_vendor/lavaland //Purchasable lavaland items, for compatability with the other asteroid
+ name = "lavaland mining equipment vendor"
+
+/obj/machinery/mineral/equipment_vendor/lavaland/Initialize()
+ . = ..()
+ desc += "\nIt seems a few selections have been added."
+ prize_list += list(
+ new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffel/mining_conscript, 1000),
+ new /datum/data/mining_equipment("Shelter Capsule", /obj/item/survivalcapsule, 400),
+ new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000),
+ new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500),
+ new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 10),
+ new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100),
+ new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300),
+ new /datum/data/mining_equipment("Explorer\'s Webbing", /obj/item/storage/belt/mining, 500)
+ )
+
/obj/machinery/mineral/equipment_vendor/golem
name = "golem ship equipment vendor"
@@ -643,6 +660,36 @@
..(user)
to_chat(user, "There's [points] points on the card.")
+/**********************Conscription Kit**********************/
+
+/obj/item/card/id/mining_access_card
+ name = "mining access card"
+ desc = "A small card, that when used on any ID, will add mining access."
+ icon_state = "data_1"
+
+/obj/item/card/id/mining_access_card/afterattack(atom/movable/AM, mob/user, proximity)
+ . = ..()
+ if(istype(AM, /obj/item/card/id) && proximity)
+ var/obj/item/card/id/I = AM
+ access=list(access_mining, access_mining_station, access_mineral_storeroom, access_cargo)
+ to_chat(user, "You upgrade [I] with mining access.")
+ qdel(src)
+
+/obj/item/storage/backpack/duffel/mining_conscript
+ name = "mining conscription kit"
+ desc = "A kit containing everything a crewmember needs to support a shaft miner in the field."
+
+/obj/item/storage/backpack/duffel/mining_conscript/New()
+ ..()
+ new /obj/item/pickaxe(src)
+ new /obj/item/clothing/glasses/meson(src)
+ new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
+ new /obj/item/storage/bag/ore(src)
+ new /obj/item/clothing/under/rank/miner/lavaland(src)
+ new /obj/item/encryptionkey/headset_cargo(src)
+ new /obj/item/clothing/mask/gas(src)
+ new /obj/item/card/id/mining_access_card(src)
+
/**********************Jaunter**********************/
/obj/item/wormhole_jaunter
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index 7d711cbadb1..5ec01dcfd7c 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -1140,3 +1140,30 @@
E.rejuvenate() //Repair it completely.
break
return ..() | update_flags
+
+/datum/reagent/medicine/lavaland_extract
+ name = "Lavaland Extract"
+ id = "lavaland_extract"
+ description = "An extract of lavaland atmospheric and mineral elements. Heals the user in small doses, but is extremely toxic otherwise."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+ metabolization_rate = 0.7 //VERY strong chemical
+ overdose_threshold = 3 //To prevent people stacking massive amounts of a very strong healing reagent
+ can_synth = FALSE
+
+/datum/reagent/medicine/lavaland_extract/on_mob_life(mob/living/carbon/M)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(-3*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustOxyLoss(-3*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustBruteLoss(-6*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(-6*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
+
+/datum/reagent/medicine/lavaland_extract/overdose_process(mob/living/M) // This WILL be brutal
+ var/update_flags = STATUS_UPDATE_NONE
+ M.AdjustConfused(5)
+ update_flags |= M.adjustBruteLoss(10*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(10*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustToxLoss(10*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.Stun(7, FALSE)
+ update_flags |= M.Weaken(7, FALSE)
+ return ..() | update_flags
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 7647df47661..dace5928b2e 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -151,6 +151,14 @@
volume = 50
list_reagents = list("stimulants" = 50)
+/obj/item/reagent_containers/hypospray/autoinjector/survival
+ name = "survival medipen"
+ desc = "A medipen for surviving in the harshest of environments, heals and protects from environmental hazards.
WARNING: Do not inject more than one pen in quick succession."
+ icon_state = "stimpen"
+ volume = 22
+ amount_per_transfer_from_this = 22
+ list_reagents = list("salbutamol" = 10, "epinephrine" = 5, "lavaland_extract" = 2, "salglu_solution" = 5) //Short burst of healing, followed by minor healing from the saline
+
/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium
name = "nanocalcium autoinjector"
desc = "After a short period of time the nanites will slow the body's systems and assist with bone repair. Nanomachines son."
diff --git a/icons/mob/actions/actions.dmi b/icons/mob/actions/actions.dmi
index d21323c80b1..0996117f2f8 100644
Binary files a/icons/mob/actions/actions.dmi and b/icons/mob/actions/actions.dmi differ
diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi
index 0cfc59b0553..a1e80aa5e65 100644
Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index 7fa7b78561d..8dfacefa278 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 4cdf9b38920..77ceb4df44c 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 5a0cb145a69..34ef8d28e9a 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index aa5f562b44b..9164b6f52ac 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 38e39071343..b181ced815d 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi
index b7d3b243994..bbb986c088e 100644
Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index ce2c967de4f..e5102b7eee9 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/clothing/belts.dmi b/icons/obj/clothing/belts.dmi
index 4445b3c3bb0..58e078b223c 100644
Binary files a/icons/obj/clothing/belts.dmi and b/icons/obj/clothing/belts.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 418f221c78f..9443be533eb 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index 14a173785ed..24a32facce4 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 95f69c6f799..fa4ee874b40 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi
index 4431d7a9afb..4799e9ad963 100644
Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 36ae38d9250..c39331ce8d4 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index f4cbb5c3bf7..0cfe6dc554c 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index 90f75df5913..b39c3668294 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ