Commit Graph

145 Commits

Author SHA1 Message Date
kevinz000
6f31e1270e Merge pull request #11098 from Trilbyspaceclone/bows!
Silk into clothing, bows, arrows, quivers and more!
2020-02-19 19:05:49 -07:00
Ghommie
1a0fba8a2a Something about consistency and magnetic rifles. 2020-02-16 18:37:51 +01:00
TrilbySpaceClone
bbe1ddc0cf silk, bows, and graytide! 2020-02-14 23:04:02 -05:00
Ghom
0b8dd2a03d Merge pull request #11045 from Trilbyspaceclone/patch-280
Flat guns can no longer be suppressed
2020-02-14 08:26:00 +01:00
Trilbyspaceclone
7cd3a51c4e Update pistol.dm 2020-02-12 14:48:53 -05:00
Linzolle
63be3300d2 actually 2020-02-09 19:52:44 -06:00
Linzolle
4622f66162 for real this time 2020-02-09 19:45:22 -06:00
kevinz000
8556a6188f Merge remote-tracking branch 'citadel/master' into small_guncode_refactor 2020-02-04 03:47:01 -07:00
Ghommie
a365f3b499 Demodularize and nerfs mag rifles with re(?)added power cell requirements. 2020-02-03 05:16:32 +01:00
kevinz000
9df12f94d4 Merge branch 'master' into one_last_taser_attempt 2020-01-29 16:27:58 -07:00
kevinz000
0eb13d8f23 refactors guns a bit 2020-01-27 17:39:49 -07:00
Ghommie
b6998a0b56 Fixes det revolver being riiiisky. 2020-01-27 00:44:25 +01:00
Chayse Ramsay
5e5d80238b Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa.
Effectively it means you can load .38 rubber into a .357 revolver to make it less than lethal, or use the various different .38 ammo types.
2020-01-21 22:29:15 +00:00
kevinz000
b0c2e4cbdd Revert "shotgun pointblanking people actually throws them" 2020-01-15 01:13:26 -07:00
Hatterhat
0374870c41 bulldogs knockback too 2020-01-01 02:04:03 -06:00
Hatterhat
318a6812c3 manually copied tgstation#47443 2019-12-31 21:38:11 -06:00
kevinz000
310d343242 Merge pull request #10095 from Ghommie/Ghommie-cit443
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
2019-12-30 00:03:21 -08:00
Ghommie
a82e0b9ee5 Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks. 2019-12-07 09:45:38 +01:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie
21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
kappa-sama
f093024967 better guns 2019-11-12 17:04:36 -05:00
BlackMajor
6a7a121d56 Merge pull request #8856 from Citadel-Station-13/magrifles_again
Security Gun Rebalancing Electric Boogaloo - overhauls magrifles/magpistols, burst fire autorifles, nerfs laser carbines, resprites energy guns
2019-10-28 16:47:02 +13:00
kevinz000
31f9ed9665 fixes 2019-10-24 15:31:45 -07:00
kevinz000
c6c2a703e5 Merge remote-tracking branch 'origin/master' into magrifles_again 2019-10-21 00:47:03 -07:00
Ghommie
fe71e2984c Fixing sniper rifles scope datum action oddities. 2019-10-19 16:40:01 +02:00
Ghommie
e991328087 progress 2019-10-19 15:02:56 +02:00
lolman360
04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00
kevinz000
39beca1a0f Merge pull request #9199 from Tupinambis/IUsedTheShotgunYouKnowWhy
I Used The Shotgun, You Know Why? (Shotgun Balance Pass)
2019-09-13 10:47:15 -07:00
nik707
01f732c57a Merge pull request #9207 from Ghommie/Ghommie-cit189
Rawket lawnchair fix.
2019-08-29 19:29:14 -05:00
Ghommie
18b023b127 arg 2019-08-28 04:47:53 +02:00
Ghommie
e25697dc14 rocket fix. 2019-08-28 03:37:35 +02:00
Tupinambis
d43b4599ef I was bullied to reduce click delay. 2019-08-26 15:53:44 -05:00
Tupinambis
13638ed5d6 Reverts some changes I deemed unneccesary. Undoes a fuckup 2019-08-26 15:08:36 -05:00
Tupinambis
a4fd2be7f7 Various Shotgun Nerfs. 2019-08-26 14:45:12 -05:00
kevinz000
3c59b43ff7 Update shotgun.dm 2019-08-21 06:39:18 -07:00
kevinz000
f59abbf073 Merge pull request #8942 from jakeramsay007/WardenShotgun
Changes the Warden's shotgun to instead be foldable, with greatly increased penalties for being folded.
2019-08-03 00:48:59 -07:00
Chayse Ramsay
085251f5f7 update_icon 2019-07-30 04:35:54 +01:00
Chayse Ramsay
1c8768afe4 Redundant Redundancies made Redundant 2019-07-22 19:31:42 +01:00
Chayse Ramsay
ede61d8cb2 Changes the Warden's shotgun to instead be foldable, with greatly increased recoil and spread while folded. 2019-07-22 00:55:41 +01:00
Ghommie
7065a86841 Revert "Revert "Fixes rocket launchers, buffing their accuracy etc."" 2019-07-19 22:02:22 +02:00
kevinz000
69f06444e6 smgs 2019-07-09 08:20:45 -07:00
Ghommie
9081b5b773 Revert "Fixes rocket launchers, buffing their accuracy etc."
This reverts commit 1c6156dd0e.
2019-07-08 07:17:49 +02:00
Ghommie
1c6156dd0e Fixes rocket launchers, buffing their accuracy etc. 2019-07-08 06:56:20 +02:00
Ghommie
f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Trilbyspaceclone
1b48db693f Update shotgun.dm 2019-05-27 02:42:46 -04:00
Trilbyspaceclone
f5d4135fe9 Update automatic.dm 2019-05-24 22:14:17 -04:00
Trilbyspaceclone
5b6f324993 Update shotgun.dm 2019-05-24 22:13:16 -04:00
Trilbyspaceclone
aabba13648 Update shotgun.dm 2019-04-26 20:34:47 -04:00