From 6979765adb342a8f92f8724ef2ff61614b01f780 Mon Sep 17 00:00:00 2001 From: Incoming Date: Sun, 9 Feb 2014 13:32:12 -0500 Subject: [PATCH] rerebalanced the SoC after running the odds Conflicts: code/modules/projectiles/projectile/magic.dm --- code/modules/projectiles/projectile/magic.dm | 45 +++++++++---------- icons/obj/janitor.dmi | Bin 0 -> 1032 bytes 2 files changed, 22 insertions(+), 23 deletions(-) create mode 100644 icons/obj/janitor.dmi diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index bba752ea6bb..e2ce8735182 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -145,7 +145,7 @@ proc/wabbajack(mob/living/M) var/mob/living/new_mob - var/randomize = pick("monkey","robot","slime","xeno","human","beast","helpless animal") + var/randomize = pick("monkey","robot","slime","xeno","human","animal") switch(randomize) if("monkey") new_mob = new /mob/living/carbon/monkey(M.loc) @@ -176,28 +176,27 @@ proc/wabbajack(mob/living/M) if("Drone") new_mob = new /mob/living/carbon/alien/humanoid/drone(M.loc) else new_mob = new /mob/living/carbon/alien/larva(M.loc) new_mob.universal_speak = 1*/ - if("beast") - var/beast = pick("carp","bear","mushroom","statue") - 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) - if("mushroom") new_mob = new /mob/living/simple_animal/hostile/mushroom(M.loc) - if("statue") new_mob = new /mob/living/simple_animal/hostile/statue(M.loc) - new_mob.universal_speak = 1 - if("helpless animal") - var/animal = pick("parrot","corgi","crab","pug","cat","tomato","mouse","chicken","cow","lizard","chick") - switch(animal) - if("parrot") new_mob = new /mob/living/simple_animal/parrot(M.loc) - if("corgi") new_mob = new /mob/living/simple_animal/corgi(M.loc) - if("crab") new_mob = new /mob/living/simple_animal/crab(M.loc) -// if("pug") new_mob = new /mob/living/simple_animal/pug(M.loc) - if("cat") new_mob = new /mob/living/simple_animal/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) - if("lizard") new_mob = new /mob/living/simple_animal/lizard(M.loc) - else new_mob = new /mob/living/simple_animal/chick(M.loc) + if("animal") + if(prob(50)) + var/beast = pick("carp","bear","mushroom","statue") + 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) + if("mushroom") new_mob = new /mob/living/simple_animal/hostile/mushroom(M.loc) + if("statue") new_mob = new /mob/living/simple_animal/hostile/statue(M.loc) + else + var/animal = pick("parrot","corgi","crab","pug","cat","tomato","mouse","chicken","cow","lizard","chick") + switch(animal) + if("parrot") new_mob = new /mob/living/simple_animal/parrot(M.loc) + if("corgi") new_mob = new /mob/living/simple_animal/corgi(M.loc) + if("crab") new_mob = new /mob/living/simple_animal/crab(M.loc) + if("cat") new_mob = new /mob/living/simple_animal/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) + if("lizard") new_mob = new /mob/living/simple_animal/lizard(M.loc) + else new_mob = new /mob/living/simple_animal/chick(M.loc) new_mob.universal_speak = 1 if("human") new_mob = new /mob/living/carbon/human/human(M.loc) diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi new file mode 100644 index 0000000000000000000000000000000000000000..07b236e1abc80a3f8b3444b1cca8bf69fc6206b9 GIT binary patch literal 1032 zcmV+j1o!)iP){Qm$}b$6Nn{{UH;0BEuRcg#3A zI6y!^0EOj+?Ee4&04yvl0L=dYng3s3U)b5(g@=m;1qJ>4%-h}q%w{v{>gxah|21F6 zReajanKN{k>zQT%z`(!&%rpN0GshjxfdBvi0d!JMQvg8b*k%9#0GxVMSad{Xb7OL8 zaCB*JZU6vyoKseCa&`CgQ*iP1EQc6V3PnU%DsufjBAJULm7{rFE=;Q zFcLCq)Q{3jEr)<#zoi@^#PCHv_KwM)=`aF$!2pwqc$f}Ah-?fnX`a1)+i!(3X0sV& z{Us!jf(U+C3kA#u*nSo zY;u@onhMBV3Nnv?e%qwUxa1tcGjtBHCm;o!_JQWx0wn~{E+gkV**YIr9qcTA)TpP` zX5%{FE#TSn-`-s3=a0zWI?lfv0L&MFd;DI2^S|Ai9P#b*$+kHeybmHE>t|b^48r#h zguocH%|D)PFaTo|CE)AdpaRCw5;XhEpn~0A$R^+K3XItA5CAs*_GqbFMte!H$nO9? zkU84#dI7vBc%kWU*xUo5fKS%bWzNfjb3x!bKvolO1jx~=3UGiQHupeSK5NymU zKmhe!qPzz}0Ai0dCD7B0Wzm+vu?o(*i~`s-fRwzRB3=#zP|7~*3clzWfizQuH<=jh zGfJt-{}TDMb