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 |
|
kevinz000
|
dfa2296758
|
Merge pull request #9430 from Ghommie/Ghommie-cit220
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
|
2019-11-14 15:44:59 -07:00 |
|
kappa-sama
|
1aa1d91b61
|
Update uplink_items.dm
|
2019-11-12 17:15:45 -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 |
|
kappa-sama
|
9f04cba7bf
|
workaround
|
2019-11-03 18:27:47 -05:00 |
|
Ghommie
|
b17346a44e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220
|
2019-10-30 14:46:42 +01:00 |
|
Ghommie
|
a5b37b658b
|
Purging a lot of space indention in favor of tabs.
|
2019-10-29 15:46:31 +01:00 |
|
deathride58
|
53fe02e2fc
|
Merge pull request #9539 from Citadel-Station-13/kevinz000-patch-100
TALLY HO! (adds claymores to the uplink)
|
2019-10-25 23:16:09 -04:00 |
|
kevinz000
|
d8fc3e7211
|
Merge pull request #9564 from kappa-sama/aliumtators
The syndicate are led by aliens.
|
2019-10-24 18:49:48 -07:00 |
|
Ghommie
|
e1928a18f1
|
Porting GetComponent macros removal, and some related changes.
|
2019-10-23 15:04:28 +02:00 |
|
kappa-sama
|
6fe65368f6
|
roboticists can have some love
|
2019-10-21 10:00:52 -04:00 |
|
kappa-sama
|
d7c6950788
|
scientists can now buy alien tech disk
this isn't a bad idea i swear
|
2019-10-21 09:30:11 -04:00 |
|
kevinz000
|
8a8e36ba1c
|
Update uplink_items.dm
|
2019-10-19 20:01:21 -07:00 |
|
kevinz000
|
53858e1818
|
Merge pull request #9416 from Ghommie/Ghommie-cit215
The niche singularity beacon now also moderately buffs meteor waves.
|
2019-10-13 13:56:03 -07:00 |
|
Ghommie
|
8228e52f43
|
Ports "Makes the illegal tech node harder to unlock"
|
2019-10-07 06:19:48 +02:00 |
|
Ghommie
|
5232728ee7
|
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
|
2019-10-07 05:25:47 +02:00 |
|
Ghommie
|
d706944e20
|
The niche singularity beacon now also moderately buffs meteor waves.
|
2019-10-05 04:37:01 +02:00 |
|
kappa-sama
|
db22ae64d4
|
im gonna go ape
|
2019-08-30 22:46:52 -04:00 |
|
kevinz000
|
7fe2d2b5f2
|
Merge pull request #9142 from Trilbyspaceclone/patch-211
removes glue from nukies/clownops uplinks
|
2019-08-21 08:11:44 -07:00 |
|
TrilbySpaceClone
|
e69d27f9eb
|
Traitor armor
|
2019-08-17 20:36:47 -04:00 |
|
Trilbyspaceclone
|
7ddfff7f5c
|
Update uplink_items.dm
|
2019-08-16 23:07:15 -04:00 |
|
Fermi
|
1fb07e286a
|
Removing reviewer comments incase of fullmerge.
|
2019-08-08 19:53:07 +01:00 |
|
Thalpy
|
5795f6bbe2
|
Merge branch 'master' into master
|
2019-08-05 09:09:36 +01:00 |
|
Trilbyspaceclone
|
3bad062c23
|
Merge branch 'master' into Unmodular
|
2019-08-05 00:04:44 -04:00 |
|
kevinz000
|
b52462de0d
|
Merge pull request #8958 from Trilbyspaceclone/emitter_gun
Makes a new traitor Emitter gun for Engi memes
|
2019-08-01 23:29:10 -07:00 |
|
Trilbyspaceclone
|
57b6294310
|
Update uplink_items.dm
|
2019-07-29 07:54:17 -04:00 |
|
EgoSumStultus
|
1263918bd3
|
REMOVE SHIELF
|
2019-07-28 21:51:40 -07:00 |
|
TrilbySpaceClone
|
13936e97de
|
emiting happyness
|
2019-07-24 14:40:59 -04:00 |
|
Thalpy
|
9c7b1dee97
|
Merge branch 'master' into master
|
2019-07-15 21:23:04 +01:00 |
|
Trilbyspaceclone
|
2a78caa127
|
Merge branch 'master' into Unmodular
|
2019-07-14 18:27:37 -04: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 |
|
Trilbyspaceclone
|
f37e1bf01b
|
Merge branch 'master' into Unmodular
|
2019-07-09 03:14:49 -04: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
|
063fe4fdef
|
Merge branch 'master' into Unmodular
|
2019-06-23 21:06:21 -04: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 |
|