cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renames Engineer & Re-Introduction of Alt-Titles: Merge attempt (#22011)

Browse Source 
https://github.com/Aurorastation/Aurora.3/pull/21195 is having some
weird merge issues, so this is put up to try to get it merged. No actual
changes from the other PR atm aside from merged master.

---------

Signed-off-by: KingOfThePing <43940569+KingOfThePing@users.noreply.github.com>
Co-authored-by: KingOfThePing <cb.back@gmx.de>
Co-authored-by: KingOfThePing <43940569+KingOfThePing@users.noreply.github.com>
Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Co-authored-by: Batrachophreno <Batrochophreno@gmail.com>
Co-authored-by: JohnWildkins <john.wildkins@gmail.com>
This commit is contained in:
Casper3667
2026-03-11 17:34:00 +00:00
committed by GitHub
co-authored by KingOfThePing KingOfThePing SleepyGemmy Batrachophreno JohnWildkins
parent baae41e1f5
commit 33278949b1
22 changed files with 86 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/occupation/occupation.dm
+1 -1
View File
@@ -285,7 +285,7 @@
var/list/choices = pref.GetValidTitles(job)
if(!LAZYLEN(choices))
return ..()// should never happen
var/choice = input("Choose a title for [job.title].", "Choose Title", pref.GetPlayerAltTitle(job)) as anything in choices|null
var/choice = input("Choose a title for [job.title]. Be aware that choosing an alternative title does not absolve you from the job's regular duties!", "Choose Title", pref.GetPlayerAltTitle(job)) as anything in choices|null
if(choice && CanUseTopic(user))
SetPlayerAltTitle(job, choice)
return TOPIC_REFRESH_UPDATE_PREVIEW