Fix for labeling virus dishes. Removed health analyzer from first-aid kit.

Made bruise packs and ointment only work above 50 health.
Added advanced treatment for future use.
Made MD's and CMO spawn with health analyzers.
Reduced medical equipment in non-medbay areas.
Made Health Scanner HUDs displays more granular.

code/WorkInProgress/virus2/isolator.dm

@@ -138,7 +138,7 @@
 	growth = rand(5, 50)
 
 /obj/item/weapon/virusdish/attackby(var/obj/item/weapon/W as obj,var/mob/living/carbon/user as mob)
-	if(istype(W,/obj/item/weapon/hand_labeler) || istype(W,/obj/item/weapon/reagent_containers/syringe))
+	if(istype(W,/obj/item/weapon/label) || istype(W,/obj/item/weapon/reagent_containers/syringe))
 		return
 	..()
 	if(prob(50))

code/defines/obj/storage.dm

@@ -197,7 +197,7 @@
 
 /obj/item/weapon/storage/firstaid
 	name = "First-Aid"
-	desc = "In case of an injury."
+	desc = "In case of injury."
 	icon_state = "firstaid"
 	throw_speed = 2
 	throw_range = 8
@@ -205,7 +205,7 @@
 
 /obj/item/weapon/storage/firstaid/fire
 	name = "Fire First Aid"
-	desc = "A kit for when you accidently burn yourself."
+	desc = "Contains burn treatments."
 	icon_state = "ointment"
 	item_state = "firstaid-ointment"
 
@@ -220,13 +220,13 @@
 
 /obj/item/weapon/storage/firstaid/toxin
 	name = "Toxin First Aid"
-	desc = "Used to treat when you have a high amount of toxins in your body."
+	desc = "Contains anti-toxin medication."
 	icon_state = "antitoxin"
 	item_state = "firstaid-toxin"
 
 /obj/item/weapon/storage/firstaid/o2
 	name = "Oxygen Deprivation First Aid"
-	desc = "A box full of oxygenating goodies."
+	desc = "Contains oxygen deprivation medication."
 	icon_state = "o2"
 	item_state = "firstaid-o2"
 
@@ -248,8 +248,6 @@
 	icon_state = "glasses"
 	item_state = "syringe_kit"
 
-
-
 /obj/item/weapon/storage/handcuff_kit
 	name = "Spare Handcuffs"
 	desc = "A box full of handcuffs."

code/defines/obj/weapon.dm

@@ -390,7 +390,7 @@
 	singular_name = "bruise pack"
 	desc = "A pack designed to treat blunt-force trauma."
 	icon_state = "brutepack"
-	heal_brute = 60
+	heal_brute = 40
 	origin_tech = "biotech=1"
 
 /obj/item/stack/medical/ointment
@@ -401,6 +401,22 @@
 	heal_burn = 40
 	origin_tech = "biotech=1"
 
+/obj/item/stack/medical/advanced/bruise_pack
+	name = "advanced trauma kit"
+	singular_name = "advanced bruise pack"
+	desc = "An advanced trauma kit for severe injuries."
+	icon_state = "brutepack"
+	heal_brute = 40
+	origin_tech = "biotech=1"
+
+/obj/item/stack/medical/advanced/ointment
+	name = "advanced burn kit"
+	singular_name = "advanced burn kit"
+	desc = "An advanced treatment kit for severe burns."
+	icon_state = "ointment"
+	heal_burn = 40
+	origin_tech = "biotech=1"
+
 /obj/item/weapon/c_tube
 	name = "cardboard tube"
 	desc = "A tube made of cardboard."

code/game/jobs/job/medical.dm

@@ -18,6 +18,7 @@
 		H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat/cmo(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/weapon/storage/firstaid/regular(H), H.slot_l_hand)
 		H.equip_if_possible(new /obj/item/device/flashlight/pen(H), H.slot_s_store)
+		H.equip_if_possible(new /obj/item/device/healthanalyzer(H), H.slot_r_store)
 		return 1
 
 
@@ -43,6 +44,7 @@
 		H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat(H), H.slot_wear_suit)
 		H.equip_if_possible(new /obj/item/weapon/storage/firstaid/regular(H), H.slot_l_hand)
 		H.equip_if_possible(new /obj/item/device/flashlight/pen(H), H.slot_s_store)
+		H.equip_if_possible(new /obj/item/device/healthanalyzer(H), H.slot_r_store)
 		return 1
 
 

code/game/objects/devices/scanners.dm

@@ -308,6 +308,10 @@ proc/analyze_health_less_info(mob/living/carbon/M as mob, mob/user as mob)
 		user.show_message(text("\red Significant brain damage detected. Subject may have had a concussion."), 1)
 	if (M.virus2 || M.reagents.reagent_list.len > 0)
 		user.show_message(text("\red Unknown substance detected in blood."), 1)
+/*	for(var/datum/organ/external/E in src)
+		if (!E.broken <= 0)
+			user.show_message(text("\red Bone fractures detected."), 1)*/
+//If someone can make this work I would be extremely grateful. -Erthilo
 	return
 
 /obj/item/device/healthanalyzer/attack(mob/M as mob, mob/user as mob)

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

@@ -7,6 +7,96 @@ MEDICAL
 
 
 /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob)
+	if (M.stat == 2)
+		var/t_him = "it"
+		if (M.gender == MALE)
+			t_him = "him"
+		else if (M.gender == FEMALE)
+			t_him = "her"
+		user << "\red \The [M] is dead, you cannot help [t_him]!"
+		return
+	if (M.health < 50)
+		var/t_him = "it"
+		if (M.gender == MALE)
+			t_him = "him"
+		else if (M.gender == FEMALE)
+			t_him = "her"
+		user << "\red \The [M] is wounded badly, this item cannot help [t_him]!"
+		return
+
+
+	if (!istype(M))
+		user << "\red \The [src] cannot be applied to [M]!"
+		return 1
+
+	if ( ! (istype(user, /mob/living/carbon/human) || \
+			istype(user, /mob/living/silicon) || \
+			istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") )
+		user << "\red You don't have the dexterity to do this!"
+		return 1
+
+	if (user)
+		if (M != user)
+			user.visible_message( \
+				"\blue [M] has been applied with [src] by [user].", \
+				"\blue You apply \the [src] to [M]." \
+			)
+		else
+			var/t_himself = "itself"
+			if (user.gender == MALE)
+				t_himself = "himself"
+			else if (user.gender == FEMALE)
+				t_himself = "herself"
+
+			user.visible_message( \
+				"\blue [M] applied [src] on [t_himself].", \
+				"\blue You apply \the [src] on yourself." \
+			)
+
+	if (istype(M, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = M
+		var/datum/organ/external/affecting = H.get_organ("chest")
+
+		if(istype(user, /mob/living/carbon/human))
+			var/mob/living/carbon/human/user2 = user
+			affecting = H.get_organ(check_zone(user2.zone_sel.selecting))
+		else
+			if(!istype(affecting, /datum/organ/external) || affecting:burn_dam <= 0)
+				affecting = H.get_organ("head")
+
+		if (affecting.heal_damage(src.heal_brute, src.heal_burn))
+			H.UpdateDamageIcon()
+
+		if(H.bloodloss > 0 && heal_brute > 0)		// fix wounds too if bruise pack
+			var/stoped = 0
+			for(var/datum/organ/external/wound/W in affecting.wounds)
+				if(W.bleeding)
+					W.stopbleeding()
+					stoped = 0
+					break
+			if(!stoped)
+				// user << "There is no bleeding wound at [t]" //code no longer in a dedicated obj, thus this doesn't really matter
+				return
+			if (user)
+				if (M != user)
+					for (var/mob/O in viewers(H, null))
+						O.show_message("\red [H] has been bandaged with [src] by [user]", 1)
+				else
+					var/t_himself = "itself"
+					if (user.gender == MALE)
+						t_himself = "himself"
+					else if (user.gender == FEMALE)
+						t_himself = "herself"
+					for (var/mob/O in viewers(H, null))
+						O.show_message("\red [H] bandaged [t_himself] with [src]", 1)
+
+		M.updatehealth()
+	else
+		M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))
+
+	use(1)
+
+/obj/item/stack/medical/advanced/attack(mob/living/carbon/M as mob, mob/user as mob)
 	if (M.stat == 2)
 		var/t_him = "it"
 		if (M.gender == MALE)

code/game/objects/storage/firstaid.dm

@@ -6,11 +6,11 @@
 	icon_state = pick("ointment","firefirstaid")
 
 	new /obj/item/device/healthanalyzer( src )
-	new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
 	new /obj/item/stack/medical/ointment( src )
 	new /obj/item/stack/medical/ointment( src )
 	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
 	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
+	new /obj/item/weapon/reagent_containers/pill/kelotane( src )
 	new /obj/item/weapon/reagent_containers/pill/kelotane( src ) //Replaced ointment with these since they actually work --Errorage
 	return
 
@@ -26,45 +26,42 @@
 	return
 
 /obj/item/weapon/storage/firstaid/regular/New()
-
 	..()
 	if (empty) return
-	new /obj/item/stack/medical/bruise_pack(src)
-	new /obj/item/stack/medical/bruise_pack(src)
-	new /obj/item/stack/medical/bruise_pack(src)
-	new /obj/item/stack/medical/ointment(src)
-	new /obj/item/stack/medical/ointment(src)
-	new /obj/item/device/healthanalyzer(src)
 	new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
+	new /obj/item/stack/medical/bruise_pack(src)
+	new /obj/item/stack/medical/bruise_pack(src)
+	new /obj/item/stack/medical/bruise_pack(src)
+	new /obj/item/stack/medical/ointment(src)
+	new /obj/item/stack/medical/ointment(src)
+	new /obj/item/stack/medical/ointment(src)
 	return
 
 /obj/item/weapon/storage/firstaid/toxin/New()
-
 	..()
 	if (empty) return
 
 	icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3")
 
-	new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
-	new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
-	new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
-	new /obj/item/weapon/reagent_containers/pill/antitox( src )
-	new /obj/item/weapon/reagent_containers/pill/antitox( src )
-	new /obj/item/weapon/reagent_containers/pill/antitox( src )
 	new /obj/item/device/healthanalyzer( src )
+	new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
+	new /obj/item/weapon/reagent_containers/syringe/antitoxin( src )
+	new /obj/item/weapon/reagent_containers/pill/antitox( src )
+	new /obj/item/weapon/reagent_containers/pill/antitox( src )
+	new /obj/item/weapon/reagent_containers/pill/antitox( src )
+	new /obj/item/weapon/reagent_containers/pill/antitox( src )
 	return
 
 /obj/item/weapon/storage/firstaid/o2/New()
-
 	..()
 	if (empty) return
-	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
-	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
-	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
-	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
-	new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
-	new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
 	new /obj/item/device/healthanalyzer( src )
+	new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
+	new /obj/item/weapon/reagent_containers/syringe/inaprovaline( src )
+	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
+	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
+	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
+	new /obj/item/weapon/reagent_containers/pill/dexalin( src )
 	return
 
 /obj/item/weapon/storage/pill_bottle/kelotane
@@ -122,4 +119,3 @@
 	new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
 	new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
 	new /obj/item/weapon/reagent_containers/pill/inaprovaline( src )
-

code/modules/clothing/glasses/hud.dm

@@ -22,20 +22,30 @@
 		switch(health)
 			if(100 to INFINITY)
 				return "health100"
-			if(70 to 100)
+			if(90 to 100)
+				return "health90"
+			if(80 to 90)
 				return "health80"
-			if(50 to 70)
+			if(70 to 80)
+				return "health70"
+			if(60 to 70)
 				return "health60"
-			if(30 to 50)
+			if(50 to 60)
+				return "health50"
+			if(40 to 50)
 				return "health40"
-			if(18 to 30)
+			if(30 to 40)
-				return "health25"
+				return "health30"
-			if(5 to 18)
+			if(20 to 30)
+				return "health20"
+			if(10 to 20)
 				return "health10"
-			if(1 to 5)
+			if(0 to 10)
 				return "health1"
-			if(-99 to 0)
+			if(-50 to 0)
-				return "health0"
+				return "health-50"
+			if(-99 to -50)
+				return "health-99"
 			else
 				return "health-100"
 		return "0"

config/admins.txt

@@ -19,3 +19,5 @@ spaceman96 - Game Admin
 strumpetplaya - Retired Admin
 tastyfish - Game Master
 uristqwerty - Game Master
+erthilo - Game Master
+erthilo2 - Game Master

maps/tgstation.2.0.8.dmm

@@ -562,9 +562,9 @@
 "akP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/turf/simulated/wall,/area/crew_quarters)
 "akQ" = (/obj/structure/cable,/obj/machinery/power/solar{id = "auxsolareast"; name = "Port Auxiliary Solar Array"},/turf/simulated/floor/airless{icon_state = "solarpanel"},/area/solar/auxport)
 "akR" = (/obj/structure/bookcase/manuals/medical,/turf/simulated/floor{icon_state = "white"},/area/security/brig)
-"akS" = (/obj/structure/table,/obj/item/device/healthanalyzer,/obj/item/device/healthanalyzer{pixel_x = 4; pixel_y = 5},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "white"},/area/security/brig)
+"akS" = (/obj/structure/table,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/ointment,/turf/simulated/floor{icon_state = "white"},/area/security/brig)
-"akT" = (/obj/structure/table,/obj/item/device/radio/electropack,/turf/simulated/floor{icon_state = "white"},/area/security/brig)
+"akT" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor{icon_state = "white"},/area/security/brig)
-"akU" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/o2,/obj/item/weapon/storage/firstaid/regular{pixel_x = 3; pixel_y = 3},/turf/simulated/floor{icon_state = "white"},/area/security/brig)
+"akU" = (/obj/structure/table,/obj/item/device/radio/electropack,/turf/simulated/floor{icon_state = "white"},/area/security/brig)
 "akV" = (/obj/structure/table,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/turf/simulated/floor,/area/security/brig)
 "akW" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig)
 "akX" = (/obj/machinery/flasher{id = "Cell 3"; pixel_x = 0; pixel_y = 24},/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{icon_state = "floorgrime"},/area/security/brig)
@@ -728,7 +728,7 @@
 "anZ" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/fitness)
 "aoa" = (/obj/machinery/sink{pixel_y = 29},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/fitness)
 "aob" = (/obj/structure/reagent_dispensers/water_cooler,/turf/simulated/floor,/area/crew_quarters/fitness)
-"aoc" = (/obj/machinery/light{dir = 1},/obj/structure/table,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack{pixel_x = 10; pixel_y = 2},/obj/item/stack/medical/ointment{pixel_y = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/crew_quarters/fitness)
+"aoc" = (/obj/machinery/light{dir = 1},/obj/structure/table,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/ointment{pixel_y = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/crew_quarters/fitness)
 "aod" = (/obj/machinery/camera{c_tag = "Fitness Room"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor,/area/crew_quarters/fitness)
 "aoe" = (/obj/structure/closet,/turf/simulated/floor,/area/crew_quarters/fitness)
 "aof" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/crew_quarters/fitness)
@@ -2790,7 +2790,7 @@
 "bbH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/maintcentral)
 "bbI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor/plating,/area/maintenance/maintcentral)
 "bbJ" = (/obj/structure/rack{dir = 1},/obj/item/clothing/mask/gas,/obj/item/clothing/glasses/meson,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor/plating,/area/maintenance/maintcentral)
-"bbK" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/table,/obj/item/weapon/storage/pill_bottle/tramadol{pixel_x = 8},/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/ointment,/obj/item/stack/medical/ointment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
+"bbK" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/table,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/ointment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bbL" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/table,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bbM" = (/obj/structure/morgue,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
 "bbN" = (/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue)
@@ -3242,7 +3242,7 @@
 "bkr" = (/obj/structure/closet/crate/medical,/turf/simulated/floor,/area/quartermaster/storage)
 "bks" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=8"; freq = 1400; location = "QM #4"},/turf/simulated/floor{icon_state = "bot"},/area/quartermaster/storage)
 "bkt" = (/obj/structure/grille,/obj/structure/disposalpipe/segment,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/storage)
-"bku" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/regular{pixel_x = 6; pixel_y = -5},/turf/simulated/floor,/area/quartermaster/storage)
+"bku" = (/obj/structure/table,/obj/item/stack/medical/ointment{pixel_y = 4},/obj/item/stack/medical/bruise_pack,/turf/simulated/floor,/area/quartermaster/storage)
 "bkv" = (/obj/structure/closet/secure_closet/cargo_tech_personal,/turf/simulated/floor,/area/quartermaster/storage)
 "bkw" = (/obj/machinery/computer/supplycomp,/turf/simulated/floor,/area/quartermaster/storage)
 "bkx" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/hologram/holopad,/turf/simulated/floor,/area/quartermaster)
@@ -3822,7 +3822,7 @@
 "bvz" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple{color = "red"; dir = 4; icon_state = "intact-r-f"; level = 1; name = "pipe"},/turf/simulated/wall,/area/maintenance/asmaint)
 "bvA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/asmaint)
 "bvB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/wall,/area/maintenance/asmaint)
-"bvC" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/table,/obj/item/weapon/storage/beakerbox{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/pill_bottle/tramadol,/obj/item/weapon/storage/pill_bottle/tramadol,/obj/item/weapon/storage/pill_bottle/tramadol,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
+"bvC" = (/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/structure/table,/obj/item/weapon/storage/beakerbox{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/pill_bottle/tramadol,/obj/item/weapon/storage/pill_bottle/tramadol,/obj/item/weapon/storage/pill_bottle/tramadol,/obj/item/weapon/storage/pill_bottle/tramadol,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bvD" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Medical Supplies"; req_access_txt = "5"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bvE" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Patient Room 2 Shutters"; name = "Privacy Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/medical/medbay)
 "bvF" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = 29},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
@@ -5162,9 +5162,9 @@
 "bVn" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor{icon_state = "yellowcorner"},/area/hallway/primary/aft)
 "bVo" = (/obj/item/weapon/clipboard,/obj/item/weapon/stamp/ce,/obj/item/clothing/glasses/meson,/obj/structure/table/reinforced,/turf/simulated/floor,/area/engine/chiefs_office)
 "bVp" = (/obj/item/weapon/storage/belt/utility,/obj/item/weapon/weldingtool,/obj/item/weapon/wrench,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/structure/table/reinforced,/turf/simulated/floor,/area/engine/chiefs_office)
-"bVq" = (/obj/item/weapon/zippo,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/item/weapon/reagent_containers/pill/kelotane{pixel_x = -3; pixel_y = -12},/obj/structure/table/reinforced,/obj/structure/disposalpipe/segment,/obj/item/device/hacktool/engineer,/turf/simulated/floor,/area/engine/chiefs_office)
+"bVq" = (/obj/item/weapon/zippo,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/structure/table/reinforced,/obj/structure/disposalpipe/segment,/obj/item/device/hacktool/engineer,/turf/simulated/floor,/area/engine/chiefs_office)
 "bVr" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/engine/chiefs_office)
-"bVs" = (/obj/item/weapon/cartridge/engineering{pixel_x = 4; pixel_y = 5},/obj/item/weapon/cartridge/engineering{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cartridge/engineering{pixel_x = 3},/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/obj/structure/table/reinforced,/turf/simulated/floor,/area/engine/chiefs_office)
+"bVs" = (/obj/item/weapon/cartridge/engineering{pixel_x = 4; pixel_y = 5},/obj/item/weapon/cartridge/engineering{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cartridge/engineering{pixel_x = 3},/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/obj/structure/table/reinforced,/obj/item/stack/medical/ointment{pixel_y = 4},/turf/simulated/floor,/area/engine/chiefs_office)
 "bVt" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/structure/table/reinforced,/turf/simulated/floor,/area/engine/chiefs_office)
 "bVu" = (/obj/machinery/camera{c_tag = "CE's Office"; dir = 1; network = "Engineering"; pixel_x = 23},/obj/structure/table/reinforced,/obj/effect/deskclutter,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/engine/chiefs_office)
 "bVv" = (/obj/machinery/portable_atmospherics/scrubber,/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/atmos)