Remaps Lava Pinnance

code/datums/ruins/lavaland.dm

@@ -48,3 +48,9 @@
 	id = "abandonedlistening"
 	description = "An abandoned Cybersun listening post. Seems like the Ramzi Clique has an interest in the site."
 	suffix = "lavaland_abandonedlisteningpost.dmm"
+
+/datum/map_template/ruin/lavaland/crashed_pinnance
+	name = "Pinnance Crash Site"
+	id = "crashed_pinnance"
+	description = "A small ship and a fairly hard landing, coupled with a less than fortunate encounter with monsters."
+	suffix = "lavaland_surface_crashed_pinnance.dmm"

code/game/objects/items/stacks/medical.dm

@@ -149,6 +149,9 @@
 	grind_results = list(/datum/reagent/cellulose = 2)
 	custom_price = 100
 
+/obj/item/stack/medical/gauze/six
+	amount = 6
+
 /obj/item/stack/medical/gauze/twelve
 	amount = 12
 
@@ -316,6 +319,9 @@
 		return
 	. = ..()
 
+/obj/item/stack/medical/mesh/six
+	amount = 6
+
 /obj/item/stack/medical/mesh/advanced
 	name = "advanced regenerative mesh"
 	desc = "An advanced mesh made with aloe extracts and sterilizing chemicals, used to treat burns."

code/game/objects/items/storage/firstaid.dm

@@ -270,6 +270,46 @@
 	new /obj/item/reagent_containers/pill/patch/silver_sulf(src)
 	new /obj/item/clothing/glasses/hud/health/night(src)
 
+/obj/item/storage/firstaid/emergency
+	name = "emergency medical kit"
+	desc = "Known in some circles as an Individual First Aid Kit. Said circles are at risk of being called nerds."
+	icon_state = "ifak"
+	drop_sound = 'sound/items/handling/cloth_drop.ogg'
+	pickup_sound = 'sound/items/handling/surgery2_pickup.ogg'
+	throw_speed = 2
+	slot_flags = ITEM_SLOT_POCKETS
+
+/obj/item/storage/firstaid/emergency/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_w_class = WEIGHT_CLASS_TINY //Absolutely doesn't hold much.
+	STR.max_items = 5
+	STR.max_combined_w_class = 5
+	STR.screen_max_columns = 5
+	STR.set_holdable(list(
+		/obj/item/healthanalyzer,
+		/obj/item/dnainjector,
+		/obj/item/reagent_containers/dropper,
+		/obj/item/reagent_containers/pill,
+		/obj/item/reagent_containers/syringe,
+		/obj/item/lighter,
+		/obj/item/storage/fancy/cigarettes,
+		/obj/item/stack/medical,
+		/obj/item/flashlight/pen,
+		/obj/item/reagent_containers/hypospray,
+		/obj/item/clothing/mask/surgical,
+		/obj/item/implant,
+		/obj/item/implanter,
+		))
+	STR.exception_hold = list(/obj/item/storage/pill_bottle,)
+
+/obj/item/storage/firstaid/emergency/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/reagent_containers/hypospray/medipen/painkiller(src)
+	new /obj/item/stack/medical/gauze/six(src)
+	new /obj/item/stack/medical/mesh/six(src)
+
 //medibot assembly
 /obj/item/storage/firstaid/attackby(obj/item/bodypart/S, mob/user, params)
 	if((!istype(S, /obj/item/bodypart/l_arm/robot)) && (!istype(S, /obj/item/bodypart/r_arm/robot)))

code/modules/cargo/packs/medical.dm

@@ -48,6 +48,13 @@
 	small_item = TRUE
 	contains = list(/obj/item/storage/firstaid/radiation)
 
+/datum/supply_pack/medical/ifak
+	name = "Individual First Aid Kit Single-Pack"
+	desc = "Contains one first aid kit for emergency first aid"
+	cost = 300
+	small_item = TRUE
+	contains = list(/obj/item/storage/firstaid/emergency)
+
 /*
 		Tools
 */

code/modules/reagents/reagent_containers/hypospray.dm

@@ -187,12 +187,20 @@
 
 /obj/item/reagent_containers/hypospray/medipen/morphine
 	name = "morphine medipen"
-	desc = "A rapid way to get you out of a tight situation and fast! You'll feel rather drowsy, though."
+	desc = "A rapid solution to intense pain or a patient who refuses to go under."
 	icon_state = "morphen"
 	base_icon_state = "morphen"
 	item_state = "morphen"
 	list_reagents = list(/datum/reagent/medicine/morphine = 10)
 
+/obj/item/reagent_containers/hypospray/medipen/painkiller
+	name = "painkiller medipen"
+	desc = "An proprietary blend of painkillers, for keeping you up just long enough to bandage something."
+	icon_state = "painpen"
+	base_icon_state = "painpen"
+	item_state = "painpen"
+	list_reagents = list(/datum/reagent/medicine/mine_salve = 2, /datum/reagent/medicine/morphine = 8)
+
 /obj/item/reagent_containers/hypospray/medipen/oxandrolone
 	name = "oxandrolone medipen"
 	desc = "A autoinjector containing oxandrolone, used to treat severe burns."