cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 14:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes being able to commit suicide with an UNREAL SORD (#1594)

Browse Source 
* 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("<span class='suicide'>[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.</span>", \
	"<span class='suicide'>You try to impale yourself with [src], but it's USELESS...</span>")
	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("<span class='suicide'>[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so HOLY.</span>", \
	"<span class='suicide'>You try to impale yourself with [src], but it's TOO HOLY...</span>")
	return SHAME
```

* Fixes being able to commit suicide with an UNREAL SORD

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-11-07 05:04:32 +00:00
committed by GitHub
co-authored by ATH1909
parent 6a4a1c69f6
commit 6f814b118d
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/holy_weapons.dm
+5
View File
@@ -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("<span class='suicide'>[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so HOLY.</span>", \
"<span class='suicide'>You try to impale yourself with [src], but it's TOO HOLY...</span>")
return SHAME
/obj/item/nullrod/scythe
icon_state = "scythe1"
inhand_icon_state = "scythe1"