From 0e9a0335ca56fd51c495b49a27deb3e8771b4afc Mon Sep 17 00:00:00 2001
From: DexeeXI <120314509+DexeeXI@users.noreply.github.com>
Date: Sat, 28 Oct 2023 02:09:44 -0600
Subject: [PATCH 1/7] initial pass of the dagoth smite
---
.../code/modules/admin/smites/dagothsmite.dm | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 monkestation/code/modules/admin/smites/dagothsmite.dm
diff --git a/monkestation/code/modules/admin/smites/dagothsmite.dm b/monkestation/code/modules/admin/smites/dagothsmite.dm
new file mode 100644
index 000000000000..92a4ce9feb97
--- /dev/null
+++ b/monkestation/code/modules/admin/smites/dagothsmite.dm
@@ -0,0 +1,21 @@
+// Dagoth Smite! (ported from Biblefart code) - Dexee
+/datum/smite/dagothsmite
+ name = "Dagoth Smite"
+
+datum/smite/dagothsmite/effect(client/user, mob/living/target)
+ . = ..()
+ if (!iscarbon(target))
+ to_chat(user, span_warning("This must be used on a carbon mob."), confidential = TRUE)
+ return
+ var/mob/living/carbon/human/Person = target
+ var/turf/T = get_step(get_step(Person, NORTH), NORTH)
+ T.Beam(Person, icon_state="lightning[rand(1,12)]", time = 15)
+ Person.Paralyze(15)
+ playsound(target,'sound/magic/lightninshock.ogg', 50, 1)
+ playsound(target, 'monkestation/sound/misc/dagothgod.ogg', 80)
+ Person.electrocution_animation(15)
+ spawn(15)
+ to_chat(Person,"What a grand and intoxicating innocence. Perish.")
+ Person.gib()
+ dyn_explosion(Location, 1, 0)
+ return
From 0b7c468a5c2c3abcf64d038ab33700c7cda444bf Mon Sep 17 00:00:00 2001
From: DexeeXI <120314509+DexeeXI@users.noreply.github.com>
Date: Sat, 28 Oct 2023 02:53:23 -0600
Subject: [PATCH 2/7] second pass dagoth smite
---
monkestation/code/modules/admin/smites/dagothsmite.dm | 6 ++++--
tgstation.dme | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/monkestation/code/modules/admin/smites/dagothsmite.dm b/monkestation/code/modules/admin/smites/dagothsmite.dm
index 92a4ce9feb97..19549bf38a19 100644
--- a/monkestation/code/modules/admin/smites/dagothsmite.dm
+++ b/monkestation/code/modules/admin/smites/dagothsmite.dm
@@ -8,14 +8,16 @@ datum/smite/dagothsmite/effect(client/user, mob/living/target)
to_chat(user, span_warning("This must be used on a carbon mob."), confidential = TRUE)
return
var/mob/living/carbon/human/Person = target
+ var/turf/Location = get_turf(target)
var/turf/T = get_step(get_step(Person, NORTH), NORTH)
T.Beam(Person, icon_state="lightning[rand(1,12)]", time = 15)
Person.Paralyze(15)
- playsound(target,'sound/magic/lightninshock.ogg', 50, 1)
+ playsound(target,'sound/magic/lightningshock.ogg', 50, 1)
playsound(target, 'monkestation/sound/misc/dagothgod.ogg', 80)
+ Person.unequip_everything()
Person.electrocution_animation(15)
+ to_chat(Person,"What a grand and intoxicating innocence. Perish.")
spawn(15)
- to_chat(Person,"What a grand and intoxicating innocence. Perish.")
Person.gib()
dyn_explosion(Location, 1, 0)
return
diff --git a/tgstation.dme b/tgstation.dme
index 02793494e3ba..40386788a387 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -5551,6 +5551,7 @@
#include "monkestation\code\modules\admin\antag_tokens.dm"
#include "monkestation\code\modules\admin\camera_view.dm"
#include "monkestation\code\modules\admin\ggg\where_are_your_fingers.dm"
+#include "monkestation\code\modules\admin\smites\dagothsmite.dm"
#include "monkestation\code\modules\aesthetics\airlock\airlock.dm"
#include "monkestation\code\modules\aesthetics\items\clothing.dm"
#include "monkestation\code\modules\aesthetics\mapping\tilecoloring.dm"
From cc5473714e1300a8054a3f5d7436a2770c99a981 Mon Sep 17 00:00:00 2001
From: DexeeXI <120314509+DexeeXI@users.noreply.github.com>
Date: Sat, 28 Oct 2023 03:02:02 -0600
Subject: [PATCH 3/7] dropped a / like a dummy
---
monkestation/code/modules/admin/smites/dagothsmite.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/monkestation/code/modules/admin/smites/dagothsmite.dm b/monkestation/code/modules/admin/smites/dagothsmite.dm
index 19549bf38a19..6152772f69d6 100644
--- a/monkestation/code/modules/admin/smites/dagothsmite.dm
+++ b/monkestation/code/modules/admin/smites/dagothsmite.dm
@@ -2,7 +2,7 @@
/datum/smite/dagothsmite
name = "Dagoth Smite"
-datum/smite/dagothsmite/effect(client/user, mob/living/target)
+/datum/smite/dagothsmite/effect(client/user, mob/living/target)
. = ..()
if (!iscarbon(target))
to_chat(user, span_warning("This must be used on a carbon mob."), confidential = TRUE)
From 62dfdf1229f47f4c29abcd08daf6c36785bc96dc Mon Sep 17 00:00:00 2001
From: DexeeXI <120314509+DexeeXI@users.noreply.github.com>
Date: Sat, 28 Oct 2023 03:10:26 -0600
Subject: [PATCH 4/7] order of operations
---
monkestation/code/modules/admin/smites/dagothsmite.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/monkestation/code/modules/admin/smites/dagothsmite.dm b/monkestation/code/modules/admin/smites/dagothsmite.dm
index 6152772f69d6..463feeeae7be 100644
--- a/monkestation/code/modules/admin/smites/dagothsmite.dm
+++ b/monkestation/code/modules/admin/smites/dagothsmite.dm
@@ -10,13 +10,13 @@
var/mob/living/carbon/human/Person = target
var/turf/Location = get_turf(target)
var/turf/T = get_step(get_step(Person, NORTH), NORTH)
+ to_chat(Person,"What a grand and intoxicating innocence. Perish.")
T.Beam(Person, icon_state="lightning[rand(1,12)]", time = 15)
+ Person.unequip_everything()
Person.Paralyze(15)
playsound(target,'sound/magic/lightningshock.ogg', 50, 1)
playsound(target, 'monkestation/sound/misc/dagothgod.ogg', 80)
- Person.unequip_everything()
Person.electrocution_animation(15)
- to_chat(Person,"What a grand and intoxicating innocence. Perish.")
spawn(15)
Person.gib()
dyn_explosion(Location, 1, 0)
From c493e2f646f08269da7befce5294ddd3f8f26216 Mon Sep 17 00:00:00 2001
From: DexeeXI <120314509+DexeeXI@users.noreply.github.com>
Date: Sat, 28 Oct 2023 14:05:15 -0600
Subject: [PATCH 5/7] hmmm yes no more destroying gear
---
monkestation/code/modules/admin/smites/dagothsmite.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/monkestation/code/modules/admin/smites/dagothsmite.dm b/monkestation/code/modules/admin/smites/dagothsmite.dm
index 463feeeae7be..fde85ed9a725 100644
--- a/monkestation/code/modules/admin/smites/dagothsmite.dm
+++ b/monkestation/code/modules/admin/smites/dagothsmite.dm
@@ -15,9 +15,9 @@
Person.unequip_everything()
Person.Paralyze(15)
playsound(target,'sound/magic/lightningshock.ogg', 50, 1)
- playsound(target, 'monkestation/sound/misc/dagothgod.ogg', 80)
+ playsound(target,'monkestation/sound/misc/dagothgod.ogg', 80)
Person.electrocution_animation(15)
spawn(15)
Person.gib()
- dyn_explosion(Location, 1, 0)
+ playsound(Location,'sound/effects/explosion3.ogg', 75, 1)
return
From 9bb5ca6612c2b53fde894b092227d915de498de1 Mon Sep 17 00:00:00 2001
From: DexeeXI <120314509+DexeeXI@users.noreply.github.com>
Date: Sun, 29 Oct 2023 17:44:46 -0600
Subject: [PATCH 6/7] code cleanup recommendations taken
---
monkestation/code/modules/admin/smites/dagothsmite.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/monkestation/code/modules/admin/smites/dagothsmite.dm b/monkestation/code/modules/admin/smites/dagothsmite.dm
index fde85ed9a725..758753a4a54c 100644
--- a/monkestation/code/modules/admin/smites/dagothsmite.dm
+++ b/monkestation/code/modules/admin/smites/dagothsmite.dm
@@ -10,8 +10,8 @@
var/mob/living/carbon/human/Person = target
var/turf/Location = get_turf(target)
var/turf/T = get_step(get_step(Person, NORTH), NORTH)
- to_chat(Person,"What a grand and intoxicating innocence. Perish.")
- T.Beam(Person, icon_state="lightning[rand(1,12)]", time = 15)
+ to_chat(Person,span_ratvar("What a grand and intoxicating innocence. Perish."))
+ T.Beam(Person, icon_state="lightning[rand(1,12)]", time = 1.5 SECONDS)
Person.unequip_everything()
Person.Paralyze(15)
playsound(target,'sound/magic/lightningshock.ogg', 50, 1)
From 368fbaf23124acbe19557e7a56005a58b3e3480a Mon Sep 17 00:00:00 2001
From: DexeeXI <120314509+DexeeXI@users.noreply.github.com>
Date: Wed, 1 Nov 2023 17:14:54 -0600
Subject: [PATCH 7/7] expansion adjustments
name adjusted to be plainly obvious that one kills. added a second one that just plain strips'm and drops'm to the floor.
---
.../{dagothsmite.dm => dagothkillsmite.dm} | 10 ++++++----
.../modules/admin/smites/dagothstripsmite.dm | 17 +++++++++++++++++
tgstation.dme | 3 ++-
3 files changed, 25 insertions(+), 5 deletions(-)
rename monkestation/code/modules/admin/smites/{dagothsmite.dm => dagothkillsmite.dm} (66%)
create mode 100644 monkestation/code/modules/admin/smites/dagothstripsmite.dm
diff --git a/monkestation/code/modules/admin/smites/dagothsmite.dm b/monkestation/code/modules/admin/smites/dagothkillsmite.dm
similarity index 66%
rename from monkestation/code/modules/admin/smites/dagothsmite.dm
rename to monkestation/code/modules/admin/smites/dagothkillsmite.dm
index 758753a4a54c..e8c58260673d 100644
--- a/monkestation/code/modules/admin/smites/dagothsmite.dm
+++ b/monkestation/code/modules/admin/smites/dagothkillsmite.dm
@@ -1,8 +1,10 @@
-// Dagoth Smite! (ported from Biblefart code) - Dexee
-/datum/smite/dagothsmite
- name = "Dagoth Smite"
+// Dagoth KILL Smite! (ported from Biblefart code) - Dexee
+// tweaked the name of this to make it extremely apparent that someone's gonna get fucked up. completely and utterly apparent. will be making a separate funny smite that doesn't kill
-/datum/smite/dagothsmite/effect(client/user, mob/living/target)
+/datum/smite/dagothkillsmite
+ name = "Dagoth KILL Smite"
+
+/datum/smite/dagothkillsmite/effect(client/user, mob/living/target)
. = ..()
if (!iscarbon(target))
to_chat(user, span_warning("This must be used on a carbon mob."), confidential = TRUE)
diff --git a/monkestation/code/modules/admin/smites/dagothstripsmite.dm b/monkestation/code/modules/admin/smites/dagothstripsmite.dm
new file mode 100644
index 000000000000..89839cd60fa1
--- /dev/null
+++ b/monkestation/code/modules/admin/smites/dagothstripsmite.dm
@@ -0,0 +1,17 @@
+// The Dagoth Strip! To have something that doesn't kill but you still wanna humiliate someone! -Dexee
+
+/datum/smite/dagothstripsmite
+ name = "Dagoth STRIP"
+
+/datum/smite/dagothstripsmite/effect(client/user, mob/living/target)
+ . = ..()
+ if (!iscarbon(target))
+ to_chat(user, span_warning("This must be used on a carbon mob."), confidential = TRUE)
+ return
+ var/mob/living/carbon/human/Person = target
+ to_chat(Person,span_ratvar("Why have you come unprepared?"))
+ Person.unequip_everything()
+ Person.Paralyze(15)
+ playsound(target,'monkestation/sound/misc/dagothgod.ogg', 80)
+ return
+
diff --git a/tgstation.dme b/tgstation.dme
index 40386788a387..e995c3261f6d 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -5551,7 +5551,8 @@
#include "monkestation\code\modules\admin\antag_tokens.dm"
#include "monkestation\code\modules\admin\camera_view.dm"
#include "monkestation\code\modules\admin\ggg\where_are_your_fingers.dm"
-#include "monkestation\code\modules\admin\smites\dagothsmite.dm"
+#include "monkestation\code\modules\admin\smites\dagothkillsmite.dm"
+#include "monkestation\code\modules\admin\smites\dagothstripsmite.dm"
#include "monkestation\code\modules\aesthetics\airlock\airlock.dm"
#include "monkestation\code\modules\aesthetics\items\clothing.dm"
#include "monkestation\code\modules\aesthetics\mapping\tilecoloring.dm"