diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index a9caeba37208..c9cdcaf8199c 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -47,7 +47,7 @@ /// Whether or not this facehugger can actually impregnate targets var/sterile = FALSE /// How long it takes for a facehugger to impregnate a target once attached - var/pregnation_time = 10 SECONDS + var/pregnation_time = 5 SECONDS /// How long it takes between coupling attempts var/couple_retry_time = 15 SECONDS /// The mob's internal mask version, stored within the mob when the facehugger isn't being used as an item. diff --git a/code/modules/spells/spell_types/wizard.dm b/code/modules/spells/spell_types/wizard.dm index 066fc487cbb7..2fab8c5848ef 100644 --- a/code/modules/spells/spell_types/wizard.dm +++ b/code/modules/spells/spell_types/wizard.dm @@ -242,12 +242,11 @@ sound = 'sound/magic/repulse.ogg' var/maxthrow = 5 var/sparkle_path = /obj/effect/temp_visual/gravpush - var/anti_magic_check = TRUE var/repulse_force = MOVE_FORCE_EXTREMELY_STRONG - + var/stun_amt = 5 action_icon_state = "repulse" -/obj/effect/proc_holder/spell/aoe_turf/repulse/cast(list/hit_turfs, mob/user = usr, stun_amt = 5) +/obj/effect/proc_holder/spell/aoe_turf/repulse/cast(list/hit_turfs, mob/user = usr) var/list/thrownatoms = list() var/distfromcaster playMagSound() @@ -267,7 +266,8 @@ if(isliving(AM)) var/mob/living/M = AM shake_camera(AM, 2, 1) - M.Paralyze(stun_amt) + if(stun_amt) + M.Paralyze(stun_amt) to_chat(M, "You're thrown back by [user]!") AM.safe_throw_at(throwtarget, ((clamp((maxthrow - (clamp(distfromcaster - 2, 0, distfromcaster))), 3, maxthrow))), 1,user, force = repulse_force)//So stuff gets tossed around at the same time. @@ -285,7 +285,7 @@ action_icon = 'icons/mob/actions/actions_xeno.dmi' action_icon_state = "tailsweep" action_background_icon_state = "bg_alien" - anti_magic_check = FALSE + stun_amt = 0 /obj/effect/proc_holder/spell/aoe_turf/repulse/xeno/cast(list/targets,mob/user = usr) if(iscarbon(user))