sprites and map fix

code/datums/supplypacks/medical.dm

@@ -116,6 +116,7 @@
 /datum/supply_pack/med/cmogear
 	name = "Chief medical officer equipment"
 	contains = list(
+			/obj/item/weapon/storage/briefcase/ml3m_pack_cmo, //VOREStation addition,
 			/obj/item/weapon/storage/belt/medical,
 			/obj/item/device/radio/headset/heads/cmo,
 			/obj/item/clothing/under/rank/chief_medical_officer,
@@ -186,6 +187,7 @@
 /datum/supply_pack/med/paramedicgear
 	name = "Paramedic equipment"
 	contains = list(
+			/obj/item/weapon/storage/briefcase/ml3m_pack_med, //VOREStation addition,
 			/obj/item/weapon/storage/belt/medical/emt,
 			/obj/item/device/radio/headset/headset_med,
 			/obj/item/clothing/under/rank/medical/scrubs/black,

code/game/objects/random/misc.dm

@@ -173,6 +173,7 @@
 				prob(3);/obj/item/weapon/reagent_containers/syringe/antiviral,
 				prob(5);/obj/item/weapon/reagent_containers/syringe/inaprovaline,
 				prob(1);/obj/item/weapon/reagent_containers/hypospray,
+				prob(1);/obj/item/weapon/storage/briefcase/ml3m_pack_med,
 				prob(1);/obj/item/weapon/storage/box/freezer,
 				prob(2);/obj/item/stack/nanopaste)
 

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -114,6 +114,7 @@
 	req_access = list(access_medical_equip)
 
 	starts_with = list(
+		/obj/item/weapon/storage/briefcase/ml3m_pack_med, //VOREStation Addition,
 		/obj/item/weapon/storage/backpack/dufflebag/emt,
 		/obj/item/weapon/storage/box/autoinjectors,
 		/obj/item/weapon/storage/box/syringes,
@@ -149,6 +150,7 @@
 	icon_off = "cmosecureoff"
 
 	starts_with = list(
+		/obj/item/weapon/storage/briefcase/ml3m_pack_cmo, //VOREStation Addition,
 		/obj/item/clothing/under/rank/chief_medical_officer,
 		/obj/item/clothing/under/rank/chief_medical_officer/skirt,
 		/obj/item/clothing/suit/storage/toggle/labcoat/cmo,

code/modules/vore/fluffstuff/guns/nsfw.dm

@@ -158,11 +158,20 @@
 	healing beams can be configured at once. Ammo not included."
 	catalogue_data = list(/datum/category_item/catalogue/information/organization/vey_med)
 
+	icon_state = "ml3m"
 	description_info = "This is a ranged healing device that uses interchangable nanite discharge cells in a magazine. Each cell is a different healing beam type, and up to three can be loaded in the magazine. Each battery usually provides four discharges of that beam type, and multiple from the same type may be loaded to increase the number of shots for that type."
 	description_fluff = "The Vey-Med ML-3 'Medigun' allows one to customize their loadout in the field, or before deploying, to allow emergency response personnel to deliver a variety of ranged healing options."
 	description_antag = ""
 	allowed_magazines = list(/obj/item/ammo_magazine/nsfw_mag/medical)
 
+/obj/item/weapon/gun/projectile/nsfw/medical/cmo
+	name = "\improper Advanced ML-3 \'Medigun\'"
+	desc = "This is a variation on the ML-3 'Medigun', a powerful cell-based ranged healing device based on the KHI-102b NSFW. \
+	It has an extended sight for increased accuracy, and is capable of holding large magazines. Ammo not included."
+
+	icon_state = "ml3m_cmo"
+
+
 // The Magazine //
 /obj/item/ammo_magazine/nsfw_mag
 	name = "microbattery magazine"
@@ -379,8 +388,8 @@
 /obj/item/weapon/storage/secure/briefcase/nsfw_pack
 	name = "\improper KHI-102b \'NSFW\' gun kit"
 	desc = "A storage case for a multi-purpose handgun. Variety hour!"
-	max_w_class = ITEMSIZE_NORMAL
 	w_class = ITEMSIZE_NORMAL
+	max_w_class = ITEMSIZE_NORMAL
 
 /obj/item/weapon/storage/secure/briefcase/nsfw_pack/New()
 	..()
@@ -392,8 +401,8 @@
 /obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos
 	name = "\improper KHI-102b \'NSFW\' gun kit"
 	desc = "A storage case for a multi-purpose handgun. Variety hour!"
-	max_w_class = ITEMSIZE_NORMAL
 	w_class = ITEMSIZE_NORMAL
+	max_w_class = ITEMSIZE_NORMAL
 
 /obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos/New()
 	..()
@@ -406,6 +415,39 @@
 	new /obj/item/ammo_casing/nsfw_batt/combat/net(src)
 	new /obj/item/ammo_casing/nsfw_batt/combat/ion(src)
 
+/obj/item/weapon/storage/briefcase/ml3m_pack_med
+	name = "\improper ML-3 \'Medigun\' ML3M gun kit"
+	desc = "A storage case for a multi-purpose healing gun. Variety hour!"
+	w_class = ITEMSIZE_NORMAL
+	max_w_class = ITEMSIZE_NORMAL
+	icon_state = "purplefirstaid"
+
+/obj/item/weapon/storage/secure/briefcase/ml3m_pack_med/New()
+	..()
+	new /obj/item/weapon/gun/projectile/nsfw/medical(src)
+	new /obj/item/ammo_magazine/nsfw_mag/medical(src)
+	new /obj/item/ammo_casing/nsfw_batt/medical/brute(src)
+	new /obj/item/ammo_casing/nsfw_batt/medical/burn(src)
+	new /obj/item/ammo_casing/nsfw_batt/medical/stabilize(src)
+
+/obj/item/weapon/storage/briefcase/ml3m_pack_cmo
+	name = "\improper Advanced ML-3 \'Medigun\' ML3M gun kit"
+	desc = "A storage case for a multi-purpose healing gun. Variety hour!"
+	w_class = ITEMSIZE_NORMAL
+	max_w_class = ITEMSIZE_NORMAL
+	icon_state = "purplefirstaid"
+
+/obj/item/weapon/storage/secure/briefcase/ml3m_pack_cmo/New()
+	..()
+	new /obj/item/weapon/gun/projectile/nsfw/medical/cmo(src)
+	new /obj/item/ammo_magazine/nsfw_mag/medical/advanced(src)
+	new /obj/item/ammo_casing/nsfw_batt/medical/brute2(src)
+	new /obj/item/ammo_casing/nsfw_batt/medical/brute2(src)
+	new /obj/item/ammo_casing/nsfw_batt/medical/burn2(src)
+	new /obj/item/ammo_casing/nsfw_batt/medical/burn2(src)
+	new /obj/item/ammo_casing/nsfw_batt/medical/stabilize2(src)
+	new /obj/item/ammo_casing/nsfw_batt/medical/stabilize2(src)
+
 
 // Medical //
 
@@ -507,7 +549,7 @@
 		target.adjustBruteLoss(-5)
 		target.adjustFireLoss(-5)
 		target.adjustToxLoss(-5)
-		target.adjustOxyLoss(-5)
+		target.adjustOxyLoss(-15)
 	else
 		return 1
 
@@ -583,7 +625,7 @@
 		target.adjustBruteLoss(-10)
 		target.adjustFireLoss(-10)
 		target.adjustToxLoss(-10)
-		target.adjustOxyLoss(-10)
+		target.adjustOxyLoss(-30)
 	else
 		return 1
 
@@ -643,7 +685,7 @@
 	name = "\'ML-3/M\' nanite cell - REVIVAL"
 	type_color = "#669900"
 	type_name = "<span style='color:#669900;font-weight:bold;'>REVIVAL</span>"
-	projectile_type = /obj/item/projectile/beam/ML3M/resistance
+	projectile_type = /obj/item/projectile/beam/ML3M/revival
 
 /obj/item/projectile/beam/ML3M/revival/on_hit(var/mob/living/carbon/human/target)
 	if(istype(target, /mob/living/carbon/human))

maps/southern_cross/structures/closets/misc.dm

@@ -82,6 +82,7 @@
 	req_access = list(access_medical_equip)
 
 	starts_with = list(
+		obj/item/weapon/storage/briefcase/ml3m_pack_med, //VOREStation addition,
 		/obj/item/weapon/storage/backpack/dufflebag/emt,
 		/obj/item/weapon/storage/box/autoinjectors,
 		/obj/item/weapon/storage/box/syringes,

maps/southern_cross/structures/closets/misc_vr.dm

@@ -32,6 +32,7 @@
 	name = "field medic locker"
 
 	starts_with = list(
+		/obj/item/weapon/storage/briefcase/ml3m_pack_med,
 		/obj/item/weapon/storage/backpack/dufflebag/emt,
 		/obj/item/weapon/storage/box/autoinjectors,
 		/obj/item/weapon/storage/box/syringes,

maps/tether/tether-10-colony.dmm

@@ -1281,14 +1281,14 @@
 /area/centcom/specops)
 "bW" = (
 /obj/structure/table/reinforced,
-/obj/item/ammo_casing/nsfw_batt/stun,
+/obj/item/ammo_casing/nsfw_batt/combat/stun,
-/obj/item/ammo_casing/nsfw_batt/stun,
+/obj/item/ammo_casing/nsfw_batt/combat/stun,
-/obj/item/ammo_casing/nsfw_batt/stun,
+/obj/item/ammo_casing/nsfw_batt/combat/stun,
-/obj/item/ammo_casing/nsfw_batt,
+/obj/item/ammo_casing/nsfw_batt/medical/brute2,
-/obj/item/ammo_casing/nsfw_batt,
+/obj/item/ammo_casing/nsfw_batt/medical/burn2,
-/obj/item/ammo_casing/nsfw_batt,
+/obj/item/ammo_casing/nsfw_batt/medical/stabilize2,
-/obj/item/ammo_casing/nsfw_batt/net,
+/obj/item/ammo_casing/nsfw_batt/combat/net,
-/obj/item/ammo_casing/nsfw_batt/net,
+/obj/item/ammo_casing/nsfw_batt/combat/net,
 /obj/item/ammo_magazine/nsfw_mag,
 /obj/item/weapon/gun/projectile/nsfw,
 /turf/unsimulated/floor/steel{