Ghom
|
12d0a2ee4c
|
Merge pull request #10281 from Hatterhat/4-am-coding-more-like-4head
good idea: .357 speedloaders printable with advanced illegal ballistics, bad idea: revolver now gets an extra speedloader and a box
|
2019-12-26 16:07:45 +01:00 |
|
Seris02
|
9e6f0762b7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass
|
2019-12-24 22:27:41 +08:00 |
|
Hatterhat
|
d1c96237a6
|
the very shitty idea: "muh speedloader"
|
2019-12-24 04:16:33 -06:00 |
|
Ghom
|
f30be0ace6
|
Merge pull request #10077 from ForrestWick/uplinkchanges
Moves brainwash surgery from role restricted to devices and tools in the uplink
|
2019-12-21 12:43:18 +01:00 |
|
Ghom
|
1748a5ee4b
|
Merge pull request #10054 from kappa-sama/patch-10
autolathe .357 speedloaders->bullets, surplus rifle bullets in hacked lathe
|
2019-12-20 13:27:35 +01:00 |
|
nik707
|
63dd3487b3
|
Merge pull request #10090 from Hatterhat/the-one-where-a-4-tc-nukies-kit-gets-buffed
the one where the combat medic kit gets buffed
|
2019-12-19 14:11:27 -06:00 |
|
Hatterhat
|
a1cc129d0b
|
slightly better storage, cucks the surgery duffel
|
2019-12-13 21:10:12 -06:00 |
|
Seris02
|
31950c106f
|
change cost to 18 tc
|
2019-12-10 12:07:33 +08:00 |
|
kappa-sama
|
d78df2cc5d
|
since they're gone from autos
|
2019-12-05 19:47:54 -05:00 |
|
ForrestWick
|
07a5b13abd
|
Update uplink_items.dm
|
2019-11-29 16:45:17 -06:00 |
|
Ghommie
|
ee73806616
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit352
|
2019-11-21 09:18:14 +01:00 |
|
kevinz000
|
1efd3ae395
|
Merge pull request #9866 from Useroth/tatorstrangeseeds
Adds strange seeds as a buyable traitor botanist item.
|
2019-11-20 22:09:53 -07:00 |
|
Useroth
|
2a8152c835
|
Applied suggestions.
|
2019-11-20 15:15:10 +01:00 |
|
Useroth
|
5169205a19
|
Added a 10pack as well
|
2019-11-19 19:35:37 +01:00 |
|
Useroth
|
24bd42fc80
|
Adds strange seeds as a buyable traitor botanist item.
|
2019-11-19 19:19:40 +01:00 |
|
GrayRachnid
|
3edaf75722
|
Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons.
|
2019-11-15 16:58:45 -05:00 |
|
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 |
|
Ghommie
|
a7b6443217
|
typo.
|
2019-11-14 03:20:43 +01:00 |
|
Ghommie
|
b48ddb99fc
|
Uplink items are now automatically sorted alphabetically. Fixed categories.
|
2019-11-14 02:56:26 +01: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 |
|
Seris02
|
8dfbc652cb
|
ADDS THE NEW MARTIAL ART - RISING BASS!!
|
2019-11-09 21:11:36 +08: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 |
|