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

The Hunting Grounds (Needs Testing) NOW WITH A MAP THAT WORKS HOPEFULLY #7486

Open
wants to merge 49 commits into
base: master
Choose a base branch
from

Conversation

Joelampost
Copy link
Contributor

@Joelampost Joelampost commented Nov 4, 2024

About the pull request

I have added a lazy map template list that is spawnable for predators (or admins) to spawn during the round. The teplate also includes a console known as the Huntsmaster Console, which can spawn a variety of Emergency Response Teams (ERTs) for dead chat players to join. To minimize impact on the current round, the Huntsmaster Console is limited to spawning an ERT only once every 20 minutes.

Additionally, I have created equipment presets for specific factions, available exclusively within the hunting ground ERTs. These factions include the United Progressive People (UPP), the Royal Marines of the Three World Empire (TWE), Freelancers, the Colonial Liberation Front (CLF), and the Marines (USCM). All of these presents spawn without headsets.

I have also added a subsection in the ‘Special’ tab of character preferences, allowing players who join these ERTs to select their faction (if they do not get their selected faction it defaults to USCM.

This PR also fixes lighting on lazy map templates(credit to harry)

Explain why it's good for the game

It reduces the amount of round impact predators have, gives ghosts and predators something new and refreshing to do. This will be one of the many PRs to help alleviate the issue with round impact.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

Changelog

🆑 Joe Lampost, Beaglegaming, harryob, Thwomper, Nanu308
add: Added Different equipment pre-sets only for use inside a hunting ground map as part of ERTs
add: Adds a hunts master console that can spawn ERTs every 20 minutes
add: Adds another console for predators to use to spawn hunting ground lazy templates
fix: Fixed the lighting on lazy templates (thanks harry)
soundadd: added a sound for spawing in as an ERT member on the hunting grounds
mapadd: added a new type of lazy_template for hunting grounds
fix: dirtgrassborder now has the correct north and south
/:cl:

@cmss13-ci cmss13-ci bot added Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players Feature Feature coder badge labels Nov 4, 2024
@Joelampost Joelampost changed the title The Hunting Grounds (Needs Testing) The Hunting Grounds (Needs Testing) NOW WITH A MAP THAT WORKS Nov 4, 2024
@cmss13-ci cmss13-ci bot added the Fix Fix one bug, make ten more label Nov 4, 2024
@deathrobotpunch
Copy link
Contributor

OWLF ERT being available would also be fun too

@Joelampost Joelampost changed the title The Hunting Grounds (Needs Testing) NOW WITH A MAP THAT WORKS The Hunting Grounds (Needs Testing) NOW WITH A MAP THAT WORKS HOPEFULLY Nov 4, 2024
@Joelampost Joelampost marked this pull request as draft November 4, 2024 02:44
@Joelampost
Copy link
Contributor Author

OWLF ERT being available would also be fun too

When they are done sure

@Joelampost Joelampost marked this pull request as ready for review November 4, 2024 04:42
cm13-github added a commit that referenced this pull request Nov 6, 2024
code/datums/emergency_calls/pred_hunt/hunting_calls.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/pred_hunt/hunting_calls.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/pred_hunt/hunting_calls.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/pred_hunt/hunting_calls.dm Outdated Show resolved Hide resolved
code/datums/emergency_calls/pred_hunt/hunting_calls.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_items.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_items.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_items.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_items.dm Outdated Show resolved Hide resolved
code/modules/cm_preds/yaut_items.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft November 6, 2024 23:31
@harryob harryob added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Nov 6, 2024
@Joelampost Joelampost marked this pull request as ready for review November 10, 2024 02:37
Copy link
Member

@harryob harryob left a comment

Choose a reason for hiding this comment

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

just a couple of nits - but otherwise i'm not really sure why the /hunted variants exist, is it just removing their headsets? because we can do that with the normal presets and not have to duplicate all this

code/controllers/subsystem/who.dm Outdated Show resolved Hide resolved
code/game/turfs/walls/wall_types.dm Outdated Show resolved Hide resolved
cm13-github added a commit that referenced this pull request Nov 14, 2024
cm13-github added a commit that referenced this pull request Nov 14, 2024
cm13-github added a commit that referenced this pull request Nov 14, 2024
cm13-github added a commit that referenced this pull request Nov 15, 2024
cm13-github added a commit that referenced this pull request Nov 16, 2024
cm13-github added a commit that referenced this pull request Nov 16, 2024
cm13-github added a commit that referenced this pull request Nov 16, 2024
@private-tristan
Copy link
Contributor

Spawning in as a feral xeno (maybe other roles) updates your last death time, meaning that you lose your spot in larva queue if you join. Also please add spitter to the possible spawns as it does decent damage against predators (at least, better than a base strain lurker).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature Feature coder badge Fix Fix one bug, make ten more Mapping did you remember to save in tgm format? Sound Blast 5 minutes of bass boosted music to our players Sprites Remove the soul from the game. Testmerge Candidate we'll test this while you're asleep and the server has 10 players UI deletes nanoui/html
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants