From 8dcfbb327e3059ba2e32478cb751b0a530f68ba5 Mon Sep 17 00:00:00 2001
From: Osetrokarasek <78341303+ostrkrs@users.noreply.github.com>
Date: Sat, 7 Jun 2025 18:26:48 +0500
Subject: [PATCH] No Brute From Throwing Cig Butts (#29445)

* fo

* fa

* Update lighters.dm
---
 code/game/objects/items/weapons/cigs.dm          | 2 +-
 code/game/objects/items/weapons/lighters.dm      | 3 ++-
 code/game/objects/items/weapons/storage/fancy.dm | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index 6a66575cc39..d04193954f0 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -369,7 +369,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 	icon = 'icons/obj/clothing/masks.dmi'
 	icon_state = "cigbutt"
 	w_class = WEIGHT_CLASS_TINY
-	throwforce = 1
+	throwforce = 0
 	scatter_distance = 10
 
 /obj/item/cigbutt/Initialize(mapload)
diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm
index 9900f76473e..efadd4be7c6 100644
--- a/code/game/objects/items/weapons/lighters.dm
+++ b/code/game/objects/items/weapons/lighters.dm
@@ -8,7 +8,7 @@
 	icon_state = "lighter-g"
 	item_state = "lighter-g"
 	w_class = WEIGHT_CLASS_TINY
-	throwforce = 4
+	throwforce = 0
 	flags = CONDUCT
 	slot_flags = ITEM_SLOT_BELT
 	attack_verb = null
@@ -155,6 +155,7 @@
 	icon_state = "zippo"
 	item_state = "zippo"
 	is_a_zippo = TRUE
+	throwforce = 4
 
 /obj/item/lighter/zippo/turn_on_lighter(mob/living/user)
 	. = ..()
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index f05629c1d3d..04485ab103d 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -227,7 +227,6 @@
 	item_state = "cigpacket"
 	belt_icon = "patch_pack"
 	w_class = WEIGHT_CLASS_SMALL
-	throwforce = 2
 	slot_flags = ITEM_SLOT_BELT
 	storage_slots = 6
 	max_combined_w_class = 6