cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 08:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

ChemMasters now eject beakers and pill bottles to the user's hand (#10569)

Browse Source
This commit is contained in:
Hockaa
2020-11-19 23:00:26 +01:00
committed by GitHub
parent 785b21570e
commit 63314ff058
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Machinery.dm
+13 -7
View File
@@ -77,7 +77,10 @@
if (href_list["ejectp"])
if(loaded_pill_bottle)
loaded_pill_bottle.forceMove(src.loc)
if(Adjacent(usr))
usr.put_in_hands(loaded_pill_bottle)
else
loaded_pill_bottle.forceMove(get_turf(src))
loaded_pill_bottle = null
else if(href_list["close"])
usr << browse(null, "window=chemmaster")
@@ -146,7 +149,10 @@
return
else if (href_list["eject"])
if(beaker)
beaker:loc = src.loc
if(Adjacent(usr))
usr.put_in_hands(beaker)
else
beaker:loc = get_turf(src)
beaker = null
reagents.clear_reagents()
icon_state = "mixer0"
@@ -171,7 +177,7 @@
if(reagents.total_volume/count < 1) //Sanity checking.
return
while (count-- && count >= 0)
var/obj/item/reagent_containers/pill/P = new/obj/item/reagent_containers/pill(src.loc)
var/obj/item/reagent_containers/pill/P = new/obj/item/reagent_containers/pill(get_turf(src))
if(!name) name = reagents.get_master_reagent_name()
P.name = "[name] pill"
P.pixel_x = rand(-7, 7) //random position
@@ -184,7 +190,7 @@
else if (href_list["createbottle"])
if(!condi)
var/name = sanitizeSafe(input(usr,"Name:","Name your bottle!",reagents.get_master_reagent_name()), MAX_NAME_LEN)
var/obj/item/reagent_containers/glass/bottle/P = new/obj/item/reagent_containers/glass/bottle(src.loc)
var/obj/item/reagent_containers/glass/bottle/P = new/obj/item/reagent_containers/glass/bottle(get_turf(src))
if(!name) name = reagents.get_master_reagent_name()
P.name = "[name] bottle"
P.pixel_x = rand(-7, 7) //random position
@@ -193,7 +199,7 @@
reagents.trans_to_obj(P,60)
P.update_icon()
else
var/obj/item/reagent_containers/food/condiment/P = new/obj/item/reagent_containers/food/condiment(src.loc)
var/obj/item/reagent_containers/food/condiment/P = new/obj/item/reagent_containers/food/condiment(get_turf(src))
reagents.trans_to_obj(P,50)
else if(href_list["change_pill"])
var/dat = "<table>"
@@ -458,7 +464,7 @@
return
if (!beaker)
return
beaker.forceMove(src.loc)
beaker.forceMove(get_turf(src))
beaker = null
update_icon()
@@ -470,7 +476,7 @@
return
for(var/obj/item/O in holdingitems)
O.forceMove(src.loc)
O.forceMove(get_turf(src))
holdingitems -= O
holdingitems.Cut()