diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index 78faf5b99fc..de0f6cddc9e 100644 --- a/code/datums/spells/wizard.dm +++ b/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" diff --git a/code/defines/mob/living/carbon/alien_humanoid.dm b/code/defines/mob/living/carbon/alien_humanoid.dm index 4dd505c9d0d..4c6ae07fbe3 100644 --- a/code/defines/mob/living/carbon/alien_humanoid.dm +++ b/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 diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index c012a59eddd..e4a5e0a16ae 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -33,7 +33,7 @@ src << "\red You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 return - if(tmob.relentless) + if(tmob.nopush) now_pushing = 0 return tmob.LAssailant = src diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 63c20fc9f0a..5e875733f4d 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -148,7 +148,7 @@ src << "\red You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 return - if(tmob.relentless) + if(tmob.nopush) now_pushing = 0 return diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index cfe9c04ca3c..a1b5250f486 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -52,7 +52,7 @@ usr << "\red You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 return - if(tmob.relentless) + if(tmob.nopush) now_pushing = 0 return diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index e5d232cf9b8..e29df9ec2d2 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/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 diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 7d089127923..483abed841a 100644 --- a/code/modules/mob/mob_defines.dm +++ b/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 \ No newline at end of file diff --git a/code/modules/mob/simple_animal/constructs.dm b/code/modules/mob/simple_animal/constructs.dm index b5ed797b427..98d42a83718 100644 --- a/code/modules/mob/simple_animal/constructs.dm +++ b/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 You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 return - if(tmob.relentless) + if(tmob.nopush) now_pushing = 0 return @@ -173,7 +173,7 @@ src << "\red You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 return - if(tmob.relentless) + if(tmob.nopush) now_pushing = 0 return diff --git a/code/modules/mob/simple_animal/corgi.dm b/code/modules/mob/simple_animal/corgi.dm index bf675df2e73..469fe26532b 100644 --- a/code/modules/mob/simple_animal/corgi.dm +++ b/code/modules/mob/simple_animal/corgi.dm @@ -344,7 +344,7 @@ src << "\red You fail to push [tmob]'s fat ass out of the way." now_pushing = 0 return - if(tmob.relentless) + if(tmob.nopush) now_pushing = 0 return