Wanted to fix one bug, but couldn't stop.

- Farmbot now have harvesting animation. 

- Farmbots no longer have two water tanks inside of them, that was causing them to use hidden water tank and not let it be refilled. Fixes #5677 

- Farmbots now will wait for weedlevel to be 5 or higher, that is when the alarm is triggered. And call `update_icon()` when it is done. Otherwise people wouldn't notice if they were killing weeds

- Vending machine now accept only items of the same type as defined in their product list. So you can no longer insert cult's ritual knife into Dinnerware. Fixes #5671 

- Merchants cannot by generic mech's weapon, it was replaced with UT AC 2 and Scatterbox. Fixes #5675 

- Ghosts cannot be teleported by telescience. Fixes #5688
This commit is contained in:
Mykhailo Bykhovtsev
2018-12-04 10:48:59 -08:00
committed by Werner
parent 4bfe5d1de1
commit a43e3fc66e
6 changed files with 50 additions and 12 deletions

View File

@@ -240,6 +240,9 @@
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
return 0
if(isobserver(teleatom)) // do not teleport ghosts
return 0
if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/disk/nuclear)))
if(istype(teleatom, /mob/living))
var/mob/living/MM = teleatom