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

Edit/rebalance beach_fishing_hut.dmm #2673

Closed

Conversation

CenkTheRaptor
Copy link
Contributor

@CenkTheRaptor CenkTheRaptor commented Jan 26, 2024

About The Pull Request

Removes the Butcher, a reskinned cat surgeon, from the beach fishing hut ruin, along with the hidden floor safe and it's loot, and the dehydrated carp plushies in a crate.

A couple extra Winchester MK.2s and a MK.1 was added to compensate, in order to change the lore purpose of the ruin to that of it being a hunting lodge with secret carpotoxin harvesting in the cold room (real carp vs the imitation carp outside the coldroom) though the fact they have guns may make it obvious anyways.

The cat surgeon was replaced with a ranged space pirate, renamed to a pirate captain.

The dehydrated carp plushies inside a crate were replaced with some imitation carp. Some overlapping items were shifted around just to make it look a bit better.

image

Why It's Good For The Game

This ruin in general sucks, and I think this may make it suck a bit less. The Winchester MK.1 may be a bit much but I do not know it's stats, please tell me if it is too op.

Changelog

🆑
balance: Removed the Butcher (a reskinned cat surgeon) from the beach fishing hut ruin along with some of it's loot, also changing it to more of a carp hunting lodge.
/:cl:

@CenkTheRaptor CenkTheRaptor requested a review from a team as a code owner January 26, 2024 18:07
@github-actions github-actions bot added the Map Change Tile placing is hard. Thank you for your service. label Jan 26, 2024
@lectronyx
Copy link

HOLD ON, NOW - REMOVE THOSE FISHSTICKS!

They aren't a food item - they're a holoparasite injector that's disguised as one, granting the user a random holocarp. Not a fun surprise when you realize most holoparas are useless on Shiptest, plus they dust you on death.

@CenkTheRaptor
Copy link
Contributor Author

HOLD ON, NOW - REMOVE THOSE FISHSTICKS!

They aren't a food item - they're a holoparasite injector that's disguised as one, granting the user a random holocarp. Not a fun surprise when you realize most holoparas are useless on Shiptest, plus they dust you on death.

those are, in fact, normal fish sticks. /obj/item/reagent_containers/food/snacks/fishfingers versus /obj/item/guardiancreator/carp or /obj/item/guardiancreator/carp/choose.

@Zevotech
Copy link
Contributor

Correct. The holocarp fishsticks dropped from the cat surgeon mob in the ruin, which was removed and replaced with a normal pirate.

@lectronyx
Copy link

Oh thank god.

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

github-actions bot commented Feb 5, 2024

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

@thgvr
Copy link
Member

thgvr commented Mar 12, 2024

conflicts pls

@FalloutFalcon
Copy link
Member

conflict plz...

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label May 20, 2024
@CenkTheRaptor
Copy link
Contributor Author

ok i think its fixed

@FalloutFalcon
Copy link
Member

looks like you need to repath the mk1

image

@FalloutFalcon
Copy link
Member

looks like you need to repath the mk1

image

I think its /obj/item/gun/ballistic/shotgun/flamingarrow/factory

@FalloutFalcon FalloutFalcon added the Ruin Ruin successfully tested. label May 24, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jun 2, 2024
Copy link
Contributor

github-actions bot commented Jun 2, 2024

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 Jun 9, 2024
@Imaginos16
Copy link
Member

PR #3026 already accomplishes what this PR attempts to do. Closing it with permission from maptainer @Zevotech

@Imaginos16 Imaginos16 closed this Jun 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Map Change Tile placing is hard. Thank you for your service. Ruin Ruin successfully tested.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants