Skip to content

Commit

Permalink
mroe fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dwasint committed Oct 7, 2023
1 parent c00b0cf commit 070f72f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,19 @@

/datum/action/cooldown/slasher/soul_steal/PreActivate(atom/target)
. = ..()
var/mob/living/human_target = target
if(!ishuman(target))
to_chat(owner, span_warning("This is only usable on humans."))
return
var/mob/living/carbon/human_target = target
if(human_target.stat != DEAD)
to_chat(owner, span_notice("This target is not dead. You can't steal their soul."))
return
if(human_target.soul_sucked)
to_chat(owner, span_warning("Their soul has already been sucked."))
return
if(!human_target.mind)
to_chat(owner, span_warning("This target doesn't seem to have a soul to suck."))
return

/datum/action/cooldown/slasher/soul_steal/Activate(atom/target)
. = ..()
Expand All @@ -41,7 +47,7 @@
human_target.dna.features["mcolor"] = "#FFFFFF"
human_target.dna.update_uf_block(DNA_MUTANT_COLOR_BLOCK)

affected_human.update_body(is_creating = TRUE)
human_target.update_body(is_creating = TRUE)

var/datum/antagonist/slasher/slasherdatum = human_owner.mind.has_antag_datum(/datum/antagonist/slasher)
if(!slasherdatum)
Expand Down
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6028,6 +6028,7 @@
#include "monkestation\code\modules\new_antagonists\slasher\abilities\blood_walk.dm"
#include "monkestation\code\modules\new_antagonists\slasher\abilities\incorporealize.dm"
#include "monkestation\code\modules\new_antagonists\slasher\abilities\recall_machette.dm"
#include "monkestation\code\modules\new_antagonists\slasher\abilities\slasher_regenerate.dm"
#include "monkestation\code\modules\new_antagonists\slasher\abilities\soul_steal.dm"
#include "monkestation\code\modules\ocean_content\department_consoles\engineering.dm"
#include "monkestation\code\modules\ocean_content\fluff\barrier.dm"
Expand Down

0 comments on commit 070f72f

Please sign in to comment.