mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 21:18:37 +01:00
[READY] I got guns (#41804)
cl actioninja\memager refactor: Ballistic guns have been almost entirely reworked from a backend side. This primarily focused on moving as much as possible into the base ballistic gun and turning as many other guns into essentially varedits as possible. add: Guns can now be racked. This is the default action unless the magazine is empty. add: Guns now can have the magazine removed by clicking on them with an open hand while they are in hand. tweak: Suppressors are now removed by alt clicking instead of clicking with an open hand add: Guns now have various bolt types that all function a bit differently. Open bolts cannot have a bullet chambered with no mag, locking bolts lock back after running out of ammo, etc. add: All ballistic gun sounds are controlled by variables instead of hardcoded usages. tweak: The l6 LMG has a reworked control scheme. alt + click to open and close the cover, open hand to remove mag, place mag in by slapping them together, default action is rack. tweak: Functionality that used to be snowflake code such as tactical reloads has been moved to the base gun, and can be toggled by variables. refactor: All shotguns are now properly subpaths of the shotgun type. They still work the same. imagedel: Gun sprites have been almost entirely overhauled to use overlays instead of states. This collapsed the L6 sprite from 20 sprites to 9 sprites to give an example. soundadd: Remixed versions of the shotgun and base gun firesound soundadd: New rifle firesound for l6 and moist nugget, new SMG fire sound, new sniper fire sound. soundadd: Lots of new weapon operation sounds such as racking and bolts and the like. imageadd: New sprites for the Riot Shotgun, Combat Shotgun, c20r, Deagle, m90, double barrel shotgun and 1911 by Memager. imageadd: All gun sprites that were pointing to the left have been flipped to point to the right. balance: Shotguns now can be pumped faster. balance: Bulldog can now be tac reloaded balance: Sawn off shotguns now have an accuracy penalty and recoil /cl
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
clothes_req = TRUE
|
||||
cooldown_min = 10 //Gun wizard
|
||||
action_icon_state = "bolt_action"
|
||||
var/summon_path = /obj/item/gun/ballistic/shotgun/boltaction/enchanted
|
||||
var/summon_path = /obj/item/gun/ballistic/rifle/boltaction/enchanted
|
||||
|
||||
/obj/effect/proc_holder/spell/targeted/infinite_guns/cast(list/targets, mob/user = usr)
|
||||
for(var/mob/living/carbon/C in targets)
|
||||
@@ -24,4 +24,4 @@
|
||||
name = "Arcane Barrage"
|
||||
desc = "Fire a torrent of arcane energy at your foes with this (powerful) spell. Deals much more damage than Lesser Summon Guns, but won't knock targets down. Requires both hands free to use. Learning this spell makes you unable to learn Lesser Summon Gun."
|
||||
action_icon_state = "arcane_barrage"
|
||||
summon_path = /obj/item/gun/ballistic/shotgun/boltaction/enchanted/arcane_barrage
|
||||
summon_path = /obj/item/gun/ballistic/rifle/boltaction/enchanted/arcane_barrage
|
||||
@@ -13,12 +13,12 @@ GLOBAL_LIST_INIT(summoned_guns, list(
|
||||
/obj/item/gun/ballistic/automatic/gyropistol,
|
||||
/obj/item/gun/energy/pulse,
|
||||
/obj/item/gun/ballistic/automatic/pistol/suppressed,
|
||||
/obj/item/gun/ballistic/revolver/doublebarrel,
|
||||
/obj/item/gun/ballistic/shotgun/doublebarrel,
|
||||
/obj/item/gun/ballistic/shotgun,
|
||||
/obj/item/gun/ballistic/shotgun/automatic/combat,
|
||||
/obj/item/gun/ballistic/automatic/ar,
|
||||
/obj/item/gun/ballistic/revolver/mateba,
|
||||
/obj/item/gun/ballistic/shotgun/boltaction,
|
||||
/obj/item/gun/ballistic/rifle/boltaction,
|
||||
/obj/item/pneumatic_cannon/speargun,
|
||||
/obj/item/gun/ballistic/automatic/mini_uzi,
|
||||
/obj/item/gun/energy/lasercannon,
|
||||
@@ -38,7 +38,7 @@ GLOBAL_LIST_INIT(summoned_guns, list(
|
||||
/obj/item/gun/energy/plasmacutter/adv,
|
||||
/obj/item/gun/energy/wormhole_projector,
|
||||
/obj/item/gun/ballistic/automatic/wt550,
|
||||
/obj/item/gun/ballistic/automatic/shotgun/bulldog,
|
||||
/obj/item/gun/ballistic/shotgun/bulldog,
|
||||
/obj/item/gun/ballistic/revolver/grenadelauncher,
|
||||
/obj/item/gun/ballistic/revolver/golden,
|
||||
/obj/item/gun/ballistic/automatic/sniper_rifle,
|
||||
|
||||
Reference in New Issue
Block a user