mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 21:48:39 +01:00
If you can't shoot a gun, then... JUST TOSS IT AT THEM (#84827)
## About The Pull Request Adds a new trait TRAIT_TOSS_GUN_HARD (which currently comes from the Sleeping Carp scroll, ninja MODsuit, berserk armor, being a medieval pirate or highlander). The owner of this trait deals an additional **10-20** (depending on the size of the weapon) damage to the enemy by throwing a gun, and also knocks them for 0.5 seconds. If a ballistic weapon **with a magazine** was thrown, then the magazine is removed and the bolt is racked, and if **without a magazine**, then all cartridges (revolvers) or chambered one is removed. Here's a preview of how it works: https://github.com/tgstation/tgstation/assets/126676387/2a56eb74-6d37-4343-a685-3bf7159ab628 ## Why It's Good For The Game It's classic  ## Changelog 🆑 add: If you can't shoot a gun, then... JUST TOSS IT AT THEM (for 0.5 seconds of knockdown and 10-20 an additional brute damage) /🆑 --------- Co-authored-by: paganiy <leunscrupuloustrolle@gmail.com>
This commit is contained in:
@@ -177,10 +177,10 @@
|
||||
var/accepted_type = /obj/item/energy_katana
|
||||
|
||||
/obj/item/mod/module/weapon_recall/on_suit_activation()
|
||||
ADD_TRAIT(mod.wearer, TRAIT_NOGUNS, MOD_TRAIT)
|
||||
mod.wearer.add_traits(list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD), MOD_TRAIT)
|
||||
|
||||
/obj/item/mod/module/weapon_recall/on_suit_deactivation(deleting = FALSE)
|
||||
REMOVE_TRAIT(mod.wearer, TRAIT_NOGUNS, MOD_TRAIT)
|
||||
mod.wearer.remove_traits(list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD), MOD_TRAIT)
|
||||
|
||||
/obj/item/mod/module/weapon_recall/on_use()
|
||||
if(!linked_weapon)
|
||||
|
||||
Reference in New Issue
Block a user