mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-27 23:14:18 +01:00
Renames Engineer & Re-Introduction of Alt-Titles: Merge attempt (#22011)
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
co-authored by
KingOfThePing
KingOfThePing
SleepyGemmy
Batrachophreno
JohnWildkins
KingOfThePing
KingOfThePing
SleepyGemmy
Batrachophreno
JohnWildkins
parent
baae41e1f5
commit
33278949b1
@@ -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()
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
..()
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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."
|
||||
@@ -2166,7 +2166,7 @@
|
||||
/area/construction)
|
||||
"pT" = (
|
||||
/obj/effect/landmark/start{
|
||||
name = "Engineer"
|
||||
name = "Ship Engineer"
|
||||
},
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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{
|
||||
|
||||
Reference in New Issue
Block a user