kevinz000
|
275b1f73e0
|
Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-04 03:39:14 -07:00 |
|
Ghommie
|
a365f3b499
|
Demodularize and nerfs mag rifles with re(?)added power cell requirements.
|
2020-02-03 05:16:32 +01:00 |
|
Ghommie
|
8de11845d5
|
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-02 03:39:49 +01:00 |
|
Ghom
|
6ae5ffddb1
|
Merge pull request #10731 from necromanceranne/howdoiswitchhands
Energy crossbow changed from RNG to static effects
|
2020-02-01 18:58:03 +01:00 |
|
Ghom
|
74ad10355c
|
Merge pull request #10805 from Citadel-Station-13/i-hate-dueling
guns/ammo/projectiles now properly clean up while being deleted
|
2020-02-01 18:52:47 +01:00 |
|
Putnam3145
|
17e08280b1
|
Merge pull request #10804 from Citadel-Station-13/kevinz000-patch-9
fixes a very likely race condition in dueling pistols
|
2020-02-01 04:15:32 -08:00 |
|
Ghom
|
ed3ebd16a8
|
Merge pull request #10830 from Seris02/nomoreglitches
[s] fixes a glitch with the PKA
|
2020-02-01 10:06:58 +01:00 |
|
Seris02
|
3c8dcbbcd2
|
merp
|
2020-02-01 16:02:30 +08:00 |
|
Seris02
|
fc70b88b06
|
actually we only need it here
|
2020-02-01 11:51:15 +08:00 |
|
Seris02
|
20308b54dd
|
exploit fix
|
2020-02-01 11:48:55 +08:00 |
|
kevinz000
|
9e08f8bed7
|
Update energy.dm
|
2020-01-31 01:23:38 -07:00 |
|
kevinz000
|
97caad18c5
|
Update dueling.dm
|
2020-01-31 01:18:43 -07:00 |
|
kevinz000
|
831fafb72b
|
Update dueling.dm
|
2020-01-29 19:06:11 -07:00 |
|
kevinz000
|
562659b5b8
|
Update dueling.dm
|
2020-01-29 19:00:11 -07:00 |
|
necromanceranne
|
f9d6a9b9c4
|
Added the tweaks suggested by kevin but good fucking lord this changes a lot and also fuck the pka reload proc
|
2020-01-29 14:23:50 +11:00 |
|
kevinz000
|
9dfcef68ed
|
Merge branch 'master' into duke_moxley
|
2020-01-28 17:53:08 -07:00 |
|
kevinz000
|
3055c2b4c1
|
Merge pull request #10742 from Ghommie/Ghommie-cit532
Fixes det revolver being risky to use.
|
2020-01-27 17:43:46 -07:00 |
|
kevinz000
|
1e19ec2c50
|
bad var
|
2020-01-27 02:59:27 -07:00 |
|
kevinz000
|
4883b36576
|
compile
|
2020-01-27 02:55:32 -07:00 |
|
kevinz000
|
d4d315b447
|
:^)
|
2020-01-27 02:51:01 -07:00 |
|
necromanceranne
|
5e7b7143de
|
Additional adjustments, added more damage to the mini ebow becaues I forgot to do that originally and made large ebows bulky and heavy weapons
|
2020-01-27 11:48:56 +11:00 |
|
Ghommie
|
b6998a0b56
|
Fixes det revolver being riiiisky.
|
2020-01-27 00:44:25 +01:00 |
|
kevinz000
|
97c65aac89
|
Update kinetic_accelerator.dm
|
2020-01-26 03:06:31 -07: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
|
aea0de30d1
|
Merge pull request #10125 from Ghommie/Ghommie-cit449
Ports a few projectile code updates by ke:b:inz.
|
2020-01-17 15:15:08 -07:00 |
|
kevinz000
|
b0c2e4cbdd
|
Revert "shotgun pointblanking people actually throws them"
|
2020-01-15 01:13:26 -07:00 |
|
Ghommie
|
02fbbd4f95
|
Ouch.
|
2020-01-12 16:54:08 +01:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
BlackMajor
|
08d042901c
|
thank you github
|
2020-01-02 22:16:47 +13:00 |
|
BlackMajor
|
aabb39a364
|
Revert "Merge branch 'master' into Yeehaw"
This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
|
2020-01-02 22:06:31 +13:00 |
|
BlackMajor
|
30e3edaac1
|
Merge branch 'master' into Yeehaw
|
2020-01-02 22:03:58 +13:00 |
|
BlackMajor
|
3239acf74d
|
Sync
|
2020-01-02 22:02:55 +13:00 |
|
BlackMajor
|
375e59a77d
|
Merge branch 'master' into Yeehaw
|
2019-12-29 22:12:40 +13:00 |
|
BlackMajor
|
2e03a529bf
|
checking off the list
|
2019-12-29 22:11:10 +13:00 |
|
BlackMajor
|
95c0eddc2a
|
Merge pull request #10072 from Useroth/new-tg-plants
Ported bamboo stuff from tg.
|
2019-12-18 01:02:29 +13:00 |
|
Ghommie
|
414d4b7a90
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408
|
2019-12-09 00:04:22 +01:00 |
|
Useroth
|
c35acf00fe
|
Empty commit to make travis recompile.
|
2019-12-07 15:18:37 +01:00 |
|
Useroth
|
28ddfd29b6
|
Merge branch 'master' into new-tg-plants
|
2019-12-07 14:25:38 +01:00 |
|
Useroth
|
1158c03ed7
|
Added bamboo.
|
2019-12-06 19:00:10 +01:00 |
|
Ghommie
|
6cc07c5bc3
|
Ports the energy gun empty state overlay fix.
|
2019-11-29 02:59:54 +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 |
|
BlackMajor
|
c81d1fe7a3
|
Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
|
2019-11-25 11:31:03 +13: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 |
|
GrayRachnid
|
3edaf75722
|
Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons.
|
2019-11-15 16:58:45 -05:00 |
|
kevinz000
|
8f08e1017e
|
Merge pull request #9688 from Ghommie/Ghommie-cit306
Fixing gibspawner runtimes and improving them, how gruesome...
|
2019-11-14 15:51:20 -07:00 |
|
kappa-sama
|
f093024967
|
better guns
|
2019-11-12 17:04:36 -05:00 |
|
kevinz000
|
48fb3a0f08
|
Merge pull request #9694 from kappa-sama/hosnowflake
Buffs security, nerfs antags
|
2019-11-10 11:40:41 -07:00 |
|
kappa-sama
|
3e95a66513
|
Update energy_gun.dm
|
2019-11-02 23:04:06 -04:00 |
|
Ghommie
|
065fbdf0cb
|
Fixing gibspawner runtimes, how gruesome...
|
2019-11-02 19:37:35 +01:00 |
|