Skip to content

Commit

Permalink
Auxmos (yogstation13#13479)
Browse files Browse the repository at this point in the history 
* Squashed commit of the following:

commit 2d7b5f07db1f24a9bd6aac979a5898f4ecf1176b
Author: Katherine Kiefer <[email protected]>
Date:   Mon Jul 31 08:18:15 2023 +1000

    add in missing stats

commit 0686d13c588afe68e6a6074b21814acad2118e87
Author: Katherine Kiefer <[email protected]>
Date:   Sun Jul 30 18:30:58 2023 +1000

    fix that

commit 075a0af640634584fa34126b98f76642b8bf7d2d
Author: Katherine Kiefer <[email protected]>
Date:   Sun Jul 30 18:26:08 2023 +1000

    duplic_8

commit 93ecfd7fc57ea2102f6be821accb0d9eb97b2a2c
Merge: 4d8c2d59883 5f5d50aa087
Author: Katherine Kiefer <[email protected]>
Date:   Sun Jul 30 16:53:47 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 4d8c2d598831ffb48344c061a512cab79ee92793
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jul 26 00:33:08 2023 +1000

    metrics

commit dff7907d2271cd702c5f57f6456fb10d75c0ca73
Merge: 7f3be2cefe7 6b5afb16d16
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jul 26 00:14:21 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 7f3be2cefe74ac229fe377df15dc7dfa6fc61d7c
Merge: d8aea8fb9b3 a646ebf8c42
Author: Katherine Kiefer <[email protected]>
Date:   Fri Jul 21 22:21:52 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit d8aea8fb9b3a075e1a9856b5b817eb5e0d28e47a
Merge: 5289cb0767c 962e2440aeb
Author: Katherine Kiefer <[email protected]>
Date:   Sun Jul 16 15:37:15 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 5289cb0767c93595545347ec54464543fe7bf9be
Merge: 2ca4e31521f ffb13431ad5
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jul 12 23:17:31 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 2ca4e31521fdb873d0a2550e3027511135fb6c75
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jul 12 22:46:57 2023 +1000

    FUCK

commit 26c461f14ddd24e82f4498e941d8258961fff0dc
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jul 12 10:03:53 2023 +1000

    fix it

commit 9c0058c500a0c25c6d9773dba8790625a69bdfad
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jul 12 10:01:50 2023 +1000

    fuck

commit c4004f3903c50a0ccb367935f685b921d20b4874
Merge: d00473551ea 0912c008ffb
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jul 12 08:29:10 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit d00473551ea4c0ebcc95a6b14e1f790f636eac8d
Merge: 547e2a03077 b9471c7cb39
Author: Katherine Kiefer <[email protected]>
Date:   Tue Jul 11 08:44:39 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 547e2a030778e424d46423d183db85af219d636e
Author: Katherine Kiefer <[email protected]>
Date:   Tue Jul 11 08:44:20 2023 +1000

    forgor

commit 5cbc0b5808c3514c65a4110d959e06248d90180d
Author: Katherine Kiefer <[email protected]>
Date:   Mon Jul 3 21:49:11 2023 +1000

    ehh

commit 3405388111379c52f2dbfc26361a495c67a91342
Author: Katherine Kiefer <[email protected]>
Date:   Mon Jul 3 21:45:24 2023 +1000

    arfghh

commit f3688b5b3eb74deb918068de48a16a952845702b
Merge: 63e6fa47f00 cdebb56739d
Author: Katherine Kiefer <[email protected]>
Date:   Mon Jul 3 21:11:16 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 63e6fa47f002e2ff2a7c8142fe773c6b4f80372f
Author: Katherine Kiefer <[email protected]>
Date:   Mon Jul 3 19:26:28 2023 +1000

    undo that

commit 9f25295c4f043ca8874b1ebda8c03929dffa379b
Author: Katherine Kiefer <[email protected]>
Date:   Sun Jul 2 18:30:00 2023 +1000

    update less

commit 5cde3ec627883db79682a154589a64d752d05389
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jul 1 23:01:50 2023 +1000

    don't set to 0 please

commit 99c26e52e4b2d34b54f41fbd894046a16858b39b
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jul 1 22:58:03 2023 +1000

    more logs

commit e4d899505c0f5d716651a8f1b6db3858b29cee87
Merge: 2a836b9818c 743dc64835e
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jul 1 22:44:21 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 2a836b9818cb639bd0044a9f9701ea117fd3b9ef
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jun 29 16:23:16 2023 +1000

    mhmm

commit 7e4b471099020e7b74383d8b1874bd29f25789d5
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jun 29 16:09:54 2023 +1000

    unfucks yog

commit 04e604863d1357b4dc8477312864d713c5ff2d2d
Merge: 069a122cc6c 5cd125c43f7
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jun 29 16:07:10 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 069a122cc6c60eed563930b156a6281318f446df
Merge: adffd10134c 0a2f65e713b
Author: Katherine Kiefer <[email protected]>
Date:   Sun Jun 25 23:43:31 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit adffd10134cf00710325f3ca2831a78a04e76d7b
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jun 22 20:25:15 2023 +1000

    do stuff

commit 8c62cc1c196c8f9e5c10518f8198197125951a33
Merge: 17654079087 5f563359715
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jun 22 20:01:21 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 176540790872cf7e7619876233e046e169ba7e8a
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jun 21 20:01:06 2023 +1000

    nope

commit 50af88554de07f992722e41bcb4aef30b22f3e99
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jun 21 19:52:24 2023 +1000

    how bout this

commit c830bda6ce4b5ce39e87eb33e5c435312eba0f6f
Author: Katherine Kiefer <[email protected]>
Date:   Mon Jun 19 19:44:45 2023 +1000

    threading, verbs and docs

commit a2c1ae237bc58c4335f08ec3ccfbb630b8c0f746
Author: Katherine Kiefer <[email protected]>
Date:   Sun Jun 18 19:41:59 2023 +1000

    clear all pipenets

commit 342961649fe27cd9295f4a2a7d6cf010d13b83d0
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jun 17 18:42:03 2023 +1000

    warning

commit 28a25567513c30c18f819a70789f95eadc32f2ed
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jun 17 18:04:54 2023 +1000

    parity

commit fe8280a8aa0c7921901f4a90837a54b98c976a62
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jun 17 16:16:08 2023 +1000

    pride shiez

commit a7b9b17b9002d93b96e648c286ed80a5e3328407
Merge: 6b1d27205a6 4d31c84b19f
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jun 17 16:11:07 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 6b1d27205a617dc5688cf0c2552e65ec7d6e56a7
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jun 17 08:12:59 2023 +1000

    update

commit c00f81d00cc973bb32a86e3d2c46e2fe4b9617b0
Author: Katherine Kiefer <[email protected]>
Date:   Fri Jun 16 22:55:23 2023 +1000

    fix lint

commit d1892ed7687d636a12a8d2e8952bfc7089dc6fcb
Merge: 63d6ccd60cd 0a6fd35ba15
Author: Katherine Kiefer <[email protected]>
Date:   Fri Jun 16 21:45:37 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 63d6ccd60cdb170e7d1c4c2a09e7c19d30ab98fe
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jun 15 18:29:17 2023 +1000

    it's this?

commit 2ef8ca3ed6d8dbc63c5eda58e13aa51cb6e947f3
Merge: be24c028ad3 8fb37fb67c1
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jun 15 18:23:51 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit be24c028ad37b371d98560e3b43b2efc0506974a
Merge: facb8c468cc d39a2c166e7
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jun 14 15:29:14 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit facb8c468ccc7d0825186ca317ef28f0158d11e4
Merge: 2d697730cd1 bda4af885ea
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jun 14 00:15:41 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 2d697730cd16d130eb2dad9fb96202882013163f
Author: Katherine Kiefer <[email protected]>
Date:   Mon Jun 12 20:44:53 2023 +1000

    fix electrolyzer

commit 9ac28274e6aa702ada8e4cb5f37f374bae87f2e5
Merge: 95c3a419628 cbf94088f84
Author: Katherine Kiefer <[email protected]>
Date:   Mon Jun 12 20:28:00 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 95c3a4196284ce8b2a7c790923883762d244c1ed
Author: Katherine Kiefer <[email protected]>
Date:   Fri Jun 9 16:46:18 2023 +1000

    mhmmmm

commit 2e4ff4bcbf2ff54081a016b4ee3e1934b483a99a
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jun 8 22:38:45 2023 +1000

    don't need that

commit 68560fdcb93035b7e6034a9adb63ee2260e4dc1c
Merge: 5f20ef33758 621ce68aef2
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jun 8 22:31:15 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 5f20ef33758c792c8e3946d74875ba3af59c5caa
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jun 3 21:17:18 2023 +1000

    forgot the feature

commit 74bbf3e86f36bdc62f6831b17333cb85cd165fa1
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jun 3 21:11:22 2023 +1000

    update bin

commit a81728f9a4c5030bd92fb3c40c8ddc528047bc83
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jun 3 21:09:38 2023 +1000

    hmm

commit cebf16ae5d4a4b52bf0b42fc7a0a01afb9439694
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jun 3 21:03:38 2023 +1000

    fix again

commit 9efe2056d250bba87f1cee2101feb4df5c8704f9
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jun 3 21:01:47 2023 +1000

    fix

commit ccc600ce97c751b7b6b7f3e324ccc5b95d870fd5
Merge: e1106299610 0637e0b8c00
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jun 3 20:59:36 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit e110629961055998ca57a3930b7603c0ffd17851
Author: Katherine Kiefer <[email protected]>
Date:   Tue May 30 19:24:26 2023 +1000

    don't need this

commit 9eebc05c334e81b89b79c1b72048d83ae486e48b
Author: Katherine Kiefer <[email protected]>
Date:   Tue May 30 19:08:59 2023 +1000

    fix

commit 2e95414882dd803f0c8e93fbb59ca8868d7adaf2
Merge: 2026c5bdb0d 55fb77a3261
Author: Katherine Kiefer <[email protected]>
Date:   Tue May 30 19:02:14 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 2026c5bdb0d4a181eeb6aa37aef6e83f2f440983
Merge: c736eafef02 d6ca0a2d4d5
Author: Katherine Kiefer <[email protected]>
Date:   Fri May 19 18:53:57 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit c736eafef0248157d067a93d1bc94e7450727929
Author: Katherine Kiefer <[email protected]>
Date:   Fri May 19 18:49:32 2023 +1000

    update binary

commit eb5b25d3c11327ce95188e85943df9594b530a96
Merge: 4510e3e0248 c8790570acc
Author: Katherine Kiefer <[email protected]>
Date:   Fri May 12 21:22:59 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 4510e3e024889700720d400582254b0f9589e4ff
Merge: 5ded2abf16a 6af4810beaa
Author: Katherine Kiefer <[email protected]>
Date:   Sat May 6 17:50:57 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 5ded2abf16ae4101cd1b64fe647cc689c190ada2
Merge: 79527f12c6a 406f86d59a8
Author: Katherine Kiefer <[email protected]>
Date:   Wed Apr 26 17:00:27 2023 +1000

    merge

commit 79527f12c6a517df08cec569fedec2c9cbb01259
Merge: c5d3d3940c3 4258b5e6262
Author: Katherine Kiefer <[email protected]>
Date:   Mon Apr 10 20:34:02 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit c5d3d3940c325e740eaa02249186daf34306bba9
Merge: 5268b80c120 2855869e284
Author: Katherine Kiefer <[email protected]>
Date:   Fri Apr 7 13:02:31 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit 5268b80c120f9c0239aea5e4058fc539dc2d600f
Author: Katherine Kiefer <[email protected]>
Date:   Tue Apr 4 21:21:35 2023 +1000

    merge error

commit 54ecb4d47547db641962a7fa17f8a63a1edbf336
Merge: ff5896a3f13 b2fad8f1a6e
Author: Katherine Kiefer <[email protected]>
Date:   Tue Apr 4 21:03:18 2023 +1000

    Merge remote-tracking branch 'upstream/master' into luciee

commit ff5896a3f1327ddf8c8c3772f50ee1504c581077
Author: Katherine Kiefer <[email protected]>
Date:   Thu Mar 30 20:36:37 2023 +1100

    update bin guh

commit 4ba2b940d069160e3320406ee207cee6fddf1bc0
Author: Katherine Kiefer <[email protected]>
Date:   Thu Mar 30 20:27:44 2023 +1100

    hmm

commit 213560f06150ba1ad573ae40f40a1bc2cb3890a4
Merge: e21ae4cefbe 10e6061f102
Author: LatteKat <[email protected]>
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 <[email protected]>
Date:   Wed Mar 29 21:00:31 2023 +0300

    Fix temp bar

commit ca60f6f267c7ba02eb44f751ec657163ca6b6249
Author: Ling <[email protected]>
Date:   Tue Mar 28 20:23:01 2023 +0300

    Some HFR fixes

commit e65bcc259d5bf306c95eb083f0354aa8f4e83764
Author: Ling <[email protected]>
Date:   Tue Mar 28 19:07:03 2023 +0300

    Fix HFR errors

commit 5c90b6c7badf89fde03670267464ded6dd82c229
Author: Ling <[email protected]>
Date:   Tue Mar 28 18:50:00 2023 +0300

    Fix merge conflicts and nitrium

commit 1c7af583f9535bd91a88285df9f7a6038e98770d
Merge: e21ae4cefbe ed0811b2b7e
Author: Ling <[email protected]>
Date:   Tue Mar 28 17:54:21 2023 +0300

    Merge branch 'master' into hfrmos

commit e21ae4cefbeae1545291b25fb80c2a25b720e1ef
Merge: affa413543d 4e328f1ee65
Author: Katherine Kiefer <[email protected]>
Date:   Sat Mar 25 17:23:34 2023 +1100

    Merge remote-tracking branch 'upstream/master' into luciee

commit affa413543d45cd53c090d5a022d073714812668
Author: Katherine Kiefer <[email protected]>
Date:   Wed Mar 22 15:44:10 2023 +1100

    this

commit fbb0d31e72910e279abe8d1820346e1a7d96de9f
Merge: 21649ae297f e9995e4b39e
Author: Katherine Kiefer <[email protected]>
Date:   Wed Mar 22 15:34:38 2023 +1100

    Merge remote-tracking branch 'upstream/master' into luciee

commit 21649ae297fa189f10d17cc43fd5c1d76bf19c83
Author: Katherine Kiefer <[email protected]>
Date:   Sun Mar 19 21:16:04 2023 +1100

    harddel workaround

commit 3f24db3290200f92662a465d38e8a48e6181b4b2
Author: Katherine Kiefer <[email protected]>
Date:   Sat Mar 18 19:03:26 2023 +1100

    optimize

commit a91c80a7c63fdb2ad5a158592d2f673e7de077f8
Author: Katherine Kiefer <[email protected]>
Date:   Wed Mar 15 21:22:01 2023 +1100

    do stuff

commit 7fa8b18cf0e0fab6d1e71698113c90e37d6e43b5
Merge: 3ee70281ef9 ba7248869f4
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 14 22:52:00 2023 +1100

    Merge branch 'luciee' of kat:jupyterkat/Yogstation into luciee

commit 3ee70281ef987024723ef13d6f6f3ba2fc27c29c
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 14 22:50:54 2023 +1100

    fix the electrolyzer

commit ba7248869f4c5ebd7cf900c74052d59861d856f1
Merge: 8c375cd2ed1 d55f6bdf07c
Author: Ling <[email protected]>
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 <[email protected]>
Date:   Fri Mar 10 09:47:24 2023 +1100

    Merge branch 'luciee' of kat:jupyterkat/Yogstation into luciee

commit d1ab0d856c888a9efbef7eaffada93b71ae0de9a
Author: Ling <[email protected]>
Date:   Fri Mar 10 11:45:05 2023 +0200

    Revert AI cooling changes

commit 5afb3eb80bb0789a75378b44433bb85a6a6f1922
Author: Katherine Kiefer <[email protected]>
Date:   Fri Mar 10 09:47:03 2023 +1100

    undo that

commit a4c943bf278220133e9072852f5de0cba06a883c
Author: Katherine Kiefer <[email protected]>
Date:   Wed Mar 8 11:28:06 2023 +1100

    try to do stuff

commit 577cce993828b351c50f83652f54a564d043f6e4
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 7 22:48:20 2023 +1100

    that

commit 114a1ec453a1e9a3995d7f27e6e04f4fa0226512
Merge: 342b8bb6227 1276613f473
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 7 22:42:41 2023 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit 342b8bb622792dc6023e84beb9d9ed3741d26126
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 7 22:39:23 2023 +1100

    stop

commit 138afc3f98b58786be6bd831abbf15d4eebe25d6
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 7 22:17:14 2023 +1100

    fucking fix pipelines

commit 72b55d7420b79a1ab6c0d9d08612fedb414b5ae6
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 7 17:56:29 2023 +1100

    disable heat var

commit 8875075efc95a3fb2c4835f2df7cbdb78a9ea96e
Author: Katherine Kiefer <[email protected]>
Date:   Sun Mar 5 19:08:47 2023 +1100

    fix ci

commit 659179bd89f9de79bc03f74f0bc37076257a0993
Author: Katherine Kiefer <[email protected]>
Date:   Sun Mar 5 18:40:25 2023 +1100

    assorted changes, balances heat gen

commit d10a7fdb2cf6c1d69edb4643a52aa3080d4ebaca
Merge: 7fe4f2ee82e 6ca588ed2a0
Author: Katherine Kiefer <[email protected]>
Date:   Sun Mar 5 02:41:49 2023 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit 7fe4f2ee82ee38d258017ec702a9cb59cfa0952b
Author: Katherine Kiefer <[email protected]>
Date:   Fri Mar 3 21:05:49 2023 +1100

    update binary

commit fa24aa1ff7476c38adb447e504afd229acb6a367
Author: Ling <[email protected]>
Date:   Thu Mar 2 13:38:53 2023 +0200

    Improve AI cooling setup

commit f956f7f4eb7922f1e290f9df293c083b73066af8
Author: Ling <[email protected]>
Date:   Wed Mar 1 22:54:40 2023 +0200

    Disable AI core heat generation for now

commit 39b8c0dd945992c903ad0e451c7107650e1a21de
Author: Katherine Kiefer <[email protected]>
Date:   Mon Feb 27 11:58:59 2023 +1100

    remove that

commit 6cb7643c877dda29c81bf3e0c6fff8baf221a62d
Author: Ling <[email protected]>
Date:   Sun Feb 26 21:58:08 2023 +0200

    Fix T

commit 7fa269e78f41b94541bae92cb9403b06af1a6a08
Author: Ling <[email protected]>
Date:   Sun Feb 26 15:23:22 2023 +0200

    fix tab

commit 6d9fdbd61f5c73833f871892acc066d8784498ef
Merge: 3940de5e938 4e454622d46
Author: Ling <[email protected]>
Date:   Sun Feb 26 15:22:11 2023 +0200

    Merge branch 'master' into luciee

commit 3940de5e938c076408ba5df1ccceb9f3baab58cd
Merge: 2f7292b3f9b 3f6effe85be
Author: Ling <[email protected]>
Date:   Wed Feb 22 15:34:43 2023 +0200

    Merge branch 'master' into luciee

commit 2f7292b3f9bfc43a39ccaa29a6803e941838612b
Author: Ling <[email protected]>
Date:   Wed Feb 15 13:54:05 2023 +0200

    Nerf AI core heat generation

commit 20f582f404d3d8c5a32055d8146678ed7e74b5c9
Merge: c97a39d5cdc 6d92b718604
Author: Katherine Kiefer <[email protected]>
Date:   Wed Feb 15 09:25:26 2023 +1100

    Merge branch 'luciee' of kat:jupyterkat/Yogstation into luciee

commit c97a39d5cdc9d9340bca0d896b955f244086aa5d
Author: Katherine Kiefer <[email protected]>
Date:   Wed Feb 15 09:23:51 2023 +1100

    fix

commit 6d92b718604ec009dd121f869cac27ad8bc0c59e
Author: Ling <[email protected]>
Date:   Sun Feb 12 22:59:43 2023 +0200

    Fix some air_update_turf calls

commit 20a27f786cf9bca2defe33c3ca5e4107333d2836
Author: Jamie D <[email protected]>
Date:   Sun Feb 12 13:00:25 2023 +0000

    Update portable_atmospherics.dm

commit 6659b79035d2c510f929cb35f85ba238c1e0aef0
Merge: 511228abe42 596b8366522
Author: Jamie D <[email protected]>
Date:   Sun Feb 12 12:59:29 2023 +0000

    Merge branch 'master' into luciee

commit 511228abe426b0661783fa89c4a5e88af4c5161e
Author: Jamie D <[email protected]>
Date:   Sun Feb 12 12:38:37 2023 +0000

    Delete IceBox.dmm

commit 25b519cea3547b806a17c8518f1bc3d3c53a9c18
Author: Jamie D <[email protected]>
Date:   Sun Feb 12 12:38:13 2023 +0000

    Delete KiloStation.dmm

commit f57f833d6530028eb30b299d1f7c79414686178f
Author: Jamie D <[email protected]>
Date:   Sun Feb 12 12:38:05 2023 +0000

    Delete omegastation.dmm

commit 581116a1c7cf14e9943494accc9c16b9a8e63805
Author: Jamie D <[email protected]>
Date:   Sun Feb 12 12:37:56 2023 +0000

    Delete YogsDelta.dmm

commit 1d1630cdca47be540a491e0e7160bab63d6c2800
Author: Katherine Kiefer <[email protected]>
Date:   Wed Feb 8 22:42:36 2023 +1100

    throw faster

commit 0b91c6e711173b9e114a38f39126fd210dbd7ea3
Merge: 205db28ecdc e7823cfc39c
Author: Katherine Kiefer <[email protected]>
Date:   Wed Feb 8 22:37:16 2023 +1100

    Merge remote-tracking branch 'upstream/master' into luciee

commit 205db28ecdc4c9962d338b8411247e7ec2310ca7
Author: Katherine Kiefer <[email protected]>
Date:   Tue Jan 31 21:35:44 2023 +1100

    lint

commit 5572516fecee88df73010fb5ff0c167dc20c8970
Author: Katherine Kiefer <[email protected]>
Date:   Tue Jan 31 21:30:49 2023 +1100

    close layer

commit e148c9155226fd90aa806ab61b62c2b02233959f
Author: Katherine Kiefer <[email protected]>
Date:   Tue Jan 31 21:23:16 2023 +1100

    fuck off

commit 0c5adb676f9f28d4f4d66571ecfb17cfbb67848d
Merge: 56c4e2b0cae 6f03bedc20c
Author: Katherine Kiefer <[email protected]>
Date:   Sun Jan 29 18:03:00 2023 +1100

    Merge remote-tracking branch 'upstream/master' into luciee

commit 56c4e2b0caead77083a74448319a1f940945eff0
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jan 28 19:24:42 2023 +1100

    aaaa

commit 0bb700af9b3018dd884c9466ecc786a123d491e7
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jan 28 08:17:07 2023 +1100

    now?

commit 54c4c739d971341ab0d5c436796e84c0cab91cc6
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jan 28 08:10:44 2023 +1100

    fix that

commit 3f4017a975b3149432031443464e62e26814b564
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jan 28 08:08:26 2023 +1100

    doesn't work

commit 8f434cb968954d50f8dc3fc33274cc933ce88a51
Merge: 112f7683306 e96e4c0de11
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jan 28 08:07:25 2023 +1100

    Merge remote-tracking branch 'upstream/master' into luciee

commit 112f7683306b2652cc632af9ac5dee8fe38a70ce
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jan 18 22:29:39 2023 +1100

    bins

commit 3fe6397a0422622814091b28fc932b09dc9ea089
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jan 18 20:57:12 2023 +1100

    fuck

commit 6df570f00f0287be5355a2e951f2b3a591a41bd4
Merge: bc0305a3b34 9a2dc1dbf77
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jan 18 20:49:34 2023 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit bc0305a3b34add94bca6b65775d07f2e17242329
Author: Katherine Kiefer <[email protected]>
Date:   Sun Jan 8 20:32:12 2023 +1100

    do this

commit fec163e2daa993f3134fc3ef04c1d0d354c40861
Merge: 2ff7a083f14 688be42140b
Author: Katherine Kiefer <[email protected]>
Date:   Sun Jan 8 20:31:31 2023 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit 2ff7a083f14393ad9e382671821cce02629a8c70
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jan 7 08:07:27 2023 +1100

    fuck n suck

commit d8781a3afcbdbff1f4211048bdaa71d41a1bbc52
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jan 7 07:45:21 2023 +1100

    update bins

commit 48f33eef246a8274bc942e23cd1fea36266d2154
Merge: d2ea670cd8a 56d3e28450c
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jan 7 07:44:00 2023 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit d2ea670cd8aa4bb430f76dcb9e02f9fedd2b9740
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jan 7 07:40:17 2023 +1100

    fix maps2

commit bfff42a62e9ffb2464f10603214ebd79a1d9e304
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jan 5 22:41:07 2023 +1100

    fix this

commit 4be0b6d1d72c5cc8e901600012419f5728b6161e
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jan 5 22:39:22 2023 +1100

    update bin

commit 1c240682c548903c862127b64067f4e62b572953
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jan 5 21:56:33 2023 +1100

    unfuck maps

commit 24b892f66a757657b3b14df6d339c80bb3ffab8f
Merge: 8b98fe162f5 a9443f77ed1
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jan 5 21:51:49 2023 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit 8b98fe162f566ee402ea9203b9b90c5e2f7df730
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jan 5 21:20:20 2023 +1100

    changes to ssair

commit bd5890cd2d1d3b84766ed1a8057bfb802870b689
Merge: c273955a30c 61c352e38b8
Author: Katherine Kiefer <[email protected]>
Date:   Sun Dec 25 09:19:19 2022 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit c273955a30c0a237ac564294cb4bd96e98930b28
Author: Katherine Kiefer <[email protected]>
Date:   Tue Dec 20 17:27:36 2022 +1100

    update linux bin

commit e96e0ee9824c76b24ec94051161eb154e9d6a767
Author: Katherine Kiefer <[email protected]>
Date:   Mon Dec 19 19:10:58 2022 +1100

    fuck

commit 49af185087d8f82365dece249071dbd65012b7ad
Author: Katherine Kiefer <[email protected]>
Date:   Mon Dec 19 18:57:31 2022 +1100

    update windows bin

commit 6cd07d84c17ebd255480f963eaa0991623f07939
Merge: 0f9100d7bba e4e1529aea5
Author: Katherine Kiefer <[email protected]>
Date:   Mon Dec 19 18:50:08 2022 +1100

    stop it

commit 0f9100d7bba21892c500facfc72763e5110047c7
Merge: e698f60fe75 72b68275889
Author: Katherine Kiefer <[email protected]>
Date:   Sat Nov 26 22:02:38 2022 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit e698f60fe75bf6b8ad2bb4cb16d45ec03561a804
Author: Katherine Kiefer <[email protected]>
Date:   Tue Nov 22 22:18:07 2022 +1100

    update bin

commit 549311fe393ba79f2476f2f4c2e9115b1ccb6462
Merge: 992fc95d13d b5211c17eef
Author: Katherine Kiefer <[email protected]>
Date:   Tue Nov 22 20:54:44 2022 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit 992fc95d13ddecd9043ba453f0b913d53161a7f9
Merge: 7226dae332c 49f5996110a
Author: Katherine Kiefer <[email protected]>
Date:   Sat Nov 19 21:08:55 2022 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit 7226dae332c9a8aded2685bd6ab1c8d7585dacb3
Author: Katherine Kiefer <[email protected]>
Date:   Wed Nov 16 11:09:20 2022 +1100

    detect self

commit 6a1300fbeb546074b7c5834eb687ba4baac00e83
Author: Katherine Kiefer <[email protected]>
Date:   Wed Nov 16 10:43:06 2022 +1100

    fixes that

commit facbee1e4e0f2fd2e8b0f64184520536826445fb
Merge: 5876f0b3998 cce20868944
Author: Katherine Kiefer <[email protected]>
Date:   Wed Nov 16 10:40:55 2022 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit 5876f0b3998b2c920ec4aee1446ba92088ca27df
Author: Katherine Kiefer <[email protected]>
Date:   Wed Nov 9 17:33:24 2022 +1100

    update bin

commit 90512671270961531712c635a1f6240a9a2a7431
Author: Katherine Kiefer <[email protected]>
Date:   Tue Nov 8 08:25:52 2022 +1100

    ass

commit c578a5da6fde8cd63fe522da8581460388423957
Author: Katherine Kiefer <[email protected]>
Date:   Tue Nov 8 08:18:38 2022 +1100

    screen

commit 2a34e22ff598b897334ff7545accc8274651817a
Merge: bed8de7e3c1 2dc98f28bde
Author: Katherine Kiefer <[email protected]>
Date:   Tue Nov 8 08:18:14 2022 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit bed8de7e3c1861e534269ec5167447cde52bd17f
Author: Katherine Kiefer <[email protected]>
Date:   Wed Oct 26 21:48:58 2022 +1100

    binupdate

commit 66b52e3ef467cf5c1f18b883220e9359cba0b104
Merge: c44d5f74a0e e5943f6c97f
Author: Katherine Kiefer <[email protected]>
Date:   Wed Oct 26 21:42:19 2022 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit c44d5f74a0e1d8dbc5b79d47fcc43dfacca3086a
Author: Katherine Kiefer <[email protected]>
Date:   Sun Oct 23 18:25:34 2022 +1100

    fix it

commit 2c440597aed7db4850dc7651c3d0aa5c518fa1e7
Merge: 2ef534eebb6 27737a887e5
Author: Katherine Kiefer <[email protected]>
Date:   Sun Oct 23 18:13:33 2022 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit 2ef534eebb604bb55e2c7e16bae2f5e2fa7ab426
Merge: 7f1ac152819 6e796d1f1b1
Author: Katherine Kiefer <[email protected]>
Date:   Mon Oct 17 14:43:52 2022 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit 7f1ac152819b84622fb271a46f566c329bf1a890
Merge: b1b407df07c 24fa9f15bc8
Author: Jamie D <[email protected]>
Date:   Sat Oct 8 15:27:29 2022 +0100

    Merge branch 'master' into luciee

commit b1b407df07ca1dadb34192b4c92c00aa04a021da
Author: Katherine Kiefer <[email protected]>
Date:   Tue Oct 4 12:27:22 2022 +1100

    semicolon ere

commit 6d6ecbd1734e30b47363651950c74f869ea56f2e
Author: Katherine Kiefer <[email protected]>
Date:   Tue Oct 4 12:25:30 2022 +1100

    no

commit b8c5c5adf90a1b43717345b2be04d4889edf11f9
Author: Katherine Kiefer <[email protected]>
Date:   Tue Oct 4 12:23:15 2022 +1100

    buh

commit 108b4114e0a72f0a1300693c44c83526b0877be3
Author: Katherine Kiefer <[email protected]>
Date:   Tue Oct 4 11:53:14 2022 +1100

    guh

commit 0377561d9c650d86563478638f692c855bcfb93d
Author: Katherine Kiefer <[email protected]>
Date:   Tue Oct 4 11:51:45 2022 +1100

    use global real

commit 75de7e4b6514dd27e766f007a708ecc3443c08c6
Author: Katherine Kiefer <[email protected]>
Date:   Mon Oct 3 11:46:48 2022 +1100

    fuck off

commit 59a4a3f69592db108ab852741fb1ef9d5f7d661a
Merge: a625f8a305c 9aced928441
Author: Katherine Kiefer <[email protected]>
Date:   Mon Oct 3 11:41:06 2022 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit a625f8a305c663fd4ce5aba5265376b917e48480
Author: Katherine Kiefer <[email protected]>
Date:   Fri Sep 9 10:24:14 2022 +1000

    libss

commit af77b1db6f9f271468f3c894a013dcf1ad48e267
Merge: 79870508f89 5ab5e5bb8b6
Author: Katherine Kiefer <[email protected]>
Date:   Fri Sep 9 08:19:49 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 79870508f893c3eedfaab4e57c18ed7ce585d4aa
Merge: 4009394215c 4bbf7894447
Author: Katherine Kiefer <[email protected]>
Date:   Fri Aug 19 08:34:55 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 4009394215ccce8ca4ca7fff0946cb380719b864
Author: Katherine Kiefer <[email protected]>
Date:   Fri Aug 19 08:24:44 2022 +1000

    mhm

commit e755b7113e1f0b51d332f30f5190d220544e065d
Author: Katherine Kiefer <[email protected]>
Date:   Fri Aug 19 08:23:28 2022 +1000

    i cry

commit 7bb50ae315268b0ab7de401c8d57c2e858e2e980
Author: Katherine Kiefer <[email protected]>
Date:   Thu Aug 11 13:09:01 2022 +1000

    update bin

commit 67f3d449bc586b3e6de26bccf20ecdacb8bbe8bf
Author: Katherine Kiefer <[email protected]>
Date:   Thu Aug 11 13:02:12 2022 +1000

    use the new parser

commit 65b5f94822f7bed37b7ea5136e2a3a0ed968890c
Merge: 02706f6477b 0334e73f6eb
Author: Katherine Kiefer <[email protected]>
Date:   Thu Aug 11 12:57:02 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 02706f6477b0ebe87580ff92179b8e5c32c11d11
Author: Katherine Kiefer <[email protected]>
Date:   Mon Aug 1 20:08:45 2022 +1000

    fix reaction orderings

commit 1bc0385faf3f5c43cc5ee69e287f6411a81f52f9
Author: Katherine Kiefer <[email protected]>
Date:   Mon Aug 1 18:10:30 2022 +1000

    christ

commit f9241f3ac7b777afa3fc89838b04f7246529d3c9
Merge: a9527be49fc 7dec922233a
Author: Katherine Kiefer <[email protected]>
Date:   Mon Aug 1 18:07:24 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit a9527be49fcd67a72d2673191c57b8a4c54472b9
Merge: e309e380018 fab877e0cc5
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jul 21 10:58:02 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit e309e380018bed86e07e23c442f22c68242bf7e6
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jul 21 10:57:09 2022 +1000

    binaries

commit 19fb4b26b84263d5f6f3c7b3e71c903cb4e9185c
Merge: 87bd779a478 dd157f698fd
Author: Katherine Kiefer <[email protected]>
Date:   Tue Jul 19 13:08:05 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 87bd779a4784cd7636e80ceb33895c2d20df1647
Author: Katherine Kiefer <[email protected]>
Date:   Tue Jul 19 12:15:44 2022 +1000

    FUCK

commit 97df2c943637e65dc73df0351c2dc1c8779a613c
Merge: eb2950c3bb7 86fd2fffe2a
Author: Katherine Kiefer <[email protected]>
Date:   Mon Jul 18 09:14:21 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit eb2950c3bb764f80c357b766878d88dcf8edf8dd
Merge: 136900c342d 023fd29e5aa
Author: Katherine Kiefer <[email protected]>
Date:   Sun Jul 17 21:17:02 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 136900c342dfca644c085247281b57a9b022cf42
Author: Katherine Kiefer <[email protected]>
Date:   Sat Jul 16 18:57:48 2022 +1000

    truly evil

commit 18b40d4e4bd15069c083f0df5baea51569bff524
Merge: 23cd9b5d9bb d3b7a40f07f
Author: Katherine Kiefer <[email protected]>
Date:   Mon Jul 11 09:11:54 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 23cd9b5d9bb7aaa34a40a091b02b213d12b03c85
Merge: 2345b52cbab e844ef3e84e
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jul 6 10:34:36 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 2345b52cbaba13b0127b2dd28df7597ec6167e60
Merge: e012900ded4 2a16756e84b
Author: Katherine Kiefer <[email protected]>
Date:   Fri Jul 1 20:13:50 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit e012900ded4c348144025e89ed7d75f6f9bd12e8
Author: Katherine Kiefer <[email protected]>
Date:   Fri Jul 1 20:12:17 2022 +1000

    minuteman

commit ee3dbd81b1f97edd47ccc95ce5606657ff2f0b2e
Merge: ec8a88c6ee6 7b5a40bb29e
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jun 29 14:18:44 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit ec8a88c6ee60fea5931206ed10f31e7d3bce525c
Merge: 6cae0a7d288 a1ee3e80d35
Author: Katherine Kiefer <[email protected]>
Date:   Mon Jun 27 14:57:22 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 6cae0a7d28844eceb3400e250c93bf03133f315a
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jun 22 20:59:10 2022 +1000

    binupdate

commit 54b8f13c81b362e2af326e832838215686189235
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jun 22 20:43:06 2022 +1000

    fix

commit d8efbcd4d607b8e0fa842e72c8da8b11973ceb6a
Merge: 23f6f5e90b9 b4c812a4d23
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jun 22 20:14:41 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 23f6f5e90b97d1dd56d8084a55785d37b63fa641
Author: Katherine Kiefer <[email protected]>
Date:   Tue Jun 21 08:16:36 2022 +1000

    fix this shit

commit 5a9338d1f7eaa7f71c69b2f2ed84eef82f065dce
Merge: 76aa7f4ba47 4e3808d40c4
Author: Katherine Kiefer <[email protected]>
Date:   Tue Jun 21 08:15:55 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 76aa7f4ba475119e06804ae0712a199b9fd4566e
Merge: 31c5983d17f 6bd31ffbd61
Author: Katherine Kiefer <[email protected]>
Date:   Wed Jun 15 21:00:20 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 31c5983d17fb8c4a6ed82506aa38d4f50e5b8b9f
Author: Katherine Kiefer <[email protected]>
Date:   Fri Jun 10 20:00:02 2022 +1000

    fuck

commit 5c39357aa09d7450c567bd9f413318a14dbac947
Merge: f82c2464aaa 4739b40eeb3
Author: Katherine Kiefer <[email protected]>
Date:   Fri Jun 10 18:21:50 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit f82c2464aaac2fec768aca08332e6276c2c7bbe1
Author: Katherine Kiefer <[email protected]>
Date:   Sun Jun 5 17:58:56 2022 +1000

    a

commit ddf2e39667bf9050bf7fc104a371439358aa70e3
Merge: 1a43a70e925 c42a1cf7a8e
Author: Katherine Kiefer <[email protected]>
Date:   Sun Jun 5 16:23:55 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 1a43a70e92584316508ef419a2c4813f10fbc27b
Author: Katherine Kiefer <[email protected]>
Date:   Fri Jun 3 20:06:50 2022 +1000

    shuttlefix

commit 1e5b30e171cdb16f293d71866a8b937bc102b02f
Author: Katherine Kiefer <[email protected]>
Date:   Fri Jun 3 19:44:12 2022 +1000

    pause this

commit 3028e94d6beffd36506d002e6bc40e53d6c138ca
Merge: f3102fca8ff 310dc2bda69
Author: Katherine Kiefer <[email protected]>
Date:   Fri Jun 3 08:53:40 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit f3102fca8ff0c086a26d18486721cc3d852b98ee
Merge: d80cc73eefd 9cdbba4e98b
Author: Katherine Kiefer <[email protected]>
Date:   Thu Jun 2 10:48:08 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit d80cc73eefd66bf1cf57f4a4e3339d31a62c0064
Author: Katherine Kiefer <[email protected]>
Date:   Tue May 31 13:26:38 2022 +1000

    shit

commit 1ab72387eee0c26cea3d03e2b68f49ed27e11f7a
Author: Katherine Kiefer <[email protected]>
Date:   Tue May 31 13:21:16 2022 +1000

    fixes xeno breathing

commit c3601a700c67349f290cca92c600c2b4e0930d16
Merge: 575cbe8c3e8 2c5c1032180
Author: Katherine Kiefer <[email protected]>
Date:   Mon May 30 18:47:39 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 575cbe8c3e8b8f5dfb090103078b59c743b94492
Author: Katherine Kiefer <[email protected]>
Date:   Mon May 30 18:47:18 2022 +1000

    little trolling

commit f570b65dcd958559a3633c61fadb9102bd38e4cf
Author: Katherine Kiefer <[email protected]>
Date:   Mon May 30 18:23:20 2022 +1000

    fix fucking planet atmos

commit 83a5a7ca55e89cacd4a0ba193386cc0744388003
Merge: 64ab6a5a0cd d55435098d5
Author: Katherine Kiefer <[email protected]>
Date:   Sun May 29 18:12:58 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 64ab6a5a0cdd2e96fa2528c77a001226c408168b
Author: Katherine Kiefer <[email protected]>
Date:   Fri May 27 08:07:08 2022 +1000

    checking

commit 569082c1b6eaa1d2dedd5c5ccc806289ff53ff8a
Author: Katherine Kiefer <[email protected]>
Date:   Thu May 26 13:12:59 2022 +1000

    more of reactions redone

commit 5cc665df186ce8053d4a1c351f8985796af36515
Author: Katherine Kiefer <[email protected]>
Date:   Thu May 26 08:52:58 2022 +1000

    adds debugger, redo reactions a bit

commit fab0086f5eb51ac7a84827f3e35aad315b748c9c
Author: Katherine Kiefer <[email protected]>
Date:   Wed May 25 14:37:36 2022 +1000

    fix oxidation/fuel brokeness

commit b5f99a71b806380168acd9ec118c577d85c7d7f8
Author: Katherine Kiefer <[email protected]>
Date:   Wed May 25 11:40:56 2022 +1000

    id of the reaction

commit ed92ad608536f138c2b64694bd261f7426e57e54
Author: Katherine Kiefer <[email protected]>
Date:   Wed May 25 11:39:47 2022 +1000

    split cold fusion into a separate category

commit 07458d6c648c539944e602338b0d4b0bbe5a79d0
Author: Katherine Kiefer <[email protected]>
Date:   Wed May 25 10:51:23 2022 +1000

    ehhh

commit a76f414bb614e529e67b88b1120e90b704bf154f
Author: Katherine Kiefer <[email protected]>
Date:   Tue May 24 09:25:19 2022 +1000

    fixes breathing a bit

commit 2fa96faed6b5c3def93ac935c6faea120c009bb5
Author: Katherine Kiefer <[email protected]>
Date:   Tue May 24 08:46:19 2022 +1000

    update linux bin

commit d90da82afa373b9618a421bb5c8db2ce74168b32
Author: Katherine Kiefer <[email protected]>
Date:   Mon May 23 20:50:28 2022 +1000

    unfucks some gases

commit 3d5534e7734fbb5e19cbc5f68452f5a2cf5746ef
Author: Katherine Kiefer <[email protected]>
Date:   Mon May 23 20:07:02 2022 +1000

    fuck

commit 3fb8935a55a2adf9d8c0a2bd6543257adf78a394
Author: Katherine Kiefer <[email protected]>
Date:   Mon May 23 20:06:02 2022 +1000

    update

commit 00395745bbc715d57858639f723aff2e569b1d0a
Author: Katherine Kiefer <[email protected]>
Date:   Mon May 23 19:54:49 2022 +1000

    unfucks yogdelta

commit 0bb8fdde0799ce1de40440386d4ba13acdbcba6c
Merge: 59336fc0605 59d949c8920
Author: Katherine Kiefer <[email protected]>
Date:   Mon May 23 19:52:29 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 59336fc0605578db37976b210a3f4974ccd46380
Author: Katherine Kiefer <[email protected]>
Date:   Mon May 23 19:46:20 2022 +1000

    fixes firedoors

commit 768ec93e8e2453486028c2654d2bf36028419823
Author: Katherine Kiefer <[email protected]>
Date:   Sun May 22 20:29:56 2022 +1000

    arght

commit 065c80c851fe38a9ac36028fa20ebba9f5f1f556
Author: Katherine Kiefer <[email protected]>
Date:   Sun May 22 20:24:09 2022 +1000

    fix reactions

commit 0c52e79ad1b7b9084207596c235c771d5016f64c
Merge: 5203996ddb1 d5b74ecea07
Author: Katherine Kiefer <[email protected]>
Date:   Sun May 22 20:04:32 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 5203996ddb1422c785b3f43e007b986313a78998
Author: Katherine Kiefer <[email protected]>
Date:   Tue May 17 07:48:04 2022 +1000

    binupdate

commit 78ff28e4961ee159ddf69e3a929bbc9444192ef5
Merge: 0fd63d9a011 6773cc2002c
Author: Katherine Kiefer <[email protected]>
Date:   Tue May 17 07:33:31 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 0fd63d9a011a61626eb85a182c302efc3c65b993
Author: Katherine Kiefer <[email protected]>
Date:   Mon May 9 11:10:07 2022 +1000

    fuck you

commit 6c3e3d4ee2e2cd754bc488d61adfc0e38ece6747
Author: Katherine Kiefer <[email protected]>
Date:   Mon May 9 08:32:36 2022 +1000

    fixup

commit 8480630ca2bec9bce7593e3b1d942b51d56ad9bb
Merge: 6f7b99b0542 b8bac39381d
Author: Katherine Kiefer <[email protected]>
Date:   Mon May 9 08:25:35 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 6f7b99b0542d9d537ade733168262b930037a3e8
Author: Katherine Kiefer <[email protected]>
Date:   Fri May 6 14:02:57 2022 +1000

    pleadster

commit a23906818719d1aa20404665d995c6328a9b1c10
Author: Katherine Kiefer <[email protected]>
Date:   Fri May 6 12:16:55 2022 +1000

    fuck

commit 27b12710b827d60cddf067d02ad6e31f6e899273
Author: Katherine Kiefer <[email protected]>
Date:   Fri May 6 11:38:59 2022 +1000

    i forgor :dead:

commit e5502e80e9ff42144c5a1f81eb3215f3fb110545
Author: Katherine Kiefer <[email protected]>
Date:   Fri May 6 10:52:27 2022 +1000

    pdb

commit eab80067119c4691d17cddb99b00afb319d3dc12
Merge: 7c9a81467a5 9799aed7b36
Author: Katherine Kiefer <[email protected]>
Date:   Fri May 6 10:28:46 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 7c9a81467a5195d93252e418b0db07c7c7599b71
Author: Katherine Kiefer <[email protected]>
Date:   Fri May 6 10:11:00 2022 +1000

    binary update

commit 8eb56840f1df902770e207847aed47202d601749
Merge: 24259d3e35d e5de7de5d22
Author: Katherine Kiefer <[email protected]>
Date:   Mon May 2 19:08:59 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 24259d3e35d8de6d3639972f8eeeb3572a208261
Author: Katherine Kiefer <[email protected]>
Date:   Wed Apr 20 13:47:01 2022 +1000

    update binary

commit 26334209e57db975f4603e1a53356489fe54ed3a
Author: Katherine Kiefer <[email protected]>
Date:   Tue Apr 19 18:26:40 2022 +1000

    spacewind is back!

commit 2c5df5bd7c81d8c8ba7d9516389a0b19fda8d994
Author: Katherine Kiefer <[email protected]>
Date:   Mon Apr 18 18:06:18 2022 +1000

    shiez

commit 84e65e53446cf981249a5fac42a9281f79887d59
Author: Katherine Kiefer <[email protected]>
Date:   Mon Apr 18 17:48:20 2022 +1000

    atmos sim fix

commit 6f4549db82f6d62ee5aa4099b1bac1291b1f81aa
Author: Katherine Kiefer <[email protected]>
Date:   Mon Apr 18 17:39:31 2022 +1000

    unfucks vents/scrubbers

commit d5ca7fe4001d7b1575ae9262fc694788b9207431
Author: Katherine Kiefer <[email protected]>
Date:   Sun Apr 17 21:08:21 2022 +1000

    ver

commit 86f156c7e61281e81de8f15e4dfdd78667d1e78f
Merge: a3061383acb 33bab18da3a
Author: Katherine Kiefer <[email protected]>
Date:   Sun Apr 17 21:08:10 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit a3061383acb46c177b8fd94b04f62406c2034060
Merge: bec911cefe5 0684995dd0b
Author: Katherine Kiefer <[email protected]>
Date:   Sun Apr 17 20:56:59 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit bec911cefe58d4cc594dc1fff7d0c7ffc5241a9c
Author: Katherine Kiefer <[email protected]>
Date:   Sun Apr 17 18:35:16 2022 +1000

    fix up bombs

commit 0efea570075fa3bd537aca7f50bc90b4b3eb0fcf
Author: Katherine Kiefer <[email protected]>
Date:   Sun Apr 17 18:15:26 2022 +1000

    turn on the damn debugger

commit a690c7427372fa006405ea6e75ab5614f44bb528
Author: Katherine Kiefer <[email protected]>
Date:   Sun Apr 17 09:07:21 2022 +1000

    make it a warn

commit 28870f8effe346ce55ef5ab0dd6ec0da1a208556
Author: Katherine Kiefer <[email protected]>
Date:   Sun Apr 17 09:04:05 2022 +1000

    bump byond ver

commit 25a6c94ea8358f11337d348c4bb2f4ec1e481141
Merge: 09192933b87 6a52c9bb7bc
Author: Katherine Kiefer <[email protected]>
Date:   Sun Apr 17 08:23:46 2022 +1000

    stop it

commit 09192933b87a20c95f19b9d68fbbf876862dd836
Merge: 40d76c56ff3 15b8eec9a64
Author: Katherine Kiefer <[email protected]>
Date:   Fri Apr 15 07:59:07 2022 +1000

    Merge remote-tracking branch 'origin/master' into luciee

commit 40d76c56ff3c04c0acda0194e397d2048e619a95
Author: Katherine Kiefer <[email protected]>
Date:   Mon Apr 4 16:59:15 2022 +1000

    update binary

commit d68c6455f7c83f31ffd966e55e3cc555e5471cce
Merge: 58f5746f65c 543fd4cdc27
Author: Katherine Kiefer <[email protected]>
Date:   Thu Mar 31 10:48:29 2022 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit 58f5746f65c638702fb38a5042cce319af26b58f
Author: Katherine Kiefer <[email protected]>
Date:   Thu Mar 31 10:47:16 2022 +1100

    boosts firedoor speed

commit 06a286f57493bcbf94f2276fc73429c31910c4d1
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 22 10:59:27 2022 +1100

    processing redone a bit

commit 4d874ab61d9fe4dbe87c81509a60f543c603dc7f
Author: Katherine Kiefer <[email protected]>
Date:   Mon Mar 21 19:11:23 2022 +1100

    use the correct version

commit 0a8d42731571662ffa337d4c4dd2789051626950
Author: Katherine Kiefer <[email protected]>
Date:   Mon Mar 21 19:09:13 2022 +1100

    these should stay on new()

commit 1cfc38bdd08160392f2ce4e950dc1eb96ab9bb4e
Author: Katherine Kiefer <[email protected]>
Date:   Mon Mar 21 18:59:00 2022 +1100

    update vis on this

commit 00eff2e85077a50c7201196062ccb685f625669e
Author: Katherine Kiefer <[email protected]>
Date:   Mon Mar 21 14:25:45 2022 +1100

    fixes debug verbs

commit 689eb2daefd40fbb4646945bd124f2a371a5c059
Author: Katherine Kiefer <[email protected]>
Date:   Mon Mar 21 13:31:02 2022 +1100

    fix air again

commit 2a68dc262124579abb7a6b8fa324f76e6d37b8fb
Author: Katherine Kiefer <[email protected]>
Date:   Mon Mar 21 11:27:03 2022 +1100

    binaries

commit 45128302e2fe14dfd5d23353360c7ec0415c741b
Author: Katherine Kiefer <[email protected]>
Date:   Mon Mar 21 09:41:48 2022 +1100

    rebuild

commit d729760ecf22e4bcbcb5c0a77bd50f288f6aca4f
Merge: 9314ac44287 2d981d5e9a0
Author: Katherine Kiefer <[email protected]>
Date:   Mon Mar 21 09:38:47 2022 +1100

    Merge remote-tracking branch 'origin/master' into luciee

commit 9314ac44287a756a28834c6bdf1fffce30fc6a07
Merge: e9c12639db2 7744d187ee1
Author: Katherine Kiefer <[email protected]>
Date:   Mon Mar 21 09:38:01 2022 +1100

    Merge remote-tracking branch 'lucy/katmos' into luciee

commit 7744d187ee1c78b68c4231125585f9f94a79e82c
Merge: 19903f87643 92ec497791b
Author: Lucy <[email protected]>
Date:   Fri Mar 11 18:52:31 2022 -0500

    Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos

commit 19903f87643e205a55e3992e2608687628503c1d
Author: Lucy <[email protected]>
Date:   Mon Mar 7 20:02:23 2022 -0500

    Rebuild DLLs; actually use ubuntu to compile linux sofile

commit 437b6fa390017ef3dbe5458fc7960af60c88dd73
Author: Lucy <[email protected]>
Date:   Sat Mar 5 17:17:40 2022 -0500

    readd deferred_airs

commit 9c7fa4fb9c3c9ea94f0eadd0ab2987bd93466ced
Author: Lucy <[email protected]>
Date:   Fri Mar 4 23:19:51 2022 -0500

    port rest of fixes

commit a02debf16c7202c21840bba6a661e1690512f118
Author: Lucy <[email protected]>
Date:   Fri Mar 4 22:26:38 2022 -0500

    Update auxmos to fix bugs

commit c2942533cd584a0877399538a7b97173ae908d70
Merge: 2fd6c84232a 508a23f718e
Author: Lucy <[email protected]>
Date:   Fri Mar 4 22:00:18 2022 -0500

    Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos

commit 2fd6c84232ab9ca599b82f1340aaf905b832f0e6
Author: LatteKat <[email protected]>
Date:   Tue Mar 1 13:17:42 2022 +1100

    it wasn't dns

    * deps

    * crap

    * oops

commit e9c12639db2ad357fdf880de5577ba114375bc0e
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 1 13:16:13 2022 +1100

    oops

commit 2d32ac587b184bbbce767f59f26ef60a9d82486e
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 1 13:06:45 2022 +1100

    crap

commit ac00b9aa1fac65a9d3d1ffa3a2fd782d2328bf6a
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 1 13:04:21 2022 +1100

    deps

commit f6924f9a1895621be9c1f90e4c1ae903dc2c4b5a
Merge: c0b18facb30 981afd3ce82
Author: Lucy <[email protected]>
Date:   Mon Feb 28 19:30:38 2022 -0500

    Merge pull request #1 from jupyterkat/luciee

    auxmos fixes

commit 981afd3ce824fb8dd7c28deb13b237f588c8b146
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 1 11:21:14 2022 +1100

    use yogs version

commit e9344a7164a24b6c07eb2801bd401b41b93c45c4
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 1 11:20:27 2022 +1100

    maybe fixes reactions

commit a9a69c4545663425a82431d3461c1fd0361b113f
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 1 10:18:15 2022 +1100

    fix adjacencies, fix pumps not shutting off

commit 31568d9c54a5682dda027b383c830e69755772b6
Merge: c0b18facb30 f19fd24755b
Author: Katherine Kiefer <[email protected]>
Date:   Tue Mar 1 09:38:37 2022 +1100

    Merge branch 'master' of https://github.com/yogstation13/Yogstation into luciee

commit c0b18facb309bfc03d84c230aa494c733c568b77
Author: Lucy <[email protected]>
Date:   Fri Feb 25 09:01:49 2022 -0500

    linux

commit 4bf127690155d1abcb094dc78b6be3fd99a7bf74
Author: Lucy <[email protected]>
Date:   Tue Feb 22 12:53:58 2022 -0500

    Update auxmos DLLs to latest commit

commit 7f454b2cf066a27e43f08de9538cd74e09f1ec7f
Merge: 3d4f24603d0 02a5e089a92
Author: Lucy <[email protected]>
Date:   Tue Feb 22 10:16:09 2022 -0500

    Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos

commit 3d4f24603d0a4cd8d2ff58af1b6e40722a712595
Merge: 566fb5fc3cb d734086c529
Author: Lucy <[email protected]>
Date:   Tue Feb 15 19:48:11 2022 -0500

    Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos

commit 566fb5fc3cbd1900632dd3b50fe249965e06da8b
Author: Lucy <[email protected]>
Date:   Tue Feb 15 19:41:46 2022 -0500

    idk why this won't go away

commit 175381fe1097f51d5e726afda79afa2269ccd8d5
Author: Lucy <[email protected]>
Date:   Sat Dec 25 17:20:32 2021 -0500

    wack

commit 448ce3862218ff1a33fed01be354affeab03b92c
Author: Lucy <[email protected]>
Date:   Sat Dec 25 00:02:51 2021 -0500

    recompile dll

commit 405522c4accfa31dd4184c9b34fc0614067fec79
Author: Lucy <[email protected]>
Date:   Thu Dec 23 15:13:07 2021 -0500

    FIXY FIXY!!!

commit 2fc8f012bc49391af25d826c16ab03cedf4cfbdc
Author: Lucy <[email protected]>
Date:   Wed Dec 22 23:38:57 2021 -0500

    AAAAA

commit a9b511d30e9eadea569fa94d055ef2ed7351cd37
Author: Lucy <[email protected]>
Date:   Wed Dec 22 20:01:30 2021 -0500

    AGH

commit bd9f5d0aed17d2de8d6fbf5c1ca469ab0aee6620
Author: Lucy <[email protected]>
Date:   Wed Dec 22 17:58:27 2021 -0500

    fix fire

commit c0dfc15a82dfe94d1a3d78f26bc99eb205b75d6a
Author: Lucy <[email protected]>
Date:   Wed Dec 22 12:56:46 2021 -0500

    fix compile

commit ec8de960dff553d51331b6fc15eaed3317db7a3b
Merge: 3ef9b39d565 e9a16185fb6
Author: Lucy <[email protected]>
Date:   Wed Dec 22 12:49:28 2021 -0500

    Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos

commit 3ef9b39d565cb6b7964c96bf429dd72fca84cfa0
Author: Lucy <[email protected]>
Date:   Mon Dec 20 22:57:22 2021 -0500

    clean up some `GLOB.gas_data.names` stuff

commit b33e299535a798a97299c7ff8c1c408a3812a8d4
Merge: 0729c3128a7 8995b15b602
Author: Lucy <[email protected]>
Date:   Mon Dec 20 20:09:18 2021 -0500

    Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos

commit 0729c3128a7908282863d7460f2aa6939fb4fdab
Author: Lucy <[email protected]>
Date:   Mon Dec 20 06:34:30 2021 -0500

    Don't do fancy dir checks in firelocks, just close 'em all

commit 887b53dfa4c4a1c676cc5574dc3359f7f4f79432
Author: Lucy <[email protected]>
Date:   Mon Dec 20 06:01:54 2021 -0500

    also update commit in dependencies.sh

commit 7994838b86f294d34915d315c3841732bc6559bf
Author: Lucy <[email protected]>
Date:   Mon Dec 20 05:59:43 2021 -0500

    update DLLs to latest commit hotfix

commit 59adf9388a5524be3e21e87de3be3307da602ca3
Author: Lucy <[email protected]>
Date:   Fri Dec 17 22:53:45 2021 -0500

    remove some spans

commit ed975dbbe35b2eb59f5e17864f5f3770ea235173
Author: Lucy <[email protected]>
Date:   Fri Dec 17 22:40:48 2021 -0500

    fix lint

commit 990f73a0c4bcd3a746d2e3ca26c85e41c7cc06d4
Author: Lucy <[email protected]>
Date:   Fri Dec 17 22:37:17 2021 -0500

    Fix up some variable crap

commit 9a7089335ba0a3cf9b0d45cb4aa0f51f74da923e
Author: Lucy <[email protected]>
Date:   Fri Dec 17 18:10:21 2021 -0500

    remove `update_visuals` calls

commit 6de6cecfd8aa0fbfe9c3ffd74e222e16f9240688
Author: Lucy <[email protected]>
Date:   Fri Dec 17 18:09:43 2021 -0500

    don't re-define those

commit a50cbe7281194b2d8dc9ad02bcd59ca2902e86ed
Author: Lucy <[email protected]>
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 <[email protected]>

* Update code/__DEFINES/atmospherics.dm

Co-authored-by: John Willard <[email protected]>

* Update code/__DEFINES/reactions.dm

Co-authored-by: John Willard <[email protected]>

* Update code/__byond_version_compat.dm

Co-authored-by: John Willard <[email protected]>

* Update code/controllers/subsystem/air.dm

Co-authored-by: John Willard <[email protected]>

* Update code/modules/atmospherics/gasmixtures/reactions.dm

Co-authored-by: John Willard <[email protected]>

* Update code/controllers/subsystem/air.dm

Co-authored-by: John Willard <[email protected]>

* Update code/modules/atmospherics/machinery/airalarm.dm

Co-authored-by: John Willard <[email protected]>

* Update code/modules/atmospherics/machinery/airalarm.dm

Co-authored-by: John Willard <[email protected]>

* Update code/modules/atmospherics/machinery/airalarm.dm

Co-authored-by: John Willard <[email protected]>

* Update code/game/machinery/doors/firedoor.dm

Co-authored-by: John Willard <[email protected]>

* Update code/game/machinery/_machinery.dm

Co-authored-by: John Willard <[email protected]>

* Update code/modules/surgery/organs/lungs.dm

Co-authored-by: John Willard <[email protected]>

* Update code/modules/surgery/organs/lungs.dm

Co-authored-by: John Willard <[email protected]>

* Update code/modules/surgery/organs/lungs.dm

Co-authored-by: John Willard <[email protected]>

* Update code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm

Co-authored-by: John Willard <[email protected]>

* Update code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm

Co-authored-by: John Willard <[email protected]>

* Update code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm

Co-authored-by: John Willard <[email protected]>

* Update code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm

Co-authored-by: John Willard <[email protected]>

* Update code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm

Co-authored-by: John Willard <[email protected]>

* Update code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm

Co-authored-by: John Willard <[email protected]>

* Update code/modules/mob/living/simple_animal/bot/mulebot.dm

Co-authored-by: John Willard <[email protected]>

* Update code/game/objects/items/tanks/tanks.dm

Co-authored-by: John Willard <[email protected]>

* Update code/game/objects/items/tanks/tanks.dm

Co-authored-by: John Willard <[email protected]>

* stuff

* suggestions

* hmm

* stray changes

* fix lungs

* stray code

* pipe down

---------

Co-authored-by: alexkar598 <[email protected]>
Co-authored-by: John Willard <[email protected]>
  • Loading branch information
@jupyterkat @alexkar598 @JohnFulpWillard
3 people authored Dec 1, 2023
1 parent 634c436 commit e94ad8e
Show file tree
Hide file tree
Showing 256 changed files with 4,050 additions and 3,824 deletions.
15 changes: 10 additions & 5 deletions SpacemanDMM.toml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
[langserver]
dreamchecker = true

[debugger]
engine = "extools"
environment = "yogstation.dme"

[langserver]
dreamchecker = true

[diagnostics]
var_in_proc_parameter = "off"

[debugger]
engine = "auxtools"
2 changes: 1 addition & 1 deletion _maps/RandomRuins/StationRuins/BoxStation/engine_sm.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@
"do" = (
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
dir = 8;
filter_type = list(/datum/gas/nitrogen)
filter_type = list("n2")
},
/turf/open/floor/engine,
/area/engine/engineering)
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/StationRuins/MetaStation/meta_sm.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
dir = 4
},
/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{
filter_type = list(/datum/gas/nitrogen)
filter_type = list("n2")
},
/turf/open/floor/engine,
/area/engine/engineering)
Expand Down
30 changes: 15 additions & 15 deletions _maps/RandomZLevels/VR/snowdin_VR.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2671,14 +2671,14 @@
"gc" = (
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"gd" = (
/obj/effect/spawner/lootdrop/crate_spawner,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"ge" = (
Expand All @@ -2689,7 +2689,7 @@
/obj/effect/spawner/lootdrop/snowdin/dungeonheavy,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"gg" = (
Expand Down Expand Up @@ -3046,14 +3046,14 @@
/obj/effect/decal/remains/human,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"gV" = (
/obj/effect/decal/cleanable/blood/old,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"gW" = (
Expand Down Expand Up @@ -3372,7 +3372,7 @@
/obj/structure/destructible/cult/pylon,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"hG" = (
Expand Down Expand Up @@ -3637,7 +3637,7 @@
/obj/effect/spawner/lootdrop/snowdin/dungeonmid,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"im" = (
Expand All @@ -3647,7 +3647,7 @@
},
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"in" = (
Expand All @@ -3657,7 +3657,7 @@
},
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"io" = (
Expand Down Expand Up @@ -4458,7 +4458,7 @@
},
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"jP" = (
Expand Down Expand Up @@ -5553,7 +5553,7 @@
/obj/effect/spawner/lootdrop/snowdin/dungeonlite,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"lU" = (
Expand Down Expand Up @@ -7439,7 +7439,7 @@
/obj/structure/flora/rock/pile/icy,
/turf/open/floor/engine/cult{
initial_gas_mix = "o2=0;n2=82;plasma=24;TEMP=120";
temperature = 120
initial_temperature = 120
},
/area/awaymission/snowdin/cave/cavern)
"qh" = (
Expand Down Expand Up @@ -13071,7 +13071,7 @@
/turf/open/floor/mineral/plastitanium{
initial_gas_mix = "o2=22;n2=82;TEMP=180";
planetary_atmos = 1;
temperature = 180
initial_temperature = 180
},
/area/awaymission/snowdin/cave)
"EF" = (
Expand All @@ -13083,7 +13083,7 @@
/turf/open/floor/mineral/plastitanium{
initial_gas_mix = "o2=22;n2=82;TEMP=180";
planetary_atmos = 1;
temperature = 180
initial_temperature = 180
},
/area/awaymission/snowdin/cave)
"EG" = (
Expand All @@ -13097,7 +13097,7 @@
/turf/open/floor/mineral/plastitanium{
initial_gas_mix = "o2=22;n2=82;TEMP=180";
planetary_atmos = 1;
temperature = 180
initial_temperature = 180
},
/area/awaymission/snowdin/cave)
"EH" = (
Expand Down
Loading

0 comments on commit e94ad8e

Please sign in to comment.