cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
97,045 Commits 21 Branches 0 Tags
25428ffb49aa2f4bd63ceedd7f60dec51971a39b
Commit Graph

892 Commits

Author SHA1 Message Date
Molti
d981936aac Jungle dragon (#22332) 
* implements jungledrake

* Update jungle_drake.dm

* Update jungle_drake.dm

* Update jungle_drake.dm

* Update jungle_drake.dm

* Update jungle_drake.dm

* Update jungle_drake.dm

* Update yogstation/code/modules/jungleland/megafauna/jungle_drake.dm

Co-authored-by: AMyriadseviltwin <mululuva@gmail.com>

* Update yogstation/code/modules/jungleland/megafauna/jungle_drake.dm

Co-authored-by: AMyriadseviltwin <mululuva@gmail.com>

* Update yogstation/code/modules/jungleland/megafauna/jungle_drake.dm

Co-authored-by: AMyriadseviltwin <mululuva@gmail.com>

* Update yogstation/code/modules/jungleland/megafauna/jungle_drake.dm

Co-authored-by: AMyriadseviltwin <mululuva@gmail.com>

* Update yogstation/code/modules/jungleland/megafauna/jungle_drake.dm

Co-authored-by: AMyriadseviltwin <mululuva@gmail.com>

* Update yogstation/code/modules/jungleland/megafauna/jungle_drake.dm

Co-authored-by: AMyriadseviltwin <mululuva@gmail.com>

* here

* Update jungle_dragon.dm

* Update jungle_dragon.dm

* drakeling

* Update jungle_whelp.dm

* tweaks

* Update jungle_dragon.dm

* code optimize

* Update jungle_dragon.dm

* Update jungle_dragon.dm

* Update jungleland_barren_drake.dmm

* reorganize

* Update jungle.dm

* layout

* Update _maps/RandomRuins/JungleRuins/jungleland_jungle_dragon.dmm

Co-authored-by: AMyriad <143908044+AMyriad@users.noreply.github.com>

---------

Co-authored-by: AMyriadseviltwin <mululuva@gmail.com>
Co-authored-by: AMyriad <143908044+AMyriad@users.noreply.github.com>
 2024-08-10 00:26:09 -05:00
AMyriad
37ee894861 [MDB IGNORE] Access Overhaul Pt. 1 (#22472) 
* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

I'm so sorry for this guys

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

finally

* ballin

* ballin

* ballin

* ballin

ty baiom

* ballin

here we go again

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

* ballin

linter please I beg you

* ballin
 2024-08-07 19:29:54 -05:00
Molti
b8da9f122c Tweaks jungleland mobs (#22293) 
* Update jungle_alpha_mobs.dm

* Update jungle_alpha_mobs.dm

* Update jungle_projectiles.dm

* tweaks

* slow

* tweaks

* oh god what have i gotten myself into

* typepaths

* nah, take it back

* whoops

* Update wasp.dm

* tweaks

* tweaks

* faster

* no revive alphas

* tweaks

* tweaks

* Update JungleBiomes.dm

* Update JungleBiomes.dm
 2024-07-25 21:46:43 -05:00
Molti
99cee9a612 Tweaks jungleland in so many ways (#22297) 
* tweaks

* Update jungle.dm

* rename to fitting name

* Revert "rename to fitting name"

This reverts commit 060cfa8989.

* renames and shift

* Update JungleBiomes.dm

* smooth

* Update jungle_turfs.dm

* tweaks

* lighting

* i hate icon cutter

* magnus purpur

* Update JungleBiomes.dm

* Update water.dm

* almost, but not quite

* Update smoothwater.dmi

* fixtearing

* tar biome

* Update jungle_datums.dm
 2024-07-23 21:32:35 -05:00
cowbot92
a4b9ba1770 Rotates the massdrivers to not hit the shipbreaking area (real edition) (#22383) 
* rotatopotatoe

* e

* plating
 2024-07-15 20:49:43 +00:00
cowbot92
8d45c37dc1 Replaces Frank the turtle from the Jungleland Mining base with Bismuth the Triceratops (also adds a new pet, Bismuth the triceratops) (#22238) 2024-07-13 22:36:20 -05:00
AMyriadseviltwin
39400ca26c Fixes many wall errors (#22327) 
* we fix error walls yes

regular error walls, abductor/alien walls, toxins walls

* Update CentCom.dmm

* locker fiks

---------

Co-authored-by: AMyriad <mdullamann@gmail.com>
 2024-07-11 10:59:58 -05:00
Molti
907ecfd3e0 Fixes jungleland mobs dying to toxic water + deep toxic not being stronger (#22212) 
* Update jungle_turfs.dm

* subtype

* Update jungle_turfs.dm

* i'm 14 and this is /deep

* Update jungle_turfs.dm
 2024-06-20 23:25:40 -05:00
AMyriad
8a420d5569 Reverts (fixes) pressure tanks looking like garbage (#21715) 
* Reverts (fixes) pressure tanks

* reruns

* linter

* attempt numero uno

* kinda works

need to fix da stripe

* repaths

* kill me

* rerun

* linter

* kill me 2x
 2024-06-17 23:00:31 -05:00
wonderinghost
8bc2ae2a1c [PORT TG] ports some disposal changes, reroutes box and more disposals (#21983) 
* Another byond min max update

* wat

* new pipes

* the shit

* test map

* for sarah

* fixed?

* updating

* cleanup

* yay combat

* HMMM

* atomizing

* something

* arg

* final

* update mapmerge

* fixes and fun toys

* revert

* whoops

* final change
 2024-06-13 22:19:18 -05:00
SapphicOverload
6ef06759ce Blocking Rework (#22029) 
* DEATH TO BLOCK CHANCE

* i forgor

* stuff

* rename define

* Update statue.dm

* i said death to block chance!!!!

* stamina damage modifiers begone

* mech stuff

* better parrying

* Update blocking.dm

* oof
 2024-05-31 04:27:49 -05:00
Addust
f6f2de80b0 Syndicate Icemoon, finished at last (#22042) 
* agh

* agh

* Update icemoon_surface_syndicate.dmm

* AGH

* yagh

* setgfd

* fool

* agh
 2024-05-20 05:52:29 -05:00
Addust
144ea671c5 Fixes Syndicate Icemoon engineering vendor (in engineering not the warehouse one) needing money (#22000) 
* oops

* fuck it throw it in
 2024-05-15 05:42:40 -05:00
Addust
d661358fe7 guh (#21957) 2024-05-15 05:41:54 -05:00
AMyriad
0a3e14e697 Synthetic Update (#21946) 
* namner

* workeds

* random names wallah

* don't need no default name

woops

* service hall and an alt title

yuss

* icon change so it isn't just copying AI
 2024-05-08 23:04:40 +02:00
SapphicOverload
fbbb81d368 Adds jumpsuits to the game (#21997) 
* lizard

* map

* more stuff

* aaaaa

* aaaa 2

* Update IceMeta.dmm

* Update religion.dm

* more map

* Update DonutStation.dmm

* Update civilian.dm

* centcom
 2024-05-07 16:36:03 -05:00
Addust
5d2b5d383d lore terminals but in charlie station! also slightly organises code (#21919) 
* lets fucking goooo

* fuck

* fuck it we ball

* it was intentional but aight
 2024-04-24 19:30:38 -05:00
Aquizit
049263d3ff [MDB IGNORE] The Great Enswitchening (#21854) 
* yogs

* asteroid

* gax and ai whale

* donut

* meta

* box ruins pass

* meta ruins pass

* recommended changes + other fixes
 2024-04-21 20:36:03 +02:00
Addust
a7256cda39 ports lore terminals from /tg/station (#21856) 
* tyjktyerjt

* gvuukrtfyukmc

* replaces computer
 2024-04-20 17:21:30 -05:00
AMyriad
0eb816f983 Fixes goat king arena portal (#21785) 
* Update kinggoatarena.dmm

* portals more interesting

* oops

* >wool

* Update kinggoatarena.dmm

* ok last one I'm just retarded

* I'm retarded?
 2024-04-05 16:39:47 -05:00
AMyriad
71306ffe6a readds missing things (#21764) 2024-04-03 05:07:09 -05:00
Addust
b056781d65 Fixes a missing plasma input vent (oops) (#21779) 
* FUCK

* Update icemoon_surface_syndicate.dmm

* A

* ertyktyk
 2024-04-03 05:05:54 -05:00
Addust
b41b2726e3 improves syndicate jungleland (#21594) 
* tuofv

* fghjrsgj

* improves syndicate jungleland

* fixes what i found in testing

* Update jungleland_swamp_syndicatestation.dmm

* fuckin

* symmetry

* srtgshh
 2024-04-01 20:23:04 -07:00
Addust
7c707c8308 Syndicate Icemoon Revision 3, with reduced atmos fuckery (#21595) 
* UHJ9R8TUHJO[RPDIHJKP[DSIH=WERAH

* kill me

* change temp and pray

* should fix one runtime

* outdoor aesthetic

* zpa

* ay blyat (area fuckup)

* lightswitches because all be dumb

* apc moment 💀

* ports a change from r3v1 that i forgot

* china mauler wreck

* idk what this one is but i think it fixes the weird corpse

* ryjertyj

* Update icemoon_surface_syndicate.dmm

* c fghbnmdfjdtyxjkdtyk (does most of what the maintainer asked, will pass through later)

* d56rywerthertdjrtdyjrtydj

* changes some plating

* ertjwrjj

* LORE!!!!

* WOOPS!

* plasmaman shit
 2024-04-01 23:48:28 +02:00
TheGamerdk
2e787af654 AI Rework | 2024 edition (#21266) 
* fix ui

* oops

* Fixes map bibby broke

* Revert "Fixes map bibby broke"

This reverts commit af1d1c610e.

* e

* Unfucks deltastation

* stuff

* cleans things after bibby

* Fix subcontroller cache

* Fixed APCs and air alarms not working when connected to a subcontroller

* bunch of fixes

* job icon

* tcomms server

Update traffic_control.dm

* make compile

* Update synthetic.dm

* Update synthetic.dm

* Update access.dm

* er

* le runtime

* Update ai_data_core.dm

* le dupe

* wall

* Update decentralized_ai.dm

* Update decentralized_ai.dm

* e

* Update wy_synths.dm

* we do a little trolling

* e

* small cahnges

* more minor changes

* Create conflict_fixer.dmm

* Create conflict_fixer - Kopi.dmm

* minor map cahnges

* broken maps

* oops

* bon

* Update ainetworkinterface.dm

* Update ainetworkinterface.dm

* Update ai.dm

* lol

* light

* fixes

* e

* Update synth_pod.dm

* e

* Update synth_os.dm

* Update objective.dm

* fixes

* Update synthetic.dm

* e

* antag

* tweaks

* e

* Update VRSleeper.js

* e

* Update synth_pod.dm

* Update synth_pod.dm

* 1

* Update synth_pod.dm

* Update synth_os.dm

* Update synthetic.dm

* fixes

* headset and ID go boom

* Update wy_synths.dm

* Update robot_parts.dm

* cremator

* Update communications.dm

* Update synthetic.dm

* no synth control

* Update synthetic.dm

* Update ai_dashboard.dm

* Update miscellaneous.dm

* Update miscellaneous.dm

* Update headset.dm

* Update damage_procs.dm

* Update server_cabinet.dm

* minor fixes

* Update miscellaneous.dm

* Update rack_creator.dm

* Update synthetic.dm

* compiles

* fixes

* brainless

* access request

* cofnlict

* fixes

* controller

* Update yogstation.dme

* Update yogstation.dme

* s

* maps

* Update NtosSynthManager.js

* unrevert this lol

* eat

* Update wy_synths.dm

* sigh

* e

* Update wy_synths.dm

* sigh

* fixed ma

* Update synthetic.dm

* better

* Update ethernet_cable.dm

* Update computer.dm

* Update computer.dm

* i hate this

* Update ai_laws.dm

* Update hardsuit.dm

* initialize

* sigh

* Update synth_os.dm

* Update master_subcontroller.dm

* Update master_subcontroller.dm

* Update synth_requester.dm

* Update synth_requester.dm

* Update room_lockdown.dm

* small fixes

* propa sprite matey

* no latejoin lol

* Update synth_os.dm

* maps fixed

* compiles

* Update brain_item.dm

* fixes

* mappers

* Update hud.dmi

* Update passworddoor.dm

* button puzzle

* mine stuff

* Update yogstation.dme

* le map

* changes

* ye

* Update abandoned_mine.dm

* Update _puzzles.dm

* bingus

* Update abandoned_mine.dm

* maps

* e

* no more quirks

* e

* DMI merge conflict resolver (from TG)

* update yogstation map

* Minor away mission changes

* forgot something

* proper fix

* donut

* maps

* asteroid

* gax

* all maps done

* Update synthetic.dm

* makes it compile

* Update backstabs.dm

* more compile!

* fix this map

* bad item

* remove broken objects

* gax

* Update ticker.dm

* pdas

* omg save the file

* Update networking_machines.dm

* area string moment

* s

* awkward

* revival

* Update ai_dashboard.dm

* fixes

* fixed floopy

* less difficult

* this is important

* Update ai_network.dm

* maps

* fixes the maps

* wHAT

* WHAT

* wet

* start fixing conflicts

* Update yogstation.dme

* start fixing map conflicts

* Update DonutStation.dmm

* updates

* donut conflicts

* update box

* Update IceMeta.dmm

* icon diffs

* Update crew.dm

* Update unsorted.dm

* Update layers.dm

* Update YogStation.dmm

* conflicts

* Update IceMeta.dmm

* will this finally fix it

* Update IceMeta.dmm

* fix all this SHIT

* what

* more shit ugh

* what!

* Update DonutStation.dmm

* Update AsteroidStation.dmm

* Update AsteroidStation.dmm

* Update dead.dm

* Update catwalk_plating.dm

* Update catwalk_plating.dm

---------

Co-authored-by: adamsong <adamsong@users.noreply.github.com>
Co-authored-by: wejengin2 <48154165+wejengin2@users.noreply.github.com>
Co-authored-by: Byemoh <baiomurang@gmail.com>
 2024-04-01 16:32:09 -05:00
AMyriad
538b43ea0d Redesigns the tar king's arena (#21665) 
* ze redesign

!!!

* Update jungleland_dead_tartemple.dmm

* Update jungleland_dead_tartemple.dmm

* let's rename it something better too

* let's rename it something better actually

* aight now we add some lore

* and format it too

* cleanup

* Update jungle_fluff.dm

* fixes a tile

* ok I'll leave the torch off

can't have shit in mapdiff

* ok I'll extinguish these too fine
 2024-03-21 18:58:30 -05:00
AMyriad
ca2f75ce29 [ALL MAPS] Fixes a bunch of wrong access requirements in engineering (#21680) 
* accesso fixo

some of these were REALLY scuffed

* oh no it's on every map

dear god

* forgot icemeta

some changes to the sat:
- most doors now have AI sat access req (instead of construction) as well as bridge access

* changes foyer/lathe access where needed to engie/construction

* refreshes

* the linter

* refreshes

* ok yeah

* refreshes

* the linter again
 2024-03-21 15:52:20 -07:00
tattax
eb5a59fa6b ports GAGS (#19885) 
admins can change colors on a specific item if it uses the GAGS system
you can now use right click -> toggle flashlight to toggle PDA flashlight
changed some sprites to use GAGS
 2024-03-16 06:03:03 +00:00
N3D6
5f4cbf0b04 [META] Fixes some decals and issues with the TEG (#21590) 
* ned you are fucking stupid

* idiot

* ok i think that's everything
 2024-03-10 00:31:38 -06:00
AMyriad
41b175bf9b [OCD] Changes too many decals everywhere to look better (#21554) 
* fixes decals

god

* redoes a lot of AI sat stuff

* missed a maint door

* Box sat + missed a maint door on asteroid
 2024-02-28 21:01:42 -08:00
SapphicOverload
51def5662d Merges the Ripley MK-II and Firefighter (#21498) 
* it's joever

* Update exosuit_fab.dm

* Update exosuit_fab.dm
 2024-02-25 16:08:17 -06:00
Marmio64
043d11d1b5 thedenofsin (#21352) 2024-02-25 12:24:29 +00:00
Chubbygummibear
0fda5cfc6a Icon smoothing, and Rendering overhaul, and Camera fix, and mapmerge.py fix, and Multi-z, and THE PLANE CUBE (#21221) 
* why no work

angy

* weird errors

shit sucks

* fixved it

I can spell good

* fix?

POSSIBLY

* nope

wasnt this

* no more immutable

thhanks koffee

* ok

ok

* removes all the pref stuff

""removes""

* remove this

idiot

* this goes bye

 bye

* these go too

genius

* bye

bye

* better night vision

* tries to fix camera

maybe

* ok fuck it we ball

we ball

* ok lets go back

go back go back go back

* WORK

DAMNIT

* ha

fuc kyou

* this

maybe

* this doesnt work :(

* maybe fix

maybe

* fucks everything

why do i do this

* test update

test

* Revert "tries to fix camera"

This reverts commit 2d14fbae66.

* reverts everything I just did

peko pain

* bye

bitch

* oh yeah add this

I guess

* Fucks up the camera net + chunk

why

* test maybe revert

* Revert "test maybe revert"

This reverts commit 98c5ef1b93.

* Revert "Fucks up the camera net + chunk"

This reverts commit 0e421ebf5f.

* this isnt going well

uh oh

* Attempts to rework out security camera

and probably more

* Revert "this isnt going well"

This reverts commit 1d8ceac867.

* Revert "Revert "this isnt going well""

This reverts commit e26fb61415.

* ok

ok

* Revert "ok"

This reverts commit 7e7a7f8372.

* Revert "Merge remote-tracking branch 'upstream/master' into NahI'dPortit"

This reverts commit 01094731c1, reversing
changes made to c0cf69ebf1.

* this doesn't need to be redefined

I guess

* no we need this

totally

* a familiar pain

* 515 is L

* yeah

yeah

* ok god

fine

* bye bye basemap :(

doesnt work on runtime station

* Fixes AI statis not working

god im good

* remove this

oh god

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into NahI'dPortit""

This reverts commit b3fb3ba0db.

* proves to god I exist

and im pissed

* yog exclusive feature (tm)

plane master

* bring this back from previous push

* updates vendor emissives

as well as firealarms

* Updates barsign

and fucks everything up

* Fixes barsigns breaks all lights and updates barsigns to be machines and not structures

We will address this in a later patch

* not sure who changed that

oh well

* yeah

this got moved

* this needs updating

yeah

* turns off the carbon monoxide alarm

duh

* FIXES IT YES

thank you biome

* turns this off too

yeah

* Can't compile yet but ports a ton of shit

* L

* the game opens ig

* extra shit

* fixes

* signals and smooth queue

* look ma im going horribly out of scope

* fixes chasms

* this fixed nothing

* ???

* more barsigns

for later

* forgive me cowboy. also fuck diagonals

* oops

we need this apparently

* fuck it we ball

* Update _lists.dm

* Update icon_smoothing.dm

* it now works kinda

* Update atom_initializing_EXPENSIVE.dm

* lighting don't work

* we have light

* sort turfs better

* big fucking reorganize

* like everything except templates

* boy i sure hope nothing bad happens to these bar templates

* we're back

* no runtimes baby

* no errors

* shuttles are almost fixed i think

* Revert "shuttles are almost fixed i think"

This reverts commit 046058827c.

* Revert "Merge remote-tracking branch 'upstream/master' into icon_smoothing"

This reverts commit 863e1b776d, reversing
changes made to 884623e600.

* Revert "no errors"

This reverts commit 884623e600.

* too far back i think

* midround smoothing runtimes fixed i think

* comment cleanup

* should fix the component runtimes

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into icon_smoothing""

This reverts commit a8ff8d63aa.

* NO RUNTIMES AND ICEMETA WORKS LET'S GOOOOOO

* please stay fixed icemeta

* organizing render dms

* woops this too in the reorganizing

* cryo fixed

* nah, i'd win

* parallax isn't my problem

* pls don't break icemeta

* runtime station gets a cam console

* well it compiles

* maybe fix the map

* woops

* man i hate maps

* was that it?

* PLEASE

* missing focus tests

* maybe that was it

* maybe

* let's take the batteries out of the carbon monoxide detector

* fuck osha

* i hate vending machines

* that's not a computer

* slot machine fix

* PLEASE

* that wasn't supposed to be there

* fuck it i can't fix everything at once

* BLUESPACE LOCKER?

* literally why

* hhh

* does this fix chasms?

* that should fix bad index

* please?

* turf_flags for reservations

* haha oops

* yolo (kill me)

* fix wood walls and other walls

* fix stairs

* that might have fixed shittles

* baseturfs are good now i think

* should fix plasma windows

* decals fixed

* please fix changelog

* shuttle lighting still fucky

* lighting is stinky slow and doesn't finish updating by the time the server starts guh

* lighting seemingly works

* slipping works

* shuttle sounds, slips, and windoors fixed

* why am i here

* fuck the changelog

* of course someone touched smoothing as i'm almost done

* we good?

* updating ai_eye and rename

* z updates and more ai cam updates

* ice fixed

* weather and ice fix

* clockies can see and other clean up catches

* windows fixed

* cowbot forgive me i'm trying to update flashlights to tg because there's no light on lower multi-z z's like ice meta bottom floor

* movable lighting works on multi-z

* gps fix

* item stacking from drag works

* falsewall fix

* job panel fixed

* AI HANDLED

* woops that comment should be gone

* i hate ai i hate ai

* brass glass visible again

* vents on top of tiles now

* sigdrobe sprite back

* centcomm portals work

* portals and see openspace mapping icons fixed

* icemeta my behated

* kill

* is that it

* lighting cutoff is old hat

* angery overlay

* not super necessary

* also extra but whatever

* ticker but thicker

* job fix i hope

* this isn't needed anymore

* latejoin fix?

* laserpointer, pipecrawl, and some consoles fixed

* i hate fixing bugs as they're made

* we're not ready for that

* redef cleanup

* gps arrows, gun flashlights, shuttle console placement, multi-z pulling fixed

* goofy ah gun code

* this was a good idea and necessary

* should fix caltrop component

* does this please the linter

* linter please accept this async function

* THERE

* take the batteries out

* make it stop

* cowbot stopped me from letting ghosts dab

* recycler loc fix

* fix border firedoors not blocking movement

* should fix screen fade out and fade in on round start and end

* darker command tile trim and fixed bronze wall sprites

* fuck you linter

* railings actually stop you from leaving

* probably fixes gibtonite overlay when struck

* armaments dispenser and clockwork catwalk

* turbine fix probably

* pointing at inhand items should be fixed

* fix overwatch app

* should hopefully fix cable rotation on shuttle move

* flashlights have better directionality logic

* hopefully fixes shuttle atmos on move

* grilles fixed

* hopefully this fixes shuttle buttons, airolocks, and other machinery not working after moving

* ice meta mining area finally not freezing

* fix lightbulb icons not updating

* lava mask and lighting dots

* we actually have this

* fuck glowshrooms GC

* fix light fixture interactions and icon updates

* hopefully catches all the updates

* lava lighting good to go

* seclite was missing inhands

* smoothing in replays

* light updates accurate in replays

* biome's multi-z requests

---------

Co-authored-by: cowbot92 <75333826+cowbot92@users.noreply.github.com>
Co-authored-by: Molti <gamingjoelouis@gmail.com>
Co-authored-by: Ringalong <53777086+JohnFulpWillard@users.noreply.github.com>
 2024-02-18 13:16:55 -06:00
wonderinghost
3984b2565e TEG REVENGENCE 3 || THE NOT CURSED, WORKING VERSION (#21306) 
* updates the damn compile error

* Create test

* this probably is good

* Delete code/__byond_version_compat.dm

* Delete .github/workflows/test

* Delete code/__byond_version_compat.dm

* woops

* big oops

* fucking fastdmm
 2024-02-11 16:57:18 +00:00
Aquizit
614ac2a433 pipe (#21379) 2024-02-09 22:37:59 -06:00
SapphicOverload
8c8cc25250 You can now place items on the Altar of the Gods (#21259) 
* table

* removes duplicate code

* sheet type
 2024-01-17 20:21:50 -06:00
Aquizit
7999935260 [IceMeta] Inn vendor fixes (#21222) 
* onstation NO

* forgot chef
 2024-01-09 12:42:45 -08:00
Cark
229b35c456 [IceMeta] Fixes and reenables Icemoon Walkers (#21161) 
* fix

* enables it
 2024-01-08 13:55:34 -06:00
Djiq
85db9beea2 [IDB IGNORE][MDB IGNORE] Adds Jungleland as a randomly chosen alternative to Lavaland, [Bounty] (#14802) 2024-01-05 12:15:25 -06:00
N3D6
ca58ab252f [IceMeta] Moves the engine SMES area to the former gravity generator (#21158) 
* Delete _maps/map_files/IceMeta/IceMeta.dmm

* gaming

* Add files via upload

* this will break it for a second but i will fix it

* now this should fix it

* Stupid decal breaking my windows

* Add files via upload

* christmas magic
 2023-12-24 17:13:06 -08:00
Cark
648f50cb1e [ICEMETA] Fixes some issues with the hermit (#21164) 
* fixes

* e
 2023-12-24 16:32:42 -06:00
Cark
8be005783b lol (#21132) 2023-12-19 11:14:26 -06:00
cowbot92
4b347a8fe0 removes the engines (#21123) 
bye bitch
 2023-12-18 05:29:12 -06:00
Cark
04fb58a1a8 [BOX] The Great Bar/Kitchen Redesign (#20971) 
* e

* e

* e

* e

* e

* e

* e

* Revamps bar

* Kills bar templates

* Redesigns Bar/kitchen on box

* fixes compile errors

* compile bitch

* compile attempt 3

* changes some furniture

* compile you bitrch

* aaaaa

* decals

* movestheare b ack and fixes issues

* finishing up

* woops

* woops x2

* ok for real now

* there

* hmmm thats mnpt rogjt

* glass

* e

* e

* alarms

* fin

* eventspawner

* tweaks the kitchen layout

* fixes issues

* ktl's requests

* windowshutters are back

* bells (i didnt know these existed for bar/kitchen)

* chair

* e

* fix

* fix it for real

---------

Co-authored-by: azzzertyy <42524344+azzzertyy@users.noreply.github.com>
 2023-12-13 18:48:18 -06:00
azzzertyy
9f373437ed Chaplains can now choose their chapel (#20528) 
* Chaplain choice

* removal

* das

* f
 2023-12-09 13:34:48 -06:00
Aquizit
5c140d7624 [ICEMETA] Fixes Hermit and Walker Spawns (Walkers disabled in config see PR text) (#21065) 
* name + config fixes

* fix walker - disabled, redo hermit flavor text

* fuck your stupid uncapitalized t
 2023-12-09 13:32:58 -06:00
CoffeeKat
e94ad8e16f Auxmos (#13479) 
* 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: 4d8c2d59883 5f5d50aa08
Author: 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: 7f3be2cefe7 6b5afb16d1
Author: 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: d8aea8fb9b3 a646ebf8c4
Author: 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: 5289cb0767c 962e2440ae
Author: 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: 2ca4e31521f ffb13431ad
Author: 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: d00473551ea 0912c008ff
Author: 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: 547e2a03077 b9471c7cb3
Author: 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: 63e6fa47f00 cdebb56739
Author: 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: 2a836b9818c 743dc64835
Author: 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: 069a122cc6c 5cd125c43f
Author: 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: adffd10134c 0a2f65e713
Author: 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: 17654079087 5f56335971
Author: 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: 6b1d27205a6 4d31c84b19
Author: 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: 63d6ccd60cd 0a6fd35ba1
Author: 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: be24c028ad3 8fb37fb67c
Author: 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: facb8c468cc d39a2c166e
Author: 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: 2d697730cd1 bda4af885e
Author: 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: 95c3a419628 cbf94088f8
Author: 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: 5f20ef33758 621ce68aef
Author: 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: e1106299610 0637e0b8c0
Author: 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: 2026c5bdb0d 55fb77a326
Author: 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: c736eafef02 d6ca0a2d4d
Author: 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: 4510e3e0248 c8790570ac
Author: 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: 5ded2abf16a 6af4810bea
Author: 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: 79527f12c6a 406f86d59a
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Apr 26 17:00:27 2023 +1000

    merge

commit 79527f12c6a517df08cec569fedec2c9cbb01259
Merge: c5d3d3940c3 4258b5e626
Author: 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: 5268b80c120 2855869e28
Author: 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: ff5896a3f13 b2fad8f1a6
Author: 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: e21ae4cefbe ed0811b2b7
Author: Ling <lingbleed@gmail.com>
Date:   Tue Mar 28 17:54:21 2023 +0300

    Merge branch 'master' into hfrmos

commit e21ae4cefbeae1545291b25fb80c2a25b720e1ef
Merge: affa413543d 4e328f1ee6
Author: 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: 21649ae297f e9995e4b39
Author: 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: 8c375cd2ed1 d55f6bdf07
Author: 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: 342b8bb6227 1276613f47
Author: 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: 7fe4f2ee82e 6ca588ed2a
Author: 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

commit 7fa269e78f
Author: Ling <lingbleed@gmail.com>
Date:   Sun Feb 26 15:23:22 2023 +0200

    fix tab

commit 6d9fdbd61f
Merge: 3940de5e93 4e454622d4
Author: Ling <lingbleed@gmail.com>
Date:   Sun Feb 26 15:22:11 2023 +0200

    Merge branch 'master' into luciee

commit 3940de5e93
Merge: 2f7292b3f9 3f6effe85b
Author: Ling <lingbleed@gmail.com>
Date:   Wed Feb 22 15:34:43 2023 +0200

    Merge branch 'master' into luciee

commit 2f7292b3f9
Author: Ling <lingbleed@gmail.com>
Date:   Wed Feb 15 13:54:05 2023 +0200

    Nerf AI core heat generation

commit 20f582f404
Merge: c97a39d5cd 6d92b71860
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Feb 15 09:25:26 2023 +1100

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

commit c97a39d5cd
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Feb 15 09:23:51 2023 +1100

    fix

commit 6d92b71860
Author: Ling <lingbleed@gmail.com>
Date:   Sun Feb 12 22:59:43 2023 +0200

    Fix some air_update_turf calls

commit 20a27f786c
Author: Jamie D <993128+JamieD1@users.noreply.github.com>
Date:   Sun Feb 12 13:00:25 2023 +0000

    Update portable_atmospherics.dm

commit 6659b79035
Merge: 511228abe4 596b836652
Author: Jamie D <993128+JamieD1@users.noreply.github.com>
Date:   Sun Feb 12 12:59:29 2023 +0000

    Merge branch 'master' into luciee

commit 511228abe4
Author: Jamie D <993128+JamieD1@users.noreply.github.com>
Date:   Sun Feb 12 12:38:37 2023 +0000

    Delete IceBox.dmm

commit 25b519cea3
Author: Jamie D <993128+JamieD1@users.noreply.github.com>
Date:   Sun Feb 12 12:38:13 2023 +0000

    Delete KiloStation.dmm

commit f57f833d65
Author: Jamie D <993128+JamieD1@users.noreply.github.com>
Date:   Sun Feb 12 12:38:05 2023 +0000

    Delete omegastation.dmm

commit 581116a1c7
Author: Jamie D <993128+JamieD1@users.noreply.github.com>
Date:   Sun Feb 12 12:37:56 2023 +0000

    Delete YogsDelta.dmm

commit 1d1630cdca
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Feb 8 22:42:36 2023 +1100

    throw faster

commit 0b91c6e711
Merge: 205db28ecd e7823cfc39
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Feb 8 22:37:16 2023 +1100

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

commit 205db28ecd
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Jan 31 21:35:44 2023 +1100

    lint

commit 5572516fec
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Jan 31 21:30:49 2023 +1100

    close layer

commit e148c91552
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Jan 31 21:23:16 2023 +1100

    fuck off

commit 0c5adb676f
Merge: 56c4e2b0ca 6f03bedc20
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jan 29 18:03:00 2023 +1100

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

commit 56c4e2b0ca
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 28 19:24:42 2023 +1100

    aaaa

commit 0bb700af9b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 28 08:17:07 2023 +1100

    now?

commit 54c4c739d9
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 28 08:10:44 2023 +1100

    fix that

commit 3f4017a975
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 28 08:08:26 2023 +1100

    doesn't work

commit 8f434cb968
Merge: 112f768330 e96e4c0de1
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 28 08:07:25 2023 +1100

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

commit 112f768330
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Jan 18 22:29:39 2023 +1100

    bins

commit 3fe6397a04
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Jan 18 20:57:12 2023 +1100

    fuck

commit 6df570f00f
Merge: bc0305a3b3 9a2dc1dbf7
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Jan 18 20:49:34 2023 +1100

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

commit bc0305a3b3
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jan 8 20:32:12 2023 +1100

    do this

commit fec163e2da
Merge: 2ff7a083f1 688be42140
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jan 8 20:31:31 2023 +1100

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

commit 2ff7a083f1
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 7 08:07:27 2023 +1100

    fuck n suck

commit d8781a3afc
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 7 07:45:21 2023 +1100

    update bins

commit 48f33eef24
Merge: d2ea670cd8 56d3e28450
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 7 07:44:00 2023 +1100

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

commit d2ea670cd8
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jan 7 07:40:17 2023 +1100

    fix maps2

commit bfff42a62e
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 5 22:41:07 2023 +1100

    fix this

commit 4be0b6d1d7
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 5 22:39:22 2023 +1100

    update bin

commit 1c240682c5
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 5 21:56:33 2023 +1100

    unfuck maps

commit 24b892f66a
Merge: 8b98fe162f a9443f77ed
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 5 21:51:49 2023 +1100

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

commit 8b98fe162f
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jan 5 21:20:20 2023 +1100

    changes to ssair

commit bd5890cd2d
Merge: c273955a30 61c352e38b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Dec 25 09:19:19 2022 +1100

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

commit c273955a30
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Dec 20 17:27:36 2022 +1100

    update linux bin

commit e96e0ee982
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Dec 19 19:10:58 2022 +1100

    fuck

commit 49af185087
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Dec 19 18:57:31 2022 +1100

    update windows bin

commit 6cd07d84c1
Merge: 0f9100d7bb e4e1529aea
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Dec 19 18:50:08 2022 +1100

    stop it

commit 0f9100d7bb
Merge: e698f60fe7 72b6827588
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Nov 26 22:02:38 2022 +1100

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

commit e698f60fe7
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Nov 22 22:18:07 2022 +1100

    update bin

commit 549311fe39
Merge: 992fc95d13 b5211c17ee
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Nov 22 20:54:44 2022 +1100

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

commit 992fc95d13
Merge: 7226dae332 49f5996110
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Nov 19 21:08:55 2022 +1100

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

commit 7226dae332
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Nov 16 11:09:20 2022 +1100

    detect self

commit 6a1300fbeb
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Nov 16 10:43:06 2022 +1100

    fixes that

commit facbee1e4e
Merge: 5876f0b399 cce2086894
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Nov 16 10:40:55 2022 +1100

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

commit 5876f0b399
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Nov 9 17:33:24 2022 +1100

    update bin

commit 9051267127
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Nov 8 08:25:52 2022 +1100

    ass

commit c578a5da6f
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Nov 8 08:18:38 2022 +1100

    screen

commit 2a34e22ff5
Merge: bed8de7e3c 2dc98f28bd
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Nov 8 08:18:14 2022 +1100

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

commit bed8de7e3c
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Oct 26 21:48:58 2022 +1100

    binupdate

commit 66b52e3ef4
Merge: c44d5f74a0 e5943f6c97
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Oct 26 21:42:19 2022 +1100

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

commit c44d5f74a0
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Oct 23 18:25:34 2022 +1100

    fix it

commit 2c440597ae
Merge: 2ef534eebb 27737a887e
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Oct 23 18:13:33 2022 +1100

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

commit 2ef534eebb
Merge: 7f1ac15281 6e796d1f1b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Oct 17 14:43:52 2022 +1100

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

commit 7f1ac15281
Merge: b1b407df07 24fa9f15bc
Author: Jamie D <993128+JamieD1@users.noreply.github.com>
Date:   Sat Oct 8 15:27:29 2022 +0100

    Merge branch 'master' into luciee

commit b1b407df07
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Oct 4 12:27:22 2022 +1100

    semicolon ere

commit 6d6ecbd173
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Oct 4 12:25:30 2022 +1100

    no

commit b8c5c5adf9
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Oct 4 12:23:15 2022 +1100

    buh

commit 108b4114e0
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Oct 4 11:53:14 2022 +1100

    guh

commit 0377561d9c
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Oct 4 11:51:45 2022 +1100

    use global real

commit 75de7e4b65
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Oct 3 11:46:48 2022 +1100

    fuck off

commit 59a4a3f695
Merge: a625f8a305 9aced92844
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Oct 3 11:41:06 2022 +1100

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

commit a625f8a305
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Sep 9 10:24:14 2022 +1000

    libss

commit af77b1db6f
Merge: 79870508f8 5ab5e5bb8b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Sep 9 08:19:49 2022 +1000

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

commit 79870508f8
Merge: 4009394215 4bbf789444
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Aug 19 08:34:55 2022 +1000

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

commit 4009394215
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Aug 19 08:24:44 2022 +1000

    mhm

commit e755b7113e
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Aug 19 08:23:28 2022 +1000

    i cry

commit 7bb50ae315
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Aug 11 13:09:01 2022 +1000

    update bin

commit 67f3d449bc
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Aug 11 13:02:12 2022 +1000

    use the new parser

commit 65b5f94822
Merge: 02706f6477 0334e73f6e
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Aug 11 12:57:02 2022 +1000

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

commit 02706f6477
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Aug 1 20:08:45 2022 +1000

    fix reaction orderings

commit 1bc0385faf
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Aug 1 18:10:30 2022 +1000

    christ

commit f9241f3ac7
Merge: a9527be49f 7dec922233
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Aug 1 18:07:24 2022 +1000

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

commit a9527be49f
Merge: e309e38001 fab877e0cc
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jul 21 10:58:02 2022 +1000

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

commit e309e38001
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jul 21 10:57:09 2022 +1000

    binaries

commit 19fb4b26b8
Merge: 87bd779a47 dd157f698f
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Jul 19 13:08:05 2022 +1000

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

commit 87bd779a47
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Jul 19 12:15:44 2022 +1000

    FUCK

commit 97df2c9436
Merge: eb2950c3bb 86fd2fffe2
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Jul 18 09:14:21 2022 +1000

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

commit eb2950c3bb
Merge: 136900c342 023fd29e5a
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jul 17 21:17:02 2022 +1000

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

commit 136900c342
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sat Jul 16 18:57:48 2022 +1000

    truly evil

commit 18b40d4e4b
Merge: 23cd9b5d9b d3b7a40f07
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Jul 11 09:11:54 2022 +1000

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

commit 23cd9b5d9b
Merge: 2345b52cba e844ef3e84
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Jul 6 10:34:36 2022 +1000

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

commit 2345b52cba
Merge: e012900ded 2a16756e84
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Jul 1 20:13:50 2022 +1000

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

commit e012900ded
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Jul 1 20:12:17 2022 +1000

    minuteman

commit ee3dbd81b1
Merge: ec8a88c6ee 7b5a40bb29
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Jun 29 14:18:44 2022 +1000

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

commit ec8a88c6ee
Merge: 6cae0a7d28 a1ee3e80d3
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Jun 27 14:57:22 2022 +1000

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

commit 6cae0a7d28
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Jun 22 20:59:10 2022 +1000

    binupdate

commit 54b8f13c81
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Jun 22 20:43:06 2022 +1000

    fix

commit d8efbcd4d6
Merge: 23f6f5e90b b4c812a4d2
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Jun 22 20:14:41 2022 +1000

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

commit 23f6f5e90b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Jun 21 08:16:36 2022 +1000

    fix this shit

commit 5a9338d1f7
Merge: 76aa7f4ba4 4e3808d40c
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Jun 21 08:15:55 2022 +1000

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

commit 76aa7f4ba4
Merge: 31c5983d17 6bd31ffbd6
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Jun 15 21:00:20 2022 +1000

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

commit 31c5983d17
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Jun 10 20:00:02 2022 +1000

    fuck

commit 5c39357aa0
Merge: f82c2464aa 4739b40eeb
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Jun 10 18:21:50 2022 +1000

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

commit f82c2464aa
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jun 5 17:58:56 2022 +1000

    a

commit ddf2e39667
Merge: 1a43a70e92 c42a1cf7a8
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Jun 5 16:23:55 2022 +1000

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

commit 1a43a70e92
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Jun 3 20:06:50 2022 +1000

    shuttlefix

commit 1e5b30e171
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Jun 3 19:44:12 2022 +1000

    pause this

commit 3028e94d6b
Merge: f3102fca8f 310dc2bda6
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Jun 3 08:53:40 2022 +1000

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

commit f3102fca8f
Merge: d80cc73eef 9cdbba4e98
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Jun 2 10:48:08 2022 +1000

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

commit d80cc73eef
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue May 31 13:26:38 2022 +1000

    shit

commit 1ab72387ee
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue May 31 13:21:16 2022 +1000

    fixes xeno breathing

commit c3601a700c
Merge: 575cbe8c3e 2c5c103218
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon May 30 18:47:39 2022 +1000

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

commit 575cbe8c3e
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon May 30 18:47:18 2022 +1000

    little trolling

commit f570b65dcd
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon May 30 18:23:20 2022 +1000

    fix fucking planet atmos

commit 83a5a7ca55
Merge: 64ab6a5a0c d55435098d
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun May 29 18:12:58 2022 +1000

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

commit 64ab6a5a0c
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri May 27 08:07:08 2022 +1000

    checking

commit 569082c1b6
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu May 26 13:12:59 2022 +1000

    more of reactions redone

commit 5cc665df18
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu May 26 08:52:58 2022 +1000

    adds debugger, redo reactions a bit

commit fab0086f5e
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed May 25 14:37:36 2022 +1000

    fix oxidation/fuel brokeness

commit b5f99a71b8
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed May 25 11:40:56 2022 +1000

    id of the reaction

commit ed92ad6085
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed May 25 11:39:47 2022 +1000

    split cold fusion into a separate category

commit 07458d6c64
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed May 25 10:51:23 2022 +1000

    ehhh

commit a76f414bb6
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue May 24 09:25:19 2022 +1000

    fixes breathing a bit

commit 2fa96faed6
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue May 24 08:46:19 2022 +1000

    update linux bin

commit d90da82afa
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon May 23 20:50:28 2022 +1000

    unfucks some gases

commit 3d5534e773
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon May 23 20:07:02 2022 +1000

    fuck

commit 3fb8935a55
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon May 23 20:06:02 2022 +1000

    update

commit 00395745bb
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon May 23 19:54:49 2022 +1000

    unfucks yogdelta

commit 0bb8fdde07
Merge: 59336fc060 59d949c892
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon May 23 19:52:29 2022 +1000

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

commit 59336fc060
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon May 23 19:46:20 2022 +1000

    fixes firedoors

commit 768ec93e8e
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun May 22 20:29:56 2022 +1000

    arght

commit 065c80c851
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun May 22 20:24:09 2022 +1000

    fix reactions

commit 0c52e79ad1
Merge: 5203996ddb d5b74ecea0
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun May 22 20:04:32 2022 +1000

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

commit 5203996ddb
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue May 17 07:48:04 2022 +1000

    binupdate

commit 78ff28e496
Merge: 0fd63d9a01 6773cc2002
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue May 17 07:33:31 2022 +1000

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

commit 0fd63d9a01
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon May 9 11:10:07 2022 +1000

    fuck you

commit 6c3e3d4ee2
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon May 9 08:32:36 2022 +1000

    fixup

commit 8480630ca2
Merge: 6f7b99b054 b8bac39381
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon May 9 08:25:35 2022 +1000

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

commit 6f7b99b054
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri May 6 14:02:57 2022 +1000

    pleadster

commit a239068187
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri May 6 12:16:55 2022 +1000

    fuck

commit 27b12710b8
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri May 6 11:38:59 2022 +1000

    i forgor :dead:

commit e5502e80e9
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri May 6 10:52:27 2022 +1000

    pdb

commit eab8006711
Merge: 7c9a81467a 9799aed7b3
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri May 6 10:28:46 2022 +1000

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

commit 7c9a81467a
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri May 6 10:11:00 2022 +1000

    binary update

commit 8eb56840f1
Merge: 24259d3e35 e5de7de5d2
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon May 2 19:08:59 2022 +1000

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

commit 24259d3e35
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Wed Apr 20 13:47:01 2022 +1000

    update binary

commit 26334209e5
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Apr 19 18:26:40 2022 +1000

    spacewind is back!

commit 2c5df5bd7c
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Apr 18 18:06:18 2022 +1000

    shiez

commit 84e65e5344
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Apr 18 17:48:20 2022 +1000

    atmos sim fix

commit 6f4549db82
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Apr 18 17:39:31 2022 +1000

    unfucks vents/scrubbers

commit d5ca7fe400
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Apr 17 21:08:21 2022 +1000

    ver

commit 86f156c7e6
Merge: a3061383ac 33bab18da3
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Apr 17 21:08:10 2022 +1000

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

commit a3061383ac
Merge: bec911cefe 0684995dd0
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Apr 17 20:56:59 2022 +1000

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

commit bec911cefe
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Apr 17 18:35:16 2022 +1000

    fix up bombs

commit 0efea57007
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Apr 17 18:15:26 2022 +1000

    turn on the damn debugger

commit a690c74273
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Apr 17 09:07:21 2022 +1000

    make it a warn

commit 28870f8eff
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Apr 17 09:04:05 2022 +1000

    bump byond ver

commit 25a6c94ea8
Merge: 09192933b8 6a52c9bb7b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Sun Apr 17 08:23:46 2022 +1000

    stop it

commit 09192933b8
Merge: 40d76c56ff 15b8eec9a6
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Fri Apr 15 07:59:07 2022 +1000

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

commit 40d76c56ff
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Apr 4 16:59:15 2022 +1000

    update binary

commit d68c6455f7
Merge: 58f5746f65 543fd4cdc2
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Mar 31 10:48:29 2022 +1100

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

commit 58f5746f65
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Thu Mar 31 10:47:16 2022 +1100

    boosts firedoor speed

commit 06a286f574
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Mar 22 10:59:27 2022 +1100

    processing redone a bit

commit 4d874ab61d
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Mar 21 19:11:23 2022 +1100

    use the correct version

commit 0a8d427315
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Mar 21 19:09:13 2022 +1100

    these should stay on new()

commit 1cfc38bdd0
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Mar 21 18:59:00 2022 +1100

    update vis on this

commit 00eff2e850
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Mar 21 14:25:45 2022 +1100

    fixes debug verbs

commit 689eb2daef
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Mar 21 13:31:02 2022 +1100

    fix air again

commit 2a68dc2621
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Mar 21 11:27:03 2022 +1100

    binaries

commit 45128302e2
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Mar 21 09:41:48 2022 +1100

    rebuild

commit d729760ecf
Merge: 9314ac4428 2d981d5e9a
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Mar 21 09:38:47 2022 +1100

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

commit 9314ac4428
Merge: e9c12639db 7744d187ee
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Mon Mar 21 09:38:01 2022 +1100

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

commit 7744d187ee
Merge: 19903f8764 92ec497791
Author: Lucy <lucy@absolucy.moe>
Date:   Fri Mar 11 18:52:31 2022 -0500

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

commit 19903f8764
Author: Lucy <lucy@absolucy.moe>
Date:   Mon Mar 7 20:02:23 2022 -0500

    Rebuild DLLs; actually use ubuntu to compile linux sofile

commit 437b6fa390
Author: Lucy <lucy@absolucy.moe>
Date:   Sat Mar 5 17:17:40 2022 -0500

    readd deferred_airs

commit 9c7fa4fb9c
Author: Lucy <lucy@absolucy.moe>
Date:   Fri Mar 4 23:19:51 2022 -0500

    port rest of fixes

commit a02debf16c
Author: Lucy <lucy@absolucy.moe>
Date:   Fri Mar 4 22:26:38 2022 -0500

    Update auxmos to fix bugs

commit c2942533cd
Merge: 2fd6c84232 508a23f718
Author: Lucy <lucy@absolucy.moe>
Date:   Fri Mar 4 22:00:18 2022 -0500

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

commit 2fd6c84232
Author: LatteKat <56778689+jupyterkat@users.noreply.github.com>
Date:   Tue Mar 1 13:17:42 2022 +1100

    it wasn't dns

    * deps

    * crap

    * oops

commit e9c12639db
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Mar 1 13:16:13 2022 +1100

    oops

commit 2d32ac587b
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Mar 1 13:06:45 2022 +1100

    crap

commit ac00b9aa1f
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Mar 1 13:04:21 2022 +1100

    deps

commit f6924f9a18
Merge: c0b18facb3 981afd3ce8
Author: Lucy <lucy@absolucy.moe>
Date:   Mon Feb 28 19:30:38 2022 -0500

    Merge pull request #1 from jupyterkat/luciee

    auxmos fixes

commit 981afd3ce8
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Mar 1 11:21:14 2022 +1100

    use yogs version

commit e9344a7164
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Mar 1 11:20:27 2022 +1100

    maybe fixes reactions

commit a9a69c4545
Author: Katherine Kiefer <sterlite2902@gmail.com>
Date:   Tue Mar 1 10:18:15 2022 +1100

    fix adjacencies, fix pumps not shutting off

commit 31568d9c54
Merge: c0b18facb3 f19fd24755
Author: 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

commit c0b18facb3
Author: Lucy <lucy@absolucy.moe>
Date:   Fri Feb 25 09:01:49 2022 -0500

    linux

commit 4bf1276901
Author: Lucy <lucy@absolucy.moe>
Date:   Tue Feb 22 12:53:58 2022 -0500

    Update auxmos DLLs to latest commit

commit 7f454b2cf0
Merge: 3d4f24603d 02a5e089a9
Author: Lucy <lucy@absolucy.moe>
Date:   Tue Feb 22 10:16:09 2022 -0500

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

commit 3d4f24603d
Merge: 566fb5fc3c d734086c52
Author: Lucy <lucy@absolucy.moe>
Date:   Tue Feb 15 19:48:11 2022 -0500

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

commit 566fb5fc3c
Author: Lucy <lucy@absolucy.moe>
Date:   Tue Feb 15 19:41:46 2022 -0500

    idk why this won't go away

commit 175381fe10
Author: Lucy <lucy@absolucy.moe>
Date:   Sat Dec 25 17:20:32 2021 -0500

    wack

commit 448ce38622
Author: Lucy <lucy@absolucy.moe>
Date:   Sat Dec 25 00:02:51 2021 -0500

    recompile dll

commit 405522c4ac
Author: Lucy <lucy@absolucy.moe>
Date:   Thu Dec 23 15:13:07 2021 -0500

    FIXY FIXY!!!

commit 2fc8f012bc
Author: Lucy <lucy@absolucy.moe>
Date:   Wed Dec 22 23:38:57 2021 -0500

    AAAAA

commit a9b511d30e
Author: Lucy <lucy@absolucy.moe>
Date:   Wed Dec 22 20:01:30 2021 -0500

    AGH

commit bd9f5d0aed
Author: Lucy <lucy@absolucy.moe>
Date:   Wed Dec 22 17:58:27 2021 -0500

    fix fire

commit c0dfc15a82
Author: Lucy <lucy@absolucy.moe>
Date:   Wed Dec 22 12:56:46 2021 -0500

    fix compile

commit ec8de960df
Merge: 3ef9b39d56 e9a16185fb
Author: Lucy <lucy@absolucy.moe>
Date:   Wed Dec 22 12:49:28 2021 -0500

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

commit 3ef9b39d56
Author: Lucy <lucy@absolucy.moe>
Date:   Mon Dec 20 22:57:22 2021 -0500

    clean up some `GLOB.gas_data.names` stuff

commit b33e299535
Merge: 0729c3128a 8995b15b60
Author: Lucy <lucy@absolucy.moe>
Date:   Mon Dec 20 20:09:18 2021 -0500

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

commit 0729c3128a
Author: 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

commit 887b53dfa4
Author: Lucy <lucy@absolucy.moe>
Date:   Mon Dec 20 06:01:54 2021 -0500

    also update commit in dependencies.sh

commit 7994838b86
Author: Lucy <lucy@absolucy.moe>
Date:   Mon Dec 20 05:59:43 2021 -0500

    update DLLs to latest commit hotfix

commit 59adf9388a
Author: Lucy <lucy@absolucy.moe>
Date:   Fri Dec 17 22:53:45 2021 -0500

    remove some spans

commit ed975dbbe3
Author: Lucy <lucy@absolucy.moe>
Date:   Fri Dec 17 22:40:48 2021 -0500

    fix lint

commit 990f73a0c4
Author: Lucy <lucy@absolucy.moe>
Date:   Fri Dec 17 22:37:17 2021 -0500

    Fix up some variable crap

commit 9a7089335b
Author: Lucy <lucy@absolucy.moe>
Date:   Fri Dec 17 18:10:21 2021 -0500

    remove `update_visuals` calls

commit 6de6cecfd8
Author: Lucy <lucy@absolucy.moe>
Date:   Fri Dec 17 18:09:43 2021 -0500

    don't re-define those

commit a50cbe7281
Author: 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>
 2023-11-30 23:08:19 -06:00
Byemoh
3f0c73ec61 no shelter (#20969) 2023-11-29 20:17:13 -08:00
adamsong
4b29886eb2 Adds unit testing for all maps and ruins (#20915) 
* Adds unit testing for all maps and ruins

* Oops

* AAAAA

* Disable multiz_debug

* Make some of the errors red so they are easier to find

* Am dumb

* Moved test colors elsewhere

* Fixed asteroid station, added debug log for icemeta map generator issues

* Fixed asteroid station, added debug log for icemeta map generator issues

* Possibly fixed gcf

* Fix sydicate surface turret control

* Add final check to make sure other checks pass

* Fix thingy
 2023-11-20 00:37:25 -06:00
Addust
4ea745a04f you idiots (#20743) 2023-10-28 23:24:18 -05:00