This repository has been archived by the owner on Jan 23, 2024. It is now read-only.
[pull] master from Aurorastation:master #10
Merged
Conversation
This file contains 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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
* the thing * tried to fix something i couldnt
…17733) * 0 * sectors_blacklist * Update code/datums/ruins.dm Co-authored-by: Fluffy <[email protected]> * Update code/modules/maps/ruins.dm Co-authored-by: Fluffy <[email protected]> * Update maps/_common/mapsystem/map.dm Co-authored-by: Fluffy <[email protected]> * Update maps/_common/mapsystem/map.dm Co-authored-by: Fluffy <[email protected]> --------- Co-authored-by: DreamySkrell <> Co-authored-by: Fluffy <[email protected]>
* 1 * u * 6 * landmarks * 8 * c * remove guaranteed flag 💀 --------- Co-authored-by: DreamySkrell <>
* p * real
* Fix Colourable Shorts * CL
* tomixfood * Update recipes_human.dm * Update recipes_human.dm * fixes blue raspberry issue * Update code/game/objects/items/trash.dm Co-authored-by: Fluffy <[email protected]> --------- Co-authored-by: Fluffy <[email protected]>
* Added the Xanan shotgun * New magazine sprites --------- Co-authored-by: Cody Brittain <[email protected]>
…l & South America (#17736) * guh! * changelog * Update html/changelogs/Lavillastrangiato - mictlan origin fix.yml goddamn it Co-authored-by: SleepyGemmy <[email protected]> * Update html/changelogs/Lavillastrangiato - mictlan origin fix.yml Co-authored-by: SleepyGemmy <[email protected]> --------- Co-authored-by: SleepyGemmy <[email protected]>
* Adds Lunan flag sprites * Update accent_tags.dmi * Update lunanflag.yml
* the boulder must be pushed * awk? * sadfasdf * sadf * sadfsda * asdf * sdfasafd * asdfsad * asdf * dsfafa * despair * sadfsda * sdfsadf * 1589 * sdaf * sadfasd * asdf * safsadf * fdsafsa * add create and destroy * fdsa * sdafasfsda * pods for away sites * oopsie * hgdfs * i am speed * sdafas * hopefully this works first trAHAHAHAH * asdf * dfsadasf * sfasdf * 6461 * dsfasfd * sfda * fsd * sdfas * fsdaf * sadf * safasf * sudo * sadfsad * dfsdf
* 1 * aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab * o * dirt --------- Co-authored-by: DreamySkrell <>
* Makes Ling More Like The Thing * update cl * Update code/game/gamemodes/changeling/implements/powers/body.dm Co-authored-by: SleepyGemmy <[email protected]> * Apply suggestions from code review Co-authored-by: Fluffy <[email protected]> * requested changes --------- Co-authored-by: SleepyGemmy <[email protected]> Co-authored-by: Fluffy <[email protected]>
* sdfsad * sdfsda * fourspaces begone
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.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )