Skip to content

Commit

Permalink
Update gun_attachables.dm
Browse files Browse the repository at this point in the history
  • Loading branch information
iloveloopers authored Apr 19, 2024
1 parent 11d9481 commit 206a748
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2502,7 +2502,7 @@ Defined in conflicts.dm of the #defines folder.

/obj/item/attachable/stock/smg/collapsible/brace/apply_on_weapon(obj/item/weapon/gun/G)
if(stock_activated)
G.flags_item |= NODROP|FORCEDROP_CONDITIONAL
G.flags_item |= NODROP
accuracy_mod = -HIT_ACCURACY_MULT_TIER_3
scatter_mod = SCATTER_AMOUNT_TIER_8
recoil_mod = RECOIL_AMOUNT_TIER_2 //Hurts pretty bad if it's wielded.
Expand All @@ -2513,7 +2513,7 @@ Defined in conflicts.dm of the #defines folder.
icon_state = "smg_brace_on"
attach_icon = "smg_brace_a_on"
else
G.flags_item &= ~(NODROP|FORCEDROP_CONDITIONAL)
G.flags_item &= ~NODROP
accuracy_mod = 0
scatter_mod = 0
recoil_mod = 0
Expand Down Expand Up @@ -3225,6 +3225,9 @@ Defined in conflicts.dm of the #defines folder.
to_chat(user, SPAN_WARNING("This chemical will clog the nozzle!"))
return

if(istype(gun.current_mag, /obj/item/ammo_magazine/flamer_tank/smoke)) // you can't fire smoke like a projectile!
to_chat(user, SPAN_WARNING("\The nozzle can't be used with this fuel tank!"))

gun.last_fired = world.time
gun.current_mag.reagents.remove_reagent(flamer_reagent.id, FLAME_REAGENT_USE_AMOUNT * fuel_per_projectile)

Expand Down

0 comments on commit 206a748

Please sign in to comment.