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 |
|
necromanceranne
|
66862db7ab
|
Last change to this, now the damage is respected by energy armor
|
2020-02-01 14:07:23 +11:00 |
|
kevinz000
|
0d15a0ec8b
|
Update projectile.dm
|
2020-01-31 01:26:48 -07:00 |
|
kevinz000
|
885b22371b
|
Update _ammunition.dm
|
2020-01-31 01:25:39 -07:00 |
|
kevinz000
|
9e08f8bed7
|
Update energy.dm
|
2020-01-31 01:23:38 -07:00 |
|
kevinz000
|
fe5a83ea52
|
Update gun.dm
|
2020-01-31 01:22:53 -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 |
|
necromanceranne
|
8e489a7726
|
Hopefully I put in the override correctly
|
2020-01-27 10:41:27 +11:00 |
|
kevinz000
|
97c65aac89
|
Update kinetic_accelerator.dm
|
2020-01-26 03:06:31 -07:00 |
|
necromanceranne
|
5ce066a21e
|
Altering the effects of the ebow to hopefully make it not terrible
|
2020-01-26 17:18:09 +11:00 |
|
kevinz000
|
a01d7260d8
|
Merge pull request #10641 from jakeramsay007/Calibers-101
Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa.
|
2020-01-23 04:34:24 -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
|
ed5172f9ca
|
changes
|
2020-01-20 23:17:58 -07:00 |
|
kevinz000
|
8f60d01208
|
Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8
|
2020-01-20 22:47:21 -07:00 |
|
Ghommie
|
9c0b78bc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 01:23:08 +01: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
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01: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 |
|
Ghommie
|
825b4f01c2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-10 02:26:19 +01:00 |
|
Putnam3145
|
b09ef97ae3
|
Merge pull request #10305 from BlackMajor/Yeehaw
Various Mining borg changes. And some extras.
|
2020-01-07 16:50:21 -08:00 |
|
BlackMajor
|
05a644cc41
|
Revert "Merge branch 'master' into Yeehaw"
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
|
2020-01-08 12:26:45 +13:00 |
|
BlackMajor
|
972c03f79f
|
Merge branch 'master' into Yeehaw
|
2020-01-08 12:25:50 +13:00 |
|
BlackMajor
|
b41c9cd844
|
Sync with master
|
2020-01-08 12:25:22 +13:00 |
|
kevinz000
|
39461e2806
|
Update beams.dm
|
2020-01-05 15:16:04 -08:00 |
|
kevinz000
|
aca8c33149
|
Update beams.dm
|
2020-01-05 15:08:12 -08:00 |
|
kevinz000
|
f26c02801a
|
Update beams.dm
|
2020-01-05 15:04:51 -08:00 |
|
kevinz000
|
ab23a934fc
|
Update beams.dm
|
2020-01-05 15:01:12 -08:00 |
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|
Ghommie
|
f5b251db66
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-03 18:24:39 +01:00 |
|
Lin
|
b1ccd512db
|
Merge pull request #10215 from Ghommie/Ghommie-cit473
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
|
2020-01-03 00:00:51 +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 |
|