Fixed the cooldown time on Phase Shift (was 2 seconds instead of 20)

Lowered the lifespan of the forcewalls created by the spell Shield

Changed the "Relentless" var to "nopush" by Urist's orders (no mechanical change, but a technical name rather than a fluffy one)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3055 316c924e-a436-60f5-8080-3fe189b3f50e

code/datums/spells/wizard.dm

@@ -145,7 +145,7 @@
 	invocation_type = "none"
 	range = 0
 	summon_type = list("/obj/effect/forcefield")
-	summon_lifespan = 100
+	summon_lifespan = 50
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/carp
 	name = "Summon Bigger Carp"
@@ -247,7 +247,7 @@
 	desc = "This spell allows you to pass through walls"
 
 	school = "transmutation"
-	charge_max = 20
+	charge_max = 200
 	clothes_req = 0
 	invocation = "none"
 	invocation_type = "none"

code/defines/mob/living/carbon/alien_humanoid.dm

@@ -45,7 +45,7 @@
 
 	health = 250
 	icon_state = "queen_s"
-	relentless = 1
+	nopush = 1
 /mob/living/carbon/alien/humanoid/rpbody
 	update_icon = 0
 

code/modules/mob/living/carbon/alien/larva/larva.dm

@@ -33,7 +33,7 @@
 					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0
 					return
-				if(tmob.relentless)
+				if(tmob.nopush)
 					now_pushing = 0
 					return
 			tmob.LAssailant = src

code/modules/mob/living/carbon/human/human.dm

@@ -148,7 +148,7 @@
 				src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 				now_pushing = 0
 				return
-		if(tmob.relentless)
+		if(tmob.nopush)
 			now_pushing = 0
 			return
 

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -52,7 +52,7 @@
 					usr << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0
 					return
-			if(tmob.relentless)
+			if(tmob.nopush)
 				now_pushing = 0
 				return
 

code/modules/mob/living/silicon/robot/robot.dm

@@ -99,7 +99,7 @@
 			hands.icon_state = "medical"
 			icon_state = "surgeon"
 			modtype = "Med"
-			relentless = 1
+			nopush = 1
 
 		if("Security")
 			module = new /obj/item/weapon/robot_module/security(src)
@@ -247,7 +247,7 @@
 					now_pushing = 0
 					//unlock_medal("That's No Moon, That's A Gourmand!", 1)
 					return
-			if(tmob.relentless)
+			if(tmob.nopush)
 				now_pushing = 0
 				return
 		now_pushing = 0

code/modules/mob/mob_defines.dm

@@ -253,6 +253,6 @@ the mob is also allowed to move without any sort of restriction. For instance, i
 
 	var/canstun = 1 	// determines if this mob can be stunned by things
 	var/canweaken = 1	// determines if this mob can be weakened/knocked down by things
-	var/relentless = 0 //Can they be shoved?
+	var/nopush = 0 //Can they be shoved?
 
 	var/area/lastarea = null

code/modules/mob/simple_animal/constructs.dm

@@ -22,7 +22,7 @@
 	max_tox = 0
 	speed = 3
 	destroyer = 1
-	relentless = 1
+	nopush = 1
 	a_intent = "harm"
 	stop_automated_movement = 1
 
@@ -76,7 +76,7 @@
 					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0
 					return
-			if(tmob.relentless)
+			if(tmob.nopush)
 				now_pushing = 0
 				return
 
@@ -173,7 +173,7 @@
 					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0
 					return
-			if(tmob.relentless)
+			if(tmob.nopush)
 				now_pushing = 0
 				return
 

code/modules/mob/simple_animal/corgi.dm

@@ -344,7 +344,7 @@
 					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0
 					return
-			if(tmob.relentless)
+			if(tmob.nopush)
 				now_pushing = 0
 				return