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

Massive Ruin Fixes + Removals PR #2334

Merged
merged 19 commits into from
Nov 17, 2023

Conversation

Zevotech
Copy link
Contributor

@Zevotech Zevotech commented Sep 4, 2023

About The Pull Request

This PR is made so I can stop getting angry at the ruins beyond saving that are still ingame. My criteria for a ruin being removed is if another ruin already does its niche better, if the ruin is outdated and/or the ruin is excessively small or unbalanced. For ruins that dont meet this criteria but are still outdated, they will be getting balance fixes and touch ups or a total remap.

This PR is a draft for now because I will need to update the PR changelog and description as I make changes and communicate with the maptainers on what stays and what goes.

Adds departmental RND lootdrop spawners for circuit imprinters, protolathes and techfabs. Excludes omnisci and basic boards from the drops.
Fixed a space tile under a door and replaced the omnilathe with a medical lathe on dangerousresearch
Fixed the whitesands saloon not spawning which may have caused some sandplanets to spawn without a ruin
Fixed harmfactory's nonfunctional traps to now be as lethal as intended. Also changed the loot in the vault to better reflect the ruin's theme and difficulty (cargo techfab board instead of omnilathe, adv plasma cutter instead of combat medkit, less gold more cash, kept the cyberarm implant).
Fixed provinggrounds magical SMES FINALLY by adding a terminal on the back. The map should finally function as intended.
Fixed a few dirs on fire extinguisher cabinets and blast door assemblies in singularity_lab
Removed mechtransport.dmm for being small and bad
Removed some leftover gasthelizards.dmm cruft (VILE)
Removed nucleardump for being an utter mess of an oldcode ruin
Removed gondolaasteroid for being large and empty besides gondolas. better suited for a jungle planet IMO.
Removed Jungle_Spider. Literally just a box with spiders and cloning equipment. Small, bad, hard to find, unjustified loot.
Removed Golem_Hijack. Like jungle spider but it was free rnd, an AI core, a full BSRPED and three golem corpses. With no enemies or obstacles.
Removed rockplanet_clock for being a tiny lootbox that doesnt fit with the lore. Also had a quantumn pad.
Removed whitesands_surface_youreinsane. Its a silly little reference to an old event that unfortunately resulted in a subpar ruin. Could return as a wasteplanet greeble ruin, but it has to go for now.

Why It's Good For The Game

Normally I'm all for remapping instead of removing ruins, but some ruins are very much beyond saving. Clearing out space for better ruins to take the spotlight is always nice. Some older ruins are fine but are missing certain things or have loot that worked fine in the past, but doesn't reflect the balance we want for ruins in the present.

I will be PR'ing ruins to replace the ones I remove.

Changelog

🆑
add: departmental RND lootdrop spawners for imprinters, protolathes and techfabs
fix: dangerous_research.dmm now no longer has a space tile under a door and a medical lathe instead of an omnilathe
fix: whitesands_surface_camp_saloon can now spawn again after its remap into a functional ruin
fix: harmfactory.dmm's traps now work and loot has been adjusted to fit the ruin better
fix: provinggrounds.dmm now has a working SMES and power
fix: singularity_lab fire extinguishers and a few poddoors now have correct dirs
del: mechtransport.dmm and associated code
del: gasthelizards areas
del: nucleardump.dmm and associated code
del: gondolaasteroid.dmm and associated code
del: jungle_spider.dmm and associated code
del: whitesands_golem_hijack.dmm and associated code
del: rockplanet_clock.dmm and associated code
del: whitesands_surface_youreinsane.dmm and associated code
/:cl:

@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Sep 4, 2023
@github-actions github-actions bot added Config Watch us shake head admins violently until this gets merged. Code change Watch something violently break. labels Sep 4, 2023
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 14, 2023
@github-actions
Copy link
Contributor

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 15, 2023
@spockye
Copy link
Contributor

spockye commented Sep 17, 2023

🦐
its not the shrivel emote, but close enough
i'll go through this tomorrow. if i forget, throw a rock through my window

@Zevotech
Copy link
Contributor Author

🦐 its not the shrivel emote, but close enough i'll go through this tomorrow. if i forget, throw a rock through my window

PR's far from done but feel free to drop suggestions in review

@spockye
Copy link
Contributor

spockye commented Sep 17, 2023

oh, apologies. missed the Draft. Ping me when you want a proper review

@Zevotech
Copy link
Contributor Author

yeah i guess that'll do. still need more suggestions for ruins to fix or remove by maptainers.

@Zevotech Zevotech marked this pull request as ready for review September 17, 2023 21:58
@Zevotech Zevotech requested a review from a team as a code owner September 17, 2023 21:58
@Zevotech
Copy link
Contributor Author

dont worry im still going to remap the rockplanet_box_robotics, golemcrash_hijack and the other whitesands ruins I was going to get.

Copy link
Contributor

@spockye spockye left a comment

Choose a reason for hiding this comment

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

sorry for the delay, thanks!

@Zevotech
Copy link
Contributor Author

Actually still have a few more things on my list to add to this but it is in a mergable state. If you have an idea for anything that should go DM me or ping in ruinyard.

@MarkSuckerberg
Copy link
Member

are you still planning to add more or is this good for merge now (please say yes. new PRs are easy to make)

@Latentish
Copy link
Member

I don't entirely agree with a couple of the ruins being removed here. You also change the ruin blacklist files, which are deprecated now.
I'm going to DNM this for now while we discuss it.

@Latentish Latentish added the Do Not Merge You probably made someone angry, or you're stopping people from getting angry. label Oct 30, 2023
@Latentish
Copy link
Member

I don't entirely agree with a couple of the ruins being removed here. You also change the ruin blacklist files, which are deprecated now. I'm going to DNM this for now while we discuss it.

Hey Latentcy get some glasses.

@Latentish Latentish removed the Do Not Merge You probably made someone angry, or you're stopping people from getting angry. label Oct 30, 2023
@Latentish
Copy link
Member

Remove the blacklist files please. In the meantime we can try TMing this.

@Latentish Latentish added the Test Merge Candidate You do it for free. label Oct 30, 2023
@Zevotech
Copy link
Contributor Author

are you still planning to add more or is this good for merge now (please say yes. new PRs are easy to make)

grins evilly (maybe. I think I've gotten most of the worst offenders that come to mind.)

@github-actions github-actions bot removed the Config Watch us shake head admins violently until this gets merged. label Oct 31, 2023
@Erikafox Erikafox closed this Nov 8, 2023
@Erikafox Erikafox reopened this Nov 8, 2023
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm partial to nuclear dump but as long as you have a replacement on the grill.

@Erikafox Erikafox added this pull request to the merge queue Nov 17, 2023
@Erikafox Erikafox removed the Test Merge Candidate You do it for free. label Nov 17, 2023
Merged via the queue into shiptest-ss13:master with commit 88e683c Nov 17, 2023
17 checks passed
MysticalFaceLesS added a commit to CeladonSS13/Shiptest that referenced this pull request Nov 18, 2023
MysticalFaceLesS added a commit to CeladonSS13/Shiptest that referenced this pull request Nov 18, 2023
MysticalFaceLesS added a commit to CeladonSS13/Shiptest that referenced this pull request Nov 18, 2023
MysticalFaceLesS added a commit to CeladonSS13/Shiptest that referenced this pull request Nov 18, 2023
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. Map Change Tile placing is hard. Thank you for your service.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants