From dbe9387f5f8008cb1278d1406b265f0957aec287 Mon Sep 17 00:00:00 2001 From: Heroman Date: Tue, 2 Nov 2021 19:56:49 +1000 Subject: [PATCH] Renames Engineer, new alt-titles for Stellar Delight --- code/game/gamemodes/objective.dm | 2 +- code/game/jobs/job/captain_vr.dm | 6 +-- code/game/jobs/job/engineering.dm | 2 +- .../objects/effects/job_start_landmarks.dm | 2 +- .../items/weapons/id cards/station_ids_vr.dm | 2 +- code/modules/admin/newbanjob.dm | 4 +- code/modules/awaymissions/corpse.dm | 4 +- .../loadout/loadout_accessories.dm | 12 +++--- .../loadout/loadout_accessories_vr.dm | 10 ++--- .../preference_setup/loadout/loadout_eyes.dm | 2 +- .../loadout/loadout_eyes_vr.dm | 4 +- .../loadout/loadout_fluffitems_vr.dm | 6 +-- .../preference_setup/loadout/loadout_head.dm | 2 +- .../preference_setup/loadout/loadout_suit.dm | 4 +- .../loadout/loadout_uniform.dm | 4 +- .../loadout/loadout_uniform_vr.dm | 16 ++++---- .../loadout/loadout_utility_vr.dm | 2 +- .../preference_setup/loadout/loadout_xeno.dm | 4 +- code/modules/flufftext/Dreaming.dm | 2 +- code/modules/power/singularity/act.dm | 2 +- .../loadout/loadout_accessories.dm | 12 +++--- maps/stellardelight/stellar_delight_jobs.dm | 37 ++++++++++++++++++- maps/tether/tether-05-station1.dmm | 16 ++++---- 23 files changed, 94 insertions(+), 63 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index ed28b847fa4..cb2a3fcb4b7 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -632,7 +632,7 @@ var/global/list/all_objectives = list() return /datum/objective/heist/kidnap/choose_target() - var/list/roles = list("Chief Engineer","Research Director","Roboticist","Chemist","Station Engineer") + var/list/roles = list("Chief Engineer","Research Director","Roboticist","Chemist","Engineer") var/list/possible_targets = list() var/list/priority_targets = list() diff --git a/code/game/jobs/job/captain_vr.dm b/code/game/jobs/job/captain_vr.dm index 64b753daabd..4cda95fbbea 100644 --- a/code/game/jobs/job/captain_vr.dm +++ b/code/game/jobs/job/captain_vr.dm @@ -2,7 +2,7 @@ disallow_jobhop = TRUE pto_type = PTO_CIVILIAN dept_time_required = 80 //Pending something more complicated - alt_titles = list("Overseer"= /datum/alt_title/overseer, "Facility Director" = /datum/alt_title/facility_director, "Chief Supervisor" = /datum/alt_title/chief_supervisor, "Captain" = /datum/alt_title/captain) + alt_titles = list("Overseer"= /datum/alt_title/overseer, "Facility Director" = /datum/alt_title/facility_director, "Chief Supervisor" = /datum/alt_title/chief_supervisor) /datum/alt_title/facility_director title = "Facility Director" @@ -10,10 +10,6 @@ /datum/alt_title/chief_supervisor title = "Chief Supervisor" -/datum/alt_title/captain - title = "Captain" - - /datum/job/hop disallow_jobhop = TRUE pto_type = PTO_CIVILIAN diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 95bfd63f7f2..780f99a76fb 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -42,7 +42,7 @@ // Engineer ////////////////////////////////// /datum/job/engineer - title = "Station Engineer" + title = "Engineer" flag = ENGINEER departments = list(DEPARTMENT_ENGINEERING) department_flag = ENGSEC diff --git a/code/game/objects/effects/job_start_landmarks.dm b/code/game/objects/effects/job_start_landmarks.dm index 56711c46f87..4e08cb75816 100644 --- a/code/game/objects/effects/job_start_landmarks.dm +++ b/code/game/objects/effects/job_start_landmarks.dm @@ -17,7 +17,7 @@ /obj/effect/landmark/start/atmostech name = "Atmospheric Technician" /obj/effect/landmark/start/engineer - name = "Station Engineer" + name = "Engineer" /obj/effect/landmark/start/cmo name = "Chief Medical Officer" /obj/effect/landmark/start/chemist diff --git a/code/game/objects/items/weapons/id cards/station_ids_vr.dm b/code/game/objects/items/weapons/id cards/station_ids_vr.dm index 0a9015145a7..a3cd6ad35c5 100644 --- a/code/game/objects/items/weapons/id cards/station_ids_vr.dm +++ b/code/game/objects/items/weapons/id cards/station_ids_vr.dm @@ -233,7 +233,7 @@ "Field Medic" = "itg_white", "Talon Doctor" = "itg_white", "Atmospheric Technician" = "itg_orange", - "Station Engineer" = "itg_orange", + "Engineer" = "itg_orange", "Off-duty Officer" = "itg_red", "Off-duty Engineer" = "itg_orange", "Off-duty Medic" = "itg_white", diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index 49d9e464b9c..c7180d0a493 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -77,7 +77,7 @@ var/savefile/Banlistjob AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") return 1 if(rank == "Engineering") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Station Engineer") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Engineer") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Atmospheric Technician") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") @@ -96,7 +96,7 @@ var/savefile/Banlistjob AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") return 1 if(rank == "CE_Station_Engineer") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Station Engineer") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Engineer") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer") return 1 if(rank == "CE_Atmospheric_Tech") diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index eecae831867..7d0508a0fd9 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -169,8 +169,8 @@ corpsegloves = /obj/item/clothing/gloves/yellow corpsehelmet = /obj/item/clothing/head/hardhat corpseid = 1 - corpseidjob = "Station Engineer" - corpseidaccess = "Station Engineer" + corpseidjob = "Engineer" + corpseidaccess = "Engineer" /obj/effect/landmark/corpse/engineer/rig corpsesuit = /obj/item/clothing/suit/space/void/engineering diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index f5a85304b9c..c99eb25d22f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -138,32 +138,32 @@ /datum/gear/accessory/brown_vest display_name = "webbing, brown" path = /obj/item/clothing/accessory/storage/brown_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/black_vest display_name = "webbing, black" path = /obj/item/clothing/accessory/storage/black_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/white_vest display_name = "webbing, white" path = /obj/item/clothing/accessory/storage/white_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown" path = /obj/item/clothing/accessory/storage/brown_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black" path = /obj/item/clothing/accessory/storage/black_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white" path = /obj/item/clothing/accessory/storage/white_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/fannypack display_name = "fannypack selection" diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 2a67109ca51..46c34cae52d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -58,11 +58,11 @@ /datum/gear/accessory/brown_vest display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") /datum/gear/accessory/black_vest display_name = "webbing, black (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") /datum/gear/accessory/white_vest display_name = "webbing, white (Medical)" @@ -70,11 +70,11 @@ /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white (Medical)" @@ -83,7 +83,7 @@ /datum/gear/accessory/bluespace display_name = "bluespace badge (Eng, Sec, Med, Exploration, Miner)" path = /obj/item/clothing/accessory/storage/bluespace - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") cost = 2 /datum/gear/accessory/webbing diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index c8c6355ea25..4a70c788c7f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -104,7 +104,7 @@ /datum/gear/eyes/meson display_name = "Optical Meson Scanners (Engineering, Science, Mining)" path = /obj/item/clothing/glasses/meson - allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Shaft Miner") + allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Shaft Miner") /datum/gear/eyes/meson/prescription display_name = "Optical Meson Scanners, prescription (Engineering, Science, Mining)" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm index 9504678e06b..6ec19f2fd8f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -3,7 +3,7 @@ /datum/gear/eyes/meson display_name = "Optical Meson Scanners (Eng, Sci, Explo)" - allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder") + allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder") /datum/gear/eyes/arglasses display_name = "AR glasses" @@ -33,7 +33,7 @@ /datum/gear/eyes/arglasses/eng display_name = "AR-E glasses (Eng)" path = /obj/item/clothing/glasses/omnihud/eng - allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician") + allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician") /datum/gear/eyes/arglasses/med display_name = "AR-M glasses (Medical)" diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index cfca34e7192..27c4732b373 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -16,7 +16,7 @@ display_name = "Airhorn - Example Item" description = "An example item that you probably shouldn't see!" ckeywhitelist = list("mewchild") - allowed_roles = list("Station Engineer") + allowed_roles = list("Engineer") */ @@ -903,14 +903,14 @@ display_name = "Kateryna's Voidsuit" ckeywhitelist = list("samanthafyre") character_name = list("Kateryna Petrovitch") - allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician") + allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician") /datum/gear/fluff/katerina_spacesuit path = /obj/item/clothing/head/helmet/space/fluff/kate display_name = "Kateryna's Helmet" ckeywhitelist = list("samanthafyre") character_name = list("Kateryna Petrovitch") - allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician") + allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician") /datum/gear/fluff/kateryna_armorvest path = /obj/item/clothing/suit/armor/vest/wolftaur/kate diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 35991ab6671..65939198a0a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -349,7 +349,7 @@ display_name = "welding, normal (engineering/robotics)" path = /obj/item/clothing/head/welding cost = 2 - allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist") + allowed_roles = list("Chief Engineer","Engineer","Atmospheric Technician","Research Director","Roboticist") /datum/gear/head/welding/demon display_name = "welding, demon (engineering/robotics)" diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 2faca440116..8c9efbd119b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -422,7 +422,7 @@ /datum/gear/suit/wintercoat/engineering display_name = "winter coat, engineering" path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering - allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer") /datum/gear/suit/wintercoat/engineering/atmos display_name = "winter coat, atmospherics" @@ -597,7 +597,7 @@ /datum/gear/suit/snowsuit/engineering display_name = "snowsuit, engineering" path = /obj/item/clothing/suit/storage/snowsuit/engineering - allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer") /datum/gear/suit/snowsuit/cargo display_name = "snowsuit, supply" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 99747a717df..874501d1088 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -119,7 +119,7 @@ /datum/gear/uniform/job_skirt/eng display_name = "skirt, engineer" path = /obj/item/clothing/under/rank/engineer/skirt - allowed_roles = list("Chief Engineer","Station Engineer") + allowed_roles = list("Chief Engineer","Engineer") /datum/gear/uniform/job_skirt/roboticist display_name = "skirt, roboticist" @@ -189,7 +189,7 @@ /datum/gear/uniform/job_turtle/engineering display_name = "turtleneck, engineering" path = /obj/item/clothing/under/rank/engineer/turtleneck - allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer") + allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Engineer") /datum/gear/uniform/job_turtle/medical display_name = "turtleneck, medical" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 8fea6638cd5..26caf70b2be 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -37,7 +37,7 @@ /datum/gear/uniform/job_khi/eng display_name = "khi uniform, eng" path = /obj/item/clothing/under/rank/khi/eng - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") /datum/gear/uniform/job_khi/sci display_name = "khi uniform, sci" @@ -67,7 +67,7 @@ /datum/gear/suit/job_fed/eng display_name = "fed uniform, eng" path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedeng - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") // Trekie things //TOS @@ -84,7 +84,7 @@ /datum/gear/uniform/job_trek/eng/tos display_name = "TOS uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security") //TNG /datum/gear/uniform/job_trek/cmd/tng @@ -100,7 +100,7 @@ /datum/gear/uniform/job_trek/eng/tng display_name = "TNG uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec/next - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security") //VOY /datum/gear/uniform/job_trek/cmd/voy @@ -116,7 +116,7 @@ /datum/gear/uniform/job_trek/eng/voy display_name = "VOY uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec/voy - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security") //DS9 @@ -126,7 +126,7 @@ allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director", "Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist", "Scientist","Roboticist","Xenobiologist","Xenobotanist","Atmospheric Technician", - "Station Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic") + "Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic") /datum/gear/uniform/job_trek/cmd/ds9 @@ -142,7 +142,7 @@ /datum/gear/uniform/job_trek/eng/ds9 display_name = "DS9 uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec/ds9 - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security") //ENT @@ -159,7 +159,7 @@ /datum/gear/uniform/job_trek/eng/ent display_name = "ENT uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec/ent - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security") /* Swimsuits */ diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm index 909ae31b87a..8695d74c63a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -49,7 +49,7 @@ /datum/gear/utility/dufflebag/eng display_name = "engineering dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/eng - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") /datum/gear/utility/dufflebag/sci display_name = "science dufflebag" diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index c4dd57d6817..59d2ab00022 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -224,7 +224,7 @@ /datum/gear/uniform/dept/undercoat/engineer display_name = "engineering undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/engineer - allowed_roles = list("Chief Engineer","Station Engineer") + allowed_roles = list("Chief Engineer","Engineer") /datum/gear/uniform/dept/undercoat/atmos display_name = "atmospherics undercoat (Teshari)" @@ -397,7 +397,7 @@ /datum/gear/suit/dept/cloak/engineer display_name = "engineering cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/engineer - allowed_roles = list("Chief Engineer","Station Engineer") + allowed_roles = list("Chief Engineer","Engineer") /datum/gear/suit/dept/cloak/engineer/New() ..() diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index f03580dde0a..49b1cc4bf22 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -7,7 +7,7 @@ var/list/dreams = list( "a blue light","an abandoned laboratory","NanoTrasen","mercenaries","blood","healing","power","respect", "riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money", "the Head of Personnel","the Head of Security","the Chief Engineer","the Research Director","the Chief Medical Officer", - "the Detective","the Warden","an Internal Affairs Agent","a Station Engineer","the Janitor","the Atmospheric Technician", + "the Detective","the Warden","an Internal Affairs Agent","an Engineer","the Janitor","the Atmospheric Technician", "the Quartermaster","a Cargo Technician","the Botanist","a Shaft Miner","the Psychologist","the Chemist","a Geneticist", "the Virologist","the Roboticist","the Chef","the Bartender","the Chaplain","the Librarian","a mouse","an ERT member", "a beach","the holodeck","a smoky room","a voice","the cold","a mouse","an operating table","the bar","the rain","a Skrell", diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm index 9c3a5b86210..1f490e8aa2c 100644 --- a/code/modules/power/singularity/act.dm +++ b/code/modules/power/singularity/act.dm @@ -18,7 +18,7 @@ /mob/living/carbon/human/singularity_act() var/gain = 20 if(mind) - if((mind.assigned_role == "Station Engineer") || (mind.assigned_role == "Chief Engineer")) + if((mind.assigned_role == "Engineer") || (mind.assigned_role == "Chief Engineer")) gain = 100 if(mind.assigned_role == USELESS_JOB) //VOREStation Edit - Visitor not Assistant gain = rand(0, 300) diff --git a/maps/southern_cross/loadout/loadout_accessories.dm b/maps/southern_cross/loadout/loadout_accessories.dm index 94a79b3cf23..3febe42b2e6 100644 --- a/maps/southern_cross/loadout/loadout_accessories.dm +++ b/maps/southern_cross/loadout/loadout_accessories.dm @@ -1,32 +1,32 @@ /datum/gear/accessory/brown_vest display_name = "webbing, brown" path = /obj/item/clothing/accessory/storage/brown_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/black_vest display_name = "webbing, black" path = /obj/item/clothing/accessory/storage/black_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/white_vest display_name = "webbing, white" path = /obj/item/clothing/accessory/storage/white_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown" path = /obj/item/clothing/accessory/storage/brown_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black" path = /obj/item/clothing/accessory/storage/black_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white" path = /obj/item/clothing/accessory/storage/white_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/holster display_name = "holster selection (Security, CD, HoP)" diff --git a/maps/stellardelight/stellar_delight_jobs.dm b/maps/stellardelight/stellar_delight_jobs.dm index 4762edce081..d2a017e877a 100644 --- a/maps/stellardelight/stellar_delight_jobs.dm +++ b/maps/stellardelight/stellar_delight_jobs.dm @@ -7,4 +7,39 @@ //Same as above, to discorage explo from taking off with the small ship without asking, SAR should not need pilot access. /datum/job/sar access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_eva, access_maint_tunnels, access_external_airlocks) - minimal_access = list(access_medical, access_medical_equip, access_morgue) \ No newline at end of file + minimal_access = list(access_medical, access_medical_equip, access_morgue) + + + +/datum/job/captain + alt_titles = list("Overseer"= /datum/alt_title/overseer, "Facility Director" = /datum/alt_title/facility_director, "Chief Supervisor" = /datum/alt_title/chief_supervisor, "Captain" = /datum/alt_title/captain) + +/datum/alt_title/captain + title = "Captain" + +/datum/job/hop + alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Manager" = /datum/alt_title/deputy_manager, "Staff Manager" = /datum/alt_title/staff_manager, + "Facility Steward" = /datum/alt_title/facility_steward, "First Mate" = /datum/alt_title/first_mate) + +/datum/alt_title/first_mate + title = "First Mate" + +/datum/job/atmos + alt_titles = list("Atmospheric Engineer" = /datum/alt_title/atmos_engi, "Atmospheric Maintainer" = /datum/alt_title/atmos_maint, "Disposals Technician" = /datum/alt_title/disposals_tech, + "Refueling Technician" = /datum/alt_title/refuel_tech) + +/datum/alt_title/refuel_tech + title = "Refueling Technician" + +/datum/job/warden + alt_titles = list("Brig Sentry" = /datum/alt_title/brig_sentry, "Armory Superintendent" = /datum/alt_title/armory_superintendent, "Gunner" = /datum/alt_title/gunner) + +/datum/alt_title/gunner + title = "Gunner" + +/datum/job/officer + alt_titles = list("Patrol Officer" = /datum/alt_title/patrol_officer, "Security Guard" = /datum/alt_title/security_guard, "Security Deputy" = /datum/alt_title/security_guard, + "Junior Officer" = /datum/alt_title/junior_officer, "Ship Officer" = /datum/alt_title/ship_officer) + +/datum/alt_title/ship_officer + title = "Ship Officer" \ No newline at end of file diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index c32f3fbdc42..7d79670c6ec 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -3534,7 +3534,7 @@ dir = 8 }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) @@ -5833,7 +5833,7 @@ dir = 8 }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) @@ -7956,7 +7956,7 @@ icon_state = "comfychair_preview" }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/carpet, /area/engineering/break_room) @@ -8402,7 +8402,7 @@ icon_state = "comfychair_preview" }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/carpet, /area/engineering/break_room) @@ -8967,7 +8967,7 @@ icon_state = "comfychair_preview" }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/carpet, /area/engineering/break_room) @@ -8977,7 +8977,7 @@ icon_state = "comfychair_preview" }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/carpet, /area/engineering/break_room) @@ -13080,7 +13080,7 @@ "aSB" = ( /obj/structure/bed/chair/office/dark, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) @@ -13687,7 +13687,7 @@ dir = 4 }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/tiled, /area/engineering/foyer)