 timothyteakettle
|
a39dea1b4d
|
json loadout
|
2020-10-24 00:31:45 +01:00 |
|
|
SandPoot
|
7495575a6a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-10-23 11:52:46 -03:00 |
|
|
Putnam
|
6dfcf12773
|
Makes the atmos subsystem pause correctly.
|
2020-10-21 22:05:28 -07:00 |
|
|
Putnam
|
558d11bc73
|
Stringified the vote #defines for easier config stuff
|
2020-10-18 14:49:43 -07:00 |
|
|
Putnam
|
07a02617c2
|
Fixed compiler errors, runtimes
|
2020-10-18 12:51:00 -07:00 |
|
|
Putnam
|
00b4d207c5
|
Added ranked choice ballots to stat voting.
|
2020-10-18 12:32:45 -07:00 |
|
|
Ghommie
|
c0f3317c01
|
mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port.
|
2020-10-16 20:27:09 +02:00 |
|
|
SandPoot
|
4c73583f75
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-10-11 21:30:33 -03:00 |
|
|
TupinambisandGitHub
|
3224533a7c
|
Merge branch 'master' into spooder
|
2020-10-11 14:31:23 -05:00 |
|
|
SandPoot
|
8128f28be4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-10-11 02:58:53 -03:00 |
|
|
BlackMajorandGitHub
|
313970000b
|
Merge pull request #13522 from silicons/async
Fixes the intermittent master controller lockups
|
2020-10-11 18:48:37 +13:00 |
|
|
SandPoot
|
8aad78b784
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-10-11 02:44:06 -03:00 |
|
|
SandPoot
|
7181e558b3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-10-11 02:42:29 -03:00 |
|
|
BlackMajorandGitHub
|
bf7d68884b
|
Merge pull request #13510 from silicons/google
a more sane json-based map override system for jobs (todo port to rp so rp can have map rotation)
|
2020-10-11 18:39:10 +13:00 |
|
|
siliconsandGitHub
|
2919dfee2e
|
Merge pull request #13014 from Hatterhat/tendril-minimum
[REVIEW PLEASE] Minimum Megas/Tendrils For Lavaland But Cleaner I Swear
|
2020-10-10 21:58:15 -07:00 |
|
|
SandPoot
|
273ad286d5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-10-10 14:43:38 -03:00 |
|
|
|
19f1e99a8c
|
mass ports like 15 tg prs + counting (#13386)
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
|
2020-10-10 12:20:33 +02:00 |
|
|
SandPoot
|
08f8360f31
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-10-06 23:10:33 -03:00 |
|
|
siliconsandGitHub
|
03a47bda6d
|
Merge pull request #13252 from timothyteakettle/loadout-loading
qol: looking at loadout equips your loadout items on you instead of job items
|
2020-10-06 16:50:08 -07:00 |
|
|
silicons
|
7c07863179
|
fix
|
2020-10-05 13:29:53 -07:00 |
|
|
Letter NandGitHub
|
1b30fbf703
|
Update statpanel.dm
|
2020-10-05 20:07:04 +08:00 |
|
|
Letter NandGitHub
|
ea48dd1e2e
|
part 2
|
2020-10-05 20:02:12 +08:00 |
|
|
Timothy TeakettleandGitHub
|
46ebb72905
|
Merge branch 'master' into loadout-loading
|
2020-10-04 01:43:17 +01:00 |
|
|
silicons
|
21d3d8fcd9
|
sigh
|
2020-10-03 14:17:13 -07:00 |
|
|
Letter NandGitHub
|
d6beeffad5
|
reverts this regression
|
2020-10-03 20:26:32 +08:00 |
|
|
Letter N
|
47845f2c30
|
suposed to be SSupdates but noo
|
2020-10-03 19:54:23 +08:00 |
|
|
Hatterhat
|
0310e3ebd5
|
please travis stop crashing on me
|
2020-10-01 19:10:13 -05:00 |
|
|
Tupinambis
|
d2860b38c7
|
normalization
|
2020-10-01 18:46:31 -05:00 |
|
|
Tupinambis
|
f1bc1ccafb
|
Merge branch 'master' into spooder
# Conflicts:
# code/modules/surgery/organs/eyes.dm
I have no idea if this will work
|
2020-10-01 17:10:42 -05:00 |
|
|
Enric Gabriel
|
7df07d2859
|
Merge branch 'master' of upstream into master
|
2020-10-01 12:49:01 -03:00 |
|
|
Tupinambis
|
a3a5fe4c2d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into spooder
|
2020-09-30 16:07:21 -05:00 |
|
|
Tupinambis
|
113b84ab50
|
Ports arachnids from WaspStation
|
2020-09-30 15:10:17 -05:00 |
|
|
ZandarioandGitHub
|
9104e2c041
|
Revert "C++ innovations: adds an "unstuck" step to SSair, AKA brute forcing LINDA"
|
2020-09-29 15:40:12 -05:00 |
|
|
Putnam
|
24c48c2bec
|
Adds an "unstuck" step to LINDA
|
2020-09-25 09:40:32 -07:00 |
|
|
SandPootandGitHub
|
13834c4bef
|
Morrowinventory Port (#75)
|
2020-09-24 20:14:53 -03:00 |
|
|
Putnam
|
650d76ba69
|
Fixed a dumb typo.
|
2020-09-23 22:36:12 -07:00 |
|
|
Enric Gabriel
|
be4a8faa29
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-23 18:52:59 -03:00 |
|
|
siliconsandGitHub
|
7ca1b1dc79
|
Merge pull request #13380 from Putnam3145/cache-locality-experiments
(TESTMERGE THIS FIRST WOW) Made monstermos faster and more convenient
|
2020-09-23 14:39:56 -07:00 |
|
|
Enric Gabriel
|
c5afd0cc9f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-23 18:30:41 -03:00 |
|
|
Artur
|
d493886875
|
Speedmerge fix
|
2020-09-23 19:14:50 +03:00 |
|
|
SandPootandGitHub
|
627ceb5b19
|
Breaks lines... with a crowbar (#74)
|
2020-09-21 14:36:06 -03:00 |
|
|
Enric Gabriel
|
4de9baf690
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-21 14:10:28 -03:00 |
|
|
Putnam
|
e89e7adda4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cache-locality-experiments
|
2020-09-21 03:31:35 -07:00 |
|
|
Artur
|
435565f1d8
|
Merge remote-tracking branch 'origin/master' into TGUI_Updoot
|
2020-09-21 00:16:12 +03:00 |
|
|
Enric Gabriel
|
d2257abe86
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-19 13:21:18 -03:00 |
|
|
GhomandGitHub
|
868e464b40
|
fixes linter issues, removes acid degrading armor (#13399)
* fix
* more
* Update brawn.dm
* Update ticketmachine.dm
|
2020-09-19 15:04:48 +02:00 |
|
|
Enric Gabriel
|
d85ebed8db
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-16 16:22:36 -03:00 |
|
|
Artur
|
74533d3f9d
|
fiiix shit
|
2020-09-16 11:16:39 +03:00 |
|
|
siliconsandGitHub
|
ca8b13b86a
|
Merge pull request #13255 from timothyteakettle/limbs
you can choose limbs to be prosthetic/amputated
|
2020-09-16 00:31:18 -07:00 |
|
|
silicons
|
95ebeac5b6
|
fix
|
2020-09-15 17:27:11 -07:00 |
|