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

[MIRROR] the negative moodlet from being held at gunpoint will no longer last indefinitely under certain conditions (#8175)

Browse Source 
* the negative moodlet from being held at gunpoint will no longer last indefinitely under certain conditions (#61395)

* the negative moodlet from being held at gunpoint will no longer last indefinitely under certain conditions

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-09-15 03:32:38 +01:00
committed by GitHub
co-authored by ATH1909
parent 802d15506d
commit a7b71ebfb6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/gunpoint.dm
+1 -1
View File
@@ -59,6 +59,7 @@
var/mob/living/shooter = parent
shooter.remove_status_effect(STATUS_EFFECT_HOLDUP)
target.remove_status_effect(STATUS_EFFECT_HELDUP, shooter)
SEND_SIGNAL(target, COMSIG_CLEAR_MOOD_EVENT, "gunpoint")
return ..()
/datum/component/gunpoint/RegisterWithParent()
@@ -164,7 +165,6 @@
shooter.visible_message(span_danger("[shooter] breaks [shooter.p_their()] aim on [target]!"), \
span_danger("You are no longer aiming [weapon] at [target]."), ignored_mobs = target)
to_chat(target, span_userdanger("[shooter] breaks [shooter.p_their()] aim on you!"))
SEND_SIGNAL(target, COMSIG_CLEAR_MOOD_EVENT, "gunpoint")
qdel(src)
///If the shooter is hit by an attack, they have a 50% chance to flinch and fire. If it hit the arm holding the trigger, it's an 80% chance to fire instead