This repository was archived by the owner on May 22, 2025. It is now read-only.
moving donut to yogs branch #20139
Merged
moving donut to yogs branch #20139
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 9325381.
Contributor
|
violation |
ToasterBiome
added a commit
that referenced
this pull request
Oct 13, 2023
* moving donut to yogs branch (#20139) * Adds DonutStation * donut :) * wtf * e * fix * Update shuttles.dm * Update _basemap.dm * Update maps.txt * typo * mapmerge * I SAID MAPMERGE * E * dorms * break time * maints start * Fix atmos fixes atmos * add cooling to telecomms * pixelshift i forgor * oops * re-atmos atmos again * fixes toxins piping * fixes incinerator i hope * i didnt save * cark forgot some cyclelinks * xenobio had some borked pipes too * haha oopsie that caused compile failures * singulo * woops * yay * woops x2 * frfr * finished up dorms * gotta move solars GRRR * BREAKTIME * removes dumb shit * i said REMOVES DUMB SHIT * STG * transfer centre * o e o a a * SW maints * port quarter finished * west and northwest maints * nearly done * e * solar areas * l * cameras * cameras! * time for DECALS * but actually breaktime * keel it * solar panels * woops * bridge decals begin * sec decals * engi decals * atmos decals * i love decals :) * so many trims * medical decals * medical decals!!!!!!!! * desk bells because i forgor * sci decals * door fixes * fixes messed up sec post trims * its done... * maint polish (im bored ok?) * ok a lil maint inflation as a treat * ITS BAAACK * yay! * pass 1 * dun * unsquare * atmos stuff * dun? * e * disposals * remove templates lol * area * fixed * there * e * fixes pods + broken airlock * floating lighjt * podbay * we * k * ferry dock * fixes * wiire * fixing disposls * dun * cark realizes that he makes dumb choices when hes been mapping for hours at a time and fixes one of them * charg * hoh boy that was a catastrophic fuckup to forget thank fuck it came to me in a vision while i sat in my chair thinking about my life choices * ezhan loves this, i think this looks more cursed but whatever makes my princess happy <3 * on god * bitch * b i t c h * stray rwall * e o o a a * security flaws i missed * carp spawns * fixes tiime * fixy fixy * mmmm fixes * eeeee * FIXXXXXXXX * that was much harder than it shouldve been * almost done... * done * forgor to door * AAAAAAAAAAAA * OOPSIE * OOPS X2 * 2 fixes * dark!!! * catwalk * lights * fixes a tube * should fix the other tube * fixes smes i think * fucky wucky * fixes engine? * cycle * DOOORS * fixes * some more fixes * e * woops * woops * sec alert terminal * dorms rework * lights for cryo * maybe up to date? * Update DonutStation.dmm * Revert "Update DonutStation.dmm" This reverts commit 9325381. --------- Co-authored-by: Cark <44718209+neeshacark@users.noreply.github.com> Co-authored-by: GenericDM <34109002+GenericDM@users.noreply.github.com> * bugger * telecomms hall * THE phones * hm * e * fix arrivals + no sunglasses * reinforced walls * garden and tool storage * pets * check again idiote clarke * moves us back to alpha because biome moved us off it * moves gravity gen somewhere infinitely more cringe but without redesigning massively, the best option * areas are important * very important change * blahaj is in danger * flavor * ocnriiclakes * 50 now * fixes a wire and a table * cuts off sec atmos * light * begins medbay overhaul * medbay 2 * medbay 2 * this is taking longer than i thought it would * finished * couple decals i missed * access * fixes a typo preventing donut from being voted for * fixes medbay cameras * electrolyzer * service fixes * gas masks? * v important * fix * mats 4 butch * moves orm a bit * a few more of these isnt a bad idea * fixes a light * nukes a hidden button * makes one of the maints less straight * better * weh * rogue catwalk * catwalk * slight improvement * betterer? * catwalk :) * there * mssing pets * flips these * access + light * airlocks here * axolotls and det shutters * cargo windows * -1 axolotl * woops * 1 * finished * kills space library * fuckup * minor changes to maint * bartender no longer gets 2x the gun * OH GOD THE HORROR * oh god what am i doing * god... * e * e * qwedrftghyjmk,l.;/ * update atmos/incinerator * some firelocks and stuff too * oopsie that's not supposed to be there * why does this PR even touch yogstation.dmm? let's fix that * mapping erorrs * showers * cam * should be good * woops * who did this * clerk exists now * there * fix a single misplaced camera * E * e * con * how tf did that happen * fucking cargo * fax and logic * sink * e * ffs * WATCH AS I FIX THE COMPILE ERROR BY MOVING A LIGHTSWITCH BEHOLD MY MAPPING PROWESS * belts bags and huds * steals from kilo * changes * done * e * done * meme big fuckin moron * e * flashes +toolbelt * minor adjustments * e * wire * w * e * e * asterrrr * mineralz * asteroid cull * doors * firalam, --------- Co-authored-by: Cark <44718209+neeshacark@users.noreply.github.com> Co-authored-by: GenericDM <34109002+GenericDM@users.noreply.github.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
nothing to see here