From 199a27d7c09d4eae06a724a4bbcc06cb78c3a47a Mon Sep 17 00:00:00 2001
From: Azarak <azarak10@gmail.com>
Date: Mon, 19 Oct 2020 19:52:33 +0200
Subject: [PATCH] thrown stuff (#1367)

---
 code/modules/mob/living/carbon/carbon.dm               | 2 ++
 modular_skyrat/master_files/code/game/objects/items.dm | 3 ---
 modular_skyrat/master_files/readme.md                  | 1 -
 tgstation.dme                                          | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 modular_skyrat/master_files/code/game/objects/items.dm

diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index f7e7326289d..a492ec7d852 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -167,6 +167,8 @@
 			power_throw++
 		if(pulling && grab_state >= GRAB_NECK)
 			power_throw++
+		do_attack_animation(target, no_effect = 1) //SKYRAT EDIT ADDITION - AESTHETICS
+		playsound(loc, 'sound/weapons/punchmiss.ogg', 50, TRUE, -1) //SKYRAT EDIT ADDITION - AESTHETICS
 		visible_message("<span class='danger'>[src] throws [thrown_thing][power_throw ? " really hard!" : "."]</span>", \
 						"<span class='danger'>You throw [thrown_thing][power_throw ? " really hard!" : "."]</span>")
 		log_message("has thrown [thrown_thing] [power_throw ? "really hard" : ""]", LOG_ATTACK)
diff --git a/modular_skyrat/master_files/code/game/objects/items.dm b/modular_skyrat/master_files/code/game/objects/items.dm
deleted file mode 100644
index 1e2e30ec1b8..00000000000
--- a/modular_skyrat/master_files/code/game/objects/items.dm
+++ /dev/null
@@ -1,3 +0,0 @@
-/obj/item/after_throw()
-	. = ..()
-	playsound(loc, 'sound/weapons/punchmiss.ogg', (throwforce ? 50 : 25), TRUE, -1)
diff --git a/modular_skyrat/master_files/readme.md b/modular_skyrat/master_files/readme.md
index c14f5d94135..1b2e6bbf12e 100644
--- a/modular_skyrat/master_files/readme.md
+++ b/modular_skyrat/master_files/readme.md
@@ -18,7 +18,6 @@ MASTER CODE FILES
 - /master_files/code/datums/traits/neutral.dm > USE THIS FOR ANY NEUTRAL TRAITS
 - /master_files/code/datums/traits/negative.dm > USE THIS FOR ANY NEGATIVE TRAITS
 - /master_files/code/datums/traits/good.dm > USE THIS FOR ANY GOOD TRAITS
-- master_files\code\game\objects\items.dm
 - \master_files\code\game\objects\structures\trash_pile.dm
 - /master_files/code/modules/mob/living/carbon/carbon_say.dm
 MASTER GLOBAL VARS
diff --git a/tgstation.dme b/tgstation.dme
index 58e1bce02d4..5cd1f94148c 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3263,7 +3263,6 @@
 #include "modular_skyrat\master_files\code\datums\traits\good.dm"
 #include "modular_skyrat\master_files\code\datums\traits\negative.dm"
 #include "modular_skyrat\master_files\code\datums\traits\neutral.dm"
-#include "modular_skyrat\master_files\code\game\objects\items.dm"
 #include "modular_skyrat\master_files\code\game\objects\structures\trash_pile.dm"
 #include "modular_skyrat\master_files\code\modules\clothing\anthro_clothes.dm"
 #include "modular_skyrat\master_files\code\modules\clothing\non_anthro_clothes.dm"