Skip to content

Commit 19e6cdf

Browse files
Roundstart Bonus & Towner Triumphs, Misc (Monkestation#3830)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> ## About The Pull Request 'Readying up gives you the great food buff, 30 mammons in a stashed pouch, higher hydration (no need to gulp from the river) and 1 triumph' Towners [Serf, Peasant, Apprentices, Youngling and Company(merchant, shophand and stevedore] get a triumph each night, This mean that they get two triumphs each two nights. No longer show returning when examining a latejoin. <!-- Describe The Pull Request. Please be sure every change is documented or this can delay review and even discourage maintainers from merging your PR! --> ## Why It's Good For The Game stop peoples from lobbysitting. Peoples that ready up get a roundstart bonus because this [pr ](Azure-Peak/Azure-Peak#4254 ) by [WeNeedMorePhoron](https://github.com/WeNeedMorePhoron) is peak. <img width="488" height="107" alt="image" src="https://github.com/user-attachments/assets/cc460457-cd06-4820-bd6c-673bd7085d39" /> And...I genuinely hate this whole 'returning' tag, it's legit fucking useless, let's not have that. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> <!-- !! Do not add whitespace in-between the entries, do not change the tags and do not leave the tags without any entries. --> :cl: add: Town-sided roles get one triumph per night (two triumphs per two night) add: Being readied up when the round start give you great food buff, 30 mammons in a stashed pouch, 1 triumph /:cl: <!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. --> <!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. --> ## Pre-Merge Checklist <!-- Don't bother filling these in while creating your Pull Request, just click the checkboxes after the Pull Request is opened and you are redirected to the page. --> - [x] You tested this on a local server. - [ ] This code did not runtime during testing. - [ ] You documented all of your changes. <!-- Neither the compiler nor workflow checks are perfect at detecting runtimes and errors. It is important to test your code/feature/fix locally. --> --------- Co-authored-by: CheffieGithub <113442598+CheffieGithub@users.noreply.github.com>
1 parent 36936d4 commit 19e6cdf

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

code/modules/jobs/job_types/_job.dm

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,15 @@
284284
for(var/datum/mind/MF in get_minds(X))
285285
spawned.mind.i_know_person(MF)
286286

287+
// Ready up bonus
288+
if(!spawned.islatejoin)
289+
spawned.adjust_triumphs(1)
290+
spawned.apply_status_effect(/datum/status_effect/buff/foodbuff)
291+
spawned.hydration = 800 // Set higher hydration
292+
spawned.nutrition = 800
293+
to_chat(spawned, span_notice("Rising early, you made sure to eat a hearty meal before starting your dae. A true TRIUMPH!"))
294+
295+
287296
var/used_title = get_informed_title(spawned)
288297
if(spawned.islatejoin && (job_flags & JOB_ANNOUNCE_ARRIVAL)) //to be moved somewhere more appropriate
289298
scom_announce("[spawned.real_name] the [used_title] arrives from [SSmapping.config.immigrant_origin].")

code/modules/mob/living/carbon/human/examine.dm

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,11 @@
8585
if(user == src)
8686
self_inspect = TRUE
8787
var/used_title = get_role_title()
88-
var/is_returning = FALSE
89-
if(islatejoin)
90-
is_returning = TRUE
9188

9289
// building the examine identity
9390
statement_of_identity += "<EM>[used_name]</EM>"
9491

9592
var/appendage_to_name
96-
if(is_returning && race_name && !HAS_TRAIT(src, TRAIT_FOREIGNER)) // latejoined? Foreigners can never be returning because they never lived here in the first place
97-
appendage_to_name += " returning"
98-
9993
if(race_name) // race name
10094
appendage_to_name += " [race_name]"
10195
// job name, don't show job of foreigners.

code/modules/mob/living/carbon/human/life.dm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@
5555
mind.sleep_adv.advance_cycle()
5656
if(!mind.antag_datums || !mind.antag_datums.len)
5757
allmig_reward++
58+
var/static/list/towner_jobs
59+
towner_jobs = GLOB.serf_positions | GLOB.peasant_positions | GLOB.apprentices_positions | GLOB.youngfolk_positions | GLOB.company_positions
60+
if(mind.assigned_role.title in towner_jobs) //If you play a towner-related role, you get triumphs.
61+
adjust_triumphs(1)
5862
to_chat(src, span_danger("Nights Survived: \Roman[allmig_reward]"))
5963
if(allmig_reward > 0 && allmig_reward % 2 == 0)
6064
adjust_triumphs(1)

0 commit comments

Comments
 (0)