From df12bc387257728a207868ca3f89840a43f2c58c Mon Sep 17 00:00:00 2001
From: Imaginos16 <77556824+Imaginos16@users.noreply.github.com>
Date: Sun, 5 May 2024 12:51:26 -0700
Subject: [PATCH 1/3] Removes the Arrhythmic Knife (#2957)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Cruft removal
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Genuinely cringeworthy shit to still have gimmick weapons that give
people max speed.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: PositiveEntropy
del: Removes the Arrhythmic Knife.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 .../BeachRuins/beach_float_resort.dmm         | 10 +------
 .../WasteRuins/wasteplanet_pandora.dmm        |  1 -
 code/game/objects/items/holy_weapons.dm       | 27 -------------------
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm
index bbac1ae4e8d9..29ad64707d84 100644
--- a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm
+++ b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm
@@ -237,14 +237,6 @@
 	light_range = 2
 	},
 /area/ruin/beach/float_resort/villa)
-"gr" = (
-/obj/structure/table/wood,
-/obj/structure/curtain/cloth,
-/obj/item/nullrod/tribal_knife,
-/turf/open/floor/wood{
-	light_range = 2
-	},
-/area/ruin/beach/float_resort/villa)
 "gQ" = (
 /obj/structure/flora/ausbushes/genericbush,
 /turf/open/floor/plating/grass/beach,
@@ -2502,7 +2494,7 @@ kp
 kp
 kp
 kp
-gr
+ar
 OH
 OH
 OH
diff --git a/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm b/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
index 8a63378ced3c..b6298e29f39d 100644
--- a/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
+++ b/_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm
@@ -35,7 +35,6 @@
 /area/ruin/wasteplanet)
 "bL" = (
 /obj/structure/fluff/divine/convertaltar,
-/obj/item/nullrod/tribal_knife,
 /obj/item/clothing/accessory/pandora_hope,
 /turf/open/indestructible/hierophant/two/waste,
 /area/ruin/wasteplanet)
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index cd01cef70503..872d81323cf3 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -671,33 +671,6 @@
 	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
 
-/obj/item/nullrod/tribal_knife
-	icon_state = "crysknife"
-	item_state = "crysknife"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
-	name = "arrhythmic knife"
-	w_class = WEIGHT_CLASS_HUGE
-	desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn."
-	sharpness = IS_SHARP
-	slot_flags = null
-	hitsound = 'sound/weapons/bladeslice.ogg'
-	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-	item_flags = SLOWS_WHILE_IN_HAND
-
-/obj/item/nullrod/tribal_knife/Initialize(mapload)
-	. = ..()
-	START_PROCESSING(SSobj, src)
-	AddComponent(/datum/component/butchering, 50, 100)
-
-/obj/item/nullrod/tribal_knife/Destroy()
-	STOP_PROCESSING(SSobj, src)
-	. = ..()
-
-/obj/item/nullrod/tribal_knife/process()
-	slowdown = rand(-2, 2)
-
-
 /obj/item/nullrod/pitchfork
 	icon_state = "pitchfork0"
 	lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'

From 52c7633757dd868f1d27ff9b3449e79ce724e7f3 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Sun, 5 May 2024 15:02:44 -0500
Subject: [PATCH 2/3] Automatic changelog generation for PR #2957 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-2957.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-2957.yml

diff --git a/html/changelogs/AutoChangeLog-pr-2957.yml b/html/changelogs/AutoChangeLog-pr-2957.yml
new file mode 100644
index 000000000000..7c8a563ac167
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-2957.yml
@@ -0,0 +1,4 @@
+author: PositiveEntropy
+changes:
+  - {rscdel: Removes the Arrhythmic Knife.}
+delete-after: true

From 8ccac2c91aadea6d47b99a33c003bf9a4f99db5b Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Mon, 6 May 2024 00:50:50 +0000
Subject: [PATCH 3/3] Automatic changelog compile [ci skip]

---
 html/changelogs/AutoChangeLog-pr-2922.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-2924.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-2935.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-2938.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-2944.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-2946.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-2947.yml |  5 -----
 html/changelogs/AutoChangeLog-pr-2957.yml |  4 ----
 html/changelogs/archive/2024-05.yml       | 19 +++++++++++++++++++
 9 files changed, 19 insertions(+), 36 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2922.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2924.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2935.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2938.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2944.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2946.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2947.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-2957.yml

diff --git a/html/changelogs/AutoChangeLog-pr-2922.yml b/html/changelogs/AutoChangeLog-pr-2922.yml
deleted file mode 100644
index 05d682b3229d..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2922.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: SuhEugene
-changes:
-  - {admin: made invisimin admins invisible for HUDs and ghosts}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2924.yml b/html/changelogs/AutoChangeLog-pr-2924.yml
deleted file mode 100644
index e70ce74597c7..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2924.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Anticept
-changes:
-  - {tweak: 'intercomms, widebands, and headsets default speaker on again. Handhelds
-      remain off by default.'}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2935.yml b/html/changelogs/AutoChangeLog-pr-2935.yml
deleted file mode 100644
index 019adfc18ce4..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2935.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Anticept
-changes:
-  - {balance: 'pure soulus dust now makes 20u per reaction, and system cleaner is
-      not required.'}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2938.yml b/html/changelogs/AutoChangeLog-pr-2938.yml
deleted file mode 100644
index 3561c2ae1fce..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2938.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Sun-Soaked
-changes:
-  - {bugfix: weird uncertainty around the name of EXOCOM. EXOCON is not real.}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2944.yml b/html/changelogs/AutoChangeLog-pr-2944.yml
deleted file mode 100644
index 94224903c076..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2944.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: SomeguyManperson
-changes:
-  - {tweak: match rounds will no longer consider the person firing them as a viable
-      target when ricocheting}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2946.yml b/html/changelogs/AutoChangeLog-pr-2946.yml
deleted file mode 100644
index eb54df0147db..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2946.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Martinpachu
-changes:
-  - {rscadd: The Candor may now be bought from the outpost.}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2947.yml b/html/changelogs/AutoChangeLog-pr-2947.yml
deleted file mode 100644
index 980e6d143543..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2947.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Martinpachu
-changes:
-  - {balance: The detective's revolver is now priced at 600 credits instead of 1000.}
-  - {balance: The detective's revolver size is now Small.}
-delete-after: true
diff --git a/html/changelogs/AutoChangeLog-pr-2957.yml b/html/changelogs/AutoChangeLog-pr-2957.yml
deleted file mode 100644
index 7c8a563ac167..000000000000
--- a/html/changelogs/AutoChangeLog-pr-2957.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: PositiveEntropy
-changes:
-  - {rscdel: Removes the Arrhythmic Knife.}
-delete-after: true
diff --git a/html/changelogs/archive/2024-05.yml b/html/changelogs/archive/2024-05.yml
index be9fdeed89f0..9287f329245c 100644
--- a/html/changelogs/archive/2024-05.yml
+++ b/html/changelogs/archive/2024-05.yml
@@ -4,3 +4,22 @@
 2024-05-04:
   Apogee-dev:
   - bugfix: fixed missing object descriptions on nanotrasen uniforms
+2024-05-06:
+  Anticept:
+  - tweak: intercomms, widebands, and headsets default speaker on again. Handhelds
+      remain off by default.
+  - balance: pure soulus dust now makes 20u per reaction, and system cleaner is not
+      required.
+  Martinpachu:
+  - balance: The detective's revolver is now priced at 600 credits instead of 1000.
+  - balance: The detective's revolver size is now Small.
+  - rscadd: The Candor may now be bought from the outpost.
+  PositiveEntropy:
+  - rscdel: Removes the Arrhythmic Knife.
+  SomeguyManperson:
+  - tweak: match rounds will no longer consider the person firing them as a viable
+      target when ricocheting
+  SuhEugene:
+  - admin: made invisimin admins invisible for HUDs and ghosts
+  Sun-Soaked:
+  - bugfix: weird uncertainty around the name of EXOCOM. EXOCON is not real.