From 5294b1b35571dd376fea31be8df81f61091d0dd0 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Fri, 6 Oct 2023 20:59:51 -0400 Subject: [PATCH] adds a chance for more blood --- .../new_antagonists/slasher/abilities/blood_walk.dm | 9 +++++++++ .../new_antagonists/slasher/abilities/incorporealize.dm | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/monkestation/code/modules/new_antagonists/slasher/abilities/blood_walk.dm b/monkestation/code/modules/new_antagonists/slasher/abilities/blood_walk.dm index aa59e9c0a2ea..e15a71e54a89 100644 --- a/monkestation/code/modules/new_antagonists/slasher/abilities/blood_walk.dm +++ b/monkestation/code/modules/new_antagonists/slasher/abilities/blood_walk.dm @@ -38,6 +38,15 @@ SIGNAL_HANDLER var/turf/oldLocTurf = get_turf(old_loc) + if(prob(5)) + for(var/mob/living/carbon/human/human in view(7, oldLocTurf)) + human.emote("scream") + human.stamina.adjust(-5) + human.Shake(duration = 3 SECONDS) + var/turf/turf = get_turf(human) + var/list/blood_drop = list(human.get_blood_id() = 3) + turf.add_liquid_list(blood_drop, FALSE, 300) + var/obj/effect/decal/cleanable/blood/footprints/oldLocFP = find_pool_by_blood_state(oldLocTurf, /obj/effect/decal/cleanable/blood/footprints) if(oldLocFP) // Footprints found in the tile we left, add us to it diff --git a/monkestation/code/modules/new_antagonists/slasher/abilities/incorporealize.dm b/monkestation/code/modules/new_antagonists/slasher/abilities/incorporealize.dm index 36b8369a39ec..72099f2dd2d3 100644 --- a/monkestation/code/modules/new_antagonists/slasher/abilities/incorporealize.dm +++ b/monkestation/code/modules/new_antagonists/slasher/abilities/incorporealize.dm @@ -29,7 +29,7 @@ button_icon_state = "corporealize" if(isliving(owner)) var/mob/living/owner_mob = owner - owner_mob.incorporeal_move = INCORPOREAL_MOVE_BASIC + owner_mob.movement_type |= PHASING animate(owner_mob, alpha = 0, time = 1.5 SECONDS) else name = "Incorporealize" @@ -37,7 +37,7 @@ button_icon_state = "incorporealize" if(isliving(owner)) var/mob/living/owner_mob = owner - owner_mob.incorporeal_move = 0 + owner_mob.movement_type & ~PHASING animate(owner_mob, alpha = 255, time = 1.5 SECONDS) build_all_button_icons(UPDATE_BUTTON_NAME|UPDATE_BUTTON_ICON)