 silicons
|
67b518bf42
|
experimental
|
2020-07-27 13:09:54 -07:00 |
|
|
silicons
|
49070d732b
|
ohhhhhhh boy
|
2020-07-26 15:10:08 -07:00 |
|
|
silicons
|
1990f75957
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-25 23:46:27 -07:00 |
|
|
DeltaFire
|
db823ac16c
|
fixes the organ bitfields
|
2020-07-25 19:13:08 +02:00 |
|
|
silicons
|
33d5ba788b
|
aight
|
2020-07-24 20:19:18 -07:00 |
|
|
silicons
|
d30acd5b09
|
smooth
|
2020-07-23 13:49:17 -07:00 |
|
|
Lin
|
e14f5ff576
|
Merge pull request #12832 from Citadel-Station-13/overlays-experimental
do we want (probably) free memory savings trick question yes we do
|
2020-07-23 13:41:36 -05:00 |
|
|
Lin
|
fbfd6286b5
|
Merge pull request #12849 from Citadel-Station-13/silicons-patch-43
raises max keybind command length to 32 so controller users don't get kicked
|
2020-07-23 13:30:31 -05:00 |
|
|
silicons
|
db24df58a0
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:36:46 -07:00 |
|
|
silicons
|
d520eaa0ad
|
Merge pull request #12854 from Zandario/tipes
tipes
|
2020-07-23 10:26:55 -07:00 |
|
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
|
silicons
|
703afec454
|
ok
|
2020-07-23 08:57:15 -07:00 |
|
|
Zandario
|
bbf38c9898
|
tipes
|
2020-07-21 11:22:21 -05:00 |
|
|
silicons
|
5347b9f6a5
|
Update keybindings.dm
|
2020-07-20 21:33:03 -07:00 |
|
|
Timothy Teakettle
|
75a2035774
|
Merge branch 'master' into wound-port
|
2020-07-21 01:10:51 +01:00 |
|
|
silicons
|
944a91e44d
|
Update subsystems.dm
|
2020-07-20 15:55:41 -07:00 |
|
|
silicons
|
924309aab8
|
changeS
|
2020-07-20 11:11:12 -07:00 |
|
|
silicons
|
984796b8c6
|
sigh
|
2020-07-20 10:46:52 -07:00 |
|
|
silicons
|
58e26c540c
|
merge from master
|
2020-07-20 10:18:44 -07:00 |
|
|
Timothy Teakettle
|
b06948bed4
|
fry smite
|
2020-07-20 17:48:37 +01:00 |
|
|
silicons
|
6ac765eca5
|
Update subsystems.dm
|
2020-07-19 20:08:56 -07:00 |
|
|
silicons
|
512174b782
|
Update subsystems.dm
|
2020-07-19 20:07:16 -07:00 |
|
|
timothyteakettle
|
8709a72fc0
|
fry everything
|
2020-07-20 00:40:18 +01:00 |
|
|
silicons
|
7c5d4f863d
|
click cd breakout
|
2020-07-18 18:10:21 -07:00 |
|
|
Timothy Teakettle
|
1a5008fee7
|
Merge branch 'master' into wound-port
|
2020-07-18 23:06:49 +01:00 |
|
|
Timothy Teakettle
|
974b80a2fd
|
Merge branch 'master' into wound-port
|
2020-07-18 21:45:24 +01:00 |
|
|
timothyteakettle
|
e8fade4f7f
|
changes
|
2020-07-18 02:29:12 +01:00 |
|
|
timothyteakettle
|
7714fcfaba
|
more changes
|
2020-07-18 01:26:38 +01:00 |
|
|
silicons
|
993b4ec222
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-16 19:39:46 -07:00 |
|
|
timothyteakettle
|
584e74590f
|
port1
|
2020-07-17 02:01:33 +01:00 |
|
|
Arturlang
|
92ed5d3201
|
Merge branch 'master' into TGUI-3.0
|
2020-07-16 15:59:37 +03:00 |
|
|
nik707
|
fa8a6dd3e1
|
Merge pull request #12788 from silicons/gasmixture_vv
"""user-friendly""" vv handling for new c++ atmos gas mixtures
|
2020-07-16 01:19:20 -05:00 |
|
|
timothyteakettle
|
03bd806c73
|
pickle
|
2020-07-16 02:51:07 +01:00 |
|
|
silicons
|
6fbd7914f5
|
stuff
|
2020-07-15 16:58:44 -07:00 |
|
|
Artur
|
f5ee74803f
|
Updates minter to tg and the prereqs
|
2020-07-14 18:08:12 +03:00 |
|
|
Artur
|
d0f1a805e4
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-14 16:15:48 +03:00 |
|
|
Lin
|
1b3112528c
|
Merge pull request #12746 from silicons/react
chemical reactions now have priority - "the first grenade helped with the revenant and the second blew up the evacuation shuttle"
|
2020-07-13 11:28:52 -05:00 |
|
|
Artur
|
5f9364c5f8
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-13 16:20:54 +03:00 |
|
|
silicons
|
fbbb5f7ea8
|
Merge pull request #12678 from Ghommie/Ghommie-cit831
Updating rust-g dependencies to 0.4.4
|
2020-07-12 08:23:29 -07:00 |
|
|
silicons
|
72c5c2234e
|
ok
|
2020-07-12 05:15:55 -07:00 |
|
|
Lin
|
955d9fa0cc
|
Merge pull request #12624 from Citadel-Station-13/policy
policy configuration & support hooks for clone memory disorder
|
2020-07-11 16:40:38 -05:00 |
|
|
silicons
|
4f4c6b85bf
|
Merge pull request #12720 from timothyteakettle/eye-contact
port examines and eye contact
|
2020-07-11 00:14:47 -07:00 |
|
|
Artur
|
9de8483bcf
|
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
|
2020-07-09 22:14:20 +03:00 |
|
|
Timothy Teakettle
|
02f46322ad
|
port examine
|
2020-07-09 18:32:45 +01:00 |
|
|
Putnam
|
9b955e5d03
|
gotta replace all of them actually
|
2020-07-09 03:19:52 -07:00 |
|
|
Putnam
|
7cf4a55496
|
at least it'll fail better this time
|
2020-07-09 02:18:08 -07:00 |
|
|
Putnam
|
196261296e
|
probably fixes travis
|
2020-07-09 01:40:39 -07:00 |
|
|
Putnam
|
aefdf9eef7
|
duplicate REVERSE_DIR
|
2020-07-09 01:38:17 -07: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 |
|
|
Artur
|
e12d690d3f
|
hopefulyl fixes cloning!?!?
|
2020-07-08 23:54:00 +03:00 |
|