kevinz000
|
d376b99af6
|
Merge pull request #11315 from Citadel-Station-13/Ghommie-patch-3-2
Fixing a little issue with the Holodeck's Kobayashi Maru phaser
|
2020-03-06 00:19:51 -07:00 |
|
deathride58
|
2e35c09dec
|
Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
|
2020-03-05 20:03:56 -05:00 |
|
Ghom
|
d78cdb9b37
|
Merge pull request #11130 from BlackMajor/SpaceRuins
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
|
2020-03-04 23:46:10 +01:00 |
|
Ghommie
|
065a5743a0
|
Toy guns.
|
2020-03-04 22:59:55 +01:00 |
|
Ghommie
|
4ff63b7791
|
Made laser carbines and magrifles bulkier.
|
2020-03-04 22:28:02 +01:00 |
|
BlackMajor
|
43e77f7d3a
|
Last few fixes. Adds arcane wand to dead wizard roid.
|
2020-03-04 19:12:56 +13:00 |
|
Ghom
|
b378da2468
|
Update energy.dm
|
2020-03-03 15:06:42 +01:00 |
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
Artur
|
5d3f3fc06a
|
WIP
|
2020-02-28 14:11:38 +02:00 |
|
kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
Ghommie
|
fc76cd9a9b
|
Porting update_icon improvements. Part 1.
|
2020-02-27 01:21:03 +01:00 |
|
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 |
|