Fixed the objectives not being assigned properly when the Summon Guns spell is used.

Removed the wizard's Nar-Sie grav pull entirely to reduce lag/it is strong enough as is.

Fixed the gyrojet projectile name

Removed the ion rifle from the armoury

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3272 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
kortgstation@gmail.com
2012-03-11 21:35:41 +00:00
parent 1ed1bcb049
commit 1be29f6468
4 changed files with 8993 additions and 9004 deletions

View File

@@ -519,7 +519,7 @@ var/global/list/uneatable = list(
/obj/machinery/singularity/narsie/wizard
grav_pull = 0
eat()
set background = 1
if(defer_powernet_rebuild != 2)
@@ -528,17 +528,6 @@ var/global/list/uneatable = list(
consume(X)
for(var/turf/X in orange(consume_range,src))
consume(X)
for(var/atom/movable/X in orange(grav_pull,src))
if(is_type_in_list(X, uneatable)) continue
if(((X) &&(!X:anchored) && (!istype(X,/mob/living/carbon/human))))
step_towards(X,src)
else if(istype(X,/mob/living/carbon/human))
var/mob/living/carbon/human/H = X
if(istype(H.shoes,/obj/item/clothing/shoes/magboots))
var/obj/item/clothing/shoes/magboots/M = H.shoes
if(M.magpulse)
continue
step_towards(H,src)
if(defer_powernet_rebuild != 2)
defer_powernet_rebuild = 0
return