Ambushes by Sun-Soaked · Pull Request #210 · Monkestation/Monkeris

Sun-Soaked · 2025-11-08T07:54:14Z

About The Pull Request

Ambush controller
Ambush datums
Ambush burrow & snares
Improve controller code & add more customization
Make the ambush look & feel nicer for players
Actually implement the ambush stuff in a player-facing way

Adds a new system that allows us to dynamically spawn an enemy encounter around players, mainly for use in hazardous exploration sites like deepmaint, golem caves, & maybe some ruins

This is heavily based on the old(and deprecated) golem wave controller, but has had a bunch of work done to make it work in a variety of situations

Currently, this system is set up to experimentally spawn ambushes in deepmaint. More types may be added depending on whether this works out well

How the system works:

1: A player steps into a tile being watched by an Ambush Snare, and is detected
2: The ambush snare spawns an Ambush Controller connected to that player, with qualities based on the Ambush Datum the snare feeds into the controller
3: For a certain amnt of time, the ambush controller will gradually spawn ambush burrows around the player, which will disgorge enemies to attack them.
The specific behavior of the ambush controller, the mobs spawned, the lenghth of the ambush, etc. Is all specified in the ambush datum
4: When the ambush has exhausted it's allotted time, spawned it's max amnt. of burrows, or successfully killed the player, it ends, and all ambush burrows seal and despawn

Why It's Good For The Game

Gives us an additional method to bring in enemies to fight players
Fun immersive way to drop a challenge directly on player's heads when they might not be expecting it, while also allowing us to increase the "real" enemy content of an area without having 500 mobs loitering around

Testing

WIP

Ambushes work, snares work, datums work

Changelog

🆑
add: Ambushes, a method to spawn in enemies around a player when they enter a location
tweak: Adds a duration arg to shake_animation
/:cl:

e

stuff

code/modules/mining/ambush.dm

code/modules/mining/ambush_structures.dm

code/modules/mob/living/living_defines.dm

code/modules/mining/ambush_structures.dm

Co-authored-by: Chen Marisa <18307183+flleeppyy@users.noreply.github.com>

…ambush

Co-authored-by: Chen Marisa <18307183+flleeppyy@users.noreply.github.com>

this feels like a violation of sacred ground

forgot to remove that def + desc stuff

for when I do cave implementation

ChiefMonkengineer · 2025-11-29T01:59:37Z

Test merge deployment history:

Test Merge Deployed @ 11/29/2025 01:59:09 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: b4a8644
Pull Request: 82dce97
Server: 8b9ce8ba93607dffdc115073264df495ac828e44

Test Merge Updated @ 11/29/2025 15:40:43 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: b4a8644
Pull Request: 82dce97
Server: cede85c434c0a77d42293004d8e61b53b57db3a9

Test Merge Updated @ 11/29/2025 15:41:45 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: b4a8644
Pull Request: 82dce97
Server: 4b16137480c46cb4eef563f4441ce79a75c8541f

Test Merge Updated @ 11/29/2025 16:04:18 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: b4a8644
Pull Request: 82dce97
Server: 7fcdc3d6df654ab2a08823323b15af2105695976

Test Merge Updated @ 11/29/2025 16:08:44 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: b4a8644
Pull Request: 82dce97
Server: a031cd1d97905bdad9a3360caf5d1482efa7d97f

Test Merge Updated @ 11/29/2025 16:11:02 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: b17cacd
Pull Request: 82dce97
Server: f32289db3f299eb4ef99a9cb7fc034026dc64633

Test Merge Updated @ 11/29/2025 16:11:57 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: 4b8afcb
Pull Request: 82dce97
Server: 4eb1f1fbd2fc85508e1be51cd7af820812c28090

Test Merge Updated @ 11/29/2025 17:56:07 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: 4b8afcb
Pull Request: 82dce97
Server: 909fdc5d46335e2a4b012001842ff474f0308679

Test Merge Updated @ 11/29/2025 23:32:01 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: 4b8afcb
Pull Request: 82dce97
Server: 1632f9b6059d17f90a3c71adbccca21df20b8144

Test Merge Updated @ 11/30/2025 00:00:16 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: b610e92
Pull Request: 82dce97
Server: b2d6c8f50c58923a021988f3ed416a2838976582

Test Merge Updated @ 11/30/2025 02:17:42 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: 5bad9ab
Pull Request: 82dce97
Server: 0b70c32a198e6e4225b333752c752ad4c129418b

Test Merge Updated @ 11/30/2025 02:28:25 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: 5bad9ab
Pull Request: 82dce97
Server: 2eba1c0eda34b831e9c1f2d2c3e1abcd8bbf6ff4

Test Merge Updated @ 12/09/2025 23:53:40 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: a360b55
Pull Request: 82dce97
Server: 107efd9c98b705e28a1e4e703fae284e5d8ba65d

Test Merge Updated @ 12/09/2025 23:54:46 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: a360b55
Pull Request: 82dce97
Server: 25a650a10cd3ddada5be0277843580ffdbfda294

Test Merge Updated @ 12/15/2025 17:19:36 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: b6aa578
Pull Request: 82dce97
Server: 394406712ade9d0eec390d40fc8f454da25d0d8c

Test Merge Updated @ 01/09/2026 21:14:20 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: e401a16
Pull Request: 041ebba
Server: 6142052c97d37ff5b60653267b17fb12f3e3d01a

Test Merge Updated @ 01/09/2026 21:16:53 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: e401a16
Pull Request: 041ebba
Server: 5fec2be7b570e0883323c8843550e0ec08cf80cf

Test Merge Updated @ 02/12/2026 02:10:15 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: 56165ce
Pull Request: 041ebba
Server: fb033c0976cf07b82d139f6b2c92a495422c082e

Test Merge Updated @ 02/12/2026 03:02:19 +00:00:

Server Instance

Monkeris

Merged By

flleeppyy2

Revision

Origin: 46383b6
Pull Request: 041ebba
Server: 1920306878d31f89fc17408e4ac660580f7d2049

Test Merge Updated @ 02/12/2026 19:19:28 +00:00:

Server Instance

Monkeris

Merged By

sunsoaked

Revision

Origin: 46383b6
Pull Request: 041ebba
Server: 04ca5a6d76257b4eeb6183b2be0fcab20239540a

Test Merge Updated @ 02/20/2026 22:40:28 +00:00:

Server Instance

Monkeris

Merged By

mycah

Revision

Origin: ccdb897
Pull Request: 041ebba
Server: d7239732881b6b8bff5fca587544cabdb4af8a33

Test Merge Updated @ 02/20/2026 22:44:08 +00:00:

Server Instance

Monkeris

Merged By

mycah

Revision

Origin: ccdb897
Pull Request: 041ebba
Server: bb023091719ec34ea5ef54a54784abc92c5e145b

Test Merge Updated @ 02/21/2026 18:29:26 +00:00:

Server Instance

Monkeris

Merged By

mycah

Revision

Origin: ccdb897
Pull Request: 041ebba
Server: eb57e4e2ed602f963ab8f3900df2e41510936ab9

Test Merge Updated @ 02/21/2026 21:48:25 +00:00:

Server Instance

Monkeris

Merged By

mycah

Revision

Origin: ccdb897
Pull Request: 041ebba
Server: b1de184b3281e4df9f369a18229d0273168fdb2a

Test Merge Updated @ 02/22/2026 04:04:58 +00:00:

Server Instance

Monkeris

Merged By

mycah

Revision

Origin: ccdb897
Pull Request: 041ebba
Server: 8f12d002fa6c369e07dd5be490ef2f42d25996ac

Test Merge Removed @ 02/22/2026 04:07:08 +00:00:

Server Instance

Monkeris

oughhhhh

Sun-Soaked · 2026-02-22T04:30:44Z

I have made a severe and continuous lapse in judgement. anyway it's fixed now

Sun-Soaked added 4 commits October 29, 2025 21:04

Merge pull request #2 from Monkestation/master

e6f6ecc

e

ambush controller

c952855

stuff

misinput

c4e3959

comment cleanup

d27946a

Sun-Soaked marked this pull request as draft November 8, 2025 08:07

flleeppyy requested changes Nov 8, 2025

View reviewed changes

Sun-Soaked and others added 20 commits November 8, 2025 03:34

improve burrow placement logic + customization

fd071a6

Update code/modules/mining/ambush.dm

d8c0292

Co-authored-by: Chen Marisa <18307183+flleeppyy@users.noreply.github.com>

Update code/modules/mining/ambush.dm

f7f3b64

Co-authored-by: Chen Marisa <18307183+flleeppyy@users.noreply.github.com>

fixes

bd1443a

Update code/modules/mining/ambush.dm

0de469a

Co-authored-by: Chen Marisa <18307183+flleeppyy@users.noreply.github.com>

Update code/modules/mining/ambush.dm

10c99f8

Co-authored-by: Chen Marisa <18307183+flleeppyy@users.noreply.github.com>

Update code/modules/mining/ambush.dm

395c1d3

Co-authored-by: Chen Marisa <18307183+flleeppyy@users.noreply.github.com>

removes stop() from burrows

05dc267

Merge branch 'ambush' of https://github.com/Sun-Soaked/CEV-Eris into …

18dfc01

…ambush

Update code/modules/mining/ambush_structures.dm

4f96488

Co-authored-by: Chen Marisa <18307183+flleeppyy@users.noreply.github.com>

Update code/modules/mining/ambush_structures.dm

9abcce8

Co-authored-by: Chen Marisa <18307183+flleeppyy@users.noreply.github.com>

Update code/modules/mining/ambush_structures.dm

99e729b

Co-authored-by: Chen Marisa <18307183+flleeppyy@users.noreply.github.com>

Update code/modules/mining/ambush_structures.dm

2ce1cc8

Co-authored-by: Chen Marisa <18307183+flleeppyy@users.noreply.github.com>

oops

f2fce41

total var/ambushed death

7f3debb

this feels like a violation of sacred ground

minor stuff

424ad17

forgot to remove that def + desc stuff

WIP anmbush implementation & golem pathing

9ba4d7c

for when I do cave implementation

skill issue

2698a2c

fixes & shorter warn time

2b27d99

fixes ambush check in gen

0a67f9c

github-actions bot added the Merge Conflict label Nov 25, 2025

Merge branch 'master' into ambush

82dce97

github-actions bot removed the Merge Conflict label Nov 25, 2025

flleeppyy and others added 2 commits December 16, 2025 12:46

Merge branch 'master' into ambush

041ebba

booboo the fool

2536349

oughhhhh

Conversation

Sun-Soaked commented Nov 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

About The Pull Request

Why It's Good For The Game

Testing

Changelog

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ChiefMonkengineer commented Nov 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test merge deployment history:

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Revision

Server Instance

Merged By

Sun-Soaked commented Nov 8, 2025 •

edited

Loading

ChiefMonkengineer commented Nov 29, 2025 •

edited

Loading