Runtime fixes for:

/mob/attackby()
Bodybag (obj/structure/crate) were getting typecasted into /obj/item/weapon.

/mob/dead/observer/proc/dead_tele()
Added a check for a null or empty list of area's for the mob to be moved to.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5273 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
2012-12-07 00:39:50 +00:00
parent fe3acba8e7
commit ff56e9cffc
2 changed files with 6 additions and 2 deletions

View File

@@ -165,6 +165,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
var/list/L = list()
for(var/turf/T in get_area_turfs(thearea.type))
L+=T
if(!L || !L.len)
usr << "No area available."
usr.loc = pick(L)
/mob/dead/observer/verb/follow()

View File

@@ -80,7 +80,7 @@
M.show_message( message, 1, blind_message, 2)
//This is aweful
//This is awful
/mob/attackby(obj/item/weapon/W as obj, mob/user as mob)
//Holding a balloon will shield you from an item that is_sharp() ... cause that makes sense
@@ -108,7 +108,7 @@
//If the mob is not wearing a shield or otherwise is not shielded
if ((!( shielded ) || !( W.flags ) & NOSHIELD))
spawn( 0 )
if (W)
if (W && istype(W, /obj/item)) //The istype is necessary for things like bodybags which are structures that do not have an attack() proc.
W.attack(src, user)
return
return