cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

more adjustments and fixes

Browse Source
This commit is contained in:
Fox-McCloud
2017-01-23 05:56:17 -05:00
parent 5c828db250
commit 3e87bd3370
8 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+6 -6
View File
@@ -120,18 +120,18 @@
update_icon()
src.updateUsrDialog()
else
user << "<span class='warning'>There's already a container inside.</span>"
to_chat(user, "<span class='warning'>There's already a container inside.</span>")
return 1 //no afterattack
if(is_type_in_list(I, dried_items))
if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/grown))
var/obj/item/weapon/reagent_containers/food/snacks/grown/G = I
if(!G.dry)
user << "<span class='warning'>You must dry that first!</span>"
to_chat(user, "<span class='warning'>You must dry that first!</span>")
return 1
if(holdingitems && holdingitems.len >= limit)
usr << "The machine cannot hold anymore items."
to_chat(usr, "The machine cannot hold anymore items.")
return 1
//Fill machine with a bag!
@@ -141,11 +141,11 @@
B.remove_from_storage(G, src)
holdingitems += G
if(holdingitems && holdingitems.len >= limit) //Sanity checking so the blender doesn't overfill
user << "<span class='notice'>You fill the All-In-One grinder to the brim.</span>"
to_chat(user, "<span class='notice'>You fill the All-In-One grinder to the brim.</span>")
break
if(!I.contents.len)
user << "<span class='notice'>You empty the plant bag into the All-In-One grinder.</span>"
to_chat(user, "<span class='notice'>You empty the plant bag into the All-In-One grinder.</span>")
src.updateUsrDialog()
return 1
@@ -154,7 +154,7 @@
if(user.a_intent == I_HARM)
return ..()
else
user << "<span class='warning'>Cannot refine into a reagent!</span>"
to_chat(user, "<span class='warning'>Cannot refine into a reagent!</span>")
return 1
if(user.drop_item())