Bugfix: Adds a var to simple animals "player_controlled" to surpress behaviors in simple_animals that have players assigned.

Bugfix: Dead player mice won't be converted to items so they can still be revived.
Bugfix: Players playing chicks won't die by developing into chickens anymore
Bugfix: Fixes an edge case where a poor soul struck by multiple polymorphing shots at once ends up in a state where they can't move.

Feature: Renames the wand of resurrection to the wand of healing to drive home the fact that it does the same things the staff of healing can do

Balancing: Gives the wand of healing more shots. 10, 5, 5, 4 up from 3, 2, 2, 1
This commit is contained in:
Incoming
2013-12-18 12:28:38 -05:00
parent 1e4ef796fd
commit 45e89b5190
5 changed files with 15 additions and 6 deletions
@@ -177,7 +177,7 @@
. =..()
if(!.)
return
if(!stat)
if(!stat && !player_controlled)
amount_grown += rand(1,2)
if(amount_grown >= 100)
new /mob/living/simple_animal/chicken(src.loc)
@@ -36,9 +36,10 @@
/mob/living/simple_animal/mouse/Die()
..()
var/obj/item/trash/deadmouse/M = new(src.loc)
M.icon_state = src.icon_dead
del (src)
if(!player_controlled)
var/obj/item/trash/deadmouse/M = new(src.loc)
M.icon_state = src.icon_dead
del (src)
/mob/living/simple_animal/mouse/Crossed(AM as mob|obj)
if( ishuman(AM) )
@@ -57,6 +57,8 @@
var/speed = 0 //LETS SEE IF I CAN SET SPEEDS FOR SIMPLE MOBS WITHOUT DESTROYING EVERYTHING. Higher speed is slower, negative speed is faster
var/player_controlled = 0 //Set to true if the simple animal ever had someone behind the steering wheel, even if they aren't currently
/mob/living/simple_animal/New()
..()
verbs -= /mob/verb/observe
@@ -195,6 +197,10 @@
adjustBruteLoss(unsuitable_atoms_damage)
return 1
//Player check
if(!player_controlled && mind)
player_controlled = 1
/mob/living/simple_animal/Bumped(AM as mob|obj)
if(!AM) return
+2 -2
View File
@@ -60,11 +60,11 @@
..()
/obj/item/weapon/gun/magic/wand/resurrection
name = "wand of resurrection"
name = "wand of healing"
desc = "This wand uses healing magics to heal and revive. They are rarely utilized within the Wizard Federation for some reason."
projectile_type = "/obj/item/projectile/magic/resurrection"
icon_state = "revivewand"
max_charges = 3 //3, 2, 2, 1
max_charges = 10 //10, 5, 5, 4
/obj/item/weapon/gun/magic/wand/resurrection/zap_self(mob/living/user as mob)
user.revive()
@@ -220,6 +220,8 @@ proc/wabbajack(mob/living/M)
new_mob << "<B>Your form morphs into that of a [randomize].</B>"
del(M)
if(!new_mob.canmove) //edge case of someone getting hit with two bolts at the same time
new_mob.canmove = 1
return new_mob
/obj/item/projectile/magic/animate