From 9615a17ecc54308165bd33afa24d7feef857f5bc Mon Sep 17 00:00:00 2001 From: alberyk Date: Sat, 22 Jan 2022 12:36:12 -0300 Subject: [PATCH] loadoutfixes --- code/game/gamemodes/objective.dm | 2 +- .../client/preference_setup/loadout/loadout_accessories.dm | 6 +++--- .../client/preference_setup/loadout/loadout_augments.dm | 2 +- .../modules/client/preference_setup/loadout/loadout_belt.dm | 2 +- .../modules/client/preference_setup/loadout/loadout_head.dm | 2 +- .../client/preference_setup/loadout/loadout_utility.dm | 2 +- .../client/preference_setup/loadout/loadout_xeno/tajara.dm | 3 +-- .../client/preference_setup/loadout/loadout_xeno/unathi.dm | 2 +- code/modules/power/singularity/act.dm | 2 +- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index a1fee658d0a..32a14ef5d6d 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","Machinist","Pharmacist","Station Engineer") + var/list/roles = list("Chief Engineer","Research Director","Machinist","Pharmacist","Engineer") var/list/possible_targets = list() var/list/priority_targets = list() diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 2e2b39b5926..bcc41add16e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -100,7 +100,7 @@ /datum/gear/accessory/brown_vest display_name = "webbing, engineering" path = /obj/item/clothing/accessory/storage/brown_vest - allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice") + allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice") /datum/gear/accessory/black_vest display_name = "webbing, security" @@ -147,7 +147,7 @@ /datum/gear/accessory/brown_pouches display_name = "drop pouches, engineering" path = /obj/item/clothing/accessory/storage/pouches/brown - allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice") + allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice") /datum/gear/accessory/black_pouches display_name = "drop pouches, security" @@ -174,7 +174,7 @@ /datum/gear/accessory/overalls_engineer display_name = "overalls, engineering" path = /obj/item/clothing/accessory/storage/overalls/engineer - allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice") + allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice") cost = 2 /datum/gear/accessory/sweater diff --git a/code/modules/client/preference_setup/loadout/loadout_augments.dm b/code/modules/client/preference_setup/loadout/loadout_augments.dm index bdc2d7ffc1b..30657989b98 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", "Machinist") + allowed_roles = list("Chief Engineer", "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 f9fd1fd28d6..3abcbcb6ac0 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", "Machinist", "Research Director") + allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Machinist", "Research Director") flags = null diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 048a984b075..7e2e38bd623 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -137,7 +137,7 @@ /datum/gear/head/hardhat display_name = "hard hat selection" path = /obj/item/clothing/head/hardhat - allowed_roles = list("Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Operations Manager", "Hangar Technician", "Shaft Miner") + allowed_roles = list("Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Operations Manager", "Hangar Technician", "Shaft Miner") /datum/gear/head/hardhat/New() ..() diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index ec9f1b26746..e5d6616cdc5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -94,7 +94,7 @@ /datum/gear/utility/himeo_kit display_name = "himean voidsuit kit" path = /obj/item/voidsuit_modkit/himeo - allowed_roles = list("Shaft Miner", "Operations Manager", "Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice") + allowed_roles = list("Shaft Miner", "Operations Manager", "Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice") /datum/gear/utility/wheelchair/color display_name = "wheelchair" diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm index dc950cb0193..a11968a5e16 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm @@ -329,7 +329,7 @@ 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", "Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice") + allowed_roles = list("Shaft Miner", "Operations Manager", "Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice") /datum/gear/tajaran_tarot display_name = "adhomian divination cards deck" @@ -358,4 +358,3 @@ charm["tajani charm"] = /obj/item/clothing/accessory/tajaran/charm/tajani charm["holy sun rosette"] = /obj/item/clothing/accessory/tajaran/srendarr gear_tweaks += new /datum/gear_tweak/path(charm) - \ No newline at end of file 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 a562ba43637..1a3a56da7fb 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", "Machinist") + allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician", "Engineering Apprentice", "Machinist") flags = GEAR_NO_SELECTION /datum/gear/augment/autakh_mining diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm index 997dbff6a49..9106bd9f3a6 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 == "Station Engineer") || (mind.assigned_role == "Chief Engineer")) + if((mind.assigned_role == "Engineer") || (mind.assigned_role == "Chief Engineer")) gain = 100 if(mind.assigned_role == "Assistant") gain = rand(0, 300)