Skip to content

Commit

Permalink
[MIRROR] Fix laughter demons not being funny [MDB IGNORE] (#25676) (#…
Browse files Browse the repository at this point in the history
…1160)

* Fix laughter demons not being funny (#80385)

## About The Pull Request

Fixes #80383
Fixes #80382 ?

Caused by a copy paste error from #79389

## Changelog

:cl: Melbert
fix: Fixes Laughter demons deleting the bodies of their friends.
/:cl:

* Fix laughter demons not being funny

---------

Co-authored-by: SkyratBot <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
  • Loading branch information
3 people authored Dec 17, 2023
1 parent f0eb230 commit 4f068b3
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

antag_type = /datum/antagonist/slaughter

/// Datum that stores the action for us to crawl around.
/// Which blood crawl do we give to the demon
var/crawl_type = /datum/action/cooldown/spell/jaunt/bloodcrawl/slaughter_demon
/// How long it takes for the alt-click slam attack to come off cooldown
var/slam_cooldown_time = 45 SECONDS
Expand All @@ -37,7 +37,7 @@

/mob/living/basic/demon/slaughter/Initialize(mapload)
. = ..()
GRANT_ACTION(/datum/action/cooldown/spell/jaunt/bloodcrawl/slaughter_demon)
GRANT_ACTION(crawl_type)
RegisterSignal(src, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(on_attack))
RegisterSignals(src, list(COMSIG_MOB_ENTER_JAUNT, COMSIG_MOB_AFTER_EXIT_JAUNT), PROC_REF(on_crawl))

Expand Down

0 comments on commit 4f068b3

Please sign in to comment.