cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10454 from mwerezak/chem-machine-fix

Browse Source 
Fixes #10021
This commit is contained in:
PsiOmegaDelta
2015-08-08 19:16:47 +02:00
parent 431cc254cd 4e70cc03bc
commit 4ae754a59d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/modules/reagents/Chemistry-Machinery.dm
View File

@@ -157,13 +157,14 @@
/obj/machinery/chem_dispenser/attackby(var/obj/item/weapon/reagent_containers/B as obj, var/mob/user as mob) /obj/machinery/chem_dispenser/attackby(var/obj/item/weapon/reagent_containers/B as obj, var/mob/user as mob)
if(isrobot(user)) if(isrobot(user))
return return 1
if(src.beaker) if(src.beaker)
user << "Something is already loaded into the machine." user << "Something is already loaded into the machine."
return return
if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food)) if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food))
if(!accept_glass && istype(B,/obj/item/weapon/reagent_containers/food)) if(!accept_glass && istype(B,/obj/item/weapon/reagent_containers/food))
user << "<span class='notice'>This machine only accepts beakers</span>" user << "<span class='notice'>This machine only accepts beakers</span>"
return
src.beaker = B src.beaker = B
user.drop_item() user.drop_item()
B.loc = src B.loc = src