Lavaland #11196
Merged
Lavaland #11196
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
…o turfs # Conflicts: # code/modules/food_and_drinks/recipes/recipes_grill.dm
|
mfw me and corn have been working on this for 2 weeeks now and someone else has started |
|
*dab |
|
Sorry @AffectedArc07, I wasn't aware of that! |
|
By their PRs combined they are Captain Confict |
|
I mean, if this is real. Pics and stuff. |
|
It's very real, I've uploaded some images here. |
mvanalphen
commented
Mar 31, 2019
mvanalphen
commented
Mar 31, 2019
mvanalphen
commented
Mar 31, 2019
mvanalphen
commented
Mar 31, 2019
mvanalphen
commented
Mar 31, 2019
mvanalphen
commented
Mar 31, 2019
mvanalphen
commented
Mar 31, 2019
|
What happens if a singulo is created in lavaland? Does it eat through the entire planet and expose the space on the other side or how do the turfs handle that? |
|
Now I want to make a singulo on the mining asteroid and see what happens 👀 |
|
Lavaland tiles are immune to the singularity. |
|
oh no conflicts! |
|
These conflicts are killing me. |
…o turfs # Conflicts: # _maps/map_files/Delta/delta.dmm # _maps/map_files/MetaStation/MetaStation.v41A.II.dmm # _maps/map_files/MetaStation/z4.dmm # _maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm # _maps/map_files/RandomRuins/SpaceRuins/spacebar.dmm # _maps/map_files/RandomZLevels/spacebattle.dmm # _maps/map_files/cyberiad/cyberiad.dmm # _maps/map_files/cyberiad/z4.dmm # _maps/map_files/cyberiad/z6.dmm # _maps/map_files/generic/z5.dmm # code/__DEFINES/misc.dm # code/__HELPERS/unsorted.dm # code/game/objects/structures/lattice.dm # code/game/turfs/space/space.dm # code/modules/mob/mob.dm # code/modules/ruins/ruin_areas.dm # paradise.dme
marlyn-x86
added
Map Edit
…o turfs # Conflicts: # icons/mob/actions/actions.dmi # paradise.dme
…o turfs # Conflicts: # icons/mob/actions/actions.dmi # icons/mob/inhands/items_lefthand.dmi # icons/mob/inhands/items_righthand.dmi # paradise.dme
|
One more conflict and I'll bomb the station. |
…o turfs # Conflicts: # icons/mob/feet.dmi # paradise.dme
|
Image of mark resolving conflicts: https://i.imgflip.com/18rd3t.jpg EDIT: |
|
@Couls should have posted the Pipboy face/his avatar over the skull |
…o turfs # Conflicts: # icons/obj/vending.dmi # paradise.dme
- Survival pod storage being broken when used. - Wrong wiring on the Syndicate base. - Added one more oxygen tank to the animal hospital. - Chasms eating up light atoms. - Mining satchels not picking up items automatically. - Releasing the legion/blob mice notifications not having icons. - Mining gear made orderable at cargo.
…vendor and add more voucher kits
…o turfs # Conflicts: # paradise.dme
marlyn-x86
removed
the
Map Freeze
marlyn-x86
reviewed
May 31, 2019
marlyn-x86
approved these changes
May 31, 2019
|
Time to get messy |
ParadiseSS13-Bot
added a commit
that referenced
this pull request
May 31, 2019
|
holy shit Sincerely going to miss space mining but this is absolutely dope. Great job |
KasparoVy
reviewed
Jun 1, 2019
| new /obj/item/clothing/suit/space/hardsuit/mining(src) | ||
| new /obj/item/clothing/head/helmet/space/hardsuit/mining(src) | ||
|
|
||
| /obj/item/storage/box/hug |
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.
After laying the foundations like... two years ago, I figured it's high time to make a return and port this over. I've ported over the Lavaland map and a number of ruins (pretty much the biggest ones). These are all entirely up-to-date with /tg/. I've also ported over everything that's on these maps that we didn't yet have and made the necessary changes to the code. These new items are generally speaking also up-to-date, unless porting them over would involve other major refactors. What I haven't done is update existing Lavaland items (although they aren't hugely outdated).
What's next?
I haven't been able to test everything I added, simply because it touches quite a large number of things and there's a lot of stuff. So what needs to happen:
This is going to conflict out the ass, so we do need to hurry up slightly with this. The diffbot contains all relevant map images.
All credit for Lavaland goes to a large number of people at /tg/. There's too many individuals, but if you'd like your name listed here or in the changelog please let me know and I will add you.
🆑 Ported by Markolie and CornMyCob. Developed by many /tg/ coders
add: The mining asteroid has been replaced with Lavaland.
/🆑