Ghommie
|
5dc1de1d04
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-05 04:34:54 +01:00 |
|
Ghommie
|
a365f3b499
|
Demodularize and nerfs mag rifles with re(?)added power cell requirements.
|
2020-02-03 05:16:32 +01:00 |
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
Trilbyspaceclone
|
9466b0f4ca
|
Merge branch 'master' into glassware
|
2020-01-23 13:31:04 -05:00 |
|
Hatterhat
|
28a2cc4a3d
|
.357 AP printable from illegal ballistics
|
2020-01-19 23:55:12 -06:00 |
|
TrilbySpaceClone
|
92dc5e61c3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware
|
2020-01-13 03:42:20 -05:00 |
|
Ghommie
|
02fbbd4f95
|
Ouch.
|
2020-01-12 16:54:08 +01:00 |
|
Lin
|
e5e2e4f012
|
Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
|
2020-01-10 01:34:39 +00:00 |
|
Trilbyspaceclone
|
2931cb6757
|
Merge branch 'master' into glassware
|
2020-01-02 20:30:20 -05:00 |
|
Ghommie
|
80e716eeaf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-30 18:14:47 +01:00 |
|
Ghommie
|
21cfb2914b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-27 17:49:59 +01:00 |
|
Ghommie
|
b4c0433d6d
|
more work.
|
2019-12-27 17:45:19 +01:00 |
|
Hatterhat
|
f3fed71e08
|
ah, the wonders of atomization
|
2019-12-24 21:28:32 -06:00 |
|
Hatterhat
|
681508482c
|
magazine metal cost tweaks, speedloader in AIB
|
2019-12-24 04:15:25 -06:00 |
|
Ghommie
|
b75349bebf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-23 04:32:09 +01:00 |
|
Trilbyspaceclone
|
0b63e79098
|
Merge branch 'master' into glassware
|
2019-12-21 15:41:45 -05:00 |
|
kevinz000
|
97f678b542
|
Merge pull request #10058 from Ghommie/Ghommie-cit432
Spinfusor nerf, cause a 7k cost supply pack containing 32 explosive munitions that work just fine without the gun is just pure balance.
|
2019-12-20 23:20:49 -07:00 |
|
Trilbyspaceclone
|
ddd3676903
|
Merge branch 'master' into glassware
|
2019-12-17 15:18:30 -05:00 |
|
Ghommie
|
3fcb7808fd
|
args
|
2019-12-13 02:30:17 +01: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 |
|
TrilbySpaceClone
|
67d3d19cb9
|
correctiosn
and movement
|
2019-12-07 13:43:34 -05:00 |
|
Ghommie
|
723690bab0
|
Demodularize defib disks and projectiles icons.
|
2019-12-06 23:07:50 +01:00 |
|
Ghommie
|
a944ea9db1
|
considering the gun holds 2 rounds at a time and we have odd amounts in the box, players may become upset about it in the future.
|
2019-12-06 05:07:34 +01:00 |
|
Ghommie
|
0e3774d73f
|
Spinfusor nerf, cause a 7k cost supply pack containing 32 explosive munitions that work just fine without the gun is just pure balance.
|
2019-12-06 04:47:33 +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 |
|
kevinz000
|
2f4562a63b
|
Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
|
2019-11-14 15:55:04 -07:00 |
|
kappa-sama
|
c9c7d3e64e
|
begone
|
2019-11-13 16:46:13 -05:00 |
|
Ghommie
|
e977ba6729
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
|
2019-11-10 23:17:58 +01:00 |
|
Ghommie
|
3a9e4c1f13
|
Unmodularizing 2/3 of the sounds folder.
|
2019-11-06 23:11:15 +01:00 |
|
Ghommie
|
a5b37b658b
|
Purging a lot of space indention in favor of tabs.
|
2019-10-29 15:46:31 +01:00 |
|
kevinz000
|
9fd3ef7801
|
Merge branch 'magrifles_again' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into magrifles_again
|
2019-10-24 18:36:04 -07:00 |
|
kevinz000
|
31f9ed9665
|
fixes
|
2019-10-24 15:31:45 -07:00 |
|
kevinz000
|
9d78d8a259
|
Merge branch 'master' into magrifles_again
|
2019-10-23 17:57:19 -07:00 |
|
kevinz000
|
f96e1bbe33
|
lmao
|
2019-10-22 01:59:45 -07:00 |
|
kevinz000
|
95b81b5938
|
fix
|
2019-10-21 00:55:15 -07:00 |
|
kevinz000
|
c6c2a703e5
|
Merge remote-tracking branch 'origin/master' into magrifles_again
|
2019-10-21 00:47:03 -07:00 |
|
deathride58
|
50c27df28f
|
Taser rework - Gives electrodes a debilitating status effect, makes disabler the default taser mode, and more
|
2019-10-15 03:48:44 -04:00 |
|
kevinz000
|
692f2322c0
|
Merge pull request #8928 from Ghommie/Ghommie-cit121
Reverts a commit that reverted a fix.
|
2019-07-25 17:43:14 -07:00 |
|
Ghommie
|
7065a86841
|
Revert "Revert "Fixes rocket launchers, buffing their accuracy etc.""
|
2019-07-19 22:02:22 +02:00 |
|
Ghommie
|
7e99dd205a
|
Fixing Shredder guns not accepting standard flechette mags, and magpistol mag sprites.
|
2019-07-19 21:54:48 +02:00 |
|
kevinz000
|
28072a31dc
|
Update magweapon.dm
|
2019-07-13 20:03:39 -07:00 |
|
kevinz000
|
69f06444e6
|
smgs
|
2019-07-09 08:20:45 -07:00 |
|
kevinz000
|
a2d52c0ed9
|
HERE WE GO AGAIN.
|
2019-07-09 07:55:44 -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 |
|
Trilbyspaceclone
|
3bf667ba36
|
Update magweapon_energy.dm
|
2019-05-22 12:42:28 -04:00 |
|
Trilbyspaceclone
|
005647d4f6
|
Update magweapon_energy.dm
|
2019-05-22 12:12:06 -04:00 |
|
kevinz000
|
90c3e4b776
|
Merge pull request #8322 from Trilbyspaceclone/patch-117
Buffs mag-gun recharges speed
|
2019-05-11 22:18:29 -07:00 |
|
Trilbyspaceclone
|
dc4aa42525
|
Update magweapon_energy.dm
|
2019-05-05 06:35:32 -04:00 |
|