Commit Graph

68 Commits

Author SHA1 Message Date
Gandalf
51eb607542 [READY FOR REVIEW] Gun play + Gun reliability(and cleaning)(and more) (#1094)
* Starting

* reliability

* modification

* reeee

* Update master.dm

* Update master.dm

* german engineering

* Update master.dm

* Update mg34_lefthand.dmi

* wooo better sprites

* Update mp40.dmi

* more realism and pps

* Update master.dm

* more realism!

* aa

* de-define

* Update master.dm

* uptoot

* Update master.dm

* misc updates

* Update master.dm

* sprite changes

* Remove stupid defines

* Update master.dm

* Update master.dm
2020-10-09 00:06:59 +02:00
SkyratBot
d5b12daac5 [MIRROR] Ballistic gun icon / overlay / ammo fixes. Adds support for suppressors to extend outside of a gun's 32x32 icon. (#176)
* Ballistic gun icon / overlay / ammo fixes. Adds support for suppressors to extend outside of a gun's 32x32 icon. (#52634)

* Ballistic gun fixes

* More fixes

* Ballistic gun icon / overlay / ammo fixes. Adds support for suppressors to extend outside of a gun's 32x32 icon.

Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com>
2020-08-03 16:34:27 +02:00
ShizCalev
c250a1a67a Fixes L6 inhands 2020-07-05 21:39:34 -04:00
ShizCalev
411dea9542 Merge pull request #51659 from TaG2e/master
Fixes more missing sprites and adds invisible icon
2020-07-01 11:58:17 -04:00
TaG2e
5276005acb Reverts, changes, and fixes to sawoff and energy weapons' icons 2020-06-28 17:34:41 -05:00
Paxilmaniac
54572041bd Adds smg to replace the mosin as nuke op surplus gun. Remake of #51285 (#51314)
* github makes my brain hurt

i managed to completely fuck over the last branch

* gun inhands

please god travis dont fail

* just learn the recoil pattern like cs:go bro its not that hard

5 more spread

* wtf appveyor

capitalizes the magazine name to make appveyor run again

* those were, in fact, not the correct inhands

dont know how i fucked up the arg inhands, urg moment indeed

* Update code/modules/projectiles/boxes_magazines/external/smg.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* fixes a minor sprite fucky wucky

would have helped if i actually tested if the sprites work

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-06-22 16:25:39 -03:00
TaG2e
b9ec327c17 Fixes more missing sprites and adds invisible icon 2020-06-15 01:56:12 -05:00
nemvar
6ef421be42 Renames a few variables. Also reorders icon fallback order again. (#51060)
* Renames a few variables. Also reorders fallback order again.
Renames item_state to inhand_icon_state
Renames mob_overlay_icon to worn_icon
Renames mob_overlay_state to worn_icon_state
worn_icon_state/mob_overlay_state now never gets used for inhands.

* Fixes some comments

* Fixes map issue

* Restart lints

* Properly resolves conflicts
2020-05-25 06:47:19 +02:00
LemonInTheDark
1614501d23 Datum view and some other things (#51208)
* Datumizes all uses of change_view

* Cleanup and helper procs

* tweaks values to match the format, hint hint, (value - 0.5) works just fine

* And there's the rest

* woop, braindamage

* and one more

* fuck you menu file

* woops

* we should apply that

* fixes tooltip drift, thank you goon coders

* you can shake but you can't zoom
2020-05-25 01:53:51 +08:00
nemvar
f59ee3609b Fixes m90 grenade launcher reload (#50856) 2020-05-05 17:23:48 -07:00
necromanceranne
0eaf4ca0df Various Antagonist Handgun/Rifle changes; Stechkin, Stechkin APS, c20-r, m90gl (#50734)
* overhauls the crap out of a lot of antag guns and their ammo

* Should probably shoot an additional bullet per squeeze at this point

* nyoops

* So travis will stop yelling at me for new lines

* Should be all I need to fix for maps

* Touches up the stechkin sprite again

* Increased the fire rate and spread of the APS and the spread of the m90, added additional magazine types for the APS and added incendiary mags into the Spetznaz bundle to retain the fire theme, added phasic m90 ammo that penetrates through all surfaces but does significantly less damage available to ops for 8 tc, tided up the code for the aps a little more and also it's sprite.

* fixes some stuff

* So travis will cease screaming

* Changed how the phasic bullets work to being closer to xray beams, added additional flags to allow the bullets to pass through structures and machinery

* Update code/game/machinery/_machinery.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/game/machinery/_machinery.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/game/machinery/doors/door.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/modules/projectiles/boxes_magazines/external/pistol.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* Update code/game/objects/structures.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* updated the gun sprites a bit more

* Hopefully this fixes the conflicts?

* Update code/game/machinery/doors/door.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

* More updating, fatter stechkin sprite

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-05-04 06:21:14 -03:00
MrPerson
26093e5ac2 Further update_icon splitup (#48784)
* Further update_icon splitup

After this there'll be just under 100 old update_icon() calls that need fixing.

* Thanks Travis
2020-01-22 10:18:05 -05:00
Rob Bailey
7d7a1e72d9 Gun sound revamp (#46689)
* shitload of new sounds

* dme fix

* file fixes

* more file fixes

* more file fixes

* volume tweaks + better pistol sounds

* more new sounds + no through walls suppressed

* better suppressed

* more work

* pistol handling sounds

* small tweaks
2019-09-24 18:01:27 -04:00
Rob Bailey
2029163d33 playsound vary boolean define conversion (#46254)
About The Pull Request

Converts every single usage of playsound's vary parameter to use the boolean define instead of 1 or 0. I'm tired of people copypasting the incorrect usage.
Also changes a couple of places where a list was picked from instead of using get_sfx internal calls

This was done via regex:
(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\)) to match 1
(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\)) to match 0
full sed commands:
/(playsound\(.+,.+,.+, ?)1( ?\)| ?,.+\))/\1TRUE\2/ 1 to TRUE
/(playsound\(.+,.+,.+, ?)0( ?\)| ?,.+\))/\1FALSE\2/ 0 to FALSE

I'm not very good with regex and these could probably be optimized, but they worked.
Why It's Good For The Game

Code usability
2019-08-30 18:45:20 +12:00
vuonojenmustaturska
8ddc9677c7 examine-code refactor (#44636)
* 1/4 done? maybe?

* more

* stuff

* incremental stuff

* stuff

* stuff & things

* mostly done but not yet

* stuffing

* stuffing 2: electric boogaloo

* Git Commit and the Kingdom of the Crystal Skull

* make it actually compile

* found more stuff

* fixes

* fix AI laws appearing out of order

* fix windows

* should be the remaining stuff

* this time for real

* i guess it should compile too

* fix sechuds
2019-06-19 22:07:57 +02:00
ShizCalev
a0652c3700 Enable tac reloads for most ballistic weapons (#43466) 2019-04-04 23:51:58 -07:00
Rob Bailey
a39b5d352f Yet more gun fixes (#42722)
Continues fixing the tide of broken shit with my awful PR.

This time around:
Corrects a control message for the l6 saw on examine
Reworks the way that open bolt guns work so that they actually work the way open bolt guns are supposed to. Loud bolt drop when you try to fire an empty magazine included.
Fixes bulldog magazine overlays.
Fixes an issue with tacloads not updating the removed magazine's icon state correctly.
Fixes locking bolt not locking back on the last bullet fired but instead on the
2019-02-10 08:02:33 +13:00
Rob Bailey
ecf9e538ed Gun (Hot)Fixes (#42666)
Fixes my broken bullshit.
2019-02-05 09:32:52 +13:00
Rob Bailey
69e217d8d9 [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
2019-02-04 10:27:01 +13:00
Rob
e4d0a34348 BLAT BLAT GOES THE GAT (#41577)
* big shooteronis

* attribute

* better + louder mix
2018-11-19 14:43:14 -05:00
ShizCalev
b044fa2462 [s] Gun TK fixes 2018-10-30 01:30:59 -04:00
ShizCalev
fe10959af0 Adds examine messages for helmets & guns with flashlights (and bayonets) (#40998)
cl ShizCalev
tweak: Added examine messages for helmets & guns with flashlights (and bayonets.)
fix: Fixed an issue where you were able to remove flashlights/bayonets that were supposed to be permanently attached to a gun.
fix: Fixed an issue where you were unable to remove flashlights & bayonets from certain weapons.
fix: Fixed a potential issue where adding a flashlight to your helmet would've caused you to lose other action buttons.
fix: Fixed a issue where guns with multiple action buttons would break all but one of those action buttons.
tweak: If you have both a bayonet and a flashlight attached to your gun, you'll now be given a prompt on which you'd like to remove when using a screwdriver on it.
/cl

Shouldn't need to have "pro-gamer tips" in adminpm's just to inform folks that you can remove a flashlight from a helmet with a screwdriver.

Also added some missing handle_atom_del / Destroy logic, as well as moving the clothing can_flashlight & flashlight vars down to helmet level (since they were the only things that utilize them anyway.)

also why the fuck was the helmet flashlight var just called F. hnnnngg
2018-10-27 13:10:37 +13:00
bawhoppen
18db7e0cc9 Fixes l6 saw having ridiculous ammo caliber (#40908)
* Fixes ammo caliber

* Fixes reference L542
2018-10-15 08:59:13 -04:00
Jordan Brown
79b681f180 Merge pull request #38964 from subject217/l6saw
Gives the L6 SAW a small amount of spread
2018-07-09 14:42:25 -04:00
Trevor Serpas
bee0b5b2c3 Afterattack() Signal (#38606)
* adds signal and modifies each call of afterattack to call it's inherited proc

* uses new macro for sendsignal()

* map fuck

* skip precommithooks

* combine and negate 2 ifs
2018-07-07 02:00:25 -04:00
Unknown
ebd280cc47 gives it 7 spread!
Why not give the ops a 300 TC instantly obtain the disk button? Or a 300 tc mech that can't be damaged in any way except by pulse lasers?

Just because something is high commitment doesn't mean you can put it at a power level that the station cannot fucking deal with.

someone actually holds this opinion
2018-07-06 21:30:30 -07:00
AnturK
4c5a43eeb8 Prefix for item flag slot defines. 2018-04-27 10:30:48 +02:00
Fox McCloud
057aa31cda Kills off /obj/item/device (#37297)
* Kills off /obj/item/device

* whoops

* whoops

* Fix
2018-04-23 15:00:23 +02:00
kevinz000
f300a5c155 Interaction/Attack Hand Refactor (#36405) 2018-03-23 11:20:54 +01:00
Emmett Gaines
25080ff2c4 defines math (#33498) 2017-12-17 11:02:11 -05:00
vuonojenmustaturska
5233ec1f6a Finishes the forceMove port (#33519)
* a thing

* thingy 2: electric boogaloo

* Obligatory webeditor commit
2017-12-15 10:39:34 +13:00
LuigiBoi
7142aaecee Fixes spelling error 2017-12-08 02:45:15 -06:00
The-clown-known-as-Pepe
7eb63cf1b8 Adds survival knifes to nukeop gear and ability to mount bayonets on few weapons, new bayonet sprites. (#33071) 2017-11-29 11:47:11 -05:00
Emmett Gaines
7c69cdcb8a Revert math (#33059)
* Revert "all this wrapping and it's not even christmas (#33035)"

This reverts commit faaf151580.

* Revert "fuck me for forgetting to graph this one"

This reverts commit 45d7acea2f.

* Revert "defines math"

This reverts commit 2817a1737b.
2017-11-23 20:59:52 -05:00
ninjanomnom
2817a1737b defines math 2017-11-22 17:36:58 -05:00
kevinz000
caa1e1f400 Massive research refactor; changes research system to techwebs; Decentralized research 2017-11-18 19:55:40 -08:00
kevinz000
2a43a4f657 Fixes a bunch of bugs (#31687)
Fixes #13784 by forcing all orbits to update if the lowest stacked one updates
Fixes #21573 by making singularity try to move if it can't expand
Fixes #23306 by making simple bots that are off not able to move
Fixes #28274, fixes #26515 by actually making snipers zoom out
2017-10-16 21:12:32 +13:00
ShizCalev
5d91844926 Fixes suppressing weapons in your bag / pocket (#30894)
* Fixes suppressing in pocked and w_class issues

* Used defines for some things

* Reworded

* Removed the now redundant initial_w_class var

* Early returns

* Null
2017-09-26 11:19:00 +02:00
JJRcop
6f1d141143 Fix L6 Saw examine word choice 2017-09-14 11:17:23 -04:00
JJRcop
1f45361beb Adds a tip for L6 SAW machinegun 2017-09-14 02:18:06 -04:00
pubby
65bb0a3e32 Ammo cleanup (#30361)
* Clean up ammo

* Fix maps

* Cyberboss ammo cleanup fixes
2017-09-07 11:02:44 -04:00
Jordan Brown
af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
shizcalev
1c69895b87 spellchecked code/modules 2017-07-31 11:18:32 -04:00
ShizCalev
0e9b3967e2 Spellchecks the map definitions (#29485) 2017-07-25 14:16:06 +12:00
shizcalev
f31cbb3ac5 Nanotrasen 2017-07-23 04:08:57 -04:00
ShizCalev
59ef81245b Changes some 1s and 0s to TRUE and FALSE (#29144) 2017-07-10 10:31:34 -04:00
Lzimann
3e34eb9e3f Changes all sounds to be lower case, plus standardizes their references 2017-06-11 00:38:45 -03:00
InsaneHyena
5713a44048 Removes donut steelpoint (#28041) 2017-06-05 00:12:26 -03:00
Expletive
70cdc48376 Fixes #27979 (#28002) 2017-06-04 12:11:44 +02:00
Nick
70506a29ae the man with the 2 shotguns that blasted me to the end of the world with dualwielding. nerf (#27978) 2017-06-03 23:45:28 -03:00