Thalpy
|
9c7b1dee97
|
Merge branch 'master' into master
|
2019-07-15 21:23:04 +01:00 |
|
kevinz000
|
2c41141d2f
|
Merge pull request #8676 from Trilbyspaceclone/patch-176
Adds a Rapier for 8 Trilby cats
|
2019-07-14 14:46:44 -07:00 |
|
Thalpy
|
c418312cc6
|
Merge branch 'master' into master
|
2019-07-09 05:33:09 +01:00 |
|
kevinz000
|
1b4df74efb
|
Merge pull request #8802 from Ghommie/Ghommie-cit101
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
|
2019-07-07 02:39:07 -07:00 |
|
Thalpy
|
cc39c9f896
|
Merge branch 'master' into master
|
2019-07-06 16:03:17 +01:00 |
|
kevinz000
|
77743c9a0f
|
Merge pull request #8794 from Ghommie/Ghommie-cit100
Fixes the uplink category indexing.
|
2019-07-05 06:56:22 -07:00 |
|
Ghommie
|
8c1e6ff66a
|
Thanks for pointing that out, lolman.
|
2019-07-01 09:24:35 +02:00 |
|
Ghommie
|
70dc9b9122
|
fomatting.
|
2019-06-30 22:37:48 +02:00 |
|
Ghommie
|
f39a5d2f6a
|
Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.
|
2019-06-30 21:53:33 +02:00 |
|
Ghommie
|
831c91fce2
|
Fixes the uplink category indexing.
|
2019-06-30 17:43:34 +02:00 |
|
Thalpy
|
696d879874
|
Merge branch 'master' into master
|
2019-06-29 15:48:25 +01:00 |
|
Trilbyspaceclone
|
5297608bfd
|
Update uplink_items.dm
|
2019-06-23 20:59:18 -04:00 |
|
Trilbyspaceclone
|
368a623cf8
|
Update uplink_items.dm
|
2019-06-23 20:58:13 -04:00 |
|
Trilbyspaceclone
|
ede0bbe89e
|
Merge branch 'master' into patch-185
|
2019-06-23 20:56:25 -04:00 |
|
Fermi
|
10109d0fe5
|
Merge branch 'pr/18'
|
2019-06-23 19:15:07 +01:00 |
|
TrilbySpaceClone
|
05416b8f53
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into patch-176
|
2019-06-23 13:00:17 -04:00 |
|
Ghom
|
41bd3caf3c
|
Ports "Reorganizes the uplink, adds grenades and explosives category." (#8669)
* Ports "Reorganizes the uplink, adds grenades and explosives category."
* Unbent codex, singing the sorrow of aborted spoils.
* .
|
2019-06-23 06:00:27 -07:00 |
|
Trilbyspaceclone
|
2945ae2a39
|
Update uplink_items.dm
|
2019-06-21 03:50:12 -04:00 |
|
Trilbyspaceclone
|
0db4125956
|
Update uplink_items.dm
|
2019-06-17 14:19:19 -04:00 |
|
Thalpy
|
41eee65b15
|
Merge branch 'master' into master
|
2019-06-17 12:18:40 +01:00 |
|
deathride58
|
b487b0103b
|
Merge pull request #8574 from Citadel-Station-13/durasteel_toolboxes
Adds 2 TC durasteel toolboxes {5 stamcost, 18 mob damage, 18+22+10 structural damage, does not fit in any kind of backpack}
|
2019-06-16 22:52:47 -04:00 |
|
kevinz000
|
8e10286fd6
|
Merge pull request #8484 from BlackMajor/Dunga
Adds bluespace compression kit and superglue
|
2019-06-16 01:10:25 -07:00 |
|
Fermi
|
6b9becce71
|
Merge branch 'pr/14'
|
2019-06-14 21:29:04 +01:00 |
|
Fermi
|
099afc3c8e
|
Removed hypnoflash TC
|
2019-06-13 02:21:37 +01:00 |
|
Fermi
|
c8bcca5964
|
Staged hypnoflash removal.
|
2019-06-13 01:45:48 +01:00 |
|
Trilbyspaceclone
|
437e66fe3e
|
Update uplink_items.dm
|
2019-06-10 17:17:45 -04:00 |
|
kevinz000
|
2cda2380f6
|
durasteel toolboxes
|
2019-06-08 03:50:22 -07:00 |
|
kevinz000
|
3b24e05dd6
|
Merge pull request #8483 from Ghommie/Ghommie-cit23
Ports in combat gloves plus.
|
2019-06-08 01:07:18 -07:00 |
|
BlackMajor
|
21fd11718a
|
Bundled glue in with compression kit PR
|
2019-06-07 12:00:06 +12:00 |
|
Thalpy
|
d9058fa53d
|
Merge pull request #13 from Citadel-Station-13/master
OH BOY HERE WE GO AGAIN
|
2019-06-01 03:23:48 +01:00 |
|
kevinz000
|
70bad08f95
|
Merge pull request #8473 from Useroth/clown-fu
[MERGE READY] Taeclowndo. Because Clowns deserve to have their own martial art too.
|
2019-05-31 19:23:03 -07:00 |
|
Fermi
|
e58a94bcc7
|
Merge remote-tracking branch 'upstream/master'
|
2019-06-01 03:12:38 +01:00 |
|
kevinz000
|
7507831ffa
|
Merge pull request #8449 from Trilbyspaceclone/patch-144
Makes PDA bomb cart cost 5 not 6
|
2019-05-31 17:52:40 -07:00 |
|
kevinz000
|
c645d2129f
|
Merge pull request #8453 from Trilbyspaceclone/patch-148
Tuberculosis 12tc - > 8tc
|
2019-05-31 17:52:25 -07:00 |
|
kevinz000
|
4224606c5f
|
Merge pull request #8452 from Trilbyspaceclone/patch-147
Makes mulligan cost only 3
|
2019-05-31 17:50:59 -07:00 |
|
kevinz000
|
61f9c2edcd
|
Merge pull request #8461 from Trilbyspaceclone/patch-155
Makes golden toolboxes cost 3 not 5
|
2019-05-31 17:47:08 -07:00 |
|
kevinz000
|
14d763bd1d
|
Merge pull request #8459 from Trilbyspaceclone/patch-153
Syndicate Sentience Potion costing 2 from 4
|
2019-05-31 17:46:44 -07:00 |
|
kevinz000
|
854eb129f6
|
Merge pull request #8462 from Trilbyspaceclone/patch-156
Makes brainwash disks cost 3 tc not 5
|
2019-05-31 17:43:53 -07:00 |
|
BlackMajor
|
93464b8f24
|
Adds bluespace compression kit
|
2019-05-30 02:46:34 +12:00 |
|
Ghommie
|
8fbc25ad77
|
Ports in combat gloves plus.
|
2019-05-29 16:35:56 +02:00 |
|
Useroth
|
bd4108c094
|
...
|
2019-05-28 09:04:13 +02:00 |
|
Useroth
|
939eb35a3f
|
Tae-clown-do v1
|
2019-05-28 09:02:26 +02:00 |
|
kevinz000
|
45146b28c8
|
Merge pull request #8456 from Trilbyspaceclone/patch-151
suppressors now only cost 1 tc
|
2019-05-27 03:27:22 -07:00 |
|
kevinz000
|
433d6cae4b
|
Merge pull request #8455 from Trilbyspaceclone/patch-150
Binary Translator Key costs 2 from 5
|
2019-05-27 03:26:45 -07:00 |
|
kevinz000
|
625901bfe3
|
Merge pull request #8454 from Trilbyspaceclone/patch-149
Adv Syndicate Surgery Duffel Bag tweaks
|
2019-05-27 03:26:26 -07:00 |
|
kevinz000
|
2f79f36a38
|
Merge pull request #8448 from Trilbyspaceclone/patch-143
Makes laser scatter shot cost 4 not 5
|
2019-05-27 03:25:56 -07:00 |
|
kevinz000
|
b718460cf6
|
Merge pull request #8460 from Trilbyspaceclone/patch-154
ultra clown fireing pins
|
2019-05-27 03:24:47 -07:00 |
|
Trilbyspaceclone
|
962c5c7a17
|
Update uplink_items.dm
|
2019-05-26 22:53:00 -04:00 |
|
Trilbyspaceclone
|
6b05ccbda8
|
Update uplink_items.dm
|
2019-05-26 22:51:22 -04:00 |
|
Trilbyspaceclone
|
21ade7bb2c
|
Update uplink_items.dm
|
2019-05-26 22:49:07 -04:00 |
|