cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 04:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merges AI Branch into Master

Browse Source
This commit is contained in:
Atermonera
2018-12-01 00:06:38 -05:00
committed by VirgoBot
parent 15017e893e
commit 2df5e9fe0e
379 changed files with 22460 additions and 4751 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/seed.dm
+2 -2
View File
@@ -104,10 +104,10 @@
return
if(!istype(target))
if(istype(target, /mob/living/simple_animal/mouse))
if(istype(target, /mob/living/simple_mob/animal/passive/mouse))
new /obj/effect/decal/remains/mouse(get_turf(target))
qdel(target)
else if(istype(target, /mob/living/simple_animal/lizard))
else if(istype(target, /mob/living/simple_mob/animal/passive/lizard))
new /obj/effect/decal/remains/lizard(get_turf(target))
qdel(target)
return
code/modules/hydroponics/seed_datums.dm
+1 -1
View File
@@ -184,7 +184,7 @@
display_name = "killer tomato plant"
mutants = null
can_self_harvest = 1
has_mob_product = /mob/living/simple_animal/hostile/tomato
has_mob_product = /mob/living/simple_mob/tomato
/datum/seed/tomato/killer/New()
..()