Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Planet import #1

Closed
wants to merge 2 commits into from
Closed

Planet import #1

wants to merge 2 commits into from

Conversation

skull132
Copy link
Contributor

No description provided.

@skull132
Code Merge
2a38092 
Ports over:
* Lift anchor (code + icons)
* Planet turf
@skull132
Map Merge: Z-level 1
38e675d 
Ports over Z-level 1 of the new map.

Items that are **missing** and need to be reviewed:
* Shutters/Emergency shutters
* Any kind of shutter and door controller (will be missing!)
* Stools
* Chairs
* Beds
* Racks

The rest should be in place and proper.
@skull132
Copy link
Contributor Author

Wrong. Sodding branch.

@skull132 skull132 closed this Sep 16, 2015
skull132 pushed a commit that referenced this pull request Feb 5, 2016
@Ryan784
Merge pull request #1 from skull132/master
1e4745d 
Dev Flags
skull132 pushed a commit that referenced this pull request Feb 12, 2016
@Ryan784
Merge pull request #1 from Aurorastation/master
00c1e04 
Updating master
@Serveris Serveris mentioned this pull request Feb 25, 2016
Closed
skull132 pushed a commit that referenced this pull request Mar 25, 2016
@Mahzel
Merge pull request #1 from skull132/mahzel-compatibility
9e59f78 
Mahzel compatibility patch
skull132 pushed a commit that referenced this pull request May 17, 2016
@Akrilla
Merge pull request #1 from Akrilla/chemical-fixes
2db13a0 
Fix chemical logic, and small change to pose text.
skull132 pushed a commit that referenced this pull request Jun 1, 2016
@LordFowl @skull132
Vaurca Bugfix #1.1 (#364)
013eb1c 
* Vaurca Bugfix

New Vaurca bugfix. Fixes lack of seeds in seed storage, Vaurca spawning
without shoes.
skull132 pushed a commit that referenced this pull request Aug 2, 2016
@Bedshaped @skull132
Bedshaped's Best Bugfixes #1 (#654)
f0df174 
Fixes #505 (again)
Fixes #626 
Fixes #647 
Resolves #509
LordFowl added a commit that referenced this pull request Feb 22, 2017
@LordFowl
Bugfix Bonanza + Z-code and stuff. (#1819)
76a8919 
* Bugfix Bonfire #1

* Bugfix Bonanza #2

* BigBomba

* Banner.dmi

* Fixing Cyborg spawn

* Re-enabling asteroid gen
@XanderDox XanderDox mentioned this pull request Jan 15, 2018
Closed
@BotBOREALIS BotBOREALIS added Update Wiki The PR changes something that needs to be reflected on the wiki. and removed Update Wiki The PR changes something that needs to be reflected on the wiki. labels Mar 20, 2018
@LordFowl LordFowl mentioned this pull request Aug 7, 2018
Merged
fernerr referenced this pull request in fernerr/Aurora.3 Dec 11, 2019
@JohnWildkins
Merge pull request #1 from fernerr/syndiestuffpt2
cd8c0fc 
The map stuff fixed
fernerr pushed a commit that referenced this pull request Dec 29, 2019
@NonQueueingMatt @fernerr
Fixes smg icons missing (#1)
d8f6c37 
* sprite f ixes

* fixes
@Chada-1 Chada-1 mentioned this pull request May 26, 2020
Merged
@Geevies Geevies mentioned this pull request Apr 14, 2021
Closed
Doxxmedearly pushed a commit to Doxxmedearly/Aurora.3 that referenced this pull request May 23, 2021
@ThrustBustSupremeOWO
Merge pull request Aurorastation#1 from ThrustBustSupremeOWO/doxxdont…
6718f72 
…fuckitup

okay i make da change
@Cooleosis Cooleosis mentioned this pull request Jan 23, 2022
Closed
NonQueueingMatt pushed a commit that referenced this pull request Feb 15, 2022
@mikomyazaki
Initialize and GC failure fixes #1 (#13190)
08ea043
Arrow768 pushed a commit that referenced this pull request Apr 10, 2022
@Alberyk
Fixes compile also adds aurora's central command to the empty new map…
9abd8da 
… centcom level (#1)

* Fixes compile

* New cc stuff
@SleepyGemmy SleepyGemmy mentioned this pull request Apr 13, 2022
Closed
@JohnWildkins JohnWildkins mentioned this pull request May 17, 2022
Merged
FluffyGhoster referenced this pull request in FluffyGhoster/Aurora.3 Jan 23, 2023
@Sniblet
Merge pull request #1 from Aurorastation/master
9f288e7 
fix conflicts?
@Avignis Avignis mentioned this pull request Mar 6, 2023
Closed
github-merge-queue bot pushed a commit that referenced this pull request Sep 14, 2023
@FluffyGhoster
Spacemandmm galore #1 (#16672)
b752616 
* dmdoc + Initialize

* no errors anymore

* removed duplicate comment, expanded the other

* changelog

* gdf

* fix emotes F4
KingOfThePing added a commit to KingOfThePing/Aurora.3-1 that referenced this pull request Oct 13, 2023
@KingOfThePing
fixes Aurorastation#1
b645fba
furrycactus added a commit to furrycactus/Aurora.3 that referenced this pull request Oct 30, 2023
@furrycactus
CI Suite fix Aurorastation#1
9b69c26
github-merge-queue bot pushed a commit that referenced this pull request Jan 16, 2024
@NonQueueingMatt
Bugfix pack #1. (#18221)
651bf48 
* Bugfix pack #1.

* oops

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
NonQueueingMatt pushed a commit that referenced this pull request Mar 9, 2024
@TheStryker
Merge pull request #1 from RustingWithYou/synthevents
afd9376 
Synthevents
AskerWhy228 pushed a commit to AskerWhy228/Aurora.3 that referenced this pull request Mar 18, 2024
@RU-Aurora-space-station13
Merge pull request Aurorastation#1 from SidVeld/fix/adminhelp-empty-m…
85a9f84 
…essage

Фикс проглатывания сообщений в пм-ках
T6751 pushed a commit to T6751/T.Aurora that referenced this pull request Apr 9, 2024
@denrules @FlacoFF
Ru lang fixes (Aurorastation#1)
3740a20 
Tongue or hiss fixes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@skull132 @BotBOREALIS