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

Beaker swapping for Pandemic machine

Browse Source
This commit is contained in:
Blue Wildrose
2021-04-05 23:06:35 -07:00
parent d1040001f6
commit 9239c1eb52
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/reagents/chemistry/machinery/pandemic.dm
View File

@@ -139,9 +139,12 @@
/obj/machinery/computer/pandemic/proc/eject_beaker()
if(beaker)
var/obj/item/reagent_containers/B = beaker
beaker.forceMove(drop_location())
beaker = null
update_icon()
return B
return null
/obj/machinery/computer/pandemic/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
@@ -237,14 +240,17 @@
. = TRUE //no afterattack
if(stat & (NOPOWER|BROKEN))
return
var/obj/item/reagent_containers/B
if(beaker)
to_chat(user, "<span class='warning'>A container is already loaded into [src]!</span>")
return
B = eject_beaker() //now with 100% more swapping
if(!user.transferItemToLoc(I, src))
return
if(B)
if(user && Adjacent(user) && user.can_hold_items())
user.put_in_hands(B)
beaker = I
to_chat(user, "<span class='notice'>You insert [I] into [src].</span>")
if(B) to_chat(user, "<span class='notice'>You remove [B] and insert [I] into [src].</span>")
else to_chat(user, "<span class='notice'>You insert [I] into [src].</span>")
update_icon()
else
return ..()