diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 1aab56c9d8a..d6579063212 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -257,7 +257,9 @@ /datum/status_effect/force_shield id = "forceshield" - duration = 4 SECONDS + alert_type = null + status_type = STATUS_EFFECT_REFRESH + duration = 5 SECONDS tick_interval = 0 var/mutable_appearance/shield diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index b2b3229053d..f335db6ae37 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -575,7 +575,7 @@ icon_state = "singulohammer0" /obj/item/singularityhammer/proc/vortex(turf/pull, mob/wielder) - for(var/atom/movable/X in orange(5, pull)) + for(var/atom/movable/X in range(5, pull)) if(X.move_resist == INFINITY) continue if(X == wielder)