Commit Graph

70 Commits

Author SHA1 Message Date
Cheridan d51a1907f8 Merge pull request #15750 from Steelpoint/M90
C20r Buff | M90 Removal
2016-02-27 00:22:01 -06:00
Steelpoint 628be2f67d C20rChange 2016-02-25 15:54:37 +08:00
Boredone 40005aca32 Hope I didn't mess up here as I didn't branch off earlier changes. 2016-02-20 15:34:01 -07:00
Thunder12345 1861e65bdd Stechkin buff 2016-02-13 20:11:58 +00:00
Thunder12345 b5c79e3781 Adds military russian
Adds camouflage fatiges, functionally identical to turtlenecks
Adds buckshot loaded pump shotgun variant
Adds sprites for the new russian
2016-02-13 20:05:51 +00:00
Thunder12345 b9fcf72e12 Added 9mm stechkin APS, 12 round magazine, 3 round burst fire or semi auto. 2016-02-13 20:05:51 +00:00
Thunder12345 f4f227412f Added nagant revolver, and its new ammo type 2016-02-13 20:05:51 +00:00
KorPhaeron 2f6c9ec50e Bulldog Fix 2016-02-05 12:06:53 -06:00
MMMiracles 045f2d480b saw and bulldog changes fight me kiddo 1v1 2016-01-25 20:58:38 -05:00
KorPhaeron a960dcf5e6 Clip descriptions 2016-01-07 16:08:02 -06:00
KorPhaeron a38a9d55c7 Autorifle magazine 2015-12-31 17:40:40 -06:00
MMMiracles 36cba7e874 ALL THESE NUMBERS AND YOU CHOOSE 30? 2015-12-21 21:34:55 -05:00
MMMiracles 98407f821e democracy demands 30 bullets 2015-12-19 16:04:07 -05:00
MMMiracles f0a56c0eb2 27 for consistency 2015-12-19 13:07:39 -05:00
MMMiracles 5f3b31d0a5 bullet 2015-12-19 12:56:37 -05:00
MMMiracles cbc9904c4c saw balance 2015-12-16 20:23:03 -05:00
Steelpoint 0070b9911d InitalCommit 2015-10-15 01:51:54 +08:00
c0 93fb95993e Instant merge is the fastest action type for this operation 2015-09-22 00:20:36 +03:00
c0 ef8bb5e0e0 Russian roulette 2015-09-22 00:20:36 +03:00
Steelpoint 62e7f1204d NewChanges 2015-09-16 17:53:04 +08:00
Steelpoint 6eac77fcfd Rifle 2015-09-10 13:14:41 +08:00
Steelpoint d6f0c2484a InitalCommit 2015-09-08 19:56:07 +08:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Alexander P. Ulan Hernandez f0d70a42b0 Rubber Shotgun Pellets
Adds rubber shotgun pellets, which spawn in the riot shotguns and can be
produced at an autolathe.
2015-07-02 21:29:18 -04:00
Xhuis 2823a98244 Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-19 11:23:45 -04:00
Swag McYolosteinen e4281bbaab Merge pull request #10019 from Thunder12345/autoshotgun
Moved combat shotguns to shotgun/automatic/combat
2015-06-19 17:06:00 +02:00
Swag McYolosteinen 1dde070d18 Merge pull request #9800 from Dorsisdwarf/wittybranchname
Buffs nuke ops [merge ready]
2015-06-19 12:00:23 +02:00
Xhuis e1356f889e Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-18 23:37:06 -04:00
Thunder12345 1c83cc6d45 Pray pray pray 2015-06-18 18:07:57 +01:00
Ikarrus fe14ff46ee - Reduced uzi ammo to 25 influence cost
- Added uzis to summon guns
- uncapitalized uzi names
2015-06-17 19:26:02 -06:00
Ikarrus 556b25aec3 Added 9mm 2-burst 32 mag uzis that costs 40 influence. Unlike tommy guns gangs will be able to purchase ammo for uzis. 2015-06-17 09:36:15 -06:00
Thunder12345 bfb2345726 Moved combat shotguns to shotgun/automatic/combat
- shotgun/automatic/ will pump itself automatically on firing
 - combat shotgun capacity nerfed to 6 rounds
 - replaced all instances of the old path with the new one
2015-06-17 15:25:59 +01:00
Xhuis 3bc466a0ff Merge remote-tracking branch 'remotes/upstream/master' into thaw 2015-06-16 11:42:47 -04:00
Ikarrus d59c67ecd0 Squashed commit:
[c9795d3] Writing and formatting tweaks

[65aae64] Tweaks to messages and notices, formatting, and cleanup. (+2 squashed commit)

Squashed commit:

[995a61b] I guess I should call them for what they are (9mm)

[0f04213]   - tweak: "While attempting a Hostile Takeover, gangs do not gain influence. Instead, the takeover timer will be reduced by how many territories they control."
  - tweak: "Tommy guns no longer deal stamina damage."

[202c743] Recruitment Pen cooldown is reduced by 10 seconds for every additional member your rival gang has over yours with a minimum of a 5 second cooldown

[c1a3af3] Pen cooldown = 2 minutes
Fixed gang dominators reporting the wrong time on examine() (+4 squashed commit)

Squashed commit:

[78c043e] Pen Cooldown returned to 60 seconds
Spray can cost halved to 5 influence

[4e65dff] - Capped outfits in stock to 10

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)

Squashed commit:

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)

Squashed commit:

[202c743] Recruitment Pen cooldown is reduced by 10 seconds for every additional member your rival gang has over yours with a minimum of a 5 second cooldown

[c1a3af3] Pen cooldown = 2 minutes
Fixed gang dominators reporting the wrong time on examine() (+4 squashed commit)

Squashed commit:

[78c043e] Pen Cooldown returned to 60 seconds
Spray can cost halved to 5 influence

[4e65dff] - Capped outfits in stock to 10

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time) (+2 squashed commit)

Squashed commit:

[1f347a9] Changelog

[615c971] - Added white suits to gang outfits
- Gang outfits are free, but are limited in stock (that replenishes over time)
2015-06-13 22:13:01 -06:00
Xhuis 700c461422 FEATURE FOUR: Bulldog shotgun darts 2015-06-07 13:08:17 -04:00
Dorsisdwarf fc88bce4b6 sets default shotgun ammo to slugs, makes syndicate ammo bag actually have ammo in it 2015-06-05 14:05:32 +01:00
Fayrik 0173c7af6e Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.) 2015-03-21 16:18:32 +00:00
Fayrik d3d491588e Cleaned up the functionality and prepared things for PR. 2015-03-20 23:19:19 +00:00
Fayrik a030c9889e Glorious second commit, introducing (mildly) dangerous rounds and a new suicide check. 2015-03-20 23:03:06 +00:00
Fayrik b758992e8c First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo. 2015-03-20 23:02:53 +00:00
hornygranny ea12d68e60 Merge pull request #7817 from paprka/whatthefucktg
Syndicate shotguns spawn with buckshot by default
2015-02-19 13:07:08 -08:00
paprka efbb4f5116 makes syndicate shotguns spawn with buckshot by default 2015-02-18 14:10:46 -08:00
paprka 15e2b88a0f removes bloat from magazines icons 2015-02-17 19:43:20 -08:00
paprka 4a0aa0c0a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/ammunition/ammo_casings.dm
	code/modules/projectiles/ammunition/boxes.dm
	icons/obj/ammo.dmi
	icons/obj/gun.dmi
2015-01-15 22:16:11 -08:00
tkdrg 6bfebf2e48 Adds bolt-action rifle
Sprites from https://tgstation13.org/phpBB/viewtopic.php?f=9&t=2151

These have a bolt that needs to be worked after each shot, and they
need it to be open in order to be reloaded. There is also a stripper
clip. Their bullet does 60 brute damage, and the gun has a 5-shot
internal magazine. They cannot be worn on the back slot as there are
no back sprites provided in that file. Bayonets are not implemented
for the same reason.

The gun can be obtained as a 50% drop from ranged russian mobs (the
other 50% still drop the mateba) and from summon guns.
2015-01-16 03:03:34 -03:00
paprka 8bde2dea03 crossbow, speargun, and grenade updates 2015-01-13 20:00:58 -08:00
paprka 460a06e683 Reverted some other magazine name changes 2015-01-03 17:23:31 -08:00
paprka 7324891c37 intense p90 fans on /tg/ apparently 2015-01-03 17:21:23 -08:00
paprka 46ee047404 further changes to the ranged stun system 2015-01-01 22:22:03 -08:00
Menshin 05378c014d * fixes #3765 (shotguns sawing off)
* fixes #994 (clumsy guns firing)
* fixes #6443 (laser tags firing without vest on)
* fixes #6262 (optimizing revolver reloading)
2014-12-21 01:35:49 +01:00