From 5aee7c8147457a872bd0be9d48116a5ced55f6f4 Mon Sep 17 00:00:00 2001
From: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Date: Wed, 22 Sep 2021 10:14:05 +1000
Subject: [PATCH] Fixes flatgun drop code (#61453)

About The Pull Request

Changes the drop code handling from being in pickup (requiring some shitcode to work) to instead handle the same code in equip. This behaviour is nonsense, but it at least now works as intended.

fixes #61281
Why It's Good For The Game

Shit ruin with bad loot and bullshit like this
Changelog

cl
fix: Stickmen flatguns now properly drop out of your hands when picked up, as intended.
/cl
---
 code/modules/projectiles/guns/ballistic/pistol.dm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index 805cf2c6a76..3b5c5a83a44 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -90,9 +90,9 @@
 	mag_display = FALSE
 	show_bolt_icon = FALSE
 
-/obj/item/gun/ballistic/automatic/pistol/stickman/pickup(mob/living/user)
-	SHOULD_CALL_PARENT(FALSE)
-	to_chat(user, span_notice("As you try to pick up [src], it slips out of your grip.."))
+/obj/item/gun/ballistic/automatic/pistol/stickman/equipped(mob/user, slot)
+	..()
+	to_chat(user, span_notice("As you try to manipulate [src], it slips out of your possession.."))
 	if(prob(50))
 		to_chat(user, span_notice("..and vanishes from your vision! Where the hell did it go?"))
 		qdel(src)
@@ -100,4 +100,3 @@
 	else
 		to_chat(user, span_notice("..and falls into view. Whew, that was a close one."))
 		user.dropItemToGround(src)
-