[READY FOR REVIEW] I killed bubblegum on hard mode and all I got was this stupid medal. Adds hard mode to megafauna. #22016

Qwertytoforty · 2023-08-17T21:04:35Z

What Does This PR Do

All megafauna will have a hard mode, engaged by a grenade available from the mining vendor with some points.
Wears off if teleported. Grenade breaks if teleported while armed.

This hard mode will often have increased stats, potentially new moves, and have moves changed up.

Nanotrasen greatly appreciates you taking on these harder fights for important research on these fauna, and will reward you handsomely for your potential sacrifice... with a medal. And half the points you put into buying the grenade.

There is no reward but the medal for each fauna, and pride. This is optional. No loot should be put behind this, par point replenishment for the grenades.

Adds boss music functionality from TG. tgstation/tgstation#77149

Makes spiral_range_turfs actually a spiral.

Why It's Good For The Game

More optional lavaland content for people that want a harder challenge, is good. This gives NO extra loot, and will not lead to more lavaland loot on station, if anything less due to the risk of death.

spirals being spirals is good

Todo:

name the grenade, add to vendor
add the medals / figure out how to make them drop
fix ash drake lavaland drop
disable enrage on teleport
boss music to base hiero
touch up all fauna
maybe something new for legion? hard to say as it splits, and no hal I am not giving it chasms that is an instant kill
have some crusher users test this.

Testing

Tested abilities.

I would like to beat every fauna personally with this on my test server, will do that after vacation.

Changelog

🆑 Qwertytoforty, tommysalami3, rick hick
add: Added a hardmode version of each megafauna fight.
add: Hardmode can be engaged by using the HRD-MDE on the megafauna, 7 grenades can be purchased for 5000 points.
/:cl:

…m-on-hard-mode-and-all-I-got-was-this-stupid-medal

code/game/objects/effects/landmarks.dm

code/game/objects/items/weapons/storage/lockbox.dm

code/__HELPERS/unsorted.dm

code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm

code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm

Co-authored-by: Contrabang <[email protected]>

…m-on-hard-mode-and-all-I-got-was-this-stupid-medal

…una.dm Co-authored-by: Contrabang <[email protected]>

…stupid-medal' of https://github.com/Qwertytoforty/Paradise into I-killed-bubblegum-on-hard-mode-and-all-I-got-was-this-stupid-medal

code/game/objects/items/weapons/storage/lockbox.dm

code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm

code/datums/status_effects/debuffs.dm

code/game/objects/items/weapons/storage/lockbox.dm

Qwertytoforty · 2023-10-09T18:09:21Z

rapid_melee makes melee attacks happen every SSnpcpool.wait / rapidmelee periods.

/mob/living/simple_animal/hostile/proc/MeleeAction(patience = TRUE) if(rapid_melee > 1) var/datum/callback/cb = CALLBACK(src, PROC_REF(CheckAndAttack)) var/delay = SSnpcpool.wait / rapid_melee for(var/i in 1 to rapid_melee) addtimer(cb, (i - 1)*delay)

…m-on-hard-mode-and-all-I-got-was-this-stupid-medal

Contrabang

Some minor stuff, looks pretty good to me

code/datums/status_effects/debuffs.dm

code/modules/clothing/under/accessories/accessory.dm

Contrabang

LGTM (lets go to mining)

…m-on-hard-mode-and-all-I-got-was-this-stupid-medal

…this stupid medal. Adds hard mode to megafauna. (ParadiseSS13#22016) * hard mode stuff * further progress * more progress * pausing work to fix bug * lets pr this mess * more progress saving as vacation soon * sleep_check_qdel * saving work * medals into deconflicting * icons * Fix compilings, medals * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> * yes * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> * earliest of the returns * icons * Apply suggestions from code review Co-authored-by: Contrabang <[email protected]> * Update code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm Co-authored-by: Contrabang <[email protected]> * ah lateload, my beloved and hated with no debug points * todoops * requested changes * move medals / move comment * guh --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: Contrabang <[email protected]>

Qwertytoforty added 6 commits August 16, 2023 15:16

hard mode stuff

6b101ec

further progress

a1845b4

more progress

76f7a83

Merge remote-tracking branch 'upstream/master' into I-killed-bubblegu…

b111be5

…m-on-hard-mode-and-all-I-got-was-this-stupid-medal

pausing work to fix bug

d8f78f8

lets pr this mess

76ad621

Qwertytoforty marked this pull request as draft August 17, 2023 21:06

Henri215 added the Requires Wiki Update Useful for Wiki Contributers to search for things that need updating label Aug 17, 2023

Qwertytoforty added 2 commits August 18, 2023 16:20

more progress saving as vacation soon

d703f9d

sleep_check_qdel

440ce44

ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally Map Edit This PR will modify a map Sprites This PR modifies the game sprites Sound This PR modifies the game sound labels Aug 18, 2023

github-actions bot added the Merge Conflict This PR is merge conflicted label Aug 19, 2023

SteelSlayer added Feature This PR is a new addition to the game Balance This PR will modify how effective something is or isnt labels Aug 22, 2023

Qwertytoforty added 5 commits August 27, 2023 10:12

saving work

57218bd

medals into deconflicting

d528a20

Merge remote-tracking branch 'upstream/master' into I-killed-bubblegu…

b1733b6

…m-on-hard-mode-and-all-I-got-was-this-stupid-medal

icons

19dda8f

Fix compilings, medals

afbb852

Qwertytoforty marked this pull request as ready for review August 31, 2023 00:10

Qwertytoforty changed the title ~~I killed bubblegum on hard mode and all I got was this stupid medal. Adds hard mode to megafauna.~~ [READY FOR REVIEW] I killed bubblegum on hard mode and all I got was this stupid medal. Adds hard mode to megafauna. Aug 31, 2023

github-actions bot added Merge Conflict This PR is merge conflicted and removed Merge Conflict This PR is merge conflicted labels Aug 31, 2023

Contrabang requested changes Sep 23, 2023

View reviewed changes

Qwertytoforty and others added 6 commits September 23, 2023 13:43

Apply suggestions from code review

9fbd893

Co-authored-by: Contrabang <[email protected]>

Merge remote-tracking branch 'upstream/master' into I-killed-bubblegu…

dcc0781

…m-on-hard-mode-and-all-I-got-was-this-stupid-medal

Update code/modules/mob/living/simple_animal/hostile/megafauna/megafa…

1d4b327

…una.dm Co-authored-by: Contrabang <[email protected]>

ah lateload, my beloved and hated with no debug points

faf07ee

Merge branch 'I-killed-bubblegum-on-hard-mode-and-all-I-got-was-this-…

3217d42

…stupid-medal' of https://github.com/Qwertytoforty/Paradise into I-killed-bubblegum-on-hard-mode-and-all-I-got-was-this-stupid-medal

todoops

18bcaaa

github-actions bot added Merge Conflict This PR is merge conflicted and removed Merge Conflict This PR is merge conflicted labels Sep 24, 2023

Contrabang requested changes Oct 9, 2023

View reviewed changes

Qwertytoforty added 4 commits October 9, 2023 14:09

requested changes

39f4b49

Merge remote-tracking branch 'upstream/master' into I-killed-bubblegu…

067e67f

…m-on-hard-mode-and-all-I-got-was-this-stupid-medal

Merge remote-tracking branch 'upstream/master' into I-killed-bubblegu…

691edce

…m-on-hard-mode-and-all-I-got-was-this-stupid-medal

Merge remote-tracking branch 'upstream/master' into I-killed-bubblegu…

e229101

…m-on-hard-mode-and-all-I-got-was-this-stupid-medal

Contrabang approved these changes Oct 9, 2023

View reviewed changes

code/datums/status_effects/debuffs.dm Outdated Show resolved Hide resolved

code/datums/status_effects/debuffs.dm Outdated Show resolved Hide resolved

code/modules/clothing/under/accessories/accessory.dm Outdated Show resolved Hide resolved

Qwertytoforty added 2 commits October 9, 2023 15:00

move medals / move comment

8213804

guh

e201344

Contrabang approved these changes Oct 9, 2023

View reviewed changes

ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Oct 9, 2023

Merge remote-tracking branch 'upstream/master' into I-killed-bubblegu…

62aadae

…m-on-hard-mode-and-all-I-got-was-this-stupid-medal

github-actions bot removed the Merge Conflict This PR is merge conflicted label Oct 9, 2023

S34NW approved these changes Oct 9, 2023

View reviewed changes

github-actions bot added the Merge Conflict This PR is merge conflicted label Oct 9, 2023

Merge remote-tracking branch 'upstream/master' into I-killed-bubblegu…

8fff82b

…m-on-hard-mode-and-all-I-got-was-this-stupid-medal

github-actions bot removed the Merge Conflict This PR is merge conflicted label Oct 9, 2023

S34NW merged commit 6445680 into ParadiseSS13:master Oct 9, 2023
15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[READY FOR REVIEW] I killed bubblegum on hard mode and all I got was this stupid medal. Adds hard mode to megafauna. #22016

[READY FOR REVIEW] I killed bubblegum on hard mode and all I got was this stupid medal. Adds hard mode to megafauna. #22016

Qwertytoforty commented Aug 17, 2023 •

edited

Loading

Qwertytoforty commented Oct 9, 2023

Contrabang left a comment

Contrabang left a comment

[READY FOR REVIEW] I killed bubblegum on hard mode and all I got was this stupid medal. Adds hard mode to megafauna. #22016

[READY FOR REVIEW] I killed bubblegum on hard mode and all I got was this stupid medal. Adds hard mode to megafauna. #22016

Conversation

Qwertytoforty commented Aug 17, 2023 • edited Loading

What Does This PR Do

Why It's Good For The Game

Todo:

Testing

Changelog

Qwertytoforty commented Oct 9, 2023

Contrabang left a comment

Choose a reason for hiding this comment

Contrabang left a comment

Choose a reason for hiding this comment

Qwertytoforty commented Aug 17, 2023 •

edited

Loading