From 6f814b118da1f3fb911d5eb59a603879e3e0fbdb Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Sat, 7 Nov 2020 06:04:32 +0100
Subject: [PATCH] [MIRROR] Fixes being able to commit suicide with an UNREAL
SORD (#1594)
* Fixes being able to commit suicide with an UNREAL SORD (#54831)
The UNREAL SORD null rod form's suicide_act() now closely matches the suicide_act of an actual SORD.
For reference, an actual SORD's suicide_act() is:
```
/obj/item/sord/suicide_act(mob/user)
user.visible_message("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.", \
"You try to impale yourself with [src], but it's USELESS...")
return SHAME
```
And the UNREAL SORD null rod form's new suicide_act() is:
```
/obj/item/nullrod/sord/suicide_act(mob/user) //a near-exact copy+paste of the actual sord suicide_act()
user.visible_message("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so HOLY.", \
"You try to impale yourself with [src], but it's TOO HOLY...")
return SHAME
```
* Fixes being able to commit suicide with an UNREAL SORD
Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
---
code/game/objects/items/holy_weapons.dm | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index 4a9493e3d83..2ab0067b484 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -420,6 +420,11 @@
attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
+/obj/item/nullrod/sord/suicide_act(mob/user) //a near-exact copy+paste of the actual sord suicide_act()
+ user.visible_message("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so HOLY.", \
+ "You try to impale yourself with [src], but it's TOO HOLY...")
+ return SHAME
+
/obj/item/nullrod/scythe
icon_state = "scythe1"
inhand_icon_state = "scythe1"