diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 790194eccdd..77e1ad50c89 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -627,7 +627,7 @@ GLOBAL_LIST_EMPTY(process_objectives) /datum/objective/heist/kidnap /datum/objective/heist/kidnap/choose_target() - var/list/roles = list("Chief Engineer","Research Director","Machinist","Pharmacist","Engineer") + var/list/roles = list("Chief Engineer","Research Director","Machinist","Pharmacist","Ship Engineer") var/list/possible_targets = list() var/list/priority_targets = list() diff --git a/code/game/jobs/faction/hephaestus.dm b/code/game/jobs/faction/hephaestus.dm index f7b3cb9bc51..80cc7b56503 100644 --- a/code/game/jobs/faction/hephaestus.dm +++ b/code/game/jobs/faction/hephaestus.dm @@ -44,7 +44,7 @@ "Hangar Technician" = /obj/outfit/job/hangar_tech/hephaestus, "Shaft Miner" = /obj/outfit/job/mining/hephaestus, "Machinist" = /obj/outfit/job/machinist/hephaestus, - "Engineer" = /obj/outfit/job/engineer/hephaestus, + "Ship Engineer" = /obj/outfit/job/engineer/hephaestus, "Atmospheric Technician" = /obj/outfit/job/atmos/hephaestus, "Engineering Apprentice" = /obj/outfit/job/intern_eng/hephaestus, "Atmospherics Apprentice" = /obj/outfit/job/intern_atmos/hephaestus, diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm index 85f3904f528..9fd2bf573dc 100644 --- a/code/game/jobs/faction/zavodskoi.dm +++ b/code/game/jobs/faction/zavodskoi.dm @@ -60,7 +60,7 @@ "Research Intern" = /obj/outfit/job/intern_sci/zavodskoi, "Xenoarchaeologist"= /obj/outfit/job/scientist/xenoarchaeologist/zavodskoi, "Anomalist"= /obj/outfit/job/scientist/anomalist/zavodskoi, - "Engineer" = /obj/outfit/job/engineer/zavodskoi, + "Ship Engineer" = /obj/outfit/job/engineer/zavodskoi, "Atmospheric Technician" = /obj/outfit/job/atmos/zavodskoi, "Engineering Apprentice" = /obj/outfit/job/intern_eng/zavodskoi, "Atmospherics Apprentice" = /obj/outfit/job/intern_atmos/zavodskoi, diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 97f1567c574..57d120ba719 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -76,7 +76,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(H), slot_gloves) /datum/job/engineer - title = "Engineer" + title = "Ship Engineer" flag = ENGINEER departments = SIMPLEDEPT(DEPARTMENT_ENGINEERING) department_flag = ENGSEC @@ -86,6 +86,7 @@ supervisors = "the chief engineer" selection_color = "#c67519" economic_modifier = 5 + alt_titles = list("Reactor Technician", "Maintenance Technician", "Systems Engineer") minimum_character_age = list( SPECIES_HUMAN = 25, @@ -104,7 +105,7 @@ blacklisted_species = list(SPECIES_VAURCA_BREEDER) /obj/outfit/job/engineer - name = "Engineer" + name = "Ship Engineer" jobtype = /datum/job/engineer box = /obj/item/storage/box/survival/engineer @@ -160,6 +161,7 @@ supervisors = "the chief engineer" selection_color = "#c67519" economic_modifier = 5 + alt_titles = list("Propulsion Engineer", "Damage Control Technician") minimum_character_age = list( SPECIES_HUMAN = 25, diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index c3ed6f2a775..bc428dc2c57 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -96,7 +96,7 @@ var/list/command_support_positions = list( var/list/engineering_positions = list( "Chief Engineer", - "Engineer", + "Ship Engineer", "Atmospheric Technician", "Engineering Apprentice", "Engineering Personnel" diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 10401e14bb9..e193a9e1e19 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -187,8 +187,7 @@ corpseidaccess = "Physician" /obj/effect/landmark/corpse/engineer - name = "Engineer" - corpseradio = /obj/item/radio/headset/headset_eng + name = "Ship Engineer" corpseuniform = /obj/item/clothing/under/rank/engineer corpseback = /obj/item/storage/backpack/industrial corpseshoes = /obj/item/clothing/shoes/sneakers/orange diff --git a/code/modules/client/preference_setup/loadout/items/accessories.dm b/code/modules/client/preference_setup/loadout/items/accessories.dm index e15a309b6e6..673f19748d4 100644 --- a/code/modules/client/preference_setup/loadout/items/accessories.dm +++ b/code/modules/client/preference_setup/loadout/items/accessories.dm @@ -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 diff --git a/code/modules/client/preference_setup/loadout/items/augments.dm b/code/modules/client/preference_setup/loadout/items/augments.dm index ed0f10833b6..31408335abe 100644 --- a/code/modules/client/preference_setup/loadout/items/augments.dm +++ b/code/modules/client/preference_setup/loadout/items/augments.dm @@ -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 diff --git a/code/modules/client/preference_setup/loadout/items/belt.dm b/code/modules/client/preference_setup/loadout/items/belt.dm index 438cc564bb0..7e48b93a8d4 100644 --- a/code/modules/client/preference_setup/loadout/items/belt.dm +++ b/code/modules/client/preference_setup/loadout/items/belt.dm @@ -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 diff --git a/code/modules/client/preference_setup/loadout/items/head.dm b/code/modules/client/preference_setup/loadout/items/head.dm index 877de5d72cc..cd21a0309d3 100644 --- a/code/modules/client/preference_setup/loadout/items/head.dm +++ b/code/modules/client/preference_setup/loadout/items/head.dm @@ -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() ..() diff --git a/code/modules/client/preference_setup/loadout/items/utility.dm b/code/modules/client/preference_setup/loadout/items/utility.dm index ed08f8f1be0..90315350fa7 100644 --- a/code/modules/client/preference_setup/loadout/items/utility.dm +++ b/code/modules/client/preference_setup/loadout/items/utility.dm @@ -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. diff --git a/code/modules/client/preference_setup/loadout/items/xeno/human.dm b/code/modules/client/preference_setup/loadout/items/xeno/human.dm index 4a74b8f76c1..bc42994a99a 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/human.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/human.dm @@ -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" diff --git a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm index fe771b16112..da8277470cf 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -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 diff --git a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm index 56b3088a794..54ec86e6b80 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm @@ -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 diff --git a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm index 3e10e09b471..37a009e1949 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm @@ -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" diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index d9ad2834eeb..f9319acbe93 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -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 diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index 0ab823412fe..2bbb2ecb45a 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -1,7 +1,7 @@ #define ASSIGNMENT_ANY "Any" #define ASSIGNMENT_AI "AI" #define ASSIGNMENT_CYBORG "Cyborg" -#define ASSIGNMENT_ENGINEER "Engineer" +#define ASSIGNMENT_ENGINEER "Ship Engineer" #define ASSIGNMENT_GARDENER "Gardener" #define ASSIGNMENT_JANITOR "Janitor" #define ASSIGNMENT_MEDICAL "Medical" diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm index 6cb7fd02abd..b6c95b9e66e 100644 --- a/code/modules/power/singularity/act.dm +++ b/code/modules/power/singularity/act.dm @@ -17,7 +17,7 @@ /mob/living/carbon/human/singularity_act() var/gain = 20 if(mind) - if((mind.assigned_role == "Engineer") || (mind.assigned_role == "Chief Engineer")) + if((mind.assigned_role == "Ship Engineer") || (mind.assigned_role == "Chief Engineer")) gain = 100 if(mind.assigned_role == "Assistant") gain = rand(0, 300) diff --git a/html/changelogs/KingOfThePing - 21195.yml b/html/changelogs/KingOfThePing - 21195.yml new file mode 100644 index 00000000000..48c956e17fe --- /dev/null +++ b/html/changelogs/KingOfThePing - 21195.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: KingOfThePing + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Returns a selection of alternative job titles to the engineering department." diff --git a/maps/runtime/runtime.dmm b/maps/runtime/runtime.dmm index bb48190fb8b..123c15458e1 100644 --- a/maps/runtime/runtime.dmm +++ b/maps/runtime/runtime.dmm @@ -2166,7 +2166,7 @@ /area/construction) "pT" = ( /obj/effect/landmark/start{ - name = "Engineer" + name = "Ship Engineer" }, /obj/structure/disposalpipe/segment{ dir = 4 diff --git a/maps/sccv_horizon/code/sccv_horizon.dm b/maps/sccv_horizon/code/sccv_horizon.dm index abdd36e2164..6513ac0b28f 100644 --- a/maps/sccv_horizon/code/sccv_horizon.dm +++ b/maps/sccv_horizon/code/sccv_horizon.dm @@ -212,7 +212,7 @@ // so as to not drain power on deadpop // also only loads if no program is loaded already var/list/roles = number_active_with_role() - if(roles && roles["Engineer"] && roles["Engineer"] >= 2) + if(roles && roles["Ship Engineer"] && roles["Ship Engineer"] >= 2) for(var/obj/machinery/computer/holodeck_control/holo in GLOB.holodeck_controls) if(!holo.active) holo.load_random_program() diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 60146f034bd..1a21e29d1a2 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -58217,7 +58217,7 @@ dir = 4 }, /obj/effect/landmark/start{ - name = "Engineer" + name = "Ship Engineer" }, /obj/effect/floor_decal/spline/plain/black{ dir = 8 @@ -60476,7 +60476,7 @@ dir = 1 }, /obj/effect/landmark/start{ - name = "Engineer" + name = "Ship Engineer" }, /obj/effect/floor_decal/spline/plain/black, /turf/simulated/floor/carpet/rubber, @@ -180206,7 +180206,7 @@ /area/horizon/service/bar) "xTM" = ( /obj/effect/landmark/start{ - name = "Engineer" + name = "Ship Engineer" }, /obj/structure/bed/stool/chair/office/dark, /obj/effect/floor_decal/spline/plain/black{