mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
e94ad8e16f
* Squashed commit of the following: commit 2d7b5f07db1f24a9bd6aac979a5898f4ecf1176b Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Jul 31 08:18:15 2023 +1000 add in missing stats commit 0686d13c588afe68e6a6074b21814acad2118e87 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Jul 30 18:30:58 2023 +1000 fix that commit 075a0af640634584fa34126b98f76642b8bf7d2d Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Jul 30 18:26:08 2023 +1000 duplic_8 commit 93ecfd7fc57ea2102f6be821accb0d9eb97b2a2c Merge: 4d8c2d598835f5d50aa08Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Jul 30 16:53:47 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 4d8c2d598831ffb48344c061a512cab79ee92793 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jul 26 00:33:08 2023 +1000 metrics commit dff7907d2271cd702c5f57f6456fb10d75c0ca73 Merge: 7f3be2cefe76b5afb16d1Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jul 26 00:14:21 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 7f3be2cefe74ac229fe377df15dc7dfa6fc61d7c Merge: d8aea8fb9b3a646ebf8c4Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Jul 21 22:21:52 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit d8aea8fb9b3a075e1a9856b5b817eb5e0d28e47a Merge: 5289cb0767c962e2440aeAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Jul 16 15:37:15 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 5289cb0767c93595545347ec54464543fe7bf9be Merge: 2ca4e31521fffb13431adAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jul 12 23:17:31 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 2ca4e31521fdb873d0a2550e3027511135fb6c75 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jul 12 22:46:57 2023 +1000 FUCK commit 26c461f14ddd24e82f4498e941d8258961fff0dc Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jul 12 10:03:53 2023 +1000 fix it commit 9c0058c500a0c25c6d9773dba8790625a69bdfad Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jul 12 10:01:50 2023 +1000 fuck commit c4004f3903c50a0ccb367935f685b921d20b4874 Merge: d00473551ea0912c008ffAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jul 12 08:29:10 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit d00473551ea4c0ebcc95a6b14e1f790f636eac8d Merge: 547e2a03077b9471c7cb3Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Jul 11 08:44:39 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 547e2a030778e424d46423d183db85af219d636e Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Jul 11 08:44:20 2023 +1000 forgor commit 5cbc0b5808c3514c65a4110d959e06248d90180d Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Jul 3 21:49:11 2023 +1000 ehh commit 3405388111379c52f2dbfc26361a495c67a91342 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Jul 3 21:45:24 2023 +1000 arfghh commit f3688b5b3eb74deb918068de48a16a952845702b Merge: 63e6fa47f00cdebb56739Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Jul 3 21:11:16 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 63e6fa47f002e2ff2a7c8142fe773c6b4f80372f Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Jul 3 19:26:28 2023 +1000 undo that commit 9f25295c4f043ca8874b1ebda8c03929dffa379b Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Jul 2 18:30:00 2023 +1000 update less commit 5cde3ec627883db79682a154589a64d752d05389 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jul 1 23:01:50 2023 +1000 don't set to 0 please commit 99c26e52e4b2d34b54f41fbd894046a16858b39b Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jul 1 22:58:03 2023 +1000 more logs commit e4d899505c0f5d716651a8f1b6db3858b29cee87 Merge: 2a836b9818c743dc64835Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jul 1 22:44:21 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 2a836b9818cb639bd0044a9f9701ea117fd3b9ef Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jun 29 16:23:16 2023 +1000 mhmm commit 7e4b471099020e7b74383d8b1874bd29f25789d5 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jun 29 16:09:54 2023 +1000 unfucks yog commit 04e604863d1357b4dc8477312864d713c5ff2d2d Merge: 069a122cc6c5cd125c43fAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jun 29 16:07:10 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 069a122cc6c60eed563930b156a6281318f446df Merge: adffd10134c0a2f65e713Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Jun 25 23:43:31 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit adffd10134cf00710325f3ca2831a78a04e76d7b Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jun 22 20:25:15 2023 +1000 do stuff commit 8c62cc1c196c8f9e5c10518f8198197125951a33 Merge: 176540790875f56335971Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jun 22 20:01:21 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 176540790872cf7e7619876233e046e169ba7e8a Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jun 21 20:01:06 2023 +1000 nope commit 50af88554de07f992722e41bcb4aef30b22f3e99 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jun 21 19:52:24 2023 +1000 how bout this commit c830bda6ce4b5ce39e87eb33e5c435312eba0f6f Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Jun 19 19:44:45 2023 +1000 threading, verbs and docs commit a2c1ae237bc58c4335f08ec3ccfbb630b8c0f746 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Jun 18 19:41:59 2023 +1000 clear all pipenets commit 342961649fe27cd9295f4a2a7d6cf010d13b83d0 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jun 17 18:42:03 2023 +1000 warning commit 28a25567513c30c18f819a70789f95eadc32f2ed Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jun 17 18:04:54 2023 +1000 parity commit fe8280a8aa0c7921901f4a90837a54b98c976a62 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jun 17 16:16:08 2023 +1000 pride shiez commit a7b9b17b9002d93b96e648c286ed80a5e3328407 Merge: 6b1d27205a64d31c84b19Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jun 17 16:11:07 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 6b1d27205a617dc5688cf0c2552e65ec7d6e56a7 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jun 17 08:12:59 2023 +1000 update commit c00f81d00cc973bb32a86e3d2c46e2fe4b9617b0 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Jun 16 22:55:23 2023 +1000 fix lint commit d1892ed7687d636a12a8d2e8952bfc7089dc6fcb Merge: 63d6ccd60cd0a6fd35ba1Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Jun 16 21:45:37 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 63d6ccd60cdb170e7d1c4c2a09e7c19d30ab98fe Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jun 15 18:29:17 2023 +1000 it's this? commit 2ef8ca3ed6d8dbc63c5eda58e13aa51cb6e947f3 Merge: be24c028ad38fb37fb67cAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jun 15 18:23:51 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit be24c028ad37b371d98560e3b43b2efc0506974a Merge: facb8c468ccd39a2c166eAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jun 14 15:29:14 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit facb8c468ccc7d0825186ca317ef28f0158d11e4 Merge: 2d697730cd1bda4af885eAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jun 14 00:15:41 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 2d697730cd16d130eb2dad9fb96202882013163f Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Jun 12 20:44:53 2023 +1000 fix electrolyzer commit 9ac28274e6aa702ada8e4cb5f37f374bae87f2e5 Merge: 95c3a419628cbf94088f8Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Jun 12 20:28:00 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 95c3a4196284ce8b2a7c790923883762d244c1ed Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Jun 9 16:46:18 2023 +1000 mhmmmm commit 2e4ff4bcbf2ff54081a016b4ee3e1934b483a99a Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jun 8 22:38:45 2023 +1000 don't need that commit 68560fdcb93035b7e6034a9adb63ee2260e4dc1c Merge: 5f20ef33758621ce68aefAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jun 8 22:31:15 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 5f20ef33758c792c8e3946d74875ba3af59c5caa Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jun 3 21:17:18 2023 +1000 forgot the feature commit 74bbf3e86f36bdc62f6831b17333cb85cd165fa1 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jun 3 21:11:22 2023 +1000 update bin commit a81728f9a4c5030bd92fb3c40c8ddc528047bc83 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jun 3 21:09:38 2023 +1000 hmm commit cebf16ae5d4a4b52bf0b42fc7a0a01afb9439694 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jun 3 21:03:38 2023 +1000 fix again commit 9efe2056d250bba87f1cee2101feb4df5c8704f9 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jun 3 21:01:47 2023 +1000 fix commit ccc600ce97c751b7b6b7f3e324ccc5b95d870fd5 Merge: e11062996100637e0b8c0Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jun 3 20:59:36 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit e110629961055998ca57a3930b7603c0ffd17851 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue May 30 19:24:26 2023 +1000 don't need this commit 9eebc05c334e81b89b79c1b72048d83ae486e48b Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue May 30 19:08:59 2023 +1000 fix commit 2e95414882dd803f0c8e93fbb59ca8868d7adaf2 Merge: 2026c5bdb0d55fb77a326Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue May 30 19:02:14 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 2026c5bdb0d4a181eeb6aa37aef6e83f2f440983 Merge: c736eafef02d6ca0a2d4dAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri May 19 18:53:57 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit c736eafef0248157d067a93d1bc94e7450727929 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri May 19 18:49:32 2023 +1000 update binary commit eb5b25d3c11327ce95188e85943df9594b530a96 Merge: 4510e3e0248c8790570acAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri May 12 21:22:59 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 4510e3e024889700720d400582254b0f9589e4ff Merge: 5ded2abf16a6af4810beaAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat May 6 17:50:57 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 5ded2abf16ae4101cd1b64fe647cc689c190ada2 Merge: 79527f12c6a406f86d59aAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Apr 26 17:00:27 2023 +1000 merge commit 79527f12c6a517df08cec569fedec2c9cbb01259 Merge: c5d3d3940c34258b5e626Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Apr 10 20:34:02 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit c5d3d3940c325e740eaa02249186daf34306bba9 Merge: 5268b80c1202855869e28Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Apr 7 13:02:31 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit 5268b80c120f9c0239aea5e4058fc539dc2d600f Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Apr 4 21:21:35 2023 +1000 merge error commit 54ecb4d47547db641962a7fa17f8a63a1edbf336 Merge: ff5896a3f13b2fad8f1a6Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Apr 4 21:03:18 2023 +1000 Merge remote-tracking branch 'upstream/master' into luciee commit ff5896a3f1327ddf8c8c3772f50ee1504c581077 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Mar 30 20:36:37 2023 +1100 update bin guh commit 4ba2b940d069160e3320406ee207cee6fddf1bc0 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Mar 30 20:27:44 2023 +1100 hmm commit 213560f06150ba1ad573ae40f40a1bc2cb3890a4 Merge: e21ae4cefbe 10e6061f102 Author: LatteKat <56778689+jupyterkat@users.noreply.github.com> Date: Thu Mar 30 20:23:17 2023 +1100 Merge pull request #320 from ThatLing/hfrmos Updates auxmos to work with HFR commit 10e6061f102f5c28aeb37d3b69ec266641337fb6 Author: Ling <lingbleed@gmail.com> Date: Wed Mar 29 21:00:31 2023 +0300 Fix temp bar commit ca60f6f267c7ba02eb44f751ec657163ca6b6249 Author: Ling <lingbleed@gmail.com> Date: Tue Mar 28 20:23:01 2023 +0300 Some HFR fixes commit e65bcc259d5bf306c95eb083f0354aa8f4e83764 Author: Ling <lingbleed@gmail.com> Date: Tue Mar 28 19:07:03 2023 +0300 Fix HFR errors commit 5c90b6c7badf89fde03670267464ded6dd82c229 Author: Ling <lingbleed@gmail.com> Date: Tue Mar 28 18:50:00 2023 +0300 Fix merge conflicts and nitrium commit 1c7af583f9535bd91a88285df9f7a6038e98770d Merge: e21ae4cefbeed0811b2b7Author: Ling <lingbleed@gmail.com> Date: Tue Mar 28 17:54:21 2023 +0300 Merge branch 'master' into hfrmos commit e21ae4cefbeae1545291b25fb80c2a25b720e1ef Merge: affa413543d4e328f1ee6Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Mar 25 17:23:34 2023 +1100 Merge remote-tracking branch 'upstream/master' into luciee commit affa413543d45cd53c090d5a022d073714812668 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Mar 22 15:44:10 2023 +1100 this commit fbb0d31e72910e279abe8d1820346e1a7d96de9f Merge: 21649ae297fe9995e4b39Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Mar 22 15:34:38 2023 +1100 Merge remote-tracking branch 'upstream/master' into luciee commit 21649ae297fa189f10d17cc43fd5c1d76bf19c83 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Mar 19 21:16:04 2023 +1100 harddel workaround commit 3f24db3290200f92662a465d38e8a48e6181b4b2 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Mar 18 19:03:26 2023 +1100 optimize commit a91c80a7c63fdb2ad5a158592d2f673e7de077f8 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Mar 15 21:22:01 2023 +1100 do stuff commit 7fa8b18cf0e0fab6d1e71698113c90e37d6e43b5 Merge: 3ee70281ef9 ba7248869f4 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 14 22:52:00 2023 +1100 Merge branch 'luciee' of kat:jupyterkat/Yogstation into luciee commit 3ee70281ef987024723ef13d6f6f3ba2fc27c29c Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 14 22:50:54 2023 +1100 fix the electrolyzer commit ba7248869f4c5ebd7cf900c74052d59861d856f1 Merge: 8c375cd2ed1d55f6bdf07Author: Ling <lingbleed@gmail.com> Date: Sun Mar 12 15:25:43 2023 +0200 Merge remote-tracking branch 'upstream/master' into luciee commit 8c375cd2ed1a0a7bfda9c97047e4e77945b75b5e Merge: 5afb3eb80bb d1ab0d856c8 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Mar 10 09:47:24 2023 +1100 Merge branch 'luciee' of kat:jupyterkat/Yogstation into luciee commit d1ab0d856c888a9efbef7eaffada93b71ae0de9a Author: Ling <lingbleed@gmail.com> Date: Fri Mar 10 11:45:05 2023 +0200 Revert AI cooling changes commit 5afb3eb80bb0789a75378b44433bb85a6a6f1922 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Mar 10 09:47:03 2023 +1100 undo that commit a4c943bf278220133e9072852f5de0cba06a883c Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Mar 8 11:28:06 2023 +1100 try to do stuff commit 577cce993828b351c50f83652f54a564d043f6e4 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 7 22:48:20 2023 +1100 that commit 114a1ec453a1e9a3995d7f27e6e04f4fa0226512 Merge: 342b8bb62271276613f47Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 7 22:42:41 2023 +1100 Merge remote-tracking branch 'origin/master' into luciee commit 342b8bb622792dc6023e84beb9d9ed3741d26126 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 7 22:39:23 2023 +1100 stop commit 138afc3f98b58786be6bd831abbf15d4eebe25d6 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 7 22:17:14 2023 +1100 fucking fix pipelines commit 72b55d7420b79a1ab6c0d9d08612fedb414b5ae6 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 7 17:56:29 2023 +1100 disable heat var commit 8875075efc95a3fb2c4835f2df7cbdb78a9ea96e Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Mar 5 19:08:47 2023 +1100 fix ci commit 659179bd89f9de79bc03f74f0bc37076257a0993 Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Mar 5 18:40:25 2023 +1100 assorted changes, balances heat gen commit d10a7fdb2cf6c1d69edb4643a52aa3080d4ebaca Merge: 7fe4f2ee82e6ca588ed2aAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Mar 5 02:41:49 2023 +1100 Merge remote-tracking branch 'origin/master' into luciee commit 7fe4f2ee82ee38d258017ec702a9cb59cfa0952b Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Mar 3 21:05:49 2023 +1100 update binary commit fa24aa1ff7476c38adb447e504afd229acb6a367 Author: Ling <lingbleed@gmail.com> Date: Thu Mar 2 13:38:53 2023 +0200 Improve AI cooling setup commit f956f7f4eb7922f1e290f9df293c083b73066af8 Author: Ling <lingbleed@gmail.com> Date: Wed Mar 1 22:54:40 2023 +0200 Disable AI core heat generation for now commit 39b8c0dd945992c903ad0e451c7107650e1a21de Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Feb 27 11:58:59 2023 +1100 remove that commit 6cb7643c877dda29c81bf3e0c6fff8baf221a62d Author: Ling <lingbleed@gmail.com> Date: Sun Feb 26 21:58:08 2023 +0200 Fix T commit7fa269e78fAuthor: Ling <lingbleed@gmail.com> Date: Sun Feb 26 15:23:22 2023 +0200 fix tab commit6d9fdbd61fMerge:3940de5e934e454622d4Author: Ling <lingbleed@gmail.com> Date: Sun Feb 26 15:22:11 2023 +0200 Merge branch 'master' into luciee commit3940de5e93Merge:2f7292b3f93f6effe85bAuthor: Ling <lingbleed@gmail.com> Date: Wed Feb 22 15:34:43 2023 +0200 Merge branch 'master' into luciee commit2f7292b3f9Author: Ling <lingbleed@gmail.com> Date: Wed Feb 15 13:54:05 2023 +0200 Nerf AI core heat generation commit20f582f404Merge:c97a39d5cd6d92b71860Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Feb 15 09:25:26 2023 +1100 Merge branch 'luciee' of kat:jupyterkat/Yogstation into luciee commitc97a39d5cdAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Feb 15 09:23:51 2023 +1100 fix commit6d92b71860Author: Ling <lingbleed@gmail.com> Date: Sun Feb 12 22:59:43 2023 +0200 Fix some air_update_turf calls commit20a27f786cAuthor: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sun Feb 12 13:00:25 2023 +0000 Update portable_atmospherics.dm commit6659b79035Merge:511228abe4596b836652Author: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sun Feb 12 12:59:29 2023 +0000 Merge branch 'master' into luciee commit511228abe4Author: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sun Feb 12 12:38:37 2023 +0000 Delete IceBox.dmm commit25b519cea3Author: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sun Feb 12 12:38:13 2023 +0000 Delete KiloStation.dmm commitf57f833d65Author: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sun Feb 12 12:38:05 2023 +0000 Delete omegastation.dmm commit581116a1c7Author: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sun Feb 12 12:37:56 2023 +0000 Delete YogsDelta.dmm commit1d1630cdcaAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Feb 8 22:42:36 2023 +1100 throw faster commit0b91c6e711Merge:205db28ecde7823cfc39Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Feb 8 22:37:16 2023 +1100 Merge remote-tracking branch 'upstream/master' into luciee commit205db28ecdAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Jan 31 21:35:44 2023 +1100 lint commit5572516fecAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Jan 31 21:30:49 2023 +1100 close layer commite148c91552Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Jan 31 21:23:16 2023 +1100 fuck off commit0c5adb676fMerge:56c4e2b0ca6f03bedc20Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Jan 29 18:03:00 2023 +1100 Merge remote-tracking branch 'upstream/master' into luciee commit56c4e2b0caAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jan 28 19:24:42 2023 +1100 aaaa commit0bb700af9bAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jan 28 08:17:07 2023 +1100 now? commit54c4c739d9Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jan 28 08:10:44 2023 +1100 fix that commit3f4017a975Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jan 28 08:08:26 2023 +1100 doesn't work commit8f434cb968Merge:112f768330e96e4c0de1Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jan 28 08:07:25 2023 +1100 Merge remote-tracking branch 'upstream/master' into luciee commit112f768330Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jan 18 22:29:39 2023 +1100 bins commit3fe6397a04Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jan 18 20:57:12 2023 +1100 fuck commit6df570f00fMerge:bc0305a3b39a2dc1dbf7Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jan 18 20:49:34 2023 +1100 Merge remote-tracking branch 'origin/master' into luciee commitbc0305a3b3Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Jan 8 20:32:12 2023 +1100 do this commitfec163e2daMerge:2ff7a083f1688be42140Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Jan 8 20:31:31 2023 +1100 Merge remote-tracking branch 'origin/master' into luciee commit2ff7a083f1Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jan 7 08:07:27 2023 +1100 fuck n suck commitd8781a3afcAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jan 7 07:45:21 2023 +1100 update bins commit48f33eef24Merge:d2ea670cd856d3e28450Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jan 7 07:44:00 2023 +1100 Merge remote-tracking branch 'origin/master' into luciee commitd2ea670cd8Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jan 7 07:40:17 2023 +1100 fix maps2 commitbfff42a62eAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jan 5 22:41:07 2023 +1100 fix this commit4be0b6d1d7Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jan 5 22:39:22 2023 +1100 update bin commit1c240682c5Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jan 5 21:56:33 2023 +1100 unfuck maps commit24b892f66aMerge:8b98fe162fa9443f77edAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jan 5 21:51:49 2023 +1100 Merge remote-tracking branch 'origin/master' into luciee commit8b98fe162fAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jan 5 21:20:20 2023 +1100 changes to ssair commitbd5890cd2dMerge:c273955a3061c352e38bAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Dec 25 09:19:19 2022 +1100 Merge remote-tracking branch 'origin/master' into luciee commitc273955a30Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Dec 20 17:27:36 2022 +1100 update linux bin commite96e0ee982Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Dec 19 19:10:58 2022 +1100 fuck commit49af185087Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Dec 19 18:57:31 2022 +1100 update windows bin commit6cd07d84c1Merge:0f9100d7bbe4e1529aeaAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Dec 19 18:50:08 2022 +1100 stop it commit0f9100d7bbMerge:e698f60fe772b6827588Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Nov 26 22:02:38 2022 +1100 Merge remote-tracking branch 'origin/master' into luciee commite698f60fe7Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Nov 22 22:18:07 2022 +1100 update bin commit549311fe39Merge:992fc95d13b5211c17eeAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Nov 22 20:54:44 2022 +1100 Merge remote-tracking branch 'origin/master' into luciee commit992fc95d13Merge:7226dae33249f5996110Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Nov 19 21:08:55 2022 +1100 Merge remote-tracking branch 'origin/master' into luciee commit7226dae332Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Nov 16 11:09:20 2022 +1100 detect self commit6a1300fbebAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Nov 16 10:43:06 2022 +1100 fixes that commitfacbee1e4eMerge:5876f0b399cce2086894Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Nov 16 10:40:55 2022 +1100 Merge remote-tracking branch 'origin/master' into luciee commit5876f0b399Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Nov 9 17:33:24 2022 +1100 update bin commit9051267127Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Nov 8 08:25:52 2022 +1100 ass commitc578a5da6fAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Nov 8 08:18:38 2022 +1100 screen commit2a34e22ff5Merge:bed8de7e3c2dc98f28bdAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Nov 8 08:18:14 2022 +1100 Merge remote-tracking branch 'origin/master' into luciee commitbed8de7e3cAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Oct 26 21:48:58 2022 +1100 binupdate commit66b52e3ef4Merge:c44d5f74a0e5943f6c97Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Oct 26 21:42:19 2022 +1100 Merge remote-tracking branch 'origin/master' into luciee commitc44d5f74a0Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Oct 23 18:25:34 2022 +1100 fix it commit2c440597aeMerge:2ef534eebb27737a887eAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Oct 23 18:13:33 2022 +1100 Merge remote-tracking branch 'origin/master' into luciee commit2ef534eebbMerge:7f1ac152816e796d1f1bAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Oct 17 14:43:52 2022 +1100 Merge remote-tracking branch 'origin/master' into luciee commit7f1ac15281Merge:b1b407df0724fa9f15bcAuthor: Jamie D <993128+JamieD1@users.noreply.github.com> Date: Sat Oct 8 15:27:29 2022 +0100 Merge branch 'master' into luciee commitb1b407df07Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Oct 4 12:27:22 2022 +1100 semicolon ere commit6d6ecbd173Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Oct 4 12:25:30 2022 +1100 no commitb8c5c5adf9Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Oct 4 12:23:15 2022 +1100 buh commit108b4114e0Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Oct 4 11:53:14 2022 +1100 guh commit0377561d9cAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Oct 4 11:51:45 2022 +1100 use global real commit75de7e4b65Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Oct 3 11:46:48 2022 +1100 fuck off commit59a4a3f695Merge:a625f8a3059aced92844Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Oct 3 11:41:06 2022 +1100 Merge remote-tracking branch 'origin/master' into luciee commita625f8a305Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Sep 9 10:24:14 2022 +1000 libss commitaf77b1db6fMerge:79870508f85ab5e5bb8bAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Sep 9 08:19:49 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit79870508f8Merge:40093942154bbf789444Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Aug 19 08:34:55 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit4009394215Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Aug 19 08:24:44 2022 +1000 mhm commite755b7113eAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Aug 19 08:23:28 2022 +1000 i cry commit7bb50ae315Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Aug 11 13:09:01 2022 +1000 update bin commit67f3d449bcAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Aug 11 13:02:12 2022 +1000 use the new parser commit65b5f94822Merge:02706f64770334e73f6eAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Aug 11 12:57:02 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit02706f6477Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Aug 1 20:08:45 2022 +1000 fix reaction orderings commit1bc0385fafAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Aug 1 18:10:30 2022 +1000 christ commitf9241f3ac7Merge:a9527be49f7dec922233Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Aug 1 18:07:24 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commita9527be49fMerge:e309e38001fab877e0ccAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jul 21 10:58:02 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commite309e38001Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jul 21 10:57:09 2022 +1000 binaries commit19fb4b26b8Merge:87bd779a47dd157f698fAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Jul 19 13:08:05 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit87bd779a47Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Jul 19 12:15:44 2022 +1000 FUCK commit97df2c9436Merge:eb2950c3bb86fd2fffe2Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Jul 18 09:14:21 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commiteb2950c3bbMerge:136900c342023fd29e5aAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Jul 17 21:17:02 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit136900c342Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sat Jul 16 18:57:48 2022 +1000 truly evil commit18b40d4e4bMerge:23cd9b5d9bd3b7a40f07Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Jul 11 09:11:54 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit23cd9b5d9bMerge:2345b52cbae844ef3e84Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jul 6 10:34:36 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit2345b52cbaMerge:e012900ded2a16756e84Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Jul 1 20:13:50 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commite012900dedAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Jul 1 20:12:17 2022 +1000 minuteman commitee3dbd81b1Merge:ec8a88c6ee7b5a40bb29Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jun 29 14:18:44 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commitec8a88c6eeMerge:6cae0a7d28a1ee3e80d3Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Jun 27 14:57:22 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit6cae0a7d28Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jun 22 20:59:10 2022 +1000 binupdate commit54b8f13c81Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jun 22 20:43:06 2022 +1000 fix commitd8efbcd4d6Merge:23f6f5e90bb4c812a4d2Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jun 22 20:14:41 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit23f6f5e90bAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Jun 21 08:16:36 2022 +1000 fix this shit commit5a9338d1f7Merge:76aa7f4ba44e3808d40cAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Jun 21 08:15:55 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit76aa7f4ba4Merge:31c5983d176bd31ffbd6Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Jun 15 21:00:20 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit31c5983d17Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Jun 10 20:00:02 2022 +1000 fuck commit5c39357aa0Merge:f82c2464aa4739b40eebAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Jun 10 18:21:50 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commitf82c2464aaAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Jun 5 17:58:56 2022 +1000 a commitddf2e39667Merge:1a43a70e92c42a1cf7a8Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Jun 5 16:23:55 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit1a43a70e92Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Jun 3 20:06:50 2022 +1000 shuttlefix commit1e5b30e171Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Jun 3 19:44:12 2022 +1000 pause this commit3028e94d6bMerge:f3102fca8f310dc2bda6Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Jun 3 08:53:40 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commitf3102fca8fMerge:d80cc73eef9cdbba4e98Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Jun 2 10:48:08 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commitd80cc73eefAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue May 31 13:26:38 2022 +1000 shit commit1ab72387eeAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue May 31 13:21:16 2022 +1000 fixes xeno breathing commitc3601a700cMerge:575cbe8c3e2c5c103218Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon May 30 18:47:39 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit575cbe8c3eAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon May 30 18:47:18 2022 +1000 little trolling commitf570b65dcdAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon May 30 18:23:20 2022 +1000 fix fucking planet atmos commit83a5a7ca55Merge:64ab6a5a0cd55435098dAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun May 29 18:12:58 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit64ab6a5a0cAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri May 27 08:07:08 2022 +1000 checking commit569082c1b6Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu May 26 13:12:59 2022 +1000 more of reactions redone commit5cc665df18Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu May 26 08:52:58 2022 +1000 adds debugger, redo reactions a bit commitfab0086f5eAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed May 25 14:37:36 2022 +1000 fix oxidation/fuel brokeness commitb5f99a71b8Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed May 25 11:40:56 2022 +1000 id of the reaction commited92ad6085Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed May 25 11:39:47 2022 +1000 split cold fusion into a separate category commit07458d6c64Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed May 25 10:51:23 2022 +1000 ehhh commita76f414bb6Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue May 24 09:25:19 2022 +1000 fixes breathing a bit commit2fa96faed6Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue May 24 08:46:19 2022 +1000 update linux bin commitd90da82afaAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon May 23 20:50:28 2022 +1000 unfucks some gases commit3d5534e773Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon May 23 20:07:02 2022 +1000 fuck commit3fb8935a55Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon May 23 20:06:02 2022 +1000 update commit00395745bbAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon May 23 19:54:49 2022 +1000 unfucks yogdelta commit0bb8fdde07Merge:59336fc06059d949c892Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon May 23 19:52:29 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit59336fc060Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon May 23 19:46:20 2022 +1000 fixes firedoors commit768ec93e8eAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun May 22 20:29:56 2022 +1000 arght commit065c80c851Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun May 22 20:24:09 2022 +1000 fix reactions commit0c52e79ad1Merge:5203996ddbd5b74ecea0Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun May 22 20:04:32 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit5203996ddbAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue May 17 07:48:04 2022 +1000 binupdate commit78ff28e496Merge:0fd63d9a016773cc2002Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue May 17 07:33:31 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit0fd63d9a01Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon May 9 11:10:07 2022 +1000 fuck you commit6c3e3d4ee2Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon May 9 08:32:36 2022 +1000 fixup commit8480630ca2Merge:6f7b99b054b8bac39381Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon May 9 08:25:35 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit6f7b99b054Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri May 6 14:02:57 2022 +1000 pleadster commita239068187Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri May 6 12:16:55 2022 +1000 fuck commit27b12710b8Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri May 6 11:38:59 2022 +1000 i forgor :dead: commite5502e80e9Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri May 6 10:52:27 2022 +1000 pdb commiteab8006711Merge:7c9a81467a9799aed7b3Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri May 6 10:28:46 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit7c9a81467aAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri May 6 10:11:00 2022 +1000 binary update commit8eb56840f1Merge:24259d3e35e5de7de5d2Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon May 2 19:08:59 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit24259d3e35Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Wed Apr 20 13:47:01 2022 +1000 update binary commit26334209e5Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Apr 19 18:26:40 2022 +1000 spacewind is back! commit2c5df5bd7cAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Apr 18 18:06:18 2022 +1000 shiez commit84e65e5344Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Apr 18 17:48:20 2022 +1000 atmos sim fix commit6f4549db82Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Apr 18 17:39:31 2022 +1000 unfucks vents/scrubbers commitd5ca7fe400Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Apr 17 21:08:21 2022 +1000 ver commit86f156c7e6Merge:a3061383ac33bab18da3Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Apr 17 21:08:10 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commita3061383acMerge:bec911cefe0684995dd0Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Apr 17 20:56:59 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commitbec911cefeAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Apr 17 18:35:16 2022 +1000 fix up bombs commit0efea57007Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Apr 17 18:15:26 2022 +1000 turn on the damn debugger commita690c74273Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Apr 17 09:07:21 2022 +1000 make it a warn commit28870f8effAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Apr 17 09:04:05 2022 +1000 bump byond ver commit25a6c94ea8Merge:09192933b86a52c9bb7bAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Sun Apr 17 08:23:46 2022 +1000 stop it commit09192933b8Merge:40d76c56ff15b8eec9a6Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Fri Apr 15 07:59:07 2022 +1000 Merge remote-tracking branch 'origin/master' into luciee commit40d76c56ffAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Apr 4 16:59:15 2022 +1000 update binary commitd68c6455f7Merge:58f5746f65543fd4cdc2Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Mar 31 10:48:29 2022 +1100 Merge remote-tracking branch 'origin/master' into luciee commit58f5746f65Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Thu Mar 31 10:47:16 2022 +1100 boosts firedoor speed commit06a286f574Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 22 10:59:27 2022 +1100 processing redone a bit commit4d874ab61dAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Mar 21 19:11:23 2022 +1100 use the correct version commit0a8d427315Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Mar 21 19:09:13 2022 +1100 these should stay on new() commit1cfc38bdd0Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Mar 21 18:59:00 2022 +1100 update vis on this commit00eff2e850Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Mar 21 14:25:45 2022 +1100 fixes debug verbs commit689eb2daefAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Mar 21 13:31:02 2022 +1100 fix air again commit2a68dc2621Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Mar 21 11:27:03 2022 +1100 binaries commit45128302e2Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Mar 21 09:41:48 2022 +1100 rebuild commitd729760ecfMerge:9314ac44282d981d5e9aAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Mar 21 09:38:47 2022 +1100 Merge remote-tracking branch 'origin/master' into luciee commit9314ac4428Merge:e9c12639db7744d187eeAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Mon Mar 21 09:38:01 2022 +1100 Merge remote-tracking branch 'lucy/katmos' into luciee commit7744d187eeMerge:19903f876492ec497791Author: Lucy <lucy@absolucy.moe> Date: Fri Mar 11 18:52:31 2022 -0500 Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos commit19903f8764Author: Lucy <lucy@absolucy.moe> Date: Mon Mar 7 20:02:23 2022 -0500 Rebuild DLLs; actually use ubuntu to compile linux sofile commit437b6fa390Author: Lucy <lucy@absolucy.moe> Date: Sat Mar 5 17:17:40 2022 -0500 readd deferred_airs commit9c7fa4fb9cAuthor: Lucy <lucy@absolucy.moe> Date: Fri Mar 4 23:19:51 2022 -0500 port rest of fixes commita02debf16cAuthor: Lucy <lucy@absolucy.moe> Date: Fri Mar 4 22:26:38 2022 -0500 Update auxmos to fix bugs commitc2942533cdMerge:2fd6c84232508a23f718Author: Lucy <lucy@absolucy.moe> Date: Fri Mar 4 22:00:18 2022 -0500 Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos commit2fd6c84232Author: LatteKat <56778689+jupyterkat@users.noreply.github.com> Date: Tue Mar 1 13:17:42 2022 +1100 it wasn't dns * deps * crap * oops commite9c12639dbAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 1 13:16:13 2022 +1100 oops commit2d32ac587bAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 1 13:06:45 2022 +1100 crap commitac00b9aa1fAuthor: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 1 13:04:21 2022 +1100 deps commitf6924f9a18Merge:c0b18facb3981afd3ce8Author: Lucy <lucy@absolucy.moe> Date: Mon Feb 28 19:30:38 2022 -0500 Merge pull request #1 from jupyterkat/luciee auxmos fixes commit981afd3ce8Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 1 11:21:14 2022 +1100 use yogs version commite9344a7164Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 1 11:20:27 2022 +1100 maybe fixes reactions commita9a69c4545Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 1 10:18:15 2022 +1100 fix adjacencies, fix pumps not shutting off commit31568d9c54Merge:c0b18facb3f19fd24755Author: Katherine Kiefer <sterlite2902@gmail.com> Date: Tue Mar 1 09:38:37 2022 +1100 Merge branch 'master' of https://github.com/yogstation13/Yogstation into luciee commitc0b18facb3Author: Lucy <lucy@absolucy.moe> Date: Fri Feb 25 09:01:49 2022 -0500 linux commit4bf1276901Author: Lucy <lucy@absolucy.moe> Date: Tue Feb 22 12:53:58 2022 -0500 Update auxmos DLLs to latest commit commit7f454b2cf0Merge:3d4f24603d02a5e089a9Author: Lucy <lucy@absolucy.moe> Date: Tue Feb 22 10:16:09 2022 -0500 Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos commit3d4f24603dMerge:566fb5fc3cd734086c52Author: Lucy <lucy@absolucy.moe> Date: Tue Feb 15 19:48:11 2022 -0500 Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos commit566fb5fc3cAuthor: Lucy <lucy@absolucy.moe> Date: Tue Feb 15 19:41:46 2022 -0500 idk why this won't go away commit175381fe10Author: Lucy <lucy@absolucy.moe> Date: Sat Dec 25 17:20:32 2021 -0500 wack commit448ce38622Author: Lucy <lucy@absolucy.moe> Date: Sat Dec 25 00:02:51 2021 -0500 recompile dll commit405522c4acAuthor: Lucy <lucy@absolucy.moe> Date: Thu Dec 23 15:13:07 2021 -0500 FIXY FIXY!!! commit2fc8f012bcAuthor: Lucy <lucy@absolucy.moe> Date: Wed Dec 22 23:38:57 2021 -0500 AAAAA commita9b511d30eAuthor: Lucy <lucy@absolucy.moe> Date: Wed Dec 22 20:01:30 2021 -0500 AGH commitbd9f5d0aedAuthor: Lucy <lucy@absolucy.moe> Date: Wed Dec 22 17:58:27 2021 -0500 fix fire commitc0dfc15a82Author: Lucy <lucy@absolucy.moe> Date: Wed Dec 22 12:56:46 2021 -0500 fix compile commitec8de960dfMerge:3ef9b39d56e9a16185fbAuthor: Lucy <lucy@absolucy.moe> Date: Wed Dec 22 12:49:28 2021 -0500 Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos commit3ef9b39d56Author: Lucy <lucy@absolucy.moe> Date: Mon Dec 20 22:57:22 2021 -0500 clean up some `GLOB.gas_data.names` stuff commitb33e299535Merge:0729c3128a8995b15b60Author: Lucy <lucy@absolucy.moe> Date: Mon Dec 20 20:09:18 2021 -0500 Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos commit0729c3128aAuthor: Lucy <lucy@absolucy.moe> Date: Mon Dec 20 06:34:30 2021 -0500 Don't do fancy dir checks in firelocks, just close 'em all commit887b53dfa4Author: Lucy <lucy@absolucy.moe> Date: Mon Dec 20 06:01:54 2021 -0500 also update commit in dependencies.sh commit7994838b86Author: Lucy <lucy@absolucy.moe> Date: Mon Dec 20 05:59:43 2021 -0500 update DLLs to latest commit hotfix commit59adf9388aAuthor: Lucy <lucy@absolucy.moe> Date: Fri Dec 17 22:53:45 2021 -0500 remove some spans commited975dbbe3Author: Lucy <lucy@absolucy.moe> Date: Fri Dec 17 22:40:48 2021 -0500 fix lint commit990f73a0c4Author: Lucy <lucy@absolucy.moe> Date: Fri Dec 17 22:37:17 2021 -0500 Fix up some variable crap commit9a7089335bAuthor: Lucy <lucy@absolucy.moe> Date: Fri Dec 17 18:10:21 2021 -0500 remove `update_visuals` calls commit6de6cecfd8Author: Lucy <lucy@absolucy.moe> Date: Fri Dec 17 18:09:43 2021 -0500 don't re-define those commita50cbe7281Author: Lucy <lucy@absolucy.moe> Date: Fri Dec 17 17:56:49 2021 -0500 auxtools and katmos! * split up air processes * fix fires * disable adjacencies during shuttlemove * fix this * fix this * add gas colors * compat * forgor * fixes * messing about * stuffo * stuffo * fuckin fix this * quit saying dumbass things * shitballs * shiez * detect auxmos correctly * fix reactions * gas color fix * update spacemandmm * fix windows * upgrade version/guides * Update code/controllers/subsystem/air.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/__DEFINES/atmospherics.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/__DEFINES/reactions.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/__byond_version_compat.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/controllers/subsystem/air.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/modules/atmospherics/gasmixtures/reactions.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/controllers/subsystem/air.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/modules/atmospherics/machinery/airalarm.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/modules/atmospherics/machinery/airalarm.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/modules/atmospherics/machinery/airalarm.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/game/machinery/doors/firedoor.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/game/machinery/_machinery.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/modules/surgery/organs/lungs.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/modules/surgery/organs/lungs.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/modules/surgery/organs/lungs.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/bot/mulebot.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/game/objects/items/tanks/tanks.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * Update code/game/objects/items/tanks/tanks.dm Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> * stuff * suggestions * hmm * stray changes * fix lungs * stray code * pipe down --------- Co-authored-by: alexkar598 <25136265+alexkar598@users.noreply.github.com> Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
14 lines
491 B
Plaintext
14 lines
491 B
Plaintext
//Datum used to init Auxtools debugging as early as possible
|
|
//Datum gets created in master.dm because for whatever reason global code in there gets runs first
|
|
//In case we ever figure out how to manipulate global init order please move the datum creation into this file
|
|
/datum/debugger
|
|
|
|
/datum/debugger/New()
|
|
enable_debugger()
|
|
|
|
/datum/debugger/proc/enable_debugger()
|
|
var/dll = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL")
|
|
if (dll)
|
|
LIBCALL(dll, "auxtools_init")()
|
|
enable_debugging()
|