 silicons
|
ddad368d6a
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-08 00:33:57 -08:00 |
|
|
DeltaFireandGitHub
|
d153d82441
|
Merge pull request #13931 from shellspeed1/porting-turret
Ports disposable sentry gun for station engineers as a traitor item from TG
|
2021-01-08 02:59:48 +01:00 |
|
|
Putnam
|
186bb483b1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-01-06 23:55:24 -08:00 |
|
|
MrJWhit
|
1cf951c4d4
|
Update atmos_control.dm
|
2021-01-06 02:38:37 -05:00 |
|
|
siliconsandGitHub
|
fbb2cfbba1
|
Update colormate.dm
|
2020-12-31 23:05:14 -07:00 |
|
|
siliconsandGitHub
|
f1205efa0f
|
Merge pull request #13885 from raspy-on-osu/spaceheater-buff
Makes space heaters worth using
|
2020-12-31 12:38:07 -07:00 |
|
|
shellspeed1
|
b69132bede
|
ports https://github.com/tgstation/tgstation/pull/52931
|
2020-12-31 00:34:44 -08:00 |
|
|
Letter N
|
40f937c28b
|
linter again
|
2020-12-29 13:56:50 +08:00 |
|
|
raspy-on-osu
|
2352580b41
|
init
|
2020-12-27 05:36:49 -05:00 |
|
|
Letter N
|
56fb81d02c
|
Immursive Audio 2
|
2020-12-24 11:06:49 +08:00 |
|
|
Letter N
|
e9ca58446c
|
Merge remote-tracking branch 'origin/master' into semi-sync
|
2020-12-23 12:25:24 +08:00 |
|
|
DeltaFireandGitHub
|
d3f30d21cf
|
Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
|
2020-12-22 17:40:33 +01:00 |
|
|
Letter N
|
abd94d1c03
|
Merge remote-tracking branch 'origin/master' into semi-sync
|
2020-12-21 21:19:06 +08:00 |
|
|
Letter N
|
98ff0a080e
|
ImmursionAudio(TM)
|
2020-12-21 19:47:11 +08:00 |
|
|
raspy-on-osu
|
d3e224d9c1
|
init
|
2020-12-21 04:54:19 -05:00 |
|
|
Letter N
|
a808f805d4
|
ASYNC EVERYTHING!
|
2020-12-21 16:24:51 +08:00 |
|
|
LinandGitHub
|
3ad777f8f7
|
Merge pull request #13755 from silicons/colormates
ports colormates from rp/vorestation
|
2020-12-20 18:14:48 +00:00 |
|
|
silicons
|
ebd6e0cbec
|
no backapck in backpack
|
2020-12-17 04:14:04 -07:00 |
|
|
SandPoot
|
3ea756a062
|
typo and remove badword
|
2020-12-16 11:43:40 -03:00 |
|
|
SandPoot
|
a0ae0c37fe
|
upload files
|
2020-12-16 11:39:50 -03:00 |
|
|
silicons
|
a7aa7f2466
|
delete pdas
|
2020-12-15 07:43:35 -07:00 |
|
|
silicons
|
e87cc27803
|
modifications
|
2020-12-15 07:21:06 -07:00 |
|
|
silicons
|
4451a96997
|
fixes
|
2020-12-13 20:12:14 -07:00 |
|
|
siliconsandGitHub
|
31beb2dd62
|
Update colormate.dm
|
2020-12-13 06:41:40 -07:00 |
|
|
siliconsandGitHub
|
28a0725bd8
|
Update colormate.dm
|
2020-12-13 06:36:20 -07:00 |
|
|
silicons
|
99709a1a35
|
fix
|
2020-12-13 04:30:00 -07:00 |
|
|
silicons
|
5c830d4d44
|
Merge remote-tracking branch 'citadel/master' into respawn_system_2
|
2020-12-13 02:34:57 -07:00 |
|
|
silicons
|
a4688557d7
|
Cryo
|
2020-12-13 02:29:31 -07:00 |
|
|
silicons
|
4b20d26d2b
|
Merge remote-tracking branch 'citadel/master' into colormates
|
2020-12-12 01:56:37 -07:00 |
|
|
silicons
|
e27c843296
|
fixes
|
2020-12-11 05:35:57 -07:00 |
|
|
silicons
|
13391d2af6
|
fix
|
2020-12-11 05:09:29 -07:00 |
|
|
silicons
|
599a1f0419
|
fix
|
2020-12-11 05:06:44 -07:00 |
|
|
silicons
|
76e7caad33
|
colormates
|
2020-12-11 04:54:30 -07:00 |
|
|
Linzolle
|
0ddc053a8b
|
what if mapmerge worked
|
2020-12-08 17:35:21 -06:00 |
|
|
Linzolle
|
3e951d334c
|
fix entertainment monitors
|
2020-12-08 17:21:14 -06:00 |
|
|
DeltaFire
|
69a1d6e603
|
oop
|
2020-12-08 16:32:34 +01:00 |
|
|
DeltaFire
|
86661a4fe0
|
aaaaaaaaaaaaaa
|
2020-12-08 16:30:09 +01:00 |
|
|
siliconsandGitHub
|
3cbec856a8
|
Update windowdoor.dm
|
2020-11-19 02:41:55 -07:00 |
|
|
siliconsandGitHub
|
f8d43b7544
|
Merge pull request #13679 from DeltaFire15/system-corruption
[TESTMERGE ONLY] System Corruption for robotic species
|
2020-11-18 22:54:51 -07:00 |
|
|
Putnam3145andGitHub
|
9d300ade35
|
Merge pull request #13677 from silicons/newlines
Adds missing EOF newlines
|
2020-11-18 17:50:38 -08:00 |
|
|
Putnam
|
30fb673670
|
Superconductivity is gone. Only rustmos now.
|
2020-11-17 02:35:10 -08:00 |
|
|
DeltaFire
|
e191cd3b5b
|
sleeper ui compartibility
ugly but less work & less ugly than completely rewriting it.
If anyone else wants to, be my guest.
|
2020-11-15 20:47:22 +01:00 |
|
|
silicons
|
803bff4e5f
|
funny
|
2020-11-12 23:34:42 -07:00 |
|
|
DeltaFire
|
a9fda43bc2
|
makes the operating computer show toxin / corruption
An ugly way to do this, but still LESS ugly than rewriting the entire thing. It'll be FIIIINE
|
2020-11-13 02:41:34 +01:00 |
|
|
DeltaFire
|
9016abbbee
|
*snap
|
2020-11-12 21:20:36 +01:00 |
|
|
Artur
|
8ce058a593
|
Fixes stupid mistakes
|
2020-11-09 14:39:51 +02:00 |
|
|
Artur
|
503d0156c6
|
Does the thing
|
2020-11-08 23:24:58 +02:00 |
|
|
DeltaFire15andGitHub
|
91584053f5
|
Fixes a bunch of fallout from the tgui PR (#13648)
* screamies
fixes a bunch of fallout from the tgui PR.. probably
* Empty commit to poke travis
|
2020-11-01 21:59:22 +01:00 |
|
|
Ghommie
|
90c4cb2022
|
Here I fix a few issues.
|
2020-10-25 14:50:42 +01:00 |
|
|
BlueWildroseandGitHub
|
6080253759
|
Fixes cloning computer UI not updating when pressing certain buttons - also adds extra check for names to update a message (#13549)
* fixes cloning computer UI not updating when pressing certain buttons
* forgot a few things
|
2020-10-15 12:54:22 +02:00 |
|