Commit Graph

60 Commits

Author SHA1 Message Date
pireamaineach
7c821fc1fa Make the .45 magazine actually update per round. (#43433)
Makes the .45 magazine actually update per round rather than just showing
full or empty.
2019-04-01 16:14:41 -07:00
ShizCalev
66fd697db4 Fixes 10mm rifle mags and sniper rounds not reporting ammo/updating material values. (#42938) 2019-02-28 11:46:23 -05:00
Rob Bailey
86cb5c2576 Fixes the RPG, renames it and adds some fluff text (#42853)
* fixes rocket launcher, but not some other issues with it

* oh god oh fuck I broke everything

* ok nevermind we rollin

* remove a dumb testing runtime

* less weird gramma on new description

* change the typepath of the rocket to make it easier to know what it is

* I don't remember if I even changed anything here but here it is anyways

* grammar error fix

* better qdel

* casing to fix the article system

* grammar fixes + hack to clear the mag

* small hack for single round mags and makes sure icons update after being loaded

* whoops

* minimize diffs

* capitalization with improper flag
2019-02-25 21:48:11 +11:00
madmanmartian
b4f373a492 Makes unloading ballistic weapons better (Namely revolvers) 2019-02-18 14:42:53 +00:00
subject217
7a2d4cd7ef Removes the stamina version of .45 ammo (#42692)
* webbit reddit

* commits for each file

damn i hate web edits

* magazine

one of these is going to conflict with the guns pr why am i doing this at 2 am

* yeet

* does it compile

probably not
2019-02-08 11:55:48 -05: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
81Denton
cd3d97c1a6 Reworks spearguns, adds Syndicate bundle, carp clothing adds carp faction (#42102)
* Reworks magspears, adds Syndicate bundle, carp clothing adds carp faction

* 20 magspears

* Replaces bandolier with quiver

* Slightly increases throwforce to OHKO space carps
2019-01-07 19:19:45 +13:00
81Denton
b6d03a9e84 Adds three new .38 ammo types (#41155)
cl Denton
add: Added three new .38 ammo types. TRAC bullets, which embed a tracking implant inside the target's body. The implant only lasts for five minutes and doesn't work as a teleport beacon. Hot Shot bullets set targets on fire; Iceblox bullets drastically lower the target's body temperature. They are available after researching the Subdermal Implants node (TRAC) or Exotic Ammunition node (Hot Shot/Iceblox).
tweak: Renamed the Technological Shells research node to Exotic Ammunition.
code: The "lifespan_postmortem" var now determines how long tracking implants work after death.
/cl

Flavor aside, the detective's revolver is little more than a weak Stechkin. I figured that some ammo variety might make it more fun to use:

    TRAC: Only deals 10 damage, but implants a tracking implant once it hits someone. Security can then track the perp with a bluespace locator. It will delete itself after 5 minutes and doesn't work as a teleport beacon.
    Hot Shot: 20 damage and hits the target with 6 fire stacks.
    Iceblox: 20 damage, lowers the target's body temp similar to the temp gun.

Let me know if you think that Hot Shot/Iceblox are too strong - they won't be available early during most rounds because they're gated behind the tech shells node and require plasma to print.
2018-11-12 20:22:48 +13:00
Jordan Brown
3b13859665 Merge pull request #41224 from ShizCalev/rocket-fixes
Rocket launcher fixes, adds suicide_act
2018-11-02 14:19:30 -04:00
ShizCalev
b4b0dea330 Fixes ammobox shell description typo (#41226) 2018-10-31 12:28:43 -04:00
ShizCalev
8c88d6bde4 Rocket launcher fixes 2018-10-30 01:38:19 -04:00
ShizCalev
b044fa2462 [s] Gun TK fixes 2018-10-30 01:30:59 -04: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
ShizCalev
b1b56e6a5e Adds RPGs to Nuke Ops (#40372)
* Gives Syndies RPGs

* Makes the rocket reusable

* fixed minor sprite issue

* SRM Rocket renamed to HE rocket
2018-09-27 12:47:23 +03:00
AnturK
ceebf2de40 Fixes bullet stuff. (#40467) 2018-09-25 12:27:00 +03:00
ShizCalev
5e7dcad6af Fix grenade launchers reporting incorrect live rounds (#40371) 2018-09-23 00:29:16 -07:00
ShizCalev
98a6b39cca Clean up mixed space & tab usage (#40121) 2018-09-05 22:51:20 -07:00
ShizCalev
f338f09207 Cleanup & corrections 2018-06-20 21:57:17 -04:00
ShizCalev
ff532a4ca4 Spellchecks TGStation 2018-06-19 18:57:44 -04:00
CitrusGender
7713aa5058 Fixes null bullets from being fired after they're deleted (#38437)
* Adds handle_atom_del check to if deleted bullets are equal to ammo type and chambered round.

* works for me

* Update _box_magazine.dm
2018-06-13 05:38:15 -04:00
vuonojenmustaturska
c65a99f130 Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong (#38171)
* (mostly) nodrop

* (mostly) dropdel

* (mostly) abstract

* nobludgeon

* things i missed

* forgot one

* unintended changes

* energy handcuffs
2018-06-01 11:36:31 +02:00
Dax Dupont
288e7866b0 Fixes oversight with foam (#37898)
braaap

TRUE FALSE

false false
2018-05-18 16:28:34 +03:00
Tlaltecuhtli
49663e02ca fixes some inconsistency in the bulldog shotgun ammo (#37548)
the default bulldog shotgun ammo makes sense now
2018-05-10 09:23:14 +12:00
Dax Dupont
1790cf7944 You can no longer print infinite ammunition. (#37626)
* You can no longer print infinite ammunition.

* henk

lazy

anus

Reduces .38

Casings now give a tiny bit of metal so the janitor gets a buff

spacing
2018-05-03 09:44:32 -04:00
Jordan Brown
e402a6c9ac Merge pull request #37501 from ShizCalev/icon-fixes
Fixes missing icons
2018-04-28 15:55:56 -04:00
ShizCalev
cda6c6662c Fixes a number of missing icons 2018-04-27 15:36:42 -04:00
AnturK
4c5a43eeb8 Prefix for item flag slot defines. 2018-04-27 10:30:48 +02:00
kevinz000
f5ae06565c Splits up projectile files (#36018) 2018-03-04 17:10:46 -05:00
vuonojenmustaturska
ca6c21851a adds abstract_1 flag to internal magazine objects 2017-12-22 23:24:32 +02: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
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
FrozenGuy5
5294c48be1 Adds alot more initialize() part two 2017-11-12 10:56:33 +00:00
Tad Hardesty
5a0bb2f599 Grammar fixes to atom descriptions (#31293)
* Grammar fixes to atom descriptions

- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate

* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
Kerbin-Fiber
91a9164062 Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter (#30531)
* Automatic changelog generation for PR #30416 [ci skip]

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Update AutoChangeLog-pr-30416.yml

* Automatic changelog generation for PR #30416 [ci skip]

* Delete AutoChangeLog-pr-30416.yml

* Removes riot foam darts from the Donksoft Toy Vendor, however the Syndicate Donksoft Toy Vendor still has riot foam darts.

* Kek

* Changes magazine paths for he Vendors so the Station made one has no riot foam darts at all meanwhile the Syndicate one still has everything just how it is.

* Hopefully fixes this.

* Reee

* Another Fix

* Another Fix, while I'm at it

* My Changelog

* Minor Fixes

* Grammar Fix
2017-09-10 18:42:16 +10:00
pubby
65bb0a3e32 Ammo cleanup (#30361)
* Clean up ammo

* Fix maps

* Cyberboss ammo cleanup fixes
2017-09-07 11:02:44 -04:00
Joan Lung
36d70f3114 Removes bows 2017-07-26 18:39:57 -04:00
InsaneHyena
5713a44048 Removes donut steelpoint (#28041) 2017-06-05 00:12:26 -03:00
Steelpoint
03b31490dd [Lavaland Ruin] Crashed Marine Transport (#27660)
* InitialCommit

* MergeConflict

* Mistakesweremade

* MissingText

* MoreFixesAndBlackList

* Tweaks

* FixedIssues

* FinalFixHopefully

* NewWalls

* IDCardAndNoNTReferences

* LorePassOver

* ArmourNerf

* MergeConflicts

* MergeConflict

* MergeConflict

* SlightRework

* Terran

* IronHawk
2017-05-28 10:30:17 -04:00
Robustin
143e3fe2f4 Merge branch 'master' of https://github.com/tgstation/-tg-station into GangBangTest
# Conflicts:
#	icons/obj/ammo.dmi
2017-05-25 14:35:25 -04:00
Robustin
5097c5ab9a Update external_mag.dm 2017-05-24 12:24:13 -04:00
Robustin
df722ce8d7 Update external_mag.dm 2017-05-24 12:23:23 -04:00
Steelpoint
836a81a85d Sketchin Alt Magazine Sprites (#27556)
* InitialCommit

* StraightStripes

* Vertical
2017-05-23 23:13:38 -06:00
Robustin
725f669726 Gang Sniper 2017-05-23 19:50:24 -04:00
Steelpoint
8c0a509bf4 Auto Rifle Alt Mag Sprites (#27463) 2017-05-23 00:15:22 -03:00
Robustin
eb7f2ddc99 Merge branch 'master' of https://github.com/tgstation/tgstation into GG3
# Conflicts:
#	icons/obj/guns/projectile.dmi
2017-05-21 17:54:44 -04:00
Steelpoint
7103172e0b Warden Compact Combat Shotgun (#27427)
* InitalCommit

* InitialCommit

* Removal

* CloseEncounters
2017-05-21 13:44:03 -04:00
Robustin
889eefdca5 more gang guns 2017-05-12 16:04:44 -04:00