Skip to content

Commit 86d3f2d

Browse files
authored
Moon heretic no longer pacifies forever (#5919)
## About The Pull Request fixes effect removal in moon code, pacification is now properly removed after 15 seconds ## Why It's Good For The Game fixes bug, and quite a terrible one at that. Getting pacified for a entire round 0 way to undo it after heretic touched you once. ## Changelog :cl: fix: moon mansus hand no longer pacifies people forever /:cl:
1 parent d7c6741 commit 86d3f2d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

code/modules/antagonists/heretic/status_effects/mark_effects.dm

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,4 +309,4 @@ monkestation end */
309309
UnregisterSignal (owner, COMSIG_MOB_APPLY_DAMAGE)
310310

311311
// Incase the trait was not removed earlier
312-
REMOVE_TRAIT(owner, TRAIT_PACIFISM, id)
312+
REMOVE_TRAIT(owner, TRAIT_PACIFISM, TRAIT_STATUS_EFFECT(id))

0 commit comments

Comments
 (0)