Hatterhat
|
accc4ce776
|
grammar shit, silkstring buff, arrow costs, yikes
|
2020-02-22 15:33:07 -06:00 |
|
Ghom
|
6f181365c2
|
Merge pull request #11172 from Trilbyspaceclone/bows!
Bow corrections.
|
2020-02-22 15:53:27 +01:00 |
|
Seris02
|
c3ec44b0d0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-02-22 19:54:10 +08:00 |
|
Seris02
|
84d08fe122
|
firebreath change + update to tg genetics + calc patch
|
2020-02-22 19:42:33 +08:00 |
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
TrilbySpaceClone
|
5401796a5f
|
corrections
|
2020-02-20 02:40:34 -05:00 |
|
kevinz000
|
c7273c03be
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-19 19:12:27 -07:00 |
|
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 |
|
kevinz000
|
9589c3116b
|
Merge pull request #11115 from Ghommie/Ghommie-cit583
Something more about runtime errors.
|
2020-02-19 19:03:01 -07:00 |
|
kevinz000
|
1c2dca4a00
|
Merge pull request #11132 from Ghommie/Ghommie-cit585
Something about tesla revolvers and tk.
|
2020-02-19 18:59:44 -07:00 |
|
kevinz000
|
9289ca8873
|
fix
|
2020-02-19 08:14:28 -07:00 |
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
Ghom
|
77d5c09858
|
Merge pull request #11124 from Citadel-Station-13/kevinz000-patch-7
Bandaids a projectile runtime, removes an unused variable
|
2020-02-19 02:05:49 +01:00 |
|
kevinz000
|
ed36aae74b
|
Merge pull request #11112 from necromanceranne/mech-revival
Mech Stuff: Ports /tg/ pr #44529, reverts #9092 (mostly)
|
2020-02-18 02:18:57 -07:00 |
|
kevinz000
|
43b9875bbd
|
Merge pull request #11119 from Ghommie/Ghommie-cit584
Something about consistency and magnetic rifles.
|
2020-02-18 02:12:51 -07:00 |
|
Ghommie
|
5dc271124a
|
Something about tesla revolvers and tk.
|
2020-02-17 14:29:14 +01:00 |
|
Ghom
|
5e10f822e6
|
Update energy.dm
|
2020-02-17 13:40:37 +01:00 |
|
kevinz000
|
262b4d95fb
|
Update projectile.dm
|
2020-02-16 16:44:29 -07:00 |
|
Ghommie
|
aba636a44c
|
ok
|
2020-02-17 00:13:16 +01:00 |
|
Lin
|
794aeb81c2
|
Merge pull request #11060 from kevinz000/stuff
guns and cult blood magic now respect stamina softcrit
|
2020-02-16 13:20:56 -06:00 |
|
Ghommie
|
1a0fba8a2a
|
Something about consistency and magnetic rifles.
|
2020-02-16 18:37:51 +01:00 |
|
necromanceranne
|
5c2e244ee0
|
Ports /tg/ pr #44529, reverts #9092
|
2020-02-16 22:20:50 +11:00 |
|
kevinz000
|
f79148d549
|
Merge pull request #10947 from Ghommie/Ghommie-cit563
Holopad static fix and a few other mistakes.
|
2020-02-15 12:16:23 -07:00 |
|
kevinz000
|
b9e8be5784
|
Merge pull request #10940 from Ghommie/Ghommie-cit560
First tweak to cargo reagents selling.
|
2020-02-15 12:15:50 -07:00 |
|
kevinz000
|
fc5eeeac00
|
Update gun.dm
|
2020-02-15 12:14:51 -07:00 |
|
kevinz000
|
24b977f655
|
Merge branch 'master' into stuff
|
2020-02-15 11:45:25 -07:00 |
|
Trilbyspaceclone
|
168a715462
|
well it takes a lot to make after all...
|
2020-02-15 01:15:46 -05:00 |
|
Trilbyspaceclone
|
46e97b3cdc
|
Update arrow.dm
|
2020-02-15 01:15:09 -05:00 |
|
TrilbySpaceClone
|
bbe1ddc0cf
|
silk, bows, and graytide!
|
2020-02-14 23:04:02 -05:00 |
|
Ghom
|
0a1c3bd084
|
Merge branch 'master' into Ghommie-cit539
|
2020-02-14 19:42:36 +01:00 |
|
Ghommie
|
4a621fb1aa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit560
|
2020-02-14 19:39:53 +01:00 |
|
Ghom
|
78ace8e855
|
Merge pull request #10916 from Citadel-Station-13/kevinz000-patch-6
Projectiles now always hit chest if targeting chest, snipers now have 100% targeting zone accuracy
|
2020-02-14 19:20:32 +01: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 |
|
Ghom
|
64882b8a90
|
Merge pull request #10993 from Linzolle/bows
adds the bow
|
2020-02-14 08:01:12 +01:00 |
|
Ghom
|
7be2602664
|
Merge pull request #11056 from necromanceranne/bloodgunsnotgood
Bullets no longer do equal blood volume deletion to unmitigated damage; replicates #9682
|
2020-02-14 07:54:41 +01:00 |
|
kevinz000
|
3865224e78
|
fine
|
2020-02-13 15:40:30 -07:00 |
|
Linzolle
|
790b7bf9cc
|
sanity check
|
2020-02-13 15:20:01 -06:00 |
|
Linzolle
|
d22631700c
|
update the fucking craft component because artur forgot to
|
2020-02-13 12:59:56 -06:00 |
|
kevinz000
|
863ce5152b
|
Merge remote-tracking branch 'citadel/master' into stuff
|
2020-02-13 04:14:44 -07:00 |
|
Ghom
|
a7d29ae830
|
Merge pull request #10973 from Trilbyspaceclone/put-a-pin-in-it
Station Locked firing pins
|
2020-02-13 09:42:22 +01:00 |
|
Ghom
|
500ed0dd57
|
Merge pull request #10955 from Citadel-Station-13/kevinz000-patch-10
refactors and changes up gravity gun projectiles a bit
|
2020-02-13 09:39:26 +01:00 |
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
kevinz000
|
a8a071851a
|
s
|
2020-02-13 00:32:26 -07:00 |
|
kevinz000
|
f1e0c62141
|
Update gravity.dm
|
2020-02-12 23:59:03 -07:00 |
|
necromanceranne
|
165f46b836
|
goodbye blood bullets
|
2020-02-13 17:05:36 +11:00 |
|
Trilbyspaceclone
|
7cd3a51c4e
|
Update pistol.dm
|
2020-02-12 14:48:53 -05:00 |
|
Trilbyspaceclone
|
49a7657404
|
Correction
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-12 14:26:29 -05:00 |
|
Ghom
|
af477aa28b
|
Merge pull request #10992 from Hatterhat/buckbuff
buckshot buff - 60 to 75 on all pellet pointblank
|
2020-02-12 10:34:25 +01:00 |
|
Trilbyspaceclone
|
a4a128f9dd
|
Ok?
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-11 15:55:54 -05:00 |
|