diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm index 7b96f712a83..93e44abdc90 100644 --- a/code/__defines/jobs.dm +++ b/code/__defines/jobs.dm @@ -1,7 +1,7 @@ #define COMMAND_ROLES list(/datum/job/captain, /datum/job/xo, /datum/job/chief_engineer, /datum/job/cmo, /datum/job/rd, /datum/job/hos, /datum/job/operations_manager, /datum/job/bridge_crew) #define ENGINEERING_ROLES list(/datum/job/engineer, /datum/job/atmos, /datum/job/intern_eng) #define SERVICE_ROLES list(/datum/job/service_manager, /datum/job/chaplain, /datum/job/bartender, /datum/job/chef, /datum/job/hydro, /datum/job/janitor, /datum/job/journalist, /datum/job/librarian) -#define OPERATIONS_ROLES list(/datum/job/hangar_tech, /datum/job/mining, /datum/job/manufacturing_tech) +#define OPERATIONS_ROLES list(/datum/job/hangar_tech, /datum/job/mining, /datum/job/machinist) #define MEDICAL_ROLES list(/datum/job/doctor, /datum/job/surgeon, /datum/job/pharmacist, /datum/job/psychiatrist, /datum/job/med_tech, /datum/job/intern_med) #define SCIENCE_ROLES list(/datum/job/scientist, /datum/job/xenobiologist, /datum/job/intern_sci) #define SECURITY_ROLES list(/datum/job/warden, /datum/job/investigator, /datum/job/officer, /datum/job/intern_sec) diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index 2a0a469aeab..3cd78aae061 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -952,8 +952,7 @@ set waitfor = 0 var/style = "font-family: 'Fixedsys'; -dm-text-outline: 1 black; font-size: 11px;" - var/area/A = get_area(C.mob) - var/text = "[worlddate2text()], [worldtime2text()]\n[station_name()], [A.name]" + var/text = "[worlddate2text()], [worldtime2text()]\n[station_name()], [SSatlas.current_sector.name]" text = uppertext(text) var/obj/effect/overlay/T = new() diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 2dfba15c028..a1fee658d0a 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -622,7 +622,7 @@ datum/objective/heist datum/objective/heist/kidnap choose_target() - var/list/roles = list("Chief Engineer","Research Director","Manufacturing Technician","Pharmacist","Station Engineer") + var/list/roles = list("Chief Engineer","Research Director","Machinist","Pharmacist","Station 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 1c941bc1a2b..a05a1e305c1 100644 --- a/code/game/jobs/faction/hephaestus.dm +++ b/code/game/jobs/faction/hephaestus.dm @@ -50,8 +50,8 @@ uniform = /obj/item/clothing/under/rank/hephaestus id = /obj/item/card/id/hephaestus -/datum/outfit/job/manufacturing_tech/hephaestus - name = "Manufacturing Technician - Hephaestus" +/datum/outfit/job/machinist/hephaestus + name = "Machinist - Hephaestus" uniform = /obj/item/clothing/under/rank/hephaestus/research id = /obj/item/card/id/hephaestus diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 1a561eb8bd2..67c98da7539 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -481,9 +481,9 @@ messengerbag = /obj/item/storage/backpack/messenger/engi -/datum/job/manufacturing_tech - title = "Manufacturing Technician" - flag = MANUFACTURING_TECH +/datum/job/machinist + title = "Machinist" + flag = MACHINIST departments = SIMPLEDEPT(DEPARTMENT_CARGO) department_flag = CIVILIAN faction = "Station" @@ -500,13 +500,13 @@ minimal_player_age = 7 - outfit = /datum/outfit/job/manufacturing_tech + outfit = /datum/outfit/job/machinist -/datum/outfit/job/manufacturing_tech - name = "Manufacturing Tech" - jobtype = /datum/job/manufacturing_tech +/datum/outfit/job/machinist + name = "Machinist" + jobtype = /datum/job/machinist - uniform = /obj/item/clothing/under/rank/manufacturing_tech + uniform = /obj/item/clothing/under/rank/machinist suit = /obj/item/clothing/suit/storage/toggle/labcoat shoes = /obj/item/clothing/shoes/black id = /obj/item/card/id/silver diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index b391225f6b3..48093b1fa50 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -50,7 +50,7 @@ var/const/CONSULAR =(1<<12) var/const/MERCHANT =(1<<13) var/const/JOURNALIST =(1<<14) var/const/ASSISTANT =(1<<15) -var/const/MANUFACTURING_TECH =(1<<16) +var/const/MACHINIST =(1<<16) var/const/SERVICE_MANAGER =(1<<17) var/const/PASSENGER =(1<<18) @@ -98,7 +98,7 @@ var/list/cargo_positions = list( "Operations Manager", "Hangar Technician", "Shaft Miner", - "Manufacturing Technician" + "Machinist" ) var/list/civilian_positions = list( diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index a9c24322e1b..6eea7bd02a7 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -1123,7 +1123,7 @@ vend_id = "robo-tools" products = list( /obj/item/clothing/suit/storage/toggle/labcoat = 4, - /obj/item/clothing/under/rank/manufacturing_tech = 4, + /obj/item/clothing/under/rank/machinist = 4, /obj/item/stack/cable_coil = 4, /obj/item/device/flash/synthetic = 4, /obj/item/cell/high = 12, diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 455f5e55fcd..582f6301fef 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -279,15 +279,15 @@ return -/obj/structure/closet/wardrobe/manufacturing_tech - name = "manufacturing technician wardrobe" +/obj/structure/closet/wardrobe/machinist + name = "Machinist wardrobe" icon_state = "black" icon_closed = "black" /obj/structure/closet/wardrobe/robotics_black/fill() ..() - new /obj/item/clothing/under/rank/manufacturing_tech(src) - new /obj/item/clothing/under/rank/manufacturing_tech(src) + new /obj/item/clothing/under/rank/machinist(src) + new /obj/item/clothing/under/rank/machinist(src) new /obj/item/clothing/suit/storage/toggle/labcoat(src) new /obj/item/clothing/suit/storage/toggle/labcoat(src) new /obj/item/clothing/shoes/black(src) diff --git a/code/modules/client/preference_setup/loadout/loadout_augments.dm b/code/modules/client/preference_setup/loadout/loadout_augments.dm index a3d7795fad0..58606d78bc2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_augments.dm +++ b/code/modules/client/preference_setup/loadout/loadout_augments.dm @@ -148,7 +148,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", "Station Engineer", "Atmospheric Technician", "Engineering Apprentice", "Manufacturing Technician") + allowed_roles = list("Chief Engineer", "Station Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist") cost = 2 /datum/gear/augment/head_fluff diff --git a/code/modules/client/preference_setup/loadout/loadout_belt.dm b/code/modules/client/preference_setup/loadout/loadout_belt.dm index bfd1168d30b..f9fd1fd28d6 100644 --- a/code/modules/client/preference_setup/loadout/loadout_belt.dm +++ b/code/modules/client/preference_setup/loadout/loadout_belt.dm @@ -14,5 +14,5 @@ display_name = "tool-belt, alt" cost = 0 path = /obj/item/storage/belt/utility/alt - allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Manufacturing Technician", "Research Director") + allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Machinist", "Research Director") flags = null diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm index 0149e315ecb..a562ba43637 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm @@ -107,7 +107,7 @@ whitelisted = list(SPECIES_UNATHI) sort_category = "Xenowear - Unathi" cost = 3 - allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician", "Engineering Apprentice", "Manufacturing Technician") + allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist") flags = GEAR_NO_SELECTION /datum/gear/augment/autakh_mining @@ -183,7 +183,7 @@ path = /obj/item/clothing/mask/gas/unathi cost = 1 whitelisted = list(SPECIES_UNATHI) - allowed_roles = list("Chaplain", "Manufacturing Technician") + allowed_roles = list("Chaplain", "Machinist") sort_category = "Xenowear - Unathi" flags = GEAR_HAS_DESC_SELECTION @@ -192,7 +192,7 @@ path = /obj/item/clothing/suit/unathi/wrapping cost = 1 whitelisted = list(SPECIES_UNATHI) - allowed_roles = list("Chaplain", "Manufacturing Technician") + allowed_roles = list("Chaplain", "Machinist") sort_category = "Xenowear - Unathi" flags = GEAR_HAS_DESC_SELECTION diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 2c15d94565e..a417c9a1c1f 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -263,8 +263,8 @@ item_state = "b_suit" worn_state = "hop" -/obj/item/clothing/under/rank/manufacturing_tech - name = "manufacturing technician's jumpsuit" +/obj/item/clothing/under/rank/machinist + name = "Machinist's jumpsuit" desc = "A practical uniform designed for industrial work." icon_state = "hop" item_state = "b_suit" diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index cc033454191..9f4d5c7c0d8 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -9,7 +9,7 @@ var/list/dreams = list( "the executive officer","the head of security","a chief engineer","a research director","a chief medical officer", "the detective","the warden","a member of the internal affairs","a station engineer","the janitor","atmospheric technician", "the operation manager","a hangar technician","the botanist","a shaft miner","the psychologist","the chemist","the geneticist", - "the chemist","the manufacturing technician","the chef","the bartender","the chaplain","the librarian","a mouse","an ert member", + "the chemist","the Machinist","the chef","the bartender","the chaplain","the librarian","a mouse","an ert member", "a beach","the holodeck","a smokey room","a voice","the cold","a mouse","an operating table","the bar","the rain","a skrell", "a unathi","a tajaran","the ai core","the mining station","the research station","a beaker of strange liquid" )