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.

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

Overmap Expansion #5 #3868

Draft
wants to merge 174 commits into
base: master
Choose a base branch
from
Draft

Conversation

rye-rice
Copy link
Member

@rye-rice rye-rice commented Dec 2, 2024

About The Pull Request

I said I would PR this by Dec 1st, and I did. Barely.
image

I need to clean this the fuck up, the branch is really messy with a ton of unused stuff left over, but never say I don't keep my word. I need a few days more to clean this up.

I have tested this and it does function.

carp_sleeping 1

Introduction

om5

Happy Holidays Shiptest!

This project initially started as yet another "add more planets, more stuff to do" PR, but as I have seen, even overmap expansion # 4 didn't really accomplish the goal of making people feel more connected to the overmap, or really making the overmap more interesting... The only interesting parts were the planets as was always the case.

So in order to do this, I have done several (Many!) things...

To keep it simple and easy to understand I have split:

For Players:

om52
Overmap sprites have been almost completely redrawn in a nice and easy to click style

image

As you might have noticed by the numbers, limited lifespan hazards. The issue with the old overmap is that it felt very static and not very "alive". This aims to fix it and add some depth, and also to keep people away from the sun.

You also might notice the asteroid field "planet" is nowhere to be seen. Well, they're actually everywhere! You just need to dock to empty space while on top of an asteroid field.

image

What's Malachite?

image

New ores were added, along with new materials. The ore rates on some planets were jacked the fuck up to make different planets worth visiting if you need X material.

image
image

Examining planets will allow you to see which ores are on what, alongside the "Materials and You" book that spawns on every ship now!

Greebles

Radio Interference

Wideband radio sound

Nebulas/new hazards

Interactions

Fauna balance

Plasteel --> Carbon Steel

Ore vein for most planets + mission changes

om5lava
om5ice
om5_sandplanet

Because we have a dedicated team of spriters here, most if not all planets have gotten a makeover...

For Admins:

image
For my fellow eventmins, you have 2 more buildmode tools, these actually manipulate the overmap unlike BUILD_ADV before which only messed with the token
Modif Overmap works like BUILD_ADV but only for the overmap, while (//) --> Overmap moves overmap objects, like the move tool

VV options

Multi-Overmap Support

Overmap Palletes

Better Upload Template UI

Static Overmap Objects

New Planets

For Coders:

om5_multiovermap
In order to get some things to work, this splits the overmap off from SSovermap .(/datum/overmap_star_system/. This techinically allows for mutiple overmaps, but the main purpose was to make the code more modular. I found this much easier to work with than having to go look at SSovermap constantly.

Explanation of punch-cards:

image
Greebles but in depth.

image
There are now mutiple sprites for overmap ships! By default it's the second one in that screenshot. You can edit it in the ship config json by adding:
to add this in your json add:

    "token_icon_state": "ship_small_generic",

And make sure it has one of these icon states
image
Technically you could name it anything in this file but ill suplex you if you do.

image
https://github.com/user-attachments/assets/6f7c6ddf-09c5-4090-b8dc-68ed05cf3ca9
Debugging Docking Ports - New Shuttle Goggles

image

image

Interactions but in depth

image
Transit levels are MUCH bigger, this was due to an attempt to code in ship to ship docking. This is actually possible, however it would require remapping every ship, so I will do that in some follow-up PR. If you want to help me in the meantime, you can offset where your ship spawns in the transit level by adding this to your config JSON:

    "tranist_x_offset": -5,
    "tranist_y_offset": -5,

This won't cause issues if unset, so don't worry about it.

image
To avoid remapping, all the new materials + materials and you spawn in once on top of the ship's autolathe.
You can disable this by setting this in your ship's config, in case you map these in:

    "spawn_matbundle": 0,

A full changelog is in the CL!

Requires #3512

Credits!

Credits:

  • Imaginos16/Spooky: Planet spriters. Fucking huge thanks to you two holy shit this would be so much harder without their help
    • Lava: Imaginos16/Spooky
    • Ice: Spooky
    • Jungle: N/A (uses re-palleted Imaginos sprites)
    • Sand: Imaginos16
    • Rock: N/A
    • Waste: Imaginos16
    • Moon: N/A (uses re-palleted Spooky sprites)
    • Desert: Spooky
    • ???: N/A (uses re-palleted Spooky sprites)
    • Water: N/A
    • Asteroid N/A (uses re-palleted Imaginos sprites)
  • Horizon: The extra planets were ported from there at first, and any remaining sprites from the original port are from there
    • The ambient sounds and footsteps are from Horizon
  • Solar Flare Alarm and Sound Effect are from Skyrat/Nova Sector/Bubberstation/Whichever Chinese Warring States Period Server is the current main holder of the Skyrat codebase
  • Wideband sound and interference sound are from Chatterer
  • Water sprite was taken from CM13

Changelog

🆑 ryerice, Imaginos16, spooky, Horizon, Nebula (presumably), MarkSuckerberg
add: Added new things
add: Added more things
del: Removed old things
tweak: tweaked a few things
balance: rebalanced something
fix: fixed 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
code: changed some code
refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
/:cl:

rye-rice added 30 commits March 28, 2023 15:43
This reverts commit 341ba0d.
This reverts commit f8ad878.
commit 584fc0d
Author: retlaw34 <[email protected]>
Date:   Mon Feb 19 19:25:07 2024 -0800

    yeag

commit fa7c458
Merge: f6ae1cd b479208
Author: retlaw34 <[email protected]>
Date:   Mon Feb 19 19:23:37 2024 -0800

    Merge remote-tracking branch 'upstream/master' into overmap5

commit f6ae1cd
Author: retlaw34 <[email protected]>
Date:   Sun Feb 11 17:01:18 2024 -0800

    hyudrosatan

commit 083ff61
Author: retlaw34 <[email protected]>
Date:   Sun Feb 4 16:05:26 2024 -0800

    aaaaaaaaaaaaaaaaaaa

commit ea6cf77
Author: retlaw34 <[email protected]>
Date:   Sat Feb 3 23:59:29 2024 -0800

    hydros shrouded ruin

commit e0ca429
Author: retlaw34 <[email protected]>
Date:   Tue Jan 23 19:57:18 2024 -0800

    DONE

commit 8294611
Author: retlaw34 <[email protected]>
Date:   Mon Jan 22 00:21:09 2024 -0800

    aaaaaaaaaaaa

commit 19d9b2b
Merge: 41232f7 2918caf
Author: retlaw34 <[email protected]>
Date:   Thu Jan 18 12:40:22 2024 -0800

    Merge remote-tracking branch 'upstream/master' into overmap5

commit 41232f7
Author: retlaw34 <[email protected]>
Date:   Wed Jan 17 16:18:31 2024 -0800

    fixes moon, im such a dumbass

commit 62065d7
Author: retlaw34 <[email protected]>
Date:   Mon Jan 8 00:49:11 2024 -0800

    AUGH

commit 23edb7d
Merge: 4ac7157 ce50d8f
Author: retlaw34 <[email protected]>
Date:   Sun Jan 7 16:45:14 2024 -0800

    Merge remote-tracking branch 'upstream/master' into overmap5

commit 4ac7157
Author: retlaw34 <[email protected]>
Date:   Wed Jan 3 10:22:49 2024 -0800

    no clue if this works

commit c0af4d0
Author: retlaw34 <[email protected]>
Date:   Tue Jan 2 18:59:05 2024 -0800

    REMINDER THERES A BUG WHERE NORUIN PLANETS NO WETH

commit 7f70165
Merge: fa88e9b 8ac66ae
Author: retlaw34 <[email protected]>
Date:   Tue Jan 2 02:19:50 2024 -0800

    Merge remote-tracking branch 'upstream/master' into overmap5

commit fa88e9b
Author: retlaw34 <[email protected]>
Date:   Tue Dec 19 02:15:24 2023 -0800

    asfdsdf

commit f9f79a3
Merge: f665f62 fa00e59
Author: retlaw34 <[email protected]>
Date:   Tue Dec 19 01:47:20 2023 -0800

    Merge remote-tracking branch 'upstream/master' into overmap5

commit f665f62
Author: retlaw34 <[email protected]>
Date:   Tue Dec 19 01:45:36 2023 -0800

    battlefield planet many fixes

commit e9ef5de
Author: retlaw34 <[email protected]>
Date:   Sat Oct 28 18:09:06 2023 -0700

    tremind me to remove half this shit

commit 4d61f01
Merge: 4280b16 498d1b3
Author: retlaw34 <[email protected]>
Date:   Tue Oct 24 21:56:59 2023 -0700

    Merge remote-tracking branch 'upstream/master' into overmap5

commit 4280b16
Author: retlaw34 <[email protected]>
Date:   Tue Oct 24 21:45:48 2023 -0700

    Revert "Ye"

    This reverts commit f304d1f.

commit 4eb63f0
Author: retlaw34 <[email protected]>
Date:   Sun Sep 3 16:32:49 2023 -0700

    adssadsaasdfasdfasdf

commit 008618a
Author: retlaw34 <[email protected]>
Date:   Sun Sep 3 12:42:26 2023 -0700

    code cleanup

commit f304d1f
Author: retlaw34 <[email protected]>
Date:   Sun Sep 3 11:58:03 2023 -0700

    Ye

commit 4d6302f
Author: retlaw34 <[email protected]>
Date:   Sat Sep 2 07:12:13 2023 -0700

    Greebling

commit c5c5c77
Merge: 8535e40 000d8d3
Author: retlaw34 <[email protected]>
Date:   Wed Aug 30 01:29:46 2023 -0700

    Merge remote-tracking branch 'upstream/master' into moreplanets

commit 8535e40
Author: retlaw34 <[email protected]>
Date:   Wed Aug 30 00:49:13 2023 -0700

    yeag

commit 9fb2745
Author: retlaw34 <[email protected]>
Date:   Tue Aug 29 03:58:09 2023 -0700

    start

commit 0beced6
Author: retlaw34 <[email protected]>
Date:   Wed Aug 16 16:19:50 2023 -0700

    working again, yaaayyyyyyyyyy

commit 97dcdcf
Author: retlaw34 <[email protected]>
Date:   Tue Aug 15 19:43:05 2023 -0700

    gets it working

commit 61f0e1f
Merge: 051d5a6 dfb0b43
Author: retlaw34 <[email protected]>
Date:   Tue Aug 15 19:42:53 2023 -0700

    Merge remote-tracking branch 'upstream/master' into moreplanets

commit 051d5a6
Merge: 216023c 8818fed
Author: retlaw34 <[email protected]>
Date:   Mon Jan 16 19:48:39 2023 -0800

    Merge remote-tracking branch 'origin/master' into moreplanets

commit 216023c
Author: retlaw34 <[email protected]>
Date:   Sun Nov 13 03:02:29 2022 -0800

    sa

commit 79a864e
Author: retlaw34 <[email protected]>
Date:   Sat Nov 12 22:15:56 2022 -0800

    a

commit 1d0a37b
Author: retlaw34 <[email protected]>
Date:   Fri Nov 11 17:32:23 2022 -0800

    messups

commit 69eb7a7
Author: retlaw34 <[email protected]>
Date:   Fri Nov 11 17:26:13 2022 -0800

    b

commit dd70a81
Merge: 84cef2b 27c7213
Author: retlaw34 <[email protected]>
Date:   Fri Nov 11 17:25:32 2022 -0800

    Merge branch 'master' into moreplanets

commit 84cef2b
Author: retlaw34 <[email protected]>
Date:   Thu Aug 11 22:27:47 2022 -0700

    A

commit 8d7efb4
Merge: 1d8d460 4a70670
Author: retlaw34 <[email protected]>
Date:   Thu Aug 11 08:15:14 2022 -0700

    Merge branch 'overmap4' into moreplanets

commit 4a70670
Merge: f80cacc a9501d3
Author: retlaw34 <[email protected]>
Date:   Thu Aug 11 08:15:03 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 1d8d460
Author: retlaw34 <[email protected]>
Date:   Thu Aug 11 08:09:35 2022 -0700

    desert

commit f80cacc
Merge: e408497 2510551
Author: retlaw34 <[email protected]>
Date:   Tue Aug 9 20:14:13 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit c6443e0
Merge: 81ff363 e408497
Author: retlaw34 <[email protected]>
Date:   Tue Aug 9 19:46:26 2022 -0700

    Merge branch 'overmap4' into moreplanets

commit e408497
Author: retlaw34 <[email protected]>
Date:   Tue Aug 9 08:37:14 2022 -0700

    lavaland is hot

commit cd0612b
Author: retlaw34 <[email protected]>
Date:   Tue Aug 9 07:07:52 2022 -0700

    zx

commit 8318c29
Author: retlaw34 <[email protected]>
Date:   Tue Aug 9 06:49:45 2022 -0700

    stops being a bitch and makes a ruin

commit 81ff363
Merge: f84e4de 47ca1a8
Author: retlaw34 <[email protected]>
Date:   Mon Aug 8 18:54:17 2022 -0700

    Merge branch 'overmap4' into moreplanets

commit 47ca1a8
Author: retlaw34 <[email protected]>
Date:   Mon Aug 8 18:50:52 2022 -0700

    rcds can build on top of water

commit f84e4de
Author: retlaw34 <[email protected]>
Date:   Mon Aug 8 18:49:15 2022 -0700

    some improvements

commit 60c088b
Merge: d75129b ed92ba0
Author: retlaw34 <[email protected]>
Date:   Mon Aug 8 18:38:12 2022 -0700

    Merge branch 'overmap4' into moreplanets

commit ed92ba0
Author: retlaw34 <[email protected]>
Date:   Mon Aug 8 18:13:45 2022 -0700

    adjusts ruins

commit 187a76f
Merge: bb723c1 39a198c
Author: retlaw34 <[email protected]>
Date:   Sun Aug 7 15:40:58 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit bb723c1
Author: retlaw34 <[email protected]>
Date:   Sat Jul 30 22:30:26 2022 -0700

    fixes unintentional backrooms planets

commit 3685712
Author: retlaw34 <[email protected]>
Date:   Sat Jul 30 20:24:39 2022 -0700

    typo

commit 884ebf3
Author: retlaw34 <[email protected]>
Date:   Sat Jul 30 02:36:47 2022 -0700

    stucpid fudcking

commit 50231ab
Author: retlaw34 <[email protected]>
Date:   Fri Jul 29 19:28:36 2022 -0700

    moths

commit 46c730f
Merge: 0fbcb23 6144a36
Author: retlaw34 <[email protected]>
Date:   Fri Jul 29 19:26:34 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 0fbcb23
Author: retlaw34 <[email protected]>
Date:   Wed Jul 27 15:39:40 2022 -0700

    fixes bug?

commit f9508ad
Author: retlaw34 <[email protected]>
Date:   Mon Jul 25 19:34:06 2022 -0700

    nerfs acid

commit 063bcc0
Merge: 3d5f9b8 1f95ddc
Author: retlaw34 <[email protected]>
Date:   Mon Jul 25 09:56:11 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 3d5f9b8
Author: retlaw34 <[email protected]>
Date:   Thu Jul 21 15:57:18 2022 -0700

    regex again

commit e9df8f3
Author: retlaw34 <[email protected]>
Date:   Thu Jul 21 15:38:53 2022 -0700

    linters

commit e02d9ff
Merge: 94f49de 9542244
Author: retlaw34 <[email protected]>
Date:   Thu Jul 21 15:20:09 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit d75129b
Author: retlaw34 <[email protected]>
Date:   Thu Jul 21 15:07:09 2022 -0700

    aqua

commit 16237cf
Merge: 316c6f6 94f49de
Author: retlaw34 <[email protected]>
Date:   Thu Jul 21 01:57:03 2022 -0700

    Merge branch 'overmap4' into moreplanets

commit 94f49de
Author: retlaw34 <[email protected]>
Date:   Thu Jul 21 01:50:44 2022 -0700

    organization

commit 316c6f6
Author: retlaw34 <[email protected]>
Date:   Tue Jul 19 05:56:02 2022 -0700

    Revert "Merge branch 'prettyovermap' into overmap4"

    This reverts commit 2cd321a.

commit 2cd321a
Merge: 9d399be 8e38659
Author: retlaw34 <[email protected]>
Date:   Tue Jul 19 05:56:02 2022 -0700

    Merge branch 'prettyovermap' into overmap4

commit 9d399be
Merge: df5ec4c 8198ece
Author: retlaw34 <[email protected]>
Date:   Tue Jul 19 05:54:19 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 8e38659
Author: retlaw34 <[email protected]>
Date:   Tue Jul 19 05:54:05 2022 -0700

    cooler overmap

commit df5ec4c
Author: retlaw34 <[email protected]>
Date:   Mon Jul 18 06:14:00 2022 -0700

    fixes outposts

commit 0518e44
Merge: be453ef d047965
Author: retlaw34 <[email protected]>
Date:   Mon Jul 18 05:06:54 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit be453ef
Merge: ae555b8 637f8a4
Author: retlaw34 <[email protected]>
Date:   Sun Jul 17 06:29:20 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit ae555b8
Author: retlaw34 <[email protected]>
Date:   Fri Jul 15 21:48:30 2022 -0700

    fixes

commit 167dbd0
Author: retlaw34 <[email protected]>
Date:   Fri Jul 15 21:27:26 2022 -0700

    A

commit ec54dab
Merge: 293d452 0b31368
Author: retlaw34 <[email protected]>
Date:   Fri Jul 15 19:27:26 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 293d452
Merge: ba70c8a 54e8a35
Author: retlaw34 <[email protected]>
Date:   Fri Jul 15 13:13:32 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit ba70c8a
Merge: d7f5108 c0f4c89
Author: retlaw34 <[email protected]>
Date:   Wed Jul 13 16:03:50 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit d7f5108
Author: retlaw34 <[email protected]>
Date:   Wed Jul 13 14:14:46 2022 -0700

    i am going to fucking scream

commit 52a94e9
Author: retlaw34 <[email protected]>
Date:   Wed Jul 13 14:12:05 2022 -0700

    shouldnt ceonflict

commit 4b25d41
Author: retlaw34 <[email protected]>
Date:   Tue Jul 12 16:22:54 2022 -0700

    yeah

commit 2835ae6
Merge: 18e60c4 35b122a
Author: retlaw34 <[email protected]>
Date:   Tue Jul 12 11:10:26 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 18e60c4
Author: retlaw34 <[email protected]>
Date:   Sun Jul 10 18:56:03 2022 -0700

    unending agonizing pain

commit 6dc5482
Author: retlaw34 <[email protected]>
Date:   Sun Jul 10 16:06:50 2022 -0700

    map editor fixes

commit 8910482
Author: retlaw34 <[email protected]>
Date:   Sun Jul 10 03:29:09 2022 -0700

    stupid me

commit 6a37b57
Merge: f060f03 7391997
Author: retlaw34 <[email protected]>
Date:   Sat Jul 9 22:27:56 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit f060f03
Merge: 80e4386 a743b2b
Author: retlaw34 <[email protected]>
Date:   Fri Jul 8 22:02:08 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 80e4386
Author: retlaw34 <[email protected]>
Date:   Fri Jul 8 21:47:28 2022 -0700

    a

commit 7f8cb97
Author: retlaw34 <[email protected]>
Date:   Fri Jul 8 21:34:50 2022 -0700

    polish/ beach planet changes

commit 7bbe922
Author: retlaw34 <[email protected]>
Date:   Fri Jul 8 20:47:18 2022 -0700

    better sprites, fixes linters

commit 033f64f
Author: retlaw34 <[email protected]>
Date:   Fri Jul 8 19:04:02 2022 -0700

    bs crystal icon

commit 382abe1
Author: retlaw34 <[email protected]>
Date:   Fri Jul 8 19:03:53 2022 -0700

    organization + neo suggestion

commit 8c2e86a
Merge: 67e9436 1753ada
Author: retlaw34 <[email protected]>
Date:   Wed Jul 6 21:33:45 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 67e9436
Merge: 9130b24 2583e48
Author: retlaw34 <[email protected]>
Date:   Wed Jul 6 14:35:18 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 9130b24
Author: retlaw34 <[email protected]>
Date:   Tue Jul 5 13:56:26 2022 -0700

    fixes

commit 7f23945
Author: retlaw34 <[email protected]>
Date:   Sun Jul 3 06:01:48 2022 -0700

    jungle fauna

commit 9c5e6d6
Author: retlaw34 <[email protected]>
Date:   Sun Jul 3 05:54:39 2022 -0700

    sand update 2

commit 4616f5e
Author: retlaw34 <[email protected]>
Date:   Sun Jul 3 04:08:54 2022 -0700

    rebalance

commit 3ba550e
Author: retlaw34 <[email protected]>
Date:   Sun Jul 3 03:53:37 2022 -0700

    concrete footstep sound

commit 1af29f2
Author: retlaw34 <[email protected]>
Date:   Sun Jul 3 03:50:25 2022 -0700

    demodularizes mining.dmi, fixes a turf file, and adds SAND

commit 8afa0de
Merge: 79c97a6 31d7352
Author: retlaw34 <[email protected]>
Date:   Sun Jul 3 03:09:19 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 79c97a6
Merge: 03ab513 02fbc20
Author: retlaw34 <[email protected]>
Date:   Tue Jun 28 17:08:21 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 03ab513
Author: retlaw34 <[email protected]>
Date:   Tue Jun 28 14:51:10 2022 -0700

    a

commit 8667e68
Author: retlaw34 <[email protected]>
Date:   Mon Jun 27 01:18:16 2022 -0700

    removes ruins

commit 5ff7edf
Merge: ee3d951 b878fe3
Author: retlaw34 <[email protected]>
Date:   Sun Jun 26 20:34:47 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit ee3d951
Author: retlaw34 <[email protected]>
Date:   Thu Jun 23 14:41:46 2022 -0700

    idk

commit 4f42a97
Author: retlaw34 <[email protected]>
Date:   Thu Jun 23 14:36:20 2022 -0700

    i am such a dumbass

commit fbbcb07
Author: retlaw34 <[email protected]>
Date:   Thu Jun 23 14:33:30 2022 -0700

    I HATE MAPPERS!! I HATE MAPPERS!!

commit 4f71d84
Author: retlaw34 <[email protected]>
Date:   Thu Jun 23 12:55:20 2022 -0700

    updates map that was never updated

commit c939232
Author: retlaw34 <[email protected]>
Date:   Thu Jun 23 11:54:36 2022 -0700

    removes tomb of decay

commit 3263b11
Author: retlaw34 <[email protected]>
Date:   Thu Jun 23 11:52:25 2022 -0700

    didnt even notice this, wtf mappers?

commit bebf60d
Author: retlaw34 <[email protected]>
Date:   Thu Jun 23 11:49:59 2022 -0700

    fixes map

commit fdb2d49
Author: retlaw34 <[email protected]>
Date:   Thu Jun 23 11:14:17 2022 -0700

    fixes rockplanet turf bug

commit 2843387
Merge: 813003d d281c5e
Author: retlaw34 <[email protected]>
Date:   Thu Jun 23 10:38:53 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 813003d
Author: retlaw34 <[email protected]>
Date:   Sun Jun 19 21:09:57 2022 -0700

    fixes air and atmos

commit 3c9d299
Merge: 0a6e11e 10044c9
Author: retlaw34 <[email protected]>
Date:   Sun Jun 19 11:13:54 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 0a6e11e
Author: retlaw34 <[email protected]>
Date:   Sat Jun 18 15:10:19 2022 -0700

    jungle

commit 199560c
Author: retlaw34 <[email protected]>
Date:   Sat Jun 18 14:38:07 2022 -0700

    removes Mark Suckerberg

commit 3c1848c
Author: retlaw34 <[email protected]>
Date:   Sat Jun 18 14:37:21 2022 -0700

    touches up ruins / fixes jungle caves

commit 35e9e6a
Author: retlaw34 <[email protected]>
Date:   Fri Jun 17 14:18:12 2022 -0700

    1 fish 2 fish green fish invisible fish

commit a9aa971
Author: retlaw34 <[email protected]>
Date:   Thu Jun 16 17:35:06 2022 -0700

    touches up fucked up ruins

commit 6fb6315
Author: retlaw34 <[email protected]>
Date:   Wed Jun 15 21:29:25 2022 -0700

    a

commit ea36707
Merge: 771874e dd32884
Author: retlaw34 <[email protected]>
Date:   Wed Jun 15 15:56:32 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 771874e
Author: retlaw34 <[email protected]>
Date:   Tue Jun 14 15:27:53 2022 -0700

    fixes trees?

commit 0a26052
Author: retlaw34 <[email protected]>
Date:   Mon Jun 13 19:51:06 2022 -0700

    fixes wasteplanet factions

commit 236eb3a
Author: retlaw34 <[email protected]>
Date:   Mon Jun 13 18:59:54 2022 -0700

    A

commit f994b27
Author: retlaw34 <[email protected]>
Date:   Sat Jun 11 17:15:53 2022 -0700

    A

commit f40a8e8
Author: retlaw34 <[email protected]>
Date:   Sat Jun 11 16:57:11 2022 -0700

    attempt 2

commit 4904e2f
Author: retlaw34 <[email protected]>
Date:   Sat Jun 11 16:50:48 2022 -0700

    revises ruins

commit f695626
Author: retlaw34 <[email protected]>
Date:   Sat Jun 11 16:12:32 2022 -0700

    fuck 2

commit 6316947
Author: retlaw34 <[email protected]>
Date:   Sat Jun 11 16:10:54 2022 -0700

    FUCK

commit 06641e2
Author: retlaw34 <[email protected]>
Date:   Sat Jun 11 15:29:10 2022 -0700

    rockplanet & largeobjecttransparency.dm component

commit 681d046
Author: retlaw34 <[email protected]>
Date:   Fri Jun 10 17:27:27 2022 -0700

    rockplanet turfs

commit 0b5c90b
Author: retlaw34 <[email protected]>
Date:   Fri Jun 10 15:07:50 2022 -0700

    cleans stuff up

commit c34e23f
Author: retlaw34 <[email protected]>
Date:   Mon Jun 6 11:55:59 2022 -0700

    tweaked the weather

commit a4308fb
Author: retlaw34 <[email protected]>
Date:   Mon Jun 6 01:19:35 2022 -0700

    a

    a

commit b7bd7a4
Author: retlaw34 <[email protected]>
Date:   Mon Jun 6 00:03:52 2022 -0700

    Whitesands 2

commit f0102c8
Author: retlaw34 <[email protected]>
Date:   Sun Jun 5 22:06:29 2022 -0700

    whitesands

commit f3ad29f
Author: retlaw34 <[email protected]>
Date:   Sun Jun 5 20:02:57 2022 -0700

    ruin fix

commit fb104a0
Author: retlaw34 <[email protected]>
Date:   Sun Jun 5 19:35:32 2022 -0700

    updates weather

commit a57037e
Merge: 11aa106 8342205
Author: retlaw34 <[email protected]>
Date:   Sun Jun 5 17:40:10 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 11aa106
Author: retlaw34 <[email protected]>
Date:   Sun Jun 5 14:50:51 2022 -0700

    tocuhps

commit 1e49967
Author: retlaw34 <[email protected]>
Date:   Sun Jun 5 14:15:06 2022 -0700

    not the best idea

commit 214fd95
Author: retlaw34 <[email protected]>
Date:   Sun Jun 5 13:55:42 2022 -0700

    gets beach ruins working

commit e943a7d
Author: retlaw34 <[email protected]>
Date:   Sun Jun 5 13:13:08 2022 -0700

    adds ruins

commit f613bab
Author: retlaw34 <[email protected]>
Date:   Sun Jun 5 12:36:08 2022 -0700

    fixes + add lobtrosity

commit 4db0e68
Author: retlaw34 <[email protected]>
Date:   Sun Jun 5 10:38:39 2022 -0700

    fixes

commit 4a08e70
Author: retlaw34 <[email protected]>
Date:   Sun Jun 5 00:52:00 2022 -0700

    icemoon makeover!

commit e96db9d
Merge: 08087b6 ee2f003
Author: retlaw34 <[email protected]>
Date:   Sat Jun 4 13:51:41 2022 -0700

    Merge remote-tracking branch 'upstream/master' into overmap4

commit 08087b6
Merge: c23e16e e8efee8
Author: retlaw34 <[email protected]>
Date:   Sat Jun 4 13:46:47 2022 -0700

    Merge remote-tracking branch 'origin/rockplanetimprovement' into overmap4

commit c23e16e
Author: IndusRobot <[email protected]>
Date:   Sat May 28 19:54:07 2022 -0600

    legally distinct videogame ruins (#3)

commit e8efee8
Author: retlaw34 <[email protected]>
Date:   Sun May 22 12:09:33 2022 -0700

    f

commit b2096e4
Merge: a731c83 4d9ceeb
Author: retlaw34 <[email protected]>
Date:   Wed May 18 15:24:26 2022 -0700

    Merge remote-tracking branch 'upstream/master' into rockplanetimprovement

commit 1cba3d8
Author: retlaw34 <[email protected]>
Date:   Wed May 11 01:52:48 2022 -0700

    placeholders and fixes

commit 7acb1b0
Author: retlaw34 <[email protected]>
Date:   Tue May 10 22:34:42 2022 -0700

    WOOOOOOOOOOOOOOOOOOOOOOOOOOOO

commit d4b843d
Author: retlaw34 <[email protected]>
Date:   Tue May 10 19:13:44 2022 -0700

    start on beach

commit dc3971d
Merge: 427067a a731c83
Author: retlaw34 <[email protected]>
Date:   Tue May 10 18:11:43 2022 -0700

    Merge branch 'rockplanetimprovement' into overmap4

commit a731c83
Merge: 5a653da 009f39a
Author: retlaw34 <[email protected]>
Date:   Tue May 10 18:11:22 2022 -0700

    Merge remote-tracking branch 'shiptest-ss13/master' into rockplanetimprovement

commit 427067a
Merge: b5883e1 5a653da
Author: retlaw34 <[email protected]>
Date:   Tue May 10 18:10:39 2022 -0700

    Merge branch 'rockplanetimprovement' into overmap4

commit 5a653da
Author: retlaw34 <[email protected]>
Date:   Tue May 10 12:06:01 2022 -0700

    cleanup2

commit 2d2d4c9
Author: retlaw34 <[email protected]>
Date:   Tue May 10 11:36:46 2022 -0700

    AAAA

commit 25be73e
Author: retlaw34 <[email protected]>
Date:   Tue May 10 11:35:39 2022 -0700

    oops

commit aba46a7
Author: retlaw34 <[email protected]>
Date:   Tue May 10 11:28:13 2022 -0700

    cleanup

commit 3d732aa
Author: retlaw34 <[email protected]>
Date:   Sun May 8 13:02:26 2022 -0700

    m

commit b27e97e
Merge: 4a389c1 a2e2d46
Author: retlaw34 <[email protected]>
Date:   Sun May 8 13:02:14 2022 -0700

    Merge remote-tracking branch 'origin/rockplanetimprovement' into rockplanetimprovement

commit a2e2d46
Author: retlaw34 <[email protected]>
Date:   Sun May 8 00:22:19 2022 -0700

    Update code/datums/mapgen/Cavegens/RockplanetCaves.dm

    Co-authored-by: Fikou <[email protected]>

commit b5883e1
Author: retlaw34 <[email protected]>
Date:   Thu May 5 20:14:11 2022 -0700

    rockplanet split complete, just needs more unique stuff

commit db48d64
Author: retlaw34 <[email protected]>
Date:   Thu May 5 16:49:49 2022 -0700

    initial

commit 4a389c1
Merge: f0aa926 4c77d78
Author: retlaw34 <[email protected]>
Date:   Thu Apr 28 13:46:21 2022 -0700

    Merge branch 'master' into rockplanetimprovement

commit f0aa926
Author: retlaw34 <[email protected]>
Date:   Tue Apr 19 21:28:46 2022 -0700

    clean up

commit 76132c1
Author: retlaw34 <[email protected]>
Date:   Sat Apr 16 19:34:13 2022 -0700

    adjust weights

commit 237ef7f
Merge: d321954 59b853d
Author: retlaw34 <[email protected]>
Date:   Sat Apr 16 19:31:57 2022 -0700

    Merge remote-tracking branch 'upstream/master' into rockplanetimprovement

commit d321954
Author: retlaw34 <[email protected]>
Date:   Fri Mar 25 23:24:46 2022 -0700

    reduces ed health

commit 55e148b
Author: retlaw34 <[email protected]>
Date:   Wed Mar 23 08:31:19 2022 -0700

    new tetra sprites plus weight ajustemenys

commit 3793aa5
Author: retlaw34 <[email protected]>
Date:   Mon Mar 21 23:00:08 2022 -0700

    Apply suggestions from code review

    Co-authored-by: tetra zeta  <[email protected]>

commit b281ca8
Author: retlaw34 <[email protected]>
Date:   Fri Mar 18 11:03:07 2022 -0700

    Update monolith.dm

commit 6e3938c
Author: retlaw34 <[email protected]>
Date:   Fri Mar 18 08:04:49 2022 -0700

    Update WhitesandsCaves.dm

commit 0e822ad
Author: retlaw34 <[email protected]>
Date:   Fri Mar 18 00:21:35 2022 -0700

    fixes bugs revealed by the TM

commit d0a020f
Author: retlaw34 <[email protected]>
Date:   Thu Mar 17 20:28:01 2022 -0700

    AUTODOC AAAAAAAAAAAAA

commit 7df4492
Merge: ee7493a bf55bde
Author: retlaw34 <[email protected]>
Date:   Fri Mar 4 15:40:51 2022 -0800

    Merge remote-tracking branch 'upstream/master' into rockplanetimprovement

commit ee7493a
Author: retlaw34 <[email protected]>
Date:   Thu Feb 24 19:59:51 2022 -0800

    Update code/modules/mob/living/simple_animal/hostile/megafauna/codename_claw.dm

    Co-authored-by: Mark Suckerberg <[email protected]>

commit bf1eb54
Author: retlaw34 <[email protected]>
Date:   Thu Feb 24 19:59:41 2022 -0800

    Update code/game/objects/structures/monolith.dm

    Co-authored-by: Mark Suckerberg <[email protected]>

commit fb508a4
Merge: 985d528 219f751
Author: Zephyr <[email protected]>
Date:   Sat Feb 19 13:21:56 2022 -0500

    Merge branch 'master' into rockplanetimprovement

commit 985d528
Author: retlaw34 <[email protected]>
Date:   Wed Feb 16 20:50:27 2022 -0800

    bug fixes

commit 4b0e5f3
Author: retlaw34 <[email protected]>
Date:   Wed Feb 16 17:34:02 2022 -0800

    makes it fucking compil

commit ee42325
Author: retlaw34 <[email protected]>
Date:   Wed Feb 16 17:16:25 2022 -0800

    crystal spear inhands

commit 6ce0681
Author: retlaw34 <[email protected]>
Date:   Wed Feb 16 16:29:27 2022 -0800

    A

commit 30c4903
Author: retlaw34 <[email protected]>
Date:   Wed Feb 16 16:09:25 2022 -0800

    fixes

commit 9cbc317
Author: retlaw34 <[email protected]>
Date:   Wed Feb 16 15:59:29 2022 -0800

    fixes goliath trophy detonation

commit b6b12cf
Author: retlaw34 <[email protected]>
Date:   Wed Feb 9 15:24:53 2022 -0800

    finishes lobster

commit 6a236c5
Author: retlaw34 <[email protected]>
Date:   Mon Jan 31 22:21:30 2022 -0800

    m

commit 36174ac
Author: retlaw34 <[email protected]>
Date:   Mon Jan 31 22:14:55 2022 -0800

    fixes things up

commit 5847a4e
Author: retlaw34 <[email protected]>
Date:   Mon Jan 31 00:53:37 2022 -0800

    much better

commit 6dbae39
Author: retlaw34 <[email protected]>
Date:   Sun Jan 30 16:34:44 2022 -0800

    finishes salvaging

commit 972dee5
Merge: aef3d93 b7ce7c5
Author: retlaw34 <[email protected]>
Date:   Sun Jan 30 15:15:16 2022 -0800

    Merge remote-tracking branch 'shiptest-ss13/master' into rockplanetimprovement

commit aef3d93
Author: retlaw34 <[email protected]>
Date:   Sun Jan 30 15:15:11 2022 -0800

    SCRAPPER

commit c4fd3e2
Author: retlaw34 <[email protected]>
Date:   Wed Jan 19 18:37:26 2022 -0800

    salvage

commit 607673a
Author: retlaw34 <[email protected]>
Date:   Tue Jan 18 17:13:34 2022 -0800

    moves ancient.dmi

commit 400009b
Author: retlaw34 <[email protected]>
Date:   Mon Jan 17 21:37:06 2022 -0800

    Update code/game/objects/structures/statues.dm

    Co-authored-by: Firefox13 <[email protected]>

commit 745c84a
Author: retlaw34 <[email protected]>
Date:   Mon Jan 17 21:37:02 2022 -0800

    Update code/game/objects/structures/statues.dm

    Co-authored-by: Firefox13 <[email protected]>

commit c668405
Author: retlaw34 <[email protected]>
Date:   Mon Jan 17 18:27:42 2022 -0800

    ancient structures

commit 9dccc3c
Author: retlaw34 <[email protected]>
Date:   Mon Jan 17 17:29:56 2022 -0800

    m

commit 067c2aa
Author: retlaw34 <[email protected]>
Date:   Mon Jan 17 11:40:49 2022 -0800

    salvaging

commit c12b239
Author: retlaw34 <[email protected]>
Date:   Sun Jan 16 16:54:38 2022 -0800

    last touches hopefully

commit 7553a0a
Author: retlaw34 <[email protected]>
Date:   Sun Jan 16 04:29:43 2022 -0800

    a

commit b12c865
Author: retlaw34 <[email protected]>
Date:   Sat Jan 15 23:57:04 2022 -0800

    Yippe

commit b2da089
Merge: 2f28bca eafe374
Author: retlaw34 <[email protected]>
Date:   Sat Jan 15 23:38:36 2022 -0800

    Merge remote-tracking branch 'upstream/master' into rockplanetimprovement

commit 2f28bca
Author: retlaw34 <[email protected]>
Date:   Sat Jan 15 23:38:28 2022 -0800

    updates

commit e65858a
Author: retlaw34 <[email protected]>
Date:   Fri Jan 14 16:29:00 2022 -0800

    more

commit ed17881
Author: retlaw34 <[email protected]>
Date:   Thu Jan 13 19:26:44 2022 -0800

    spears work lol

commit 59c8bd8
Author: retlaw34 <[email protected]>
Date:   Sat Jan 8 05:43:45 2022 -0800

    more

commit b77dd81
Author: retlaw34 <[email protected]>
Date:   Tue Jan 4 19:41:59 2022 -0800

    FUCK

commit b62022e
Merge: ad8bbd3 2b51deb
Author: retlaw34 <[email protected]>
Date:   Tue Jan 4 19:33:45 2022 -0800

    Merge remote-tracking branch 'upstream/master' into rockplanetimprovement

commit ad8bbd3
Author: retlaw34 <[email protected]>
Date:   Tue Jan 4 19:28:45 2022 -0800

    makes them actually spawn and removes the bad idea

commit 6225a94
Author: retlaw34 <[email protected]>
Date:   Mon Dec 27 15:45:26 2021 -0800

    test

commit fb00201
Author: retlaw34 <[email protected]>
Date:   Sun Dec 26 21:26:20 2021 -0800

    fixes

commit 4d8f9ef
Author: retlaw34 <[email protected]>
Date:   Sun Dec 26 16:25:34 2021 -0800

    E

commit 5e77c0f
Author: retlaw34 <[email protected]>
Date:   Sun Dec 26 14:19:20 2021 -0800

    asfda

commit 877b670
Author: retlaw34 <[email protected]>
Date:   Fri Dec 24 14:27:29 2021 -0800

    saves progress

commit 6bc23a3
Author: retlaw34 <[email protected]>
Date:   Thu Dec 23 18:59:16 2021 -0800

    More fauna updtates

commit 0400e97
Author: retlaw34 <[email protected]>
Date:   Mon Dec 20 21:37:01 2021 -0800

    for some reason the linter does not want to work

commit 79b37e3
Author: retlaw34 <[email protected]>
Date:   Mon Dec 20 20:59:08 2021 -0800

    very better

commit a181650
Author: retlaw34 <[email protected]>
Date:   Mon Dec 20 18:54:07 2021 -0800

    start
@Erikafox
Copy link
Contributor

Erikafox commented Dec 7, 2024

cragoney health and max health do not match

Copy link
Contributor

github-actions bot commented Dec 7, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Dec 7, 2024
@Erikafox
Copy link
Contributor

Erikafox commented Dec 7, 2024

the outpost should be immune to comms interference.

@Ratvarr
Copy link

Ratvarr commented Dec 7, 2024

Desert planet: Very good, but the air burns the lungs of srothy+eluouze, forcing them to wear internals. Would be cool to have it not burn their lungs
I really love the ambience of them.
The antlions need to have their death sprite applied after they die instead of when they are pulled south after death.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Dec 13, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Dec 13, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Dec 13, 2024
Copy link
Member

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
first review. not even kinda done..
this is very unatomic please dont make one of these again.

return ..()

/mob/living/simple_animal/hostile/asteroid/basilisk/whitesands/bullet_act(obj/projectile/P)
shell_damage(BULLET_SHELL_DAMAGE)
shell_damage(max(P.force, MAX_BULLET_SHELL_DAMAGE))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
shell_damage(max(P.force, MAX_BULLET_SHELL_DAMAGE))
shell_damage(min(P.force, MAX_BULLET_SHELL_DAMAGE))

Comment on lines +126 to +127
if(client)
return
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you shouldnt even be running this proc if it has a client.

Comment on lines +157 to +158
if(client)
return
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why?

Comment on lines 194 to 200
/proc/flame_radius(turf/epicenter, radius = 1, power = 5, fire_color = "red")
if(!isturf(epicenter))
CRASH("flame_radius used without a valid turf parameter")
radius = clamp(radius, 1, 50) //Sanitize inputs

for(var/turf/turf_to_flame as anything in filled_turfs(epicenter, radius, "circle"))
turf_to_flame.IgniteTurf(power, fire_color)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could be in a better spot (probally mob helpers) or not global

Comment on lines -21 to -22
maxHealth = 80
health = 80
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reasoning?

@@ -313,7 +313,7 @@
// Carbon Monoxide
var/carbon_monoxide_pp = PP(breath,GAS_CO)
if (carbon_monoxide_pp > gas_stimulation_min)
H.reagents.add_reagent(/datum/reagent/carbon_monoxide, 1)
H.reagents.add_reagent(/datum/reagent/carbon_monoxide, 2)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reasoning?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would recommend using an effect where they are still visible while burrowed.

visible_message("<span class='danger'>\The [src] erupts from \the [my_turf]!</span>")
invisibility = 0
burrowed = FALSE
AIStatus = AI_ON
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
AIStatus = AI_ON
toggle_ai(AI_ON)

visible_message("<span class='notice'>\The [src] burrows into \the [my_turf]!</span>")
burrowed = TRUE
invisibility = INVISIBILITY_MAXIMUM
AIStatus = AI_OFF
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
AIStatus = AI_OFF
toggle_ai(AI_OFF)

@@ -3,7 +3,7 @@
copy_type = /datum/disease/advance

/datum/disease/advance/cold/New()
name = "Cold"
name = BIOME_COLD
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bad regex..

Suggested change
name = BIOME_COLD
name = "Cold"

@Erikafox
Copy link
Contributor

I think legally speaking we need to not use the ftl sfx for storms and stuff.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Map Change Tile placing is hard. Thank you for your service. Ruin Ruin successfully tested. Ship Ship successfully tested. Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes. TGUI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants