 SandPootandGitHub
|
6809afb45c
|
Many borg changes (seriously) (#69)
|
2020-09-15 23:25:59 -03:00 |
|
|
Enric Gabriel
|
38c0f8efbd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-07 18:21:54 -03:00 |
|
|
siliconsandGitHub
|
419eb5ae05
|
Merge pull request #13360 from KeRSedChaplain/silicon_death_sounds
Silicon death sounds or "Cease shooting the malfunctioning metal doorknob at the tone"
|
2020-09-07 13:42:31 -07:00 |
|
|
Enric Gabriel
|
1ddcd7669e
|
yes
|
2020-09-07 16:23:13 -03:00 |
|
|
Enric Gabriel
|
b163c6435d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-07 13:33:45 -03:00 |
|
|
Dan-Neposh
|
db67e6db1f
|
AIs have their own unique sound for death now
|
2020-09-06 18:02:30 -04:00 |
|
|
Dan-Neposh
|
f4ae266d66
|
Silicons now have a sound to let you know when your flash spam succeeds
|
2020-09-06 17:21:52 -04:00 |
|
|
Cameron!andGitHub
|
e3af0d654e
|
Revert "[READY] DRAKEBORGS & PLUSHIES"
|
2020-09-02 17:47:22 -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 |
|
|
Timothy Teakettle
|
b3c459c59c
|
okay you can use any emote
|
2020-08-27 21:04:36 +01:00 |
|
|
Timothy Teakettle
|
398692df0b
|
emotes
|
2020-08-27 20:24:37 +01:00 |
|
|
Enric Gabriel
|
4028af4f4f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-26 12:24:38 -03:00 |
|
|
siliconsandGitHub
|
1b30adbf2a
|
Update robot.dm (#13247)
|
2020-08-26 14:14:33 +02: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 |
|
|
silicons
|
8dedcbcf76
|
Merge branch '13113'
|
2020-08-16 18:53:35 -07:00 |
|
|
Enric Gabriel
|
ac9be68d8d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-16 01:13:03 -03:00 |
|
|
Navier
|
fc70d3dde2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG
|
2020-08-15 23:13:41 -04:00 |
|
|
SandPootandGitHub
|
518c70e6ed
|
Some Cit reverts and skyrat features. (#46)
|
2020-08-15 13:29:50 -03:00 |
|
|
Enric Gabriel
|
f7c56e075b
|
Merge branch 'master' of https://github.com/SandPoot/Sandstorm-Station-13 into pr/Strazyplus/12739
|
2020-08-12 12:34:29 -03: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 |
|
|
Seris02andGitHub
|
635a42e102
|
yeet (#11699)
|
2020-08-09 15:14:25 +02:00 |
|
|
siliconsandGitHub
|
f20f01cc6b
|
Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
|
2020-08-09 05:46:21 -07:00 |
|
|
Letter N
|
773509719a
|
TGUI-Go for launch
|
2020-08-09 20:39:04 +08:00 |
|
|
Putnam
|
9bb3ba5c5a
|
added ethereals
|
2020-08-08 00:08:43 -07:00 |
|
|
Letter N
|
333ca2cc7b
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-06 18:26:04 +08:00 |
|
|
Enric Gabriel
|
e4f7092490
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-05 22:52:22 -03:00 |
|
|
LinandGitHub
|
ede59e5c4d
|
Merge pull request #13021 from silicons/salt_pr
gives ipcs silicon sound emotes
|
2020-08-05 19:43:54 -05:00 |
|
|
silicons
|
bbcc36bdec
|
ok
|
2020-08-03 22:31:31 -07:00 |
|
|
Enric Gabriel
|
8558cc8747
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-04 01:48:59 -03:00 |
|
|
Letter N
|
b376a6b6c4
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-07-30 14:43:52 +08:00 |
|
|
Letter N
|
0805265412
|
yet another batch. MAJOR: APC
|
2020-07-30 12:54:53 +08:00 |
|
|
Timothy TeakettleandGitHub
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
|
Enric Gabriel
|
935901593b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-07-29 09:52:32 -03:00 |
|
|
LinandGitHub
|
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 |
|
|
silicons
|
ffcfd21613
|
fix
|
2020-07-27 14:24:10 -07:00 |
|
|
Enric Gabriel
|
861faf7210
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-26 23:33:23 -03:00 |
|
|
Sishen
|
04feb3c4a5
|
borg
|
2020-07-25 03:22:48 -06:00 |
|
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
|
Enric Gabriel
|
ba3da94e74
|
fix some positioning stuff + revert forced _indicator on some binds
|
2020-07-24 00:08:08 -03:00 |
|
|
Enric Gabriel
|
e0fdf3dce9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 / merge conflicts
|
2020-07-23 19:14:58 -03:00 |
|
|
silicons
|
db24df58a0
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:36:46 -07:00 |
|
|
siliconsandGitHub
|
ec72015f4f
|
Merge pull request #12809 from BlackMajor/borgo
Gripper brained. The medborg can do chemistry now, oh no.
|
2020-07-23 10:35:16 -07:00 |
|
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
|
silicons
|
184e3992f3
|
fixes
|
2020-07-21 11:56:23 -07:00 |
|
|
Timothy TeakettleandGitHub
|
75a2035774
|
Merge branch 'master' into wound-port
|
2020-07-21 01:10:51 +01:00 |
|
|
Enric Gabriel
|
ac5b4dacd5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-20 15:41:28 -03:00 |
|
|
Enric GabrielandGitHub
|
06264ba994
|
Some lewdy additions. (#26)
|
2020-07-20 15:39:27 -03:00 |
|
|
silicons
|
416b989e12
|
changes
|
2020-07-20 11:35:10 -07:00 |
|
|
silicons
|
98d3ac80d9
|
:pika:
|
2020-07-20 11:25:17 -07:00 |
|