cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 12:02:31 +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/loadout/items/accessories.dm
+3 -3
View File
@@ -111,7 +111,7 @@ ABSTRACT_TYPE(/datum/gear/accessory)
/datum/gear/accessory/brown_vest
display_name = "webbing, engineering"
path = /obj/item/clothing/accessory/storage/brown_vest
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel")
allowed_roles = list("Ship Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel")
/datum/gear/accessory/black_vest
display_name = "webbing, security"
@@ -158,7 +158,7 @@ ABSTRACT_TYPE(/datum/gear/accessory)
/datum/gear/accessory/brown_pouches
display_name = "drop pouches, engineering"
path = /obj/item/clothing/accessory/storage/pouches/brown
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel")
allowed_roles = list("Ship Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel")
/datum/gear/accessory/black_pouches
display_name = "drop pouches, security"
@@ -179,7 +179,7 @@ ABSTRACT_TYPE(/datum/gear/accessory)
/datum/gear/accessory/overalls_engineer
display_name = "overalls, engineering"
path = /obj/item/clothing/accessory/storage/overalls/engineer
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel")
allowed_roles = list("Ship Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel")
cost = 2
/datum/gear/accessory/overalls_mining
code/modules/client/preference_setup/loadout/items/augments.dm
+1 -1
View File
@@ -231,7 +231,7 @@
display_name = "retractable glare dampeners"
description = "A subdermal implant installed just above the brow line that deploys a thin sheath of hyperpolycarbonate that protects from eye damage associated with arc flash."
path = /obj/item/organ/internal/augment/tool/correctivelens/glare_dampener
allowed_roles = list("Chief Engineer", "Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist", "Engineering Personnel", "Operations Personnel")
allowed_roles = list("Chief Engineer", "Ship Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist", "Engineering Personnel", "Operations Personnel")
cost = 2
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
code/modules/client/preference_setup/loadout/items/belt.dm
+1 -1
View File
@@ -30,7 +30,7 @@
description = "An alternative look to a standard toolbelt."
cost = 1
path = /obj/item/storage/belt/utility/alt
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Machinist", "Research Director", "Engineering Personnel", "Operations Personnel")
allowed_roles = list("Ship Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Machinist", "Research Director", "Engineering Personnel", "Operations Personnel")
flags = null
/datum/gear/belt/securitybelt_alt
code/modules/client/preference_setup/loadout/items/head.dm
+1 -1
View File
@@ -97,7 +97,7 @@
/datum/gear/head/hardhat
display_name = "hard hat selection"
path = /obj/item/clothing/head/hardhat
allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Operations Manager", "Hangar Technician", "Shaft Miner", "Xenoarchaeologist", "Engineering Personnel", "Operations Personnel")
allowed_roles = list("Ship Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Operations Manager", "Hangar Technician", "Shaft Miner", "Xenoarchaeologist", "Engineering Personnel", "Operations Personnel")
/datum/gear/head/hardhat/New()
..()
code/modules/client/preference_setup/loadout/items/utility.dm
+1 -1
View File
@@ -113,7 +113,7 @@
/datum/gear/utility/himeo_kit
display_name = "himean voidsuit kit"
path = /obj/item/voidsuit_modkit/himeo
allowed_roles = list("Shaft Miner", "Operations Manager", "Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel", "Operations Personnel")
allowed_roles = list("Shaft Miner", "Operations Manager", "Ship Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel", "Operations Personnel")
origin_restriction = list(/singleton/origin_item/origin/himeo, /singleton/origin_item/origin/ipc_himeo, /singleton/origin_item/origin/free_council)
// See the IPC-exclusive tab for the human variant.
code/modules/client/preference_setup/loadout/items/xeno/human.dm
+1 -1
View File
@@ -19,7 +19,7 @@
whitelisted = list(SPECIES_HUMAN_OFFWORLD)
sort_category = "Xenowear - Human"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
allowed_roles = list("Chief Engineer", "Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist", "Engineering Personnel")
allowed_roles = list("Chief Engineer", "Ship Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist", "Engineering Personnel")
/datum/gear/accessory/offworlder
display_name = "legbrace"
code/modules/client/preference_setup/loadout/items/xeno/tajara.dm
+1 -1
View File
@@ -164,7 +164,7 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
path = /obj/item/voidsuit_modkit/himeo/tajara
sort_category = "Xenowear - Tajara"
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
allowed_roles = list("Shaft Miner", "Operations Manager", "Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel", "Operations Personnel")
allowed_roles = list("Shaft Miner", "Operations Manager", "Ship Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel", "Operations Personnel")
origin_restriction = list(/singleton/origin_item/origin/free_council)
/datum/gear/suit/tajara_coat
code/modules/client/preference_setup/loadout/items/xeno/unathi.dm
+1 -1
View File
@@ -228,7 +228,7 @@
culture_restriction = list(/singleton/origin_item/culture/autakh)
sort_category = "Xenowear - Unathi"
cost = 2
allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist", "Engineering Personnel")
allowed_roles = list("Ship Engineer", "Chief Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist", "Engineering Personnel")
flags = GEAR_NO_SELECTION
/datum/gear/augment/autakh_mining
code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm
+1 -1
View File
@@ -294,7 +294,7 @@ ABSTRACT_TYPE(/datum/gear/ears/vaurca)
path = /obj/item/organ/internal/augment/vaurca_mag
sort_category = "Xenowear - Vaurca"
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK)
allowed_roles = list("Shaft Miner", "Engineer", "Atmospheric Technician", "Engineering Apprentice", "Xenoarchaeologist", "Engineering Personnel", "Operations Personnel", "Paramedic", "Medical Personnel")
allowed_roles = list("Shaft Miner", "Ship Engineer", "Atmospheric Technician", "Engineering Apprentice", "Xenoarchaeologist", "Engineering Personnel", "Operations Personnel", "Paramedic", "Medical Personnel")
/datum/gear/accessory/tret_passcard
display_name = "tret passcard"
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