forked from yogstation13/Yogstation
-
Notifications
You must be signed in to change notification settings - Fork 0
Jungleland Ruins #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
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
Author
|
messed up making this branch |
Djiq
pushed a commit
that referenced
this pull request
Aug 16, 2023
* Starts placing ice and snow at evac, makes shuttle dock * IceMeta dm and json file * A lot more ice and snow * two files/????? * maybe halfway done placing ice if even lol * more ice. almost done with this LONG ASS PROCESS * engines, maybe? this will take some testing * a lotta lotta ice (HOLY SHIT I ALMOST CLOSED MY BROWSER WITHOUT COMMITTING THIS) * Finishes placing ice and adds genturf around the map * oops! * couple little bugaroonies * some stuff i missed * some more stuff, mining base is done, added snow to some space i missed things * stuff * oops * Config * new landmarks * ioopssie poopsie!!!!!!!!!!! * forgor * fmaily guy * forgot like one or twenty tiles of ice * Rename the map * fix that a little * why was this not here exactly? * ATV room * podbay door * finishes up * disables meta * coats, boots and a pickaxe * i caught you on camera acting sus * removes bloat bandaid fix * replaces bloat with not bloat * finishes fixing that stuff * oops * space tile * Quality issues and makes a cool snow path around the stayshun * airless turf no bueno * expand escape shuttle dock * update meta * fuck you *steals atmos* * ye * plz work uwu * snow tiles on engine * jortz * makes tesla template look much better * cleans up the outside of the station more * sussy * icemoon 2 z levels now * Revert "icemoon 2 z levels now" This reverts commit 9a6aaee. * plz work this time * fixes json * why isn't it working * ned you're fucking retarded * god fucking damnit ned * poop * Revert "poop" This reverts commit 62cecf7. * ok this time it should work * one more thing * fortnite * rip spacemeta.... you did well * ned are you fucking dumb? * what the flip * a zillion errors * what the hell was the point of this? * oops * axes bloat icemoon maps * forgot to delete this one lol * adds joe the goliath to the mining base. super important change * maybe fixes that? probably not * fixes 2 runtimes * fixes another runtime * fix window * b * l * fixes lavaland spawning * random maint ruins with space in them suck anyway * dogshit ass ruins * fuck you maint ruins * dilithium spawns now * fixes KAs again and makes legion damage ignore apply to mining levels again * b * left some space * prolly fixes solars * Revert "Merge remote-tracking branch 'upstream/master' into icemeta" This reverts commit 82e3ad1, reversing changes made to 9d918cf. * Revert "Merge branch 'icemeta' of https://github.com/N3D6/YogstationIfItWasntMid into icemeta" This reverts commit 9d918cf, reversing changes made to f06088b. * Revert "Merge remote-tracking branch 'upstream/master' into icemeta" This reverts commit f06088b, reversing changes made to c217b19. * Revert "Revert "Merge remote-tracking branch 'upstream/master' into icemeta"" This reverts commit e4e6180. * Revert "Revert "Merge branch 'icemeta' of https://github.com/N3D6/YogstationIfItWasntMid into icemeta"" This reverts commit 6982c47. * Revert "Revert "Merge remote-tracking branch 'upstream/master' into icemeta"" This reverts commit 5ea59d7. * security interace * walls instead of windows for the space loop pipes so it's less cancerous in the long run * Expands mining station atmos a little, shifts some stuff around the mining base in general, adds a heater so the base no longer gets mad chilly * forgot a decal * didn't commit it * y * ned * i love this so much! * brig :) * L bozo * THE DECALENING PART TWO: SCIENCE (#2) * remove tiles * forgot some red tiles * farts * done * THE GREAT DECALENING PART 3: EVERYTHING ELSE (#3) * should kill most tile decals * should finish murdering old ones * hey buddy you dropped this * probably finishes killing old ones * should properly shorten the ones that were done wrong * maybe shrinks it now * something went very wrong but i think we are back * okay is this it * silly ned * what the flip * balderdash * Revert "balderdash" This reverts commit 969dc70. * does like WAY too much stuff to describe * ALMOST DONE * ned you suck lol * L ned + Ratio * CONCLUDES THE GREAT DECAL-ENING * few little tweaks * HoP turnstile, as god intended * remove free laser gun * Fix Nukies P1: The Shuddle can drop (someone fix the flattening problems plz) * Fix Nukies P2: Add plasma cutters and some plasma to the nukie shuttle * gene wallmed 4 consistency * fuck update appearance * make bridge trims a ltitle better * fuck this shit bro jesus * i think i forgot this somehow idk * fuck * smart feller? no. fart smeller. * makes engi and atmos way better looking trim-wise * wait what if that's not actually true at all?? * plz work that'd be cool if it did * i think this is right * dumbass ned * this might work idk * plz * Revert "plz" This reverts commit c13270e. * Revert "this might work idk" This reverts commit 495db72. * Revert "dumbass ned" This reverts commit cd59b84. * Revert "i think this is right" This reverts commit 63a858a. * Revert "plz work that'd be cool if it did" This reverts commit b332d0f. * part 1 * ned is dumb * part 2 * let me push this probably * insignificant change to see if it fixes anything * sick * i deadass forgot to commit bro * Revert "i deadass forgot to commit bro" This reverts commit 986fa06. * Revert "Revert "i deadass forgot to commit bro"" This reverts commit 6d7bed5. * i hate this game * n * h * h * L * cocaine * that's important * when you're here, you're family * you suck eg ned * starts working on this a little bit * labor camp pt 1 * part 2 * sick * it's done * oops * docking port * kill the old one * probably fixes pods * finishing touches * actual finishing touches * touches up on a few poopy trims * de-shittify tool storage * why was this like that * Aux base works now * camra * fixes everything * a * scrungularky * gta 5 * lets see what this breaks * unbreak the entire map * does some stuff * cool * i think we are in the clear * stuff, finishes stuff * cool --------- Co-authored-by: Byemoh <baiomurang@gmail.com>
Djiq
pushed a commit
that referenced
this pull request
Nov 6, 2023
* ok all redone * fixes this idiot * im stupid idiot * im stupid x2
Djiq
pushed a commit
that referenced
this pull request
Dec 12, 2023
* Update nordic_accent.json * fix * Update accent_nordic.json * Update accent_nordic.json * Update accent_nordic.json * Update accent_nordic.json * Update accent_nordic.json * Update accent_nordic.json * Update accent_nordic.json * Update accent_nordic.json * Update accent_nordic.json * Update accent_nordic.json * Update accent_nordic.json * Update accent_nordic.json * alright this is fine now * removes this cringe first * fixed
Djiq
pushed a commit
that referenced
this pull request
Dec 12, 2023
…pital "T" from all mentions of "NanoTrasen" (yogstation13#21043) * Update wanted_message.json * Update yogs_ion_laws.json * this too * Update cryopod.dm * Update headset.dm * Update topic.dm * Update nuclearbomb.dm * Update corpse.dm * Update expressconsole.dm * Update jobs.dm * Update miscellaneous.dm * Update captain.dm * Update machine_vending.dm * Update gimmick_objectives.txt * Update infiltration.dm * Update parts.dm * think I did this right * no apparently I didn't if this works, it only dies on mapping stuff * fixed? * tests the linter to see if the grep catches this * test didn't work, reverts last commit * test #2: does it detect case sensitivity? * test worked, I think it's done! * Update check_grep.sh * Update check_grep.sh * Update check_grep.sh
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
to be added
Changelog
🆑
rscadd: Added new things
rscdel: Removed old things
bugfix: fixed a few things
wip: This is work in progress
tweak: tweaked a few things
soundadd: added a new sound thingy
sounddel: removed an old sound thingy
imageadd: added some icons and images
imagedel: deleted some icons and images
spellcheck: fixed a few typos
experimental: This is experimental
/:cl: