From 8db007bffedb261deb660c646fb117dc06e10413 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Thu, 21 Mar 2019 19:40:41 -0400
Subject: [PATCH 1/3] Update weaponry.dm
---
code/game/objects/items/weaponry.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 294611c1f1..c3efa62359 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -224,7 +224,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
resistance_flags = FIRE_PROOF
/obj/item/katana/cursed
- slot_flags = null
+ slot_flags = null | NODROP
/obj/item/katana/suicide_act(mob/user)
user.visible_message("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!")
From b0835cd94bdd9d37b2ba660b722996a43d49728a Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Thu, 21 Mar 2019 19:42:57 -0400
Subject: [PATCH 2/3] Update weaponry.dm
---
code/game/objects/items/weaponry.dm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index c3efa62359..636c4bc6b6 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -224,7 +224,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
resistance_flags = FIRE_PROOF
/obj/item/katana/cursed
- slot_flags = null | NODROP
+ slot_flags = null
+ flags = NODROP
/obj/item/katana/suicide_act(mob/user)
user.visible_message("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!")
From 4fb335ec87459c0a925d7e7342e6965f3965e19d Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Thu, 21 Mar 2019 19:57:22 -0400
Subject: [PATCH 3/3] shift key must be broken or something
---
code/game/objects/items/weaponry.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 636c4bc6b6..19848f45ea 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -225,7 +225,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/katana/cursed
slot_flags = null
- flags = NODROP
+ item_flags = NODROP
/obj/item/katana/suicide_act(mob/user)
user.visible_message("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!")