shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes IV Drips

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-14 06:38:40 -05:00
parent eb5cce3b8b
commit 1dc34f7383
2 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/iv_drip.dm
+29 -25
View File
@@ -59,11 +59,11 @@
add_overlay(filling_overlay)
/obj/machinery/iv_drip/MouseDrop(mob/living/target)
if(!ishuman(usr) || !usr.canUseTopic(src,BE_CLOSE) || !isliving(target))
if(!ishuman(usr) || !usr.canUseTopic(src, BE_CLOSE) || !isliving(target))
return
if(attached)
visible_message("<span class='warning'>[attached] is detached from \the [src].</span>")
visible_message("<span class='warning'>[attached] is detached from [src].</span>")
attached = null
update_icon()
return
@@ -74,7 +74,7 @@
if(Adjacent(target) && usr.Adjacent(target))
if(beaker)
usr.visible_message("<span class='warning'>[usr] attaches \the [src] to \the [target].</span>", "<span class='notice'>You attach \the [src] to \the [target].</span>")
usr.visible_message("<span class='warning'>[usr] attaches [src] to [target].</span>", "<span class='notice'>You attach [src] to [target].</span>")
attached = target
START_PROCESSING(SSmachines, src)
update_icon()
@@ -83,16 +83,16 @@
/obj/machinery/iv_drip/attackby(obj/item/weapon/W, mob/user, params)
if (is_type_in_typecache(W, drip_containers))
if(!isnull(beaker))
if(is_type_in_typecache(W, drip_containers))
if(beaker)
to_chat(user, "<span class='warning'>There is already a reagent container loaded!</span>")
return
if(!user.drop_item())
return
W.loc = src
W.forceMove(src)
beaker = W
to_chat(user, "<span class='notice'>You attach \the [W] to \the [src].</span>")
to_chat(user, "<span class='notice'>You attach [W] to [src].</span>")
update_icon()
return
else
@@ -117,13 +117,13 @@
if(beaker)
// Give blood
if(mode)
if(beaker.volume > 0)
if(beaker.reagents.total_volume)
var/transfer_amount = 5
if(istype(beaker, /obj/item/weapon/reagent_containers/blood))
// speed up transfer on blood packs
transfer_amount = 10
var/fraction = min(transfer_amount/beaker.volume, 1) //the fraction that is transfered of the total volume
beaker.reagents.reaction(attached, INJECT, fraction,0) //make reagents reacts, but don't spam messages
var/fraction = min(transfer_amount/beaker.reagents.total_volume, 1) //the fraction that is transfered of the total volume
beaker.reagents.reaction(attached, INJECT, fraction, FALSE) //make reagents reacts, but don't spam messages
beaker.reagents.trans_to(attached, transfer_amount)
update_icon()
@@ -132,13 +132,14 @@
var/amount = beaker.reagents.maximum_volume - beaker.reagents.total_volume
amount = min(amount, 4)
// If the beaker is full, ping
if(amount == 0)
if(prob(5)) visible_message("\The [src] pings.")
if(!amount)
if(prob(5))
visible_message("[src] pings.")
return
// If the human is losing too much blood, beep.
if(attached.blood_volume < BLOOD_VOLUME_SAFE && prob(5))
visible_message("\The [src] beeps loudly.")
visible_message("[src] beeps loudly.")
playsound(loc, 'sound/machines/twobeep.ogg', 50, 1)
attached.transfer_blood_to(beaker, amount)
update_icon()
@@ -147,7 +148,7 @@
if(!ishuman(user))
return
if(attached)
visible_message("[attached] is detached from \the [src]")
visible_message("[attached] is detached from [src]")
attached = null
update_icon()
return
@@ -165,11 +166,11 @@
to_chat(usr, "<span class='warning'>You can't do that!</span>")
return
if(usr.stat)
if(usr.incapacitated())
return
if(beaker)
beaker.loc = get_turf(src)
beaker.forceMove(get_turf(src))
beaker = null
update_icon()
@@ -182,26 +183,29 @@
to_chat(usr, "<span class='warning'>You can't do that!</span>")
return
if(usr.stat)
if(usr.incapacitated())
return
mode = !mode
to_chat(usr, "The IV drip is now [mode ? "injecting" : "taking blood"].")
update_icon()
/obj/machinery/iv_drip/examine()
set src in view()
/obj/machinery/iv_drip/examine(mob/user)
..()
if (!(usr in view(2)) && usr!=loc) return
if(get_dist(user, src) > 2)
return
to_chat(usr, "The IV drip is [mode ? "injecting" : "taking blood"].")
to_chat(user, "The IV drip is [mode ? "injecting" : "taking blood"].")
if(beaker)
if(beaker.reagents && beaker.reagents.reagent_list.len)
to_chat(usr, "<span class='notice'>Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid.</span>")
to_chat(user, "<span class='notice'>Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid.</span>")
else
to_chat(usr, "<span class='notice'>Attached is an empty [beaker.name].</span>")
to_chat(user, "<span class='notice'>Attached is an empty [beaker.name].</span>")
else
to_chat(usr, "<span class='notice'>No chemicals are attached.</span>")
to_chat(user, "<span class='notice'>No chemicals are attached.</span>")
to_chat(usr, "<span class='notice'>[attached ? attached : "No one"] is attached.</span>")
to_chat(user, "<span class='notice'>[attached ? attached : "No one"] is attached.</span>")
#undef IV_TAKING
#undef IV_INJECTING
code/game/machinery/iv_drip.dm.rej
+35
View File
@@ -0,0 +1,35 @@
diff a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm (rejected hunks)
@@ -1,21 +1,29 @@
+#define IV_TAKING 0
+#define IV_INJECTING 1
+
/obj/machinery/iv_drip
name = "\improper IV drip"
icon = 'icons/obj/iv_drip.dmi'
icon_state = "iv_drip"
- anchored = 0
+ anchored = FALSE
mouse_drag_pointer = MOUSE_ACTIVE_POINTER
var/mob/living/carbon/attached = null
- var/mode = 1 // 1 is injecting, 0 is taking blood.
+ var/mode = IV_INJECTING
var/obj/item/weapon/reagent_containers/beaker = null
var/list/drip_containers = list(/obj/item/weapon/reagent_containers/blood,
- /obj/item/weapon/reagent_containers/food,
- /obj/item/weapon/reagent_containers/glass)
+ /obj/item/weapon/reagent_containers/food,
+ /obj/item/weapon/reagent_containers/glass)
/obj/machinery/iv_drip/Initialize()
..()
update_icon()
drip_containers = typecacheof(drip_containers)
+/obj/machinery/iv_drip/Destroy()
+ attached = null
+ QDEL_NULL(beaker)
+ return ..()
+
/obj/machinery/iv_drip/update_icon()
if(attached)
if(mode)