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

[MIRROR] Minor touchups to chemistry/bar/virology machinery #2484

Browse Source
This commit is contained in:
CitadelStationBot
2017-09-13 17:59:07 -05:00
committed by Poojawa
parent 6cebac0053
commit b8667591f4
3 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/reagents/chemistry/machinery/chem_heater.dm
View File

@@ -45,14 +45,13 @@
if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1))
. = 1 //no afterattack
if(beaker)
to_chat(user, "<span class='warning'>A beaker is already loaded into the machine!</span>")
to_chat(user, "<span class='warning'>A container is already loaded into [src]!</span>")
return
if(!user.drop_item())
if(!user.transferItemToLoc(I, src))
return
beaker = I
I.loc = src
to_chat(user, "<span class='notice'>You add the beaker to the machine.</span>")
to_chat(user, "<span class='notice'>You add [I] to [src].</span>")
icon_state = "mixer1b"
return
return ..()

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

@@ -85,27 +85,25 @@
to_chat(user, "<span class='warning'>You can't use the [src.name] while its panel is opened!</span>")
return
if(beaker)
to_chat(user, "<span class='warning'>A container is already loaded in the machine!</span>")
to_chat(user, "<span class='warning'>A container is already loaded into [src]!</span>")
return
if(!user.drop_item())
if(!user.transferItemToLoc(I, src))
return
beaker = I
beaker.loc = src
to_chat(user, "<span class='notice'>You add the beaker to the machine.</span>")
to_chat(user, "<span class='notice'>You add [I] to [src].</span>")
src.updateUsrDialog()
icon_state = "mixer1"
else if(!condi && istype(I, /obj/item/storage/pill_bottle))
if(bottle)
to_chat(user, "<span class='warning'>A pill bottle is already loaded into the machine!</span>")
to_chat(user, "<span class='warning'>A pill bottle is already loaded into [src]!</span>")
return
if(!user.drop_item())
if(!user.transferItemToLoc(I, src))
return
bottle = I
bottle.loc = src
to_chat(user, "<span class='notice'>You add the pill bottle into the dispenser slot.</span>")
to_chat(user, "<span class='notice'>You add [I] into the dispenser slot.</span>")
src.updateUsrDialog()
else
return ..()

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

@@ -118,21 +118,20 @@
if (istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1) )
if (!beaker)
if(!user.drop_item())
if(!user.transferItemToLoc(I, src))
return 1
beaker = I
beaker.loc = src
update_icon()
src.updateUsrDialog()
else
to_chat(user, "<span class='warning'>There's already a container inside.</span>")
to_chat(user, "<span class='warning'>There's already a container inside [src].</span>")
return 1 //no afterattack
if(is_type_in_list(I, dried_items))
if(istype(I, /obj/item/reagent_containers/food/snacks/grown))
var/obj/item/reagent_containers/food/snacks/grown/G = I
if(!G.dry)
to_chat(user, "<span class='warning'>You must dry that first!</span>")
to_chat(user, "<span class='warning'>You must dry [G] first!</span>")
return 1
if(holdingitems && holdingitems.len >= limit)
@@ -146,11 +145,11 @@
B.remove_from_storage(G, src)
holdingitems += G
if(holdingitems && holdingitems.len >= limit) //Sanity checking so the blender doesn't overfill
to_chat(user, "<span class='notice'>You fill the All-In-One grinder to the brim.</span>")
to_chat(user, "<span class='notice'>You fill [src] to the brim.</span>")
break
if(!I.contents.len)
to_chat(user, "<span class='notice'>You empty the plant bag into the All-In-One grinder.</span>")
to_chat(user, "<span class='notice'>You empty [I] into [src].</span>")
src.updateUsrDialog()
return 1
@@ -162,8 +161,7 @@
to_chat(user, "<span class='warning'>Cannot refine into a reagent!</span>")
return 1
if(user.drop_item())
I.loc = src
if(user.transferItemToLoc(I, src))
holdingitems += I
src.updateUsrDialog()
return 0