From e73541a2acd76fd250d7a7111b12217d98c0e263 Mon Sep 17 00:00:00 2001
From: dwasint <82520990+dwasint@users.noreply.github.com>
Date: Fri, 6 Oct 2023 15:07:52 -0400
Subject: [PATCH] and now its cached

---
 goon/icons/mob/slasher.dmi                    | Bin 0 -> 2359 bytes
 .../slasher/abilities/_slasher_base.dm        |  13 ++++
 .../slasher/abilities/blood_walk.dm           |  62 ++++++++++++++++++
 .../slasher/abilities/incorporealize.dm       |  32 +++++++++
 .../ocean_content/hotspot/trench_map.dm       |   1 +
 tgstation.dme                                 |   3 +
 6 files changed, 111 insertions(+)
 create mode 100644 goon/icons/mob/slasher.dmi
 create mode 100644 monkestation/code/modules/new_antagonists/slasher/abilities/_slasher_base.dm
 create mode 100644 monkestation/code/modules/new_antagonists/slasher/abilities/blood_walk.dm
 create mode 100644 monkestation/code/modules/new_antagonists/slasher/abilities/incorporealize.dm

diff --git a/goon/icons/mob/slasher.dmi b/goon/icons/mob/slasher.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..e0450ebc7ae91556296993da3bf3598a95775a01
GIT binary patch
literal 2359
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

literal 0
HcmV?d00001

diff --git a/monkestation/code/modules/new_antagonists/slasher/abilities/_slasher_base.dm b/monkestation/code/modules/new_antagonists/slasher/abilities/_slasher_base.dm
new file mode 100644
index 000000000000..39266c43f671
--- /dev/null
+++ b/monkestation/code/modules/new_antagonists/slasher/abilities/_slasher_base.dm
@@ -0,0 +1,13 @@
+/datum/action/cooldown/slasher
+	name = "Slasher Possession"
+	desc = "You've been possessed by the Slasher"
+	button_icon = 'goon/icons/mob/slasher.dmi'
+	background_icon_state = "slasher_background"
+	button_icon = 'goon/icons/mob/slasher.dmi'
+	button_icon_state = "slasher_template"
+	buttontooltipstyle = "cult"
+	transparent_when_unavailable = TRUE
+
+
+/datum/action/cooldown/slasher/IsAvailable(feedback = FALSE)
+	return next_use_time <= world.time
diff --git a/monkestation/code/modules/new_antagonists/slasher/abilities/blood_walk.dm b/monkestation/code/modules/new_antagonists/slasher/abilities/blood_walk.dm
new file mode 100644
index 000000000000..f014c1261bb5
--- /dev/null
+++ b/monkestation/code/modules/new_antagonists/slasher/abilities/blood_walk.dm
@@ -0,0 +1,62 @@
+/datum/action/cooldown/slasher/blood_walk
+	name = "Blood Trail"
+	desc = "Begin trailing blood in your wake. Spooky! "
+	button_icon_state = "trail_blood"
+
+	cooldown_time = 30 SECONDS
+
+/datum/action/cooldown/slasher/blood_walk/Activate(atom/target)
+	. = ..()
+	if(isliving(target))
+		var/mob/living/mob_target = target
+		mob_target.set_timed_status_effect(15 SECONDS, /datum/status_effect/blood_trial)
+
+
+/datum/status_effect/blood_trial
+	id = "confusion"
+	alert_type = null
+
+/datum/status_effect/blood_trial/on_creation(mob/living/new_owner, duration = 15 SECONDS)
+	src.duration = duration
+	return ..()
+
+/datum/status_effect/blood_trial/on_apply()
+	RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
+	return TRUE
+
+/datum/status_effect/blood_trial/on_remove()
+	UnregisterSignal(owner, COMSIG_MOVABLE_MOVED)
+
+
+/datum/status_effect/blood_trial/proc/find_pool_by_blood_state(turf/turfLoc, typeFilter = null)
+	for(var/obj/effect/decal/cleanable/blood/pool in turfLoc)
+		if(pool.blood_state == BLOOD_STATE_HUMAN && (!typeFilter || istype(pool, typeFilter)))
+			return pool
+
+
+/datum/status_effect/blood_trial/proc/on_move(atom/movable/mover, turf/old_loc)
+	SIGNAL_HANDLER
+
+	var/turf/oldLocTurf = get_turf(old_loc)
+	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
+		if (!(oldLocFP.exited_dirs & mover.dir))
+			oldLocFP.exited_dirs |= mover.dir
+			oldLocFP.update_appearance()
+
+	else
+		oldLocFP = new(oldLocTurf)
+		if(!QDELETED(oldLocFP)) ///prints merged
+			oldLocFP.blood_state = BLOOD_STATE_HUMAN
+			oldLocFP.exited_dirs |= mover.dir
+			oldLocFP.bloodiness = 100
+			oldLocFP.update_appearance()
+
+	var/obj/effect/decal/cleanable/blood/footprints/FP = new(get_turf(100))
+	if(!QDELETED(FP)) ///prints merged
+		FP.blood_state = BLOOD_STATE_HUMAN
+		FP.entered_dirs |= mover.dir
+		FP.bloodiness = 100
+		FP.update_appearance()
+
diff --git a/monkestation/code/modules/new_antagonists/slasher/abilities/incorporealize.dm b/monkestation/code/modules/new_antagonists/slasher/abilities/incorporealize.dm
new file mode 100644
index 000000000000..33e6a2e03db3
--- /dev/null
+++ b/monkestation/code/modules/new_antagonists/slasher/abilities/incorporealize.dm
@@ -0,0 +1,32 @@
+/datum/action/cooldown/slasher/incorporealize
+	name = "Incorporealize"
+	desc = " Become incorporeal, capable of moving through walls and being completely invisible, but unable to interact with the world. Can only be used when corporeal and when not in view of any human being. "
+	button_icon_state = "incorporealize"
+	cooldown_time = 20 SECONDS
+
+	var/flipped = FALSE
+
+/datum/action/cooldown/slasher/incorporealize/PreActivate(atom/target)
+	. = ..()
+	if(!do_after(target, 1.5 SECONDS, get_turf(target)))
+		return FALSE
+
+	if(!flipped)
+		for(var/mob/living/watchers in view(9, target) - target)
+			target.balloon_alert(owner, "you can only vanish unseen.")
+			return FALSE
+	return TRUE
+
+/datum/action/cooldown/slasher/incorporealize/Activate(atom/target)
+	. = ..()
+
+	flipped = !flipped
+
+	if(flipped)
+		name = "Corporealize"
+		desc = "Manifest your being from your incorporeal state."
+		button_icon_state = "corporealize"
+	else
+		name = "Incorporealize"
+		desc = " Become incorporeal, capable of moving through walls and being completely invisible, but unable to interact with the world. Can only be used when corporeal and when not in view of any human being. "
+		button_icon_state = "incorporealize"
diff --git a/monkestation/code/modules/ocean_content/hotspot/trench_map.dm b/monkestation/code/modules/ocean_content/hotspot/trench_map.dm
index 792371c59720..9ca987c584c8 100644
--- a/monkestation/code/modules/ocean_content/hotspot/trench_map.dm
+++ b/monkestation/code/modules/ocean_content/hotspot/trench_map.dm
@@ -122,6 +122,7 @@
 	ui_interact(user)
 
 /obj/item/sea_map/ui_interact(mob/user, datum/tgui/ui)
+	user.client << browse_rsc(SShotspots.map, "trenchmap.png")
 	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
 		ui = new(user, src, "TrenchMap", name)
diff --git a/tgstation.dme b/tgstation.dme
index d2581ffb9eaf..968e3e5c8535 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6023,6 +6023,9 @@
 #include "monkestation\code\modules\mob\living\carbon\human\species_type\zombies.dm"
 #include "monkestation\code\modules\mob\living\simple_animal\pets\bees.dm"
 #include "monkestation\code\modules\mob\living\simple_animal\pets\honk_platinum.dm"
+#include "monkestation\code\modules\new_antagonists\slasher\abilities\_slasher_base.dm"
+#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\ocean_content\department_consoles\engineering.dm"
 #include "monkestation\code\modules\ocean_content\fluff\barrier.dm"
 #include "monkestation\code\modules\ocean_content\fluff\base_turf_editor.dm"