diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index 39dd4e665aa..3226e36270a 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -5132,7 +5132,7 @@
"bUJ" = (/obj/structure/closet/wardrobe/genetics_white,/obj/machinery/camera{c_tag = "Medbay Genetics"; network = list("SS13")},/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurplecorner"},/area/medical/genetics)
"bUK" = (/turf/simulated/floor/plasteel{dir = 5; icon_state = "whitehall"},/area/medical/research{name = "Research Division"})
"bUL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/effect/decal/warning_stripes/yellow/partial{icon_state = "3"; dir = 8},/obj/effect/decal/warning_stripes/arrow{icon_state = "4"; dir = 8},/turf/simulated/floor/plasteel,/area/hallway/primary/central/se)
-"bUM" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/structure/closet/secure_closet/medical1,/obj/machinery/ai_status_display{pixel_x = 32; pixel_y = 0; step_size = 0},/obj/item/storage/box/pillbottles,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/item/reagent_containers/iv_bag/salglu,/turf/simulated/floor/plasteel{tag = "icon-whitebluefull"; icon_state = "whitebluefull"},/area/medical/biostorage)
+"bUM" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/obj/structure/closet/secure_closet/medical1,/obj/machinery/ai_status_display{pixel_x = 32; pixel_y = 0; step_size = 0},/obj/item/storage/box/pillbottles,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/item/reagent_containers/iv_bag/salglu,/obj/item/storage/box/iv_bags,/turf/simulated/floor/plasteel{tag = "icon-whitebluefull"; icon_state = "whitebluefull"},/area/medical/biostorage)
"bUN" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel,/area/assembly/chargebay)
"bUO" = (/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/obj/machinery/camera{c_tag = "Research Hallway Entrance"; dir = 2; network = list("Research","SS13")},/obj/effect/decal/warning_stripes/yellow/hollow,/turf/simulated/floor/plasteel,/area/medical/research{name = "Research Division"})
"bUP" = (/obj/machinery/door/poddoor{density = 0; icon_state = "open"; id_tag = "Biohazard"; name = "Biohazard Shutter"; opacity = 0},/obj/effect/decal/warning_stripes/yellow/hollow,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plasteel,/area/medical/research{name = "Research Division"})
diff --git a/code/game/machinery/defib_mount.dm b/code/game/machinery/defib_mount.dm
index 208209c6ec3..c5d6c281c81 100644
--- a/code/game/machinery/defib_mount.dm
+++ b/code/game/machinery/defib_mount.dm
@@ -10,7 +10,7 @@
use_power = IDLE_POWER_USE
idle_power_usage = 1
power_channel = EQUIP
- req_one_access = list(access_medical, access_heads, access_security) //used to control clamps
+ req_one_access = list(access_medical, access_heads) //used to control clamps
var/obj/item/defibrillator/defib //this mount's defibrillator
var/clamps_locked = FALSE //if true, and a defib is loaded, it can't be removed without unlocking the clamps
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index c49a6576142..eb939a05753 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -49,7 +49,9 @@
to_chat(user, "You attach [I] to [src].")
update_icon()
else if (bag && istype(I, /obj/item/reagent_containers))
- bag.attackby(I) // TODO - Make sure this shit even works.
+ bag.attackby(I)
+ I.afterattack(bag, usr, 1)
+ update_icon()
else
return ..()
diff --git a/code/modules/reagents/reagent_containers/iv_bag.dm b/code/modules/reagents/reagent_containers/iv_bag.dm
index 1aba90995da..5946e646d19 100644
--- a/code/modules/reagents/reagent_containers/iv_bag.dm
+++ b/code/modules/reagents/reagent_containers/iv_bag.dm
@@ -61,8 +61,8 @@
if(mode) // Injecting
if(reagents.total_volume)
- var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1) //the fraction that is transfered of the total volume
- reagents.reaction(injection_target, INGEST, fraction) //make reagents reacts, but don't spam messages
+ var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1) //The amount of reagents we'll transfer to the person
+ reagents.reaction(injection_target, INGEST, fraction) //React the amount we're transfering.
reagents.trans_to(injection_target, amount_per_transfer_from_this)
update_icon()
else // Drawing
@@ -84,19 +84,19 @@
var/mob/living/L
if(isliving(target))
L = target
- if(injection_target)
+ if(injection_target) // Removing the needle
if(L != injection_target)
to_chat(user, "[src] is already inserted into [injection_target]'s arm!")
return
if(L != user)
L.visible_message("[user] is trying to remove [src]'s needle from [L]'s arm!", \
- "[user] is trying to remove [src]'s needle from [L]'s arm!")
+ "[user] is trying to remove [src]'s needle from [L]'s arm!")
if(!do_mob(user, L))
return
L.visible_message("[user] removes [src]'s needle from [L]'s arm!", \
- "[user] removes [src]'s needle from [L]'s arm!")
+ "[user] removes [src]'s needle from [L]'s arm!")
end_processing()
- else
+ else // Inserting the needle
if(!L.can_inject(user, 1))
return
if(L != user)
@@ -153,6 +153,7 @@
if(blood_type != null)
set_label(blood_type)
reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
+ amount_per_transfer_from_this = 5 // Bloodbags are set to transfer 5 units by default.
update_icon()