silicons
|
bc1fad653b
|
Merge branch '13147'
|
2020-08-16 18:48:57 -07:00 |
|
silicons
|
01dd2f389b
|
Merge branch 'pr-13067'
|
2020-08-16 18:38:13 -07:00 |
|
Lin
|
d287f44d9a
|
Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
|
2020-08-16 20:20:03 -05:00 |
|
Hatterhat
|
d8f5acfa22
|
i despise cargocode
|
2020-08-13 13:09:41 -05:00 |
|
DeltaFire
|
0f27a89e5d
|
yeah this belongs into the armory
Hellgun single pack
goodies > armory
|
2020-08-10 18:41:56 +02:00 |
|
silicons
|
f20f01cc6b
|
Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
|
2020-08-09 05:46:21 -07:00 |
|
silicons
|
8ef539b417
|
Merge pull request #13053 from kappa-sama/patch-39
makes cargo's Dirty Magazines 3x cheaper
|
2020-08-09 05:43:37 -07:00 |
|
Putnam
|
467f66b2a6
|
Removed crocin/hexacrocin.
|
2020-08-08 00:46:30 -07:00 |
|
Hatterhat
|
6f754188ac
|
funny guns go pew
|
2020-08-07 18:02:33 -05:00 |
|
Letter N
|
5b63f0acce
|
fix fix fix^2
|
2020-08-07 15:15:34 +08:00 |
|
kappa-sama
|
865970fcc3
|
lol
|
2020-08-06 21:34:25 -04:00 |
|
Letter N
|
333ca2cc7b
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-06 18:26:04 +08:00 |
|
silicons
|
815ddd1866
|
oh boy
|
2020-08-05 21:34:26 -07:00 |
|
Letter N
|
9a9e3ffef5
|
fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category.
|
2020-08-03 21:14:17 +08:00 |
|
Letter N
|
a19e306137
|
less redtext - updates anomalies
|
2020-08-03 20:53:36 +08:00 |
|
Letter N
|
e40470f553
|
h. Updates NTOS, and axes p2p filetransfer!
|
2020-07-30 20:54:13 +08:00 |
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
Letter N
|
5d4bb48628
|
another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator
|
2020-07-29 15:10:01 +08:00 |
|
Lin
|
81a7542aa6
|
Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
|
2020-07-28 21:51:10 -05:00 |
|
CameronWoof
|
df7a1f2b8d
|
adds spaceman's trumpet seeds to the exotic seeds crate
|
2020-07-24 23:08:36 -07:00 |
|
timothyteakettle
|
8360bb1a7f
|
section 2
|
2020-07-24 23:44:57 +01:00 |
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
silicons
|
416b989e12
|
changes
|
2020-07-20 11:35:10 -07:00 |
|
silicons
|
984796b8c6
|
sigh
|
2020-07-20 10:46:52 -07:00 |
|
Timothy Teakettle
|
1b99cb9201
|
everything has the bonesetter
|
2020-07-19 18:32:44 +01:00 |
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
Timothy Teakettle
|
a4478b0cda
|
it continues
|
2020-07-17 22:38:28 +01:00 |
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
silicons
|
00867c064c
|
Merge pull request #12715 from HeroWithYay/Drinkable_Telecrystals
Drinkable and Sell-able Telecrystals
|
2020-07-11 00:49:15 -07:00 |
|
silicons
|
36ba62652b
|
Merge pull request #12717 from YakumoChen/wedding-crate
Wedding crate
|
2020-07-11 00:44:50 -07:00 |
|
YakumoChen
|
475a546033
|
adds wedding crate
|
2020-07-10 04:06:55 +00:00 |
|
YakumoChen
|
bfa672b091
|
adds some rings to the wedding crate
|
2020-07-09 07:49:11 +00:00 |
|
YakumoChen
|
1a82955f32
|
adds a wedding crate
|
2020-07-09 07:22:33 +00:00 |
|
Putnam
|
a625d6562b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-07-08 22:02:03 -07:00 |
|
HeroWithYay
|
bed6f4ac91
|
Adds "Telecrystal Dust" a useless, red waste of syndicate resources that can be obtained by grinding raw telecrystals in a blender.
Also makes it so you can sell raw telecrystals at cargo 1000 points each which is also a considerable waste of TC.
|
2020-07-09 16:32:14 +12:00 |
|
Artur
|
6ee1eba56c
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-07-02 23:23:47 +03:00 |
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
timothyteakettle
|
76b5557e1e
|
bunch of grammar corrections
|
2020-06-27 02:12:44 +01:00 |
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
Ghommie
|
29a8d2ed78
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813
|
2020-06-20 00:07:47 +02:00 |
|
kevinz000
|
118ac1a775
|
Merge pull request #12548 from timothyteakettle/more-events
ports several tg events including fugitives
|
2020-06-17 20:10:04 -07:00 |
|
Artur
|
ceba739231
|
Cooonflicts
|
2020-06-16 01:23:42 +03:00 |
|
Timothy Teakettle
|
d7bce8aec0
|
ports some events
|
2020-06-15 20:22:40 +01:00 |
|
Timothy Teakettle
|
34c9a2f821
|
part 4
|
2020-06-11 21:45:32 +01:00 |
|
Timothy Teakettle
|
38bf529f3c
|
a tonne of fixes
|
2020-06-11 20:18:36 +01:00 |
|
Timothy Teakettle
|
4c55e86da7
|
part 2
|
2020-06-10 23:14:25 +01:00 |
|