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

Removes the Blood Cult from Maps #2776

Merged
merged 12 commits into from
Apr 1, 2024
Merged

Conversation

goober3
Copy link
Member

@goober3 goober3 commented Feb 28, 2024

About The Pull Request

This PR:

  • Mass-replaces Cult mobs, turfs, items & structures.
  • Reworks onehalf.dmm & rockplanet_crash_cult.dmm (now rockplanet_crash.dmm) to feature hivebots instead of cult constructs.
  • Removes jungle_demon.dmm, jungle_witch.dmm, lavaland_surface_cultaltar.dmm, lavaland_surface_fuckedupandevilclub.dmm, and rockplanet_cult.dmm due overall lack of quality.
  • The 'village elder' boss in icemoon_underground_abandoned_village.dmm has been replaced by a frontiersman with a shotgun & a box of slugs.

Why It's Good For The Game

We changed our lore and cultists aren't canon anymore. Nor is magic. Half of these ruins are god awful, also. Take the fucked up and evil club, for instance:

image

Now, behold, a lore-friendly onehalf.dmm:

image

Changelog

🆑
tweak: Blood Cult content has been removed from all maps.
del: Jungle_demon.dmm, jungle_witch.dmm, lavaland_surface_cultaltar.dmm, lavaland_surface_fuckedupandevilclub.dmm, clericden.dmm, and rockplanet_cult.dmm have been removed.
tweak: Onehalf.dmm, rockplanet_crash_cult.dmm & icemoon_underground_abandoned_village.dmm have been reworked slightly, to feature no more magic.
/:cl:

@goober3 goober3 requested review from a team as code owners February 28, 2024 00:02
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Code change Watch something violently break. labels Feb 28, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Feb 29, 2024
Copy link
Contributor

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

@Latentish
Copy link
Member

Very epic and cool, we can tm this once it's no longer merge conflicting

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

@Latentish Latentish left a comment

Choose a reason for hiding this comment

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

image
Kill or change cleric den please.

@goober3
Copy link
Member Author

goober3 commented Mar 23, 2024

image Kill or change cleric den please.

oh, woops. totally forgot about that one.

Copy link
Member

@Latentish Latentish left a comment

Choose a reason for hiding this comment

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

Merging this is a sort of gambit we play. There's no way know for sure whether or not you removed all the peripheral code bullshit. So we're going to play a game.

Yeah this is good, tested on live. you did the correct stuff with the catalogue, and you seem to have hunted down areas. You've almost certainly missed a couple things. But that's just the world we live in. Marge time.

@Latentish Latentish added this pull request to the merge queue Apr 1, 2024
Merged via the queue into shiptest-ss13:master with commit 6b499e0 Apr 1, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Apr 12, 2024
## About The Pull Request
This PR:
- Mass-replaces Cult mobs, turfs, items & structures. 
- Reworks onehalf.dmm & rockplanet_crash_cult.dmm (now
rockplanet_crash.dmm) to feature hivebots instead of cult constructs.
- Removes jungle_demon.dmm, jungle_witch.dmm,
lavaland_surface_cultaltar.dmm,
lavaland_surface_fuckedupandevilclub.dmm, and rockplanet_cult.dmm due
overall lack of quality.
- The 'village elder' boss in icemoon_underground_abandoned_village.dmm
has been replaced by a frontiersman with a shotgun & a box of slugs.

## Why It's Good For The Game
We changed our lore and cultists aren't canon anymore. Nor is magic.
Half of these ruins are god awful, also. Take the fucked up and evil
club, for instance:


![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/1be7ddac-22ed-4cdc-8940-4d8d32fa1b2c)

Now, behold, a lore-friendly onehalf.dmm:


![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/422652af-7c59-46bf-a64d-d508a83e0bc4)


## Changelog

:cl:
tweak: Blood Cult content has been removed from all maps.
del: Jungle_demon.dmm, jungle_witch.dmm, lavaland_surface_cultaltar.dmm,
lavaland_surface_fuckedupandevilclub.dmm, clericden.dmm, and
rockplanet_cult.dmm have been removed.
tweak: Onehalf.dmm, rockplanet_crash_cult.dmm &
icemoon_underground_abandoned_village.dmm have been reworked slightly,
to feature no more magic.
/:cl:
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Apr 15, 2024
## About The Pull Request
This PR:
- Mass-replaces Cult mobs, turfs, items & structures. 
- Reworks onehalf.dmm & rockplanet_crash_cult.dmm (now
rockplanet_crash.dmm) to feature hivebots instead of cult constructs.
- Removes jungle_demon.dmm, jungle_witch.dmm,
lavaland_surface_cultaltar.dmm,
lavaland_surface_fuckedupandevilclub.dmm, and rockplanet_cult.dmm due
overall lack of quality.
- The 'village elder' boss in icemoon_underground_abandoned_village.dmm
has been replaced by a frontiersman with a shotgun & a box of slugs.

## Why It's Good For The Game
We changed our lore and cultists aren't canon anymore. Nor is magic.
Half of these ruins are god awful, also. Take the fucked up and evil
club, for instance:


![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/1be7ddac-22ed-4cdc-8940-4d8d32fa1b2c)

Now, behold, a lore-friendly onehalf.dmm:


![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/422652af-7c59-46bf-a64d-d508a83e0bc4)


## Changelog

:cl:
tweak: Blood Cult content has been removed from all maps.
del: Jungle_demon.dmm, jungle_witch.dmm, lavaland_surface_cultaltar.dmm,
lavaland_surface_fuckedupandevilclub.dmm, clericden.dmm, and
rockplanet_cult.dmm have been removed.
tweak: Onehalf.dmm, rockplanet_crash_cult.dmm &
icemoon_underground_abandoned_village.dmm have been reworked slightly,
to feature no more magic.
/:cl:
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.

2 participants