This repository was archived by the owner on May 22, 2025. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 457
[MIRROR] Any closed turf blocks aux base placement #12
Merged
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
* Any closed turf blocks aux base placement * ignores rock walls and destroys them before landing * Goes back to some more standard style
yogstation13-bot
added a commit
that referenced
this pull request
Mar 14, 2018
yogstation13-bot
pushed a commit
that referenced
this pull request
Sep 10, 2019
alexkar598
pushed a commit
that referenced
this pull request
Nov 30, 2019
* E (#11) * its a bazillion times faster now thanks to asd. no more lag * Dreamchecker is dumb * tells it to fuck off on linux * tells it to fuck off on linux 2 * I just want it to not fail * MR AZIZ IS GONNA FLIP WHEN HE FINDS OUT ABOUT THESE PIZZAS * Obsessed people may no longer have the objective to have a picture with the target (#7061) * Automatic changelog generation #7061 [ci skip] * Plasma tank objective now checks for 28 moles across all tanks, not 28 moles in one tank (#7042) * Plasma tank objective now checks for 28 moles across all tanks, not 28 moles in one tank * Update code/game/gamemodes/objective_items.dm * maybe make sure it works before you push next time, moron * Update objective_items.dm * Automatic changelog generation #7042 [ci skip] * War ops less people (#7049) * makes halloween commit * Update nuclear_challenge.dm * Update halloween.dm * Automatic changelog generation #7049 [ci skip] * monkey cube amount (#7072) * haahhhaha * Update conveyor2.dm * Update conveyor2.dm * probably converts achievements to datums and adds database supports * fix description of bubblegum achievement * renames SSmedals to SSachievements * adds apostrophes around SQL value * possibly creates the schemas? * forgot semicolons * changes ckey to name * adds desc to the database as well * forgot the id * fuck * fixes an apostrophe * I happen to be a moron * I am messing with tcomms again * hivelord legion cant float over tables (#7073) * Automatic changelog generation #7073 [ci skip] * Powerarmor fix (#7069) * Re-adds working hardsuit * removes broke hardsuit * Adds working icons * Working icons * Fixed stray quotemark * Automatic changelog generation #7069 [ci skip] * Changes (probably) all the times that Clock Cult uses watts to joules (#7052) * Changes Clock Cult's watts to Joules Changes (probably) all the times Clock Cult uses the term watts to joules * Swing and a miss I missed some * Automatic changelog generation #7052 [ci skip] * stupid and confusing misname * Update conveyor2.dm * adds a cache of achievements to reduce DB calls * backend ui * take 2 * prevents xeno pipe evolving * construction bag now gets more love, can be bought from engi-vend or made with cloth * fixes Jcat's OCD bags are now in tens intead of nines * people were arguing, one "lets go with 4" the other one went with "lets go with 10" so i went with 6 * appearance debugging * RIP shooted * 21 gun salute * Update gunpoint.dm * You can now select exactly which limb was lost in your tragic backstory (#7060) * bubububububububbeatentodeath * Update negative.dm * whoops * reeeeeeeeeeeeeeeee * Automatic changelog generation #7060 [ci skip] * Surrender text clarity revive (#7059) * Revert "Restoring my main branch" This reverts commit 39cb232. * Revert "Revert "Restoring my main branch"" This reverts commit 856950c. * Revive SurrenderText PR This PR got closed for a stupid reason then died so I'm bringing it back. Fixed line endings. * Makes the text easier to see Nich brought this up. Valid point. Changed to a very easy to see span. * Surrendering now has its own span Per Xoxeyos's suggestion * Stole Alex's span Yoink my span nerd * Automatic changelog generation #7059 [ci skip] * update maps * fucking tgui * adds a return so you can't check achivements while they're initializing * Automatic changelog generation #6926 [ci skip] * Revert "Moving will no longer interrupt breaking out of cuffs" * Update mobs.dm * I have no clue how to make tgui work * why the fuck won't it work * removes client var for the achievement browser * tcomms mapping * fuck * thank fucking monster for being the only person who could make this work * fuck * Revert "Revert "Automatic changelog generation #6967 [ci skip]"" This reverts commit 17d9133. * "overrides the proc" whatever that meant damn coding conventions * Dorkspawn are immune to mindswapping (#7089) * fuckkk * Meatball rename * Update meatball icon state * Update construction.dm * Update forcefieldprojector.dm * Update construction.dm * description issues fixed * spelling error * removed duplicates * Strips some input * fuck * alcohol bad kids * Automatic changelog generation #7096 [ci skip] * Revert "Synergy" * makes magic ball chaplain only * Adds support for locking holodeck templates to security levels, and locks medical holodeck behind red or delta seclevel. * Im a moron * Automatic changelog generation #7077 [ci skip] * Automatic changelog generation #7079 [ci skip] * Automatic changelog generation #7093 [ci skip] * Bridge below xenobio is sometimes open space * fixes the thing * cool * use the real commit * verified * Im tired * Update screen_objects.dm * Update generic_positive_events.dm * Update lavaland.dm * Update human_defense.dm * Create lovemobile * Adds the boys * Images of da bois * Stuff for da bois * Screen for da bois * Actions for da bois * Convert map to tgm * Automatic changelog generation #7081 [ci skip] * Automatic changelog generation #7084 [ci skip] * Automatic changelog generation #7097 [ci skip] * Automatic changelog generation #7085 [ci skip] * Adds a list for all the achievements earned during the round * Makes it a local variable * gets rid of shuttle_purchase_requirements_met on SSshuttles, since it's redundant now that bubblegum doesn't use it * Update achievements.ract * Update viewer.dm * Update viewer.dm * Automatic changelog generation #7104 [ci skip] * Fixes oopsie * i am retard * holy fuck it works * brubrubrubrubrubrubruburburubruh * cdfhjksfvgasdfhav * health is reduced to 200 on revival instead of 400 * stupid intercom nonsense * change descriptions * update * description * let's not be rash * eeeeeeeeeeeeeeeee * hope gives minor armor same as talisman/codpiece * Update holidays.dm * Update holidays.dm * Add a couple of windows. * Update tgstation_schema.sql * Update tgstation_schema_prefixed.sql * Update achievements.dm * THE GREAT TG MUTATION PORT (#7035) * makes halloween commit * the great mutation port * Update _combined.dm * hhahahahah * Update dna_injector.dm * fggffdds * Update DNA.dm * Automatic changelog generation #7035 [ci skip] * Actually placed the window in a usable spot. * point of no return to stop reaction spam * Update necropolis_chests.dm * Update halloween.dm * more * should fix it * Update achievements.dm * I don't get why this doesn't work as is, but oh well * fuck * fixes my stupid asshattery * Update holidays.dm * Automatic changelog generation #7015 [ci skip] * Automatic changelog generation #7102 [ci skip] * Automatic changelog generation #7106 [ci skip] * Automatic changelog generation #7121 [ci skip] * for nich * Update rune.dm * Automatic changelog generation #7103 [ci skip] * Automatic changelog generation #7114 [ci skip] * Automatic changelog generation #7078 [ci skip] * Automatic changelog generation #7070 [ci skip] * Changelog Compilation 21/11/2019 [ci skip] * Update holidays.dm * Update holidays.dm * fuck * layers pipes * removed dsi song sadly * [s] fuck * Delete weapons.dmi * Adds a map of the station to players' boxes * W I N G S * fuck * I am going to keep this to force someone to make better sprites * Update necropolis_chests.dm * Minor grammatical and spelling fixes across the codebase * Automatic changelog generation #7051 [ci skip] * Automatic changelog generation #7120 [ci skip] * Automatic changelog generation #7065 [ci skip] * Automatic changelog generation #7111 [ci skip] * i hate spam clicking * Automatic changelog generation #7133 [ci skip] * f * woops * f * woops2 * f * f * I think this fixes disabler cooler * Automatic changelog generation #7148 [ci skip] * Automatic changelog generation #7136 [ci skip] * Automatic changelog generation #7132 [ci skip] * umbral tendrils can chain easier (#7152) * Automatic changelog generation #7134 [ci skip] * Automatic changelog generation #7141 [ci skip] * Automatic changelog generation #7147 [ci skip] * Automatic changelog generation #7144 [ci skip] * Automatic changelog generation #7146 [ci skip] * Automatic changelog generation #7145 [ci skip] * darkspawn time dilation now actually ignores slowdown (#7155) * Revert "E (#11)" (#12) This reverts commit 73e185a. * baddna comes first
SomeguyManperson
added a commit
that referenced
this pull request
Jan 1, 2020
Amelia0010
pushed a commit
that referenced
this pull request
Jan 2, 2020
* E (#11) * its a bazillion times faster now thanks to asd. no more lag * Dreamchecker is dumb * tells it to fuck off on linux * tells it to fuck off on linux 2 * I just want it to not fail * MR AZIZ IS GONNA FLIP WHEN HE FINDS OUT ABOUT THESE PIZZAS * Obsessed people may no longer have the objective to have a picture with the target (#7061) * Automatic changelog generation #7061 [ci skip] * Plasma tank objective now checks for 28 moles across all tanks, not 28 moles in one tank (#7042) * Plasma tank objective now checks for 28 moles across all tanks, not 28 moles in one tank * Update code/game/gamemodes/objective_items.dm * maybe make sure it works before you push next time, moron * Update objective_items.dm * Automatic changelog generation #7042 [ci skip] * War ops less people (#7049) * makes halloween commit * Update nuclear_challenge.dm * Update halloween.dm * Automatic changelog generation #7049 [ci skip] * monkey cube amount (#7072) * haahhhaha * Update conveyor2.dm * Update conveyor2.dm * probably converts achievements to datums and adds database supports * fix description of bubblegum achievement * renames SSmedals to SSachievements * adds apostrophes around SQL value * possibly creates the schemas? * forgot semicolons * changes ckey to name * adds desc to the database as well * forgot the id * fuck * fixes an apostrophe * I happen to be a moron * I am messing with tcomms again * hivelord legion cant float over tables (#7073) * Automatic changelog generation #7073 [ci skip] * Powerarmor fix (#7069) * Re-adds working hardsuit * removes broke hardsuit * Adds working icons * Working icons * Fixed stray quotemark * Automatic changelog generation #7069 [ci skip] * Changes (probably) all the times that Clock Cult uses watts to joules (#7052) * Changes Clock Cult's watts to Joules Changes (probably) all the times Clock Cult uses the term watts to joules * Swing and a miss I missed some * Automatic changelog generation #7052 [ci skip] * stupid and confusing misname * Update conveyor2.dm * adds a cache of achievements to reduce DB calls * backend ui * take 2 * prevents xeno pipe evolving * construction bag now gets more love, can be bought from engi-vend or made with cloth * fixes Jcat's OCD bags are now in tens intead of nines * people were arguing, one "lets go with 4" the other one went with "lets go with 10" so i went with 6 * appearance debugging * RIP shooted * 21 gun salute * Update gunpoint.dm * You can now select exactly which limb was lost in your tragic backstory (#7060) * bubububububububbeatentodeath * Update negative.dm * whoops * reeeeeeeeeeeeeeeee * Automatic changelog generation #7060 [ci skip] * Surrender text clarity revive (#7059) * Revert "Restoring my main branch" This reverts commit 39cb232. * Revert "Revert "Restoring my main branch"" This reverts commit 856950c. * Revive SurrenderText PR This PR got closed for a stupid reason then died so I'm bringing it back. Fixed line endings. * Makes the text easier to see Nich brought this up. Valid point. Changed to a very easy to see span. * Surrendering now has its own span Per Xoxeyos's suggestion * Stole Alex's span Yoink my span nerd * Automatic changelog generation #7059 [ci skip] * update maps * fucking tgui * adds a return so you can't check achivements while they're initializing * Automatic changelog generation #6926 [ci skip] * Revert "Moving will no longer interrupt breaking out of cuffs" * Update mobs.dm * I have no clue how to make tgui work * why the fuck won't it work * removes client var for the achievement browser * tcomms mapping * fuck * thank fucking monster for being the only person who could make this work * fuck * Revert "Revert "Automatic changelog generation #6967 [ci skip]"" This reverts commit 17d9133. * "overrides the proc" whatever that meant damn coding conventions * Dorkspawn are immune to mindswapping (#7089) * fuckkk * Meatball rename * Update meatball icon state * Update construction.dm * Update forcefieldprojector.dm * Update construction.dm * description issues fixed * spelling error * removed duplicates * Strips some input * fuck * alcohol bad kids * Automatic changelog generation #7096 [ci skip] * Revert "Synergy" * makes magic ball chaplain only * Adds support for locking holodeck templates to security levels, and locks medical holodeck behind red or delta seclevel. * Im a moron * Automatic changelog generation #7077 [ci skip] * Automatic changelog generation #7079 [ci skip] * Automatic changelog generation #7093 [ci skip] * Bridge below xenobio is sometimes open space * fixes the thing * cool * use the real commit * verified * Im tired * Update screen_objects.dm * Update generic_positive_events.dm * Update lavaland.dm * Update human_defense.dm * Create lovemobile * Adds the boys * Images of da bois * Stuff for da bois * Screen for da bois * Actions for da bois * Convert map to tgm * Automatic changelog generation #7081 [ci skip] * Automatic changelog generation #7084 [ci skip] * Automatic changelog generation #7097 [ci skip] * Automatic changelog generation #7085 [ci skip] * Adds a list for all the achievements earned during the round * Makes it a local variable * gets rid of shuttle_purchase_requirements_met on SSshuttles, since it's redundant now that bubblegum doesn't use it * Update achievements.ract * Update viewer.dm * Update viewer.dm * Automatic changelog generation #7104 [ci skip] * Fixes oopsie * i am retard * holy fuck it works * brubrubrubrubrubrubruburburubruh * cdfhjksfvgasdfhav * health is reduced to 200 on revival instead of 400 * stupid intercom nonsense * change descriptions * update * description * let's not be rash * eeeeeeeeeeeeeeeee * hope gives minor armor same as talisman/codpiece * Update holidays.dm * Update holidays.dm * Add a couple of windows. * Update tgstation_schema.sql * Update tgstation_schema_prefixed.sql * Update achievements.dm * THE GREAT TG MUTATION PORT (#7035) * makes halloween commit * the great mutation port * Update _combined.dm * hhahahahah * Update dna_injector.dm * fggffdds * Update DNA.dm * Automatic changelog generation #7035 [ci skip] * Actually placed the window in a usable spot. * point of no return to stop reaction spam * Update necropolis_chests.dm * Update halloween.dm * more * should fix it * Update achievements.dm * I don't get why this doesn't work as is, but oh well * fuck * fixes my stupid asshattery * Update holidays.dm * Automatic changelog generation #7015 [ci skip] * Automatic changelog generation #7102 [ci skip] * Automatic changelog generation #7106 [ci skip] * Automatic changelog generation #7121 [ci skip] * for nich * Update rune.dm * Automatic changelog generation #7103 [ci skip] * Automatic changelog generation #7114 [ci skip] * Automatic changelog generation #7078 [ci skip] * Automatic changelog generation #7070 [ci skip] * Changelog Compilation 21/11/2019 [ci skip] * Update holidays.dm * Update holidays.dm * fuck * layers pipes * removed dsi song sadly * [s] fuck * Delete weapons.dmi * Adds a map of the station to players' boxes * W I N G S * fuck * I am going to keep this to force someone to make better sprites * Update necropolis_chests.dm * Minor grammatical and spelling fixes across the codebase * Automatic changelog generation #7051 [ci skip] * Automatic changelog generation #7120 [ci skip] * Automatic changelog generation #7065 [ci skip] * Automatic changelog generation #7111 [ci skip] * i hate spam clicking * Automatic changelog generation #7133 [ci skip] * f * woops * f * woops2 * f * f * I think this fixes disabler cooler * Automatic changelog generation #7148 [ci skip] * Automatic changelog generation #7136 [ci skip] * Automatic changelog generation #7132 [ci skip] * umbral tendrils can chain easier (#7152) * Automatic changelog generation #7134 [ci skip] * Automatic changelog generation #7141 [ci skip] * Automatic changelog generation #7147 [ci skip] * Automatic changelog generation #7144 [ci skip] * Automatic changelog generation #7146 [ci skip] * Automatic changelog generation #7145 [ci skip] * darkspawn time dilation now actually ignores slowdown (#7155) * Revert "E (#11)" (#12) This reverts commit 73e185a. * what hath god wrought * unrequired
Amelia0010
pushed a commit
to Amelia0010/Yogstation-TG
that referenced
this pull request
Jul 17, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Original PR: tgstation/tgstation#35308
🆑 ninjanomnom
fix: You need to actually clear an area for the aux base, remove all walls (except rock walls).
/:cl:
fixes #35276