From 023681a0b9aec3457a1d482f82547d8afa512f18 Mon Sep 17 00:00:00 2001
From: Iajret Creature
 <122297233+AnArgonianLizardThatStealsPRs@users.noreply.github.com>
Date: Sun, 22 Oct 2023 16:12:51 +0300
Subject: [PATCH] [MODULAR] Re-Replaces Demonic Watcher Trophy (#210)

* wew

* whoops lol

---------

Co-authored-by: Nerevar <12636964+Nerev4r@users.noreply.github.com>
Co-authored-by: Snakebittenn <12636964+Snakebittenn@users.noreply.github.com>
---
 .../mob/living/basic/icemoon/ice_demon.dm       |  3 ---
 .../modular_items/code/kinetic_crusher.dm       | 17 -----------------
 tgstation.dme                                   |  2 --
 3 files changed, 22 deletions(-)
 delete mode 100644 modular_skyrat/master_files/code/modules/mob/living/basic/icemoon/ice_demon.dm
 delete mode 100644 modular_skyrat/modules/modular_items/code/kinetic_crusher.dm

diff --git a/modular_skyrat/master_files/code/modules/mob/living/basic/icemoon/ice_demon.dm b/modular_skyrat/master_files/code/modules/mob/living/basic/icemoon/ice_demon.dm
deleted file mode 100644
index 0c8f44b3118..00000000000
--- a/modular_skyrat/master_files/code/modules/mob/living/basic/icemoon/ice_demon.dm
+++ /dev/null
@@ -1,3 +0,0 @@
-// crusher loot /obj/item/crusher_trophy/ice_demon_cube -> /obj/item/crusher_trophy/demon_core
-/mob/living/basic/mining/ice_demon
-	crusher_loot = /obj/item/crusher_trophy/demon_core
diff --git a/modular_skyrat/modules/modular_items/code/kinetic_crusher.dm b/modular_skyrat/modules/modular_items/code/kinetic_crusher.dm
deleted file mode 100644
index d023759b770..00000000000
--- a/modular_skyrat/modules/modular_items/code/kinetic_crusher.dm
+++ /dev/null
@@ -1,17 +0,0 @@
-/obj/item/crusher_trophy/demon_core
-	name = "demonic core"
-	desc = "The chipped core of a demonic watcher, it gently hums with weak bluespace energy."
-	icon = 'modular_skyrat/modules/modular_items/icons/artefacts.dmi'
-	icon_state = "demon_core"
-	denied_type = /obj/item/crusher_trophy/demon_core
-
-/obj/item/crusher_trophy/demon_core/effect_desc()
-	return "mark detonation to normalise your body and core temperature"
-
-/obj/item/crusher_trophy/demon_core/on_mark_detonation(mob/living/target, mob/living/user)
-	user.bodytemperature = user.get_body_temp_normal()
-	if(ishuman(user))
-		var/mob/living/carbon/human/humi = user
-		humi.coretemperature = humi.get_body_temp_normal()
-	..()
-
diff --git a/tgstation.dme b/tgstation.dme
index 271117c9a77..442d0cd7b46 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -6224,7 +6224,6 @@
 #include "modular_skyrat\master_files\code\modules\mob\living\living.dm"
 #include "modular_skyrat\master_files\code\modules\mob\living\living_defines.dm"
 #include "modular_skyrat\master_files\code\modules\mob\living\living_movement.dm"
-#include "modular_skyrat\master_files\code\modules\mob\living\basic\icemoon\ice_demon.dm"
 #include "modular_skyrat\master_files\code\modules\mob\living\carbon\death.dm"
 #include "modular_skyrat\master_files\code\modules\mob\living\carbon\human.dm"
 #include "modular_skyrat\master_files\code\modules\mob\living\carbon\human_helpers.dm"
@@ -7290,7 +7289,6 @@
 #include "modular_skyrat\modules\modular_items\code\ciggies.dm"
 #include "modular_skyrat\modules\modular_items\code\cross.dm"
 #include "modular_skyrat\modules\modular_items\code\designs.dm"
-#include "modular_skyrat\modules\modular_items\code\kinetic_crusher.dm"
 #include "modular_skyrat\modules\modular_items\code\makeshift.dm"
 #include "modular_skyrat\modules\modular_items\code\modular_glasses.dm"
 #include "modular_skyrat\modules\modular_items\code\necklace.dm"