cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Farmbots can be constructed again

Browse Source
This commit is contained in:
Anewbe
2016-12-31 17:16:34 -06:00
parent dc89eb5700
commit 24fcd2523b
3 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/bot/farmbot.dm
View File

@@ -338,7 +338,7 @@
new /obj/item/weapon/farmbot_arm_assembly(loc, src)
/obj/structure/reagent_dispensers/watertank/attackby(var/obj/item/organ/external/S, mob/user as mob)
if ((!istype(S, /obj/item/organ/external/arm)) && (!S.robotic == ORGAN_ROBOT))
if ((!istype(S, /obj/item/organ/external/arm)) || (!S.robotic == ORGAN_ROBOT))
..()
return

2
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -93,7 +93,7 @@
if(standard_pour_into(user, target))
return
if(reagents.total_volume)
if(reagents && reagents.total_volume)
user << "<span class='notice'>You splash the solution onto [target].</span>"
reagents.splash(target, reagents.total_volume)
return