 Enric Gabriel
|
46ef6a63c5
|
upload files
|
2020-09-21 13:27:22 -03:00 |
|
|
Enric Gabriel
|
46288f263e
|
upload files
|
2020-09-21 02:04:24 -03:00 |
|
|
Enric Gabriel
|
ef96fd6389
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-11 18:51:33 -03:00 |
|
|
siliconsandGitHub
|
10a753bf4d
|
Merge pull request #13368 from Tupinambis/CoggyDoggy
Cogstation Fixes and Improvements
|
2020-09-11 14:14:59 -07:00 |
|
|
Blue Wildrose
|
81e9d34684
|
I love having my ears assaulted by 50 minesweeper_menuselect.oggs
|
2020-09-11 09:34:56 -07:00 |
|
|
Tupinambis
|
fe7a21ebc7
|
Coggers Fixes + Mass Driver Things
|
2020-09-07 22:33:54 -05:00 |
|
|
Enric Gabriel
|
499fec6a16
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-06 10:42:43 -03:00 |
|
|
BlackMajorandGitHub
|
1943a2fdd7
|
Merge pull request #13246 from silicons/anomaly_manufacturing
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
|
2020-09-06 17:53:35 +12:00 |
|
|
Enric Gabriel
|
9de5d19c24
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-30 11:07:30 -03:00 |
|
|
Putnam3145andGitHub
|
7c5197f383
|
Merge pull request #13249 from Citadel-Station-13/silicons-patch-25
removes firedoor autoopen on touch
|
2020-08-29 22:34:43 -07:00 |
|
|
Enric Gabriel
|
c10471fac9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-30 01:42:29 -03:00 |
|
|
Letter N
|
ae482c1bb8
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-29 14:09:56 +08:00 |
|
|
Enric Gabriel
|
0db4397e7c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-27 14:07:17 -03:00 |
|
|
shellspeed1
|
de7ecefad2
|
minor description change
|
2020-08-24 15:07:40 -07:00 |
|
|
shellspeed1
|
142dee3645
|
Update iv_drip.dm
|
2020-08-24 12:47:56 -07:00 |
|
|
siliconsandGitHub
|
e1e0d5e1da
|
Update firedoor.dm
|
2020-08-23 06:50:47 -07:00 |
|
|
silicons
|
b2a38a09a1
|
circuit
|
2020-08-23 05:59:24 -07:00 |
|
|
Letter N
|
6ba29acd4e
|
uses some cit procs. and how the fuck did i forget to componentualize this
|
2020-08-22 16:08:05 +08:00 |
|
|
Letter N
|
afe32406c0
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-22 13:40:36 +08:00 |
|
|
Enric Gabriel
|
b0662f5e39
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-21 02:19:20 -03:00 |
|
|
siliconsandGitHub
|
120bcfc00c
|
Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
|
2020-08-20 21:32:26 -07:00 |
|
|
Letter N
|
2dd3d71b19
|
config©paste chang.
|
2020-08-20 16:36:24 +08:00 |
|
|
Letter N
|
3b7bca28b3
|
Functional* code
|
2020-08-20 13:50:33 +08:00 |
|
|
Enric Gabriel
|
06496434a4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-16 23:30:53 -03:00 |
|
|
Enric Gabriel
|
7898f1fe3e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-16 23:24:11 -03:00 |
|
|
silicons
|
8dedcbcf76
|
Merge branch '13113'
|
2020-08-16 18:53:35 -07:00 |
|
|
LinandGitHub
|
d287f44d9a
|
Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
|
2020-08-16 20:20:03 -05:00 |
|
|
Enric Gabriel
|
9610b6a9af
|
ya guys like wiring?
|
2020-08-16 15:17:37 -03:00 |
|
|
Enric Gabriel
|
7484c6c698
|
Merge branch 'master' of https://github.com/SandPoot/Sandstorm-Station-13 into master
|
2020-08-14 15:13:03 -03:00 |
|
|
Enric Gabriel
|
4e7312d276
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-14 15:07:53 -03:00 |
|
|
SandPootandGitHub
|
fe8119c18c
|
Code optimizations + clean-up (#45)
|
2020-08-14 02:01:54 -03:00 |
|
|
Enric Gabriel
|
1afc491b5a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-13 21:23:43 -03:00 |
|
|
Letter NandGitHub
|
3ff770b38f
|
wrong state
|
2020-08-13 12:13:42 +08:00 |
|
|
Letter NandGitHub
|
2eb6eb5032
|
state moment
|
2020-08-13 12:01:36 +08:00 |
|
|
Letter N
|
081f07e259
|
bye!
|
2020-08-12 16:38:36 +08:00 |
|
|
lolman360andGitHub
|
6f7badda41
|
Merge branch 'master' into plumb
|
2020-08-12 09:03:11 +10:00 |
|
|
Enric Gabriel
|
7929924d4a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-11 13:04:34 -03:00 |
|
|
siliconsandGitHub
|
a8d61b60ef
|
Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
|
2020-08-11 01:47:32 -07:00 |
|
|
kiwedespars
|
eb8574d6d6
|
heretics from tg (with changes)
|
2020-08-10 19:17:26 -07:00 |
|
|
Enric Gabriel
|
bae8c236f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-09 18:34:33 -03:00 |
|
|
lolman360andGitHub
|
308d77da7c
|
Merge branch 'master' into plumb
|
2020-08-09 22:48:18 +10:00 |
|
|
siliconsandGitHub
|
f20f01cc6b
|
Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
|
2020-08-09 05:46:21 -07:00 |
|
|
Letter N
|
2615506ae9
|
oops, forgot about this
|
2020-08-09 13:18:10 +08:00 |
|
|
Letter N
|
4bed3a5349
|
OH FUCK
|
2020-08-09 12:49:14 +08:00 |
|
|
Letter N
|
5abcc1c220
|
reverts this change
|
2020-08-09 12:00:12 +08:00 |
|
|
Letter N
|
c4b4801132
|
shockies
|
2020-08-08 15:20:03 +08:00 |
|
|
Putnam
|
9bb3ba5c5a
|
added ethereals
|
2020-08-08 00:08:43 -07:00 |
|
|
Letter N
|
71bf63d0dd
|
this is needed
|
2020-08-07 14:06:14 +08:00 |
|
|
Letter N
|
c6c78667cb
|
atmo control fix
|
2020-08-07 13:58:08 +08:00 |
|
|
Letter N
|
333ca2cc7b
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-06 18:26:04 +08:00 |
|