Commit Graph

37275 Commits

Author SHA1 Message Date
Detective Google
ee7c528185 adds art to ghost cafe 2020-08-17 00:36:09 -05:00
Timothy Teakettle
f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
Lin
d285e9f005 Merge pull request #13187 from Citadel-Station-13/revert-13110-cum
[TESTMERGE ONLY] FUCK
2020-08-16 21:16:42 -05:00
silicons
4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
Detective Google
3ac272c9be a few other little cleanups while I'm opening a PR 2020-08-16 21:03:11 -05:00
Detective Google
83332453b6 clarifies a bit more where each pad goes on snaxi. 2020-08-16 21:01:09 -05:00
CitadelStationBot
3b2d93dcce Automatic changelog generation for PR #13110 [ci skip] 2020-08-16 20:56:17 -05:00
CitadelStationBot
c210667237 Automatic changelog generation for PR #13122 [ci skip] 2020-08-16 20:56:16 -05:00
CitadelStationBot
56d15c7829 Automatic changelog generation for PR #13124 [ci skip] 2020-08-16 20:56:14 -05:00
CitadelStationBot
604fdff241 Automatic changelog generation for PR #13135 [ci skip] 2020-08-16 20:56:13 -05:00
CitadelStationBot
e86a51e302 Automatic changelog generation for PR #13141 [ci skip] 2020-08-16 20:56:12 -05:00
CitadelStationBot
514241e1fa Automatic changelog generation for PR #13144 [ci skip] 2020-08-16 20:56:11 -05:00
CitadelStationBot
6be76bdefd Automatic changelog generation for PR #13148 [ci skip] 2020-08-16 20:56:10 -05:00
CitadelStationBot
2b919f3888 Automatic changelog generation for PR #13159 [ci skip] 2020-08-16 20:56:07 -05:00
CitadelStationBot
17cb79cea4 Automatic changelog generation for PR #13164 [ci skip] 2020-08-16 20:56:06 -05:00
CitadelStationBot
b7530eff6d Automatic changelog generation for PR #13167 [ci skip] 2020-08-16 20:56:05 -05:00
CitadelStationBot
5be2587b1e Automatic changelog generation for PR #13168 [ci skip] 2020-08-16 20:56:04 -05:00
CitadelStationBot
054c7fe5c5 Automatic changelog generation for PR #13169 [ci skip] 2020-08-16 20:56:03 -05:00
CitadelStationBot
1194341659 Automatic changelog generation for PR #13176 [ci skip] 2020-08-16 20:56:01 -05:00
silicons
f3da72137d Merge branch 'master' of github.com-kevinz000:Citadel-Station-13/CitadelStation13 2020-08-16 18:55:36 -07:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons
ac7bdb5db5 Merge branch '13175' 2020-08-16 18:53:00 -07:00
silicons
1f0f5d621a Merge branch '13176' 2020-08-16 18:52:48 -07:00
silicons
83b41b1a0f Merge branch '13174' 2020-08-16 18:52:33 -07:00
silicons
2095e2705f Merge branch '13169' 2020-08-16 18:52:13 -07:00
silicons
690f610f62 Merge branch '13168' 2020-08-16 18:52:04 -07:00
silicons
384e5ae311 Merge branch '13167' 2020-08-16 18:51:48 -07:00
silicons
83e72b4f96 Merge branch '13164' 2020-08-16 18:51:36 -07:00
silicons
a900c07846 Merge branch '13163' 2020-08-16 18:51:24 -07:00
silicons
a1a26d6941 Merge branch '13159' 2020-08-16 18:51:07 -07:00
silicons
66322c4d38 Merge branch '13156' 2020-08-16 18:50:29 -07:00
silicons
806a0d289b Merge branch '13153' 2020-08-16 18:50:16 -07:00
silicons
451d5e52de Merge branch '13148' 2020-08-16 18:49:57 -07:00
silicons
b8686ab0f9 Update _vehicle.dm 2020-08-16 18:49:49 -07:00
silicons
bc1fad653b Merge branch '13147' 2020-08-16 18:48:57 -07:00
silicons
b767c99bac Merge branch '13144' 2020-08-16 18:48:14 -07:00
silicons
44e2327280 Merge branch '13143' 2020-08-16 18:47:48 -07:00
silicons
59f2d1ea75 Merge branch '13142' 2020-08-16 18:47:07 -07:00
silicons
38959b6120 Merge branch '13141' 2020-08-16 18:46:33 -07:00
silicons
9602f0742e Merge branch '13135' 2020-08-16 18:46:06 -07:00
silicons
b7b13403b9 Merge branch '13130' 2020-08-16 18:45:54 -07:00
silicons
397cdb6c03 Merge branch '13129' 2020-08-16 18:45:35 -07:00
silicons
fe7d8860f5 Merge branch '13124' 2020-08-16 18:45:23 -07:00
silicons
53fe2c95c5 Merge branch 'pr-13122' 2020-08-16 18:45:01 -07:00
silicons
b56742beb5 Merge branch 'pr-13110' 2020-08-16 18:40:23 -07:00
silicons
9c63a09907 Merge branch 'pr-13087' 2020-08-16 18:40:07 -07:00
CitadelStationBot
bdacd72f3d Automatic changelog generation for PR #13067 [ci skip] 2020-08-16 20:38:56 -05:00
silicons
01dd2f389b Merge branch 'pr-13067' 2020-08-16 18:38:13 -07:00
silicons
fa11480781 Merge pull request #13109 from Detective-Google/sm-fix
adds more heatpipes to snaxi sm
2020-08-16 18:36:16 -07:00
CitadelStationBot
6f0c6ca88d Automatic changelog generation for PR #13037 [ci skip] 2020-08-16 20:35:08 -05:00