Commit Graph

127 Commits

Author SHA1 Message Date
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
kevinz000
d681b30df5 Merge pull request #8102 from Trilbyspaceclone/semi-auto
Fixes ever case I can fine of WT-550 Auto Rifle being called Auto Rifle and not Semi-Auto - SMG
2019-03-10 13:44:57 -07:00
Trilbyspaceclone
5aa5f1ed56 SMG 2019-03-09 20:29:19 -05:00
Trilbyspaceclone
8f9542bc43 Update automatic.dm 2019-03-09 20:05:07 -05:00
deathride58
7b00195c0c reduces stamloss for shotgun pumping from 5 to 2 (#7973) 2019-02-05 18:15:31 -08:00
BlackMajor
454f672e34 Why isn't the compact shotgun compact
-Changes the wardens compact combat shotgun to fit in backpacks.

No really, a sawed off riot shotgun fits in a backpack and holds more ammo. Any Warden worth their salt just swaps shotguns, you'd think a "Compact" shotgun would be able to fit much the same considering the lower ammo count.
2019-01-16 19:54:58 +13:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
6fa011c1be INTRODUCING KITCHEN GUN (#7508) 2018-09-07 05:40:35 -07:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJay
06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
YPOQ
23f6567872 Fixes defibs/watertanks/gatling lasers (#37792) 2018-05-13 06:13:45 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
vuonojenmustaturska
f373b2c9e6 Kills off three more flags from flags_2 2018-04-29 17:30:55 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
iksyp
5a06fd98ed Whether or not a pacifist can fire a gun is no longer based on the gun being harmful, but the chambered round being harmful (#36670)
fix: makes dragnet non harmful
tweak: pacifists can now use any disabler or stun setting on any energy gun
code: removed all of the pacifism check code from code/modules/mob/living/living.dm
code: gun objects no longer have a harmful variable, instead, ammo_casing objects now have a harmful variable, which is by default set to TRUE
code: if a pacifist fires a gun, it checks whether or not the round chambered is lethal, instead of whether or not the gun itself is lethal.
2018-04-11 04:59:57 -05:00
deathride58
87365ee74b getStaminaLoss() 2018-04-07 23:39:48 -04:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00