mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +01:00
thrown stuff (#1367)
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
/obj/item/after_throw()
|
||||
. = ..()
|
||||
playsound(loc, 'sound/weapons/punchmiss.ogg', (throwforce ? 50 : 25), TRUE, -1)
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user