yogstation13
diff --git a/‎code/game/objects/items/storage/firstaid.dm‎
Lines changed: 25 additions & 0 deletions b/‎code/game/objects/items/storage/firstaid.dm‎
Lines changed: 25 additions & 0 deletions
diff --git a/‎code/modules/reagents/reagent_containers/hypospray.dm‎
Lines changed: 5 additions & 0 deletions b/‎code/modules/reagents/reagent_containers/hypospray.dm‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎code/modules/reagents/reagent_containers/patch.dm‎
Lines changed: 7 additions & 1 deletion b/‎code/modules/reagents/reagent_containers/patch.dm‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎code/modules/reagents/reagent_containers/pill.dm‎
Lines changed: 6 additions & 0 deletions b/‎code/modules/reagents/reagent_containers/pill.dm‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎code/modules/vending/medical.dm‎
Lines changed: 2 additions & 1 deletion b/‎code/modules/vending/medical.dm‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎icons/mob/inhands/equipment/medical_lefthand.dmi‎
137 Bytes b/‎icons/mob/inhands/equipment/medical_lefthand.dmi‎
137 Bytes
diff --git a/‎icons/mob/inhands/equipment/medical_righthand.dmi‎
147 Bytes b/‎icons/mob/inhands/equipment/medical_righthand.dmi‎
147 Bytes
diff --git a/‎icons/obj/chemical.dmi‎
-465 Bytes b/‎icons/obj/chemical.dmi‎
-465 Bytes
@@ -135,6 +135,23 @@
 		/obj/item/healthanalyzer = 1)
 	generate_items_inside(items_inside,src)
 
+/obj/item/storage/firstaid/advanced
+	name = "advanced first aid kit"
+	desc = "An advanced kit to help deal with advanced wounds."
+	icon_state = "radfirstaid"
+	item_state = "firstaid-rad"
+	custom_premium_price = 600
+
+/obj/item/storage/firstaid/advanced/PopulateContents()
+	if(empty)
+		return
+	var/static/items_inside = list(
+		/obj/item/reagent_containers/pill/patch/synthflesh = 3,
+		/obj/item/reagent_containers/hypospray/medipen/atropine = 2,
+		/obj/item/stack/medical/gauze = 1,
+		/obj/item/storage/pill_bottle/penacid = 1)
+	generate_items_inside(items_inside,src)
+
 /obj/item/storage/firstaid/tactical
 	name = "combat medical kit"
 	desc = "I hope you've got insurance."
@@ -278,3 +295,11 @@
 /obj/item/storage/pill_bottle/happiness/PopulateContents()
 	for(var/i in 1 to 5)
 		new /obj/item/reagent_containers/pill/happiness(src)
+
+/obj/item/storage/pill_bottle/penacid
+	name = "bottle of pentetic acid"
+	desc = "Contains pills to expunge radioation and toxins"
+
+/obj/item/storage/pill_bottle/penacid/PopulateContents()
+	for(var/i in 1 to 3)
+		new /obj/item/reagent_containers/pill/penacid(src)
@@ -193,3 +193,8 @@
 	volume = 250
 	list_reagents = list("holywater" = 150, "tiresolution" = 50, "dizzysolution" = 50)
 	amount_per_transfer_from_this = 50
+
+/obj/item/reagent_containers/hypospray/medipen/atropine
+	name = "atropine autoinjector"
+	desc = "A rapid way to save a person from a critical injury state!"
+	list_reagents = list("atropine" = 10)
@@ -37,4 +37,10 @@
 	name = "burn patch"
 	desc = "Helps with burn injuries."
 	list_reagents = list("silver_sulfadiazine" = 20)
-	icon_state = "bandaid_burn"
+	icon_state = "bandaid_burn"
+
+/obj/item/reagent_containers/pill/patch/synthflesh
+	name = "synthflesh patch"
+	desc = "Helps with brute and burn injuries."
+	list_reagents = list("synthflesh" = 20)
+	icon_state = "bandaid_both"
@@ -160,6 +160,12 @@
 	list_reagents = list("psicodine" = 10)
 	icon_state = "pill22"
 	roundstart = 1
+/obj/item/reagent_containers/pill/penacid
+	name = "pentetic acid pill"
+	desc = "Used to expunge radioation and toxins."
+	list_reagents = list("pen_acid" = 10)
+	icon_state = "pill22"
+	roundstart = 1
 ///////////////////////////////////////// this pill is used only in a legion mob drop
 /obj/item/reagent_containers/pill/shadowtoxin
 	name = "black pill"
 
@@ -32,7 +32,8 @@
 		           /obj/item/storage/pill_bottle/psicodine = 2,
 		           /obj/item/reagent_containers/hypospray/medipen = 3,
 		           /obj/item/storage/belt/medical = 3,
-		           /obj/item/wrench/medical = 1)
+		           /obj/item/wrench/medical = 1,
+		           /obj/item/storage/firstaid/advanced = 2)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
 	resistance_flags = FIRE_PROOF
 	refill_canister = /obj/item/vending_refill/medical