cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4158 from Fox-McCloud/killer-tomato

Browse Source 
Killer Tomatoes Live Up to their Name
This commit is contained in:
TheDZD
2016-04-14 19:12:34 -04:00
parent 78cef45f33 d6f33a0127
commit d95102b007
8 changed files with 64 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile/magic.dm
+3 -3
View File
@@ -185,7 +185,7 @@ proc/wabbajack(mob/living/M)
new_mob.universal_speak = 1*/
if("animal")
if(prob(50))
var/beast = pick("carp","bear","mushroom","statue", "bat", "goat")
var/beast = pick("carp","bear","mushroom","statue", "bat", "goat", "tomato")
switch(beast)
if("carp") new_mob = new /mob/living/simple_animal/hostile/carp(M.loc)
if("bear") new_mob = new /mob/living/simple_animal/hostile/bear(M.loc)
@@ -193,14 +193,14 @@ proc/wabbajack(mob/living/M)
if("statue") new_mob = new /mob/living/simple_animal/hostile/statue(M.loc)
if("bat") new_mob = new /mob/living/simple_animal/hostile/scarybat(M.loc)
if("goat") new_mob = new /mob/living/simple_animal/hostile/retaliate/goat(M.loc)
if("tomato") new_mob = new /mob/living/simple_animal/hostile/killertomato(M.loc)
else
var/animal = pick("parrot","corgi","crab","pug","cat","tomato","mouse","chicken","cow","lizard","chick","fox")
var/animal = pick("parrot","corgi","crab","pug","cat","mouse","chicken","cow","lizard","chick","fox")
switch(animal)
if("parrot") new_mob = new /mob/living/simple_animal/parrot(M.loc)
if("corgi") new_mob = new /mob/living/simple_animal/pet/corgi(M.loc)
if("crab") new_mob = new /mob/living/simple_animal/crab(M.loc)
if("cat") new_mob = new /mob/living/simple_animal/pet/cat(M.loc)
if("tomato") new_mob = new /mob/living/simple_animal/tomato(M.loc)
if("mouse") new_mob = new /mob/living/simple_animal/mouse(M.loc)
if("chicken") new_mob = new /mob/living/simple_animal/chicken(M.loc)
if("cow") new_mob = new /mob/living/simple_animal/cow(M.loc)