cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 20:20:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds some sanity to the blade heretic's mark effect (#66572)

Browse Source 
Blade Mark no longer allows you to throw people out of the area
If the mob ends up completely outside of the marked area, they will no longer be burdened by being locked to a room they are no longer within
Heretics can drag blade-marked mobs out of the room they're locked within
Forced movement is no longer blocked by the mark (just in case)
The mark now throws a bit further back into the area + throws gentally

Heretics can't accidentally lock their abduction target in a room
Heretics can't get owned by a bodythrow
Prevents some bugs and rare cases where people can escape the room they're locked to


Managing to escape the area of a blade heretic's mark will no longer constantly burden you as if you never left.
There should be less ways of escaping the area of a blade heretic's mark now.
Heretics can drag people marked by a blade heretic out of the area they are trapped within.
Being thrown back by a blade heretic's mark will be slightly less awkward now, and less dangerous.
This commit is contained in:
MrMelbert
2022-05-06 15:00:15 -07:00
committed by GitHub
parent 869a622d79
commit 2c0df1a00d
1 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/status_effects/debuffs/debuffs.dm
+49 -9
View File
@@ -515,21 +515,57 @@
/datum/status_effect/eldritch/blade/on_apply()
. = ..()
RegisterSignal(owner, COMSIG_MOVABLE_PRE_THROW, .proc/on_pre_throw)
RegisterSignal(owner, COMSIG_MOVABLE_TELEPORTED, .proc/on_teleport)
RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/on_move)
/datum/status_effect/eldritch/blade/on_remove()
UnregisterSignal(owner, list(COMSIG_MOVABLE_TELEPORTED, COMSIG_MOVABLE_MOVED))
UnregisterSignal(owner, list(
COMSIG_MOVABLE_PRE_THROW,
COMSIG_MOVABLE_TELEPORTED,
COMSIG_MOVABLE_MOVED,
))
return ..()
/// Signal proc for [COMSIG_MOVABLE_TELEPORTED] that blocks any teleports from our locked area
/// Checks if the movement from moving_from to going_to leaves our [var/locked_to] area. Returns TRUE if so.
/datum/status_effect/eldritch/blade/proc/is_escaping_locked_area(atom/moving_from, atom/going_to)
if(!locked_to)
return FALSE
// If moving_from isn't in our locked area, it means they've
// somehow completely escaped, so we'll opt not to act on them.
if(get_area(moving_from) != locked_to)
return FALSE
// If going_to is in our locked area,
// they're just moving within the area like normal.
if(get_area(going_to) == locked_to)
return FALSE
return TRUE
/// Signal proc for [COMSIG_MOVABLE_PRE_THROW] that prevents people from escaping our locked area via throw.
/datum/status_effect/eldritch/blade/proc/on_pre_throw(mob/living/source, list/throw_args)
SIGNAL_HANDLER
var/atom/throw_dest = throw_args[1]
if(!is_escaping_locked_area(source, throw_dest))
return
var/mob/thrower = throw_args[4]
if(istype(thrower))
to_chat(thrower, span_hypnophrase("An otherworldly force prevents you from throwing [source] out of [get_area_name(locked_to)]!"))
to_chat(source, span_hypnophrase("An otherworldly force prevents you from being thrown out of [get_area_name(locked_to)]!"))
return COMPONENT_CANCEL_THROW
/// Signal proc for [COMSIG_MOVABLE_TELEPORTED] that blocks any teleports from our locked area.
/datum/status_effect/eldritch/blade/proc/on_teleport(mob/living/source, atom/destination, channel)
SIGNAL_HANDLER
if(!locked_to)
return
if(get_area(destination) == locked_to)
if(!is_escaping_locked_area(source, destination))
return
to_chat(source, span_hypnophrase("An otherworldly force prevents your escape from [get_area_name(locked_to)]!"))
@@ -541,16 +577,20 @@
/datum/status_effect/eldritch/blade/proc/on_move(mob/living/source, turf/old_loc, movement_dir, forced)
SIGNAL_HANDLER
if(!locked_to)
// Let's not mess with heretics dragging a potential victim.
if(ismob(source.pulledby) && IS_HERETIC(source.pulledby))
return
if(get_area(source) == locked_to)
// If the movement's forced, just let it happen regardless.
if(forced || !is_escaping_locked_area(old_loc, source))
return
to_chat(source, span_hypnophrase("An otherworldly force prevents your escape from [get_area_name(locked_to)]!"))
var/turf/further_behind_old_loc = get_edge_target_turf(old_loc, REVERSE_DIR(movement_dir))
source.Stun(1 SECONDS)
source.throw_at(old_loc, 5, 1)
source.throw_at(further_behind_old_loc, 3, 1, gentle = TRUE) // Keeping this gentle so they don't smack into the heretic max speed
/// A status effect used for specifying confusion on a living mob.
/// Created automatically with /mob/living/set_confusion.