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

Joelampost · 2024-11-04T02:24:58Z

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

🆑 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:

Fixes map a lil bit more

deathrobotpunch · 2024-11-04T02:42:14Z

OWLF ERT being available would also be fun too

Joelampost · 2024-11-04T04:37:32Z

OWLF ERT being available would also be fun too

When they are done sure

code/datums/emergency_calls/pred_hunt/hunting_calls.dm

code/modules/cm_preds/yaut_items.dm

Co-authored-by: harryob <me@harryob.live>

Resolved

cm13-github · 2024-11-19T13:42:21Z

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

cm13-github · 2024-11-19T15:12:32Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

Nanu308

mapping lgtm now

cm13-github · 2024-11-29T12:03:24Z

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

cm13-github · 2024-11-29T16:49:56Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

15b9e26: maps/map_files/LV624/LV624.dmm 15b9e26: maps/map_files/LV624/standalone/leftsidepass.dmm 15b9e26: maps/map_files/LV624/standalone/lv-bridge-east.dmm 15b9e26: maps/map_files/LV624/standalone/rightsidepass.dmm 15b9e26: maps/map_files/LV624/standalone/sandtemple-jungle.dmm 15b9e26: maps/map_files/LV624/standalone/sandtemple-se.dmm Automatically commited by: tools\mapmerge2\fixup.py

Drulikar · 2024-11-29T20:09:33Z

Re flowers from hell [bcb8dbe] you can also just revert that commit and instead use the UpdatePath script from my PR that had to repath the flowers. The issue was two flower types were mismatched with the quantity of flowers they had as variants, so the update paths corrects that.

See https://github.com/cmss13-devs/cmss13/tree/master/tools/UpdatePaths for details
But basically the process if you want to keep flowers, but not have messed up flowers would be this:

Revert commit bcb8dbe
Drag the script 7659-expanded-missing-icons.txt (its in tools/UpdatePaths/Scripts) onto Update Paths.bat
Check + Commit/Push

This reverts commit bcb8dbe.

Joelampost and others added 4 commits November 4, 2024 00:17

hell

07a0732

Fixes map a lil bit more

1642d43

Merge pull request #3 from Nanu308/thwomper

e0be018

Fixes map a lil bit more

fixes map probably

58b2c14

Joelampost requested a review from Nanu308 as a code owner November 4, 2024 02:24

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 changed the title ~~The Hunting Grounds (Needs Testing)~~ The Hunting Grounds (Needs Testing) NOW WITH A MAP THAT WORKS Nov 4, 2024

cmss13-ci bot added the Fix Fix one bug, make ten more label Nov 4, 2024

Joelampost added 2 commits November 4, 2024 02:31

chair

3684ff1

hunt.dm

9c7c2a1

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 marked this pull request as draft November 4, 2024 02:44

Joelampost added 4 commits November 4, 2024 03:05

possible

3df5e63

maybe

b28abe0

test

ff15f93

wei

0762c84

Joelampost marked this pull request as ready for review November 4, 2024 04:42

Joelampost added 2 commits November 5, 2024 04:19

Missed

53f45d0

north = south

145115b

cm13-github added a commit that referenced this pull request Nov 6, 2024

TGS Test Merge (#7486)

8a4d17a

harryob requested changes Nov 6, 2024

View reviewed changes

harryob marked this pull request as draft November 6, 2024 23:31

harryob added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Nov 6, 2024

Joelampost and others added 3 commits November 6, 2024 23:31

Update code/modules/cm_preds/yaut_items.dm

01784d0

Co-authored-by: harryob <me@harryob.live>

Update code/modules/cm_preds/yaut_items.dm

fd9624e

Co-authored-by: harryob <me@harryob.live>

Update code/modules/cm_preds/yaut_items.dm

8fa1d11

Co-authored-by: harryob <me@harryob.live>

Joelampost marked this pull request as ready for review November 19, 2024 10:34

cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 19, 2024

Joelampost added 2 commits November 19, 2024 15:03

Merge branch 'master' into thwomper

d19966e

Merge branch 'master' into thwomper

9b2bfdf

cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 19, 2024

Nanu308 approved these changes Nov 20, 2024

View reviewed changes

Nanu308 added the Mapping Approved adds 500 new dict keys label Nov 20, 2024

Steelpoint mentioned this pull request Nov 23, 2024

SSV Rostock - UPP Warship Map #7525

Open

cm13-github added a commit that referenced this pull request Nov 26, 2024

TGS Test Merge (#7486)

4cbbb5c

cm13-github added a commit that referenced this pull request Nov 26, 2024

TGS Test Merge (#7486)

c0bbbdd

ClairionCM mentioned this pull request Nov 27, 2024

Lesser drone planting weeds doesnt check properly #7683

Open

3 tasks

cm13-github added a commit that referenced this pull request Nov 27, 2024

TGS Test Merge (#7486)

19d1548

cm13-github added a commit that referenced this pull request Nov 27, 2024

TGS Test Merge (#7486)

9073fad

cm13-issue-bot mentioned this pull request Nov 27, 2024

Solar Devils can be seen via Overwatch Console #7486 #7690

Open

cm13-github added a commit that referenced this pull request Nov 28, 2024

TGS Test Merge (#7486)

18abd99

cm13-github added a commit that referenced this pull request Nov 28, 2024

TGS Test Merge (#7486)

9cf8b7b

cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 29, 2024

Joelampost added 2 commits November 29, 2024 16:47

temp escape

e1c140d

Merge branch 'master' into thwomper

0e96ebd

cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 29, 2024

Joelampost added 2 commits November 29, 2024 16:58

flowers from hell

bcb8dbe

Joelampost added 2 commits November 29, 2024 21:49

Revert "flowers from hell"

3d86e75

This reverts commit bcb8dbe.

Update jungle_moon.dmm

53bcc27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

Joelampost commented Nov 4, 2024 •

edited

Loading

deathrobotpunch commented Nov 4, 2024

Joelampost commented Nov 4, 2024

cm13-github commented Nov 19, 2024

cm13-github commented Nov 19, 2024

Nanu308 left a comment

cm13-github commented Nov 29, 2024

cm13-github commented Nov 29, 2024

Drulikar commented Nov 29, 2024 •

edited

Loading

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

Are you sure you want to change the base?

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

Conversation

Joelampost commented Nov 4, 2024 • edited Loading

About the pull request

Explain why it's good for the game

Testing Photographs and Procedure

Changelog

Changelog

deathrobotpunch commented Nov 4, 2024

Joelampost commented Nov 4, 2024

cm13-github commented Nov 19, 2024

cm13-github commented Nov 19, 2024

Nanu308 left a comment

Choose a reason for hiding this comment

cm13-github commented Nov 29, 2024

cm13-github commented Nov 29, 2024

Drulikar commented Nov 29, 2024 • edited Loading

Joelampost commented Nov 4, 2024 •

edited

Loading

Drulikar commented Nov 29, 2024 •

edited

Loading