Merge remote-tracking branch 'upstream/master' into riotgran

_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

_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)

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'

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.