diff --git a/code/game/objects/items/weapons/misc_items.dm b/code/game/objects/items/weapons/misc_items.dm index f51407438a3..7e8310e4b5b 100644 --- a/code/game/objects/items/weapons/misc_items.dm +++ b/code/game/objects/items/weapons/misc_items.dm @@ -158,8 +158,6 @@ icon = 'icons/obj/stacks/miscellaneous.dmi' icon_state = "c_tube" hitsound = 'sound/items/cardboard_tube.ogg' - throwforce = 1 - force = 1 attack_verb = list("bonked", "thunked") w_class = WEIGHT_CLASS_TINY throw_speed = 4 @@ -169,7 +167,8 @@ qdel(src) return TRUE - +/obj/item/c_tube/should_play_hitsound(damage) + return TRUE /obj/item/fan name = "desk fan" diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm index b90cede3efa..a5bc5c8f901 100644 --- a/code/modules/clothing/head/misc_hats.dm +++ b/code/modules/clothing/head/misc_hats.dm @@ -462,7 +462,6 @@ desc = "This cone is trying to warn you of something!" icon = 'icons/obj/janitor.dmi' icon_state = "cone" - force = 1.0 throwforce = 3.0 throw_range = 5 attack_verb = list("warned", "cautioned", "smashed") @@ -479,6 +478,9 @@ "Tajaran" = 'icons/mob/clothing/species/tajaran/head.dmi', ) +/obj/item/clothing/head/cone/should_play_hitsound(damage) + return TRUE + /obj/item/clothing/head/jester name = "jester hat" desc = "A hat with bells, to add some merryness to the suit."