From 9fb2fa737bcdc17531e595b6e6b5c241d19367a5 Mon Sep 17 00:00:00 2001 From: alberyk Date: Sun, 2 Jan 2022 02:34:51 -0300 Subject: [PATCH] more fixes --- code/datums/outfits/outfit.dm | 6 +- code/game/jobs/faction/hephaestus.dm | 3 +- code/game/jobs/faction/idris.dm | 4 +- code/game/jobs/faction/nanotrasen.dm | 115 ------------------ code/game/jobs/faction/orion_express.dm | 1 + code/game/jobs/faction/pmc.dm | 3 +- code/game/jobs/faction/unaffiliated.dm | 1 - code/game/jobs/faction/zeng_hu.dm | 20 ++- code/game/jobs/job/civilian.dm | 31 +++-- code/game/jobs/job/medical.dm | 20 +-- code/game/jobs/job/science.dm | 13 +- code/game/jobs/job/ship_crew.dm | 2 +- code/game/jobs/jobs.dm | 7 +- code/modules/clothing/head/jobs.dm | 4 +- code/modules/clothing/under/jobs/civilian.dm | 12 +- .../clothing/under/jobs/engineering.dm | 12 +- code/modules/clothing/under/jobs/medsci.dm | 2 +- .../department_uniforms/security.dmi | Bin 3605 -> 3604 bytes .../department_uniforms/service.dmi | Bin 5254 -> 5253 bytes 19 files changed, 75 insertions(+), 181 deletions(-) diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index 23b438cf1cf..812709c049b 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -191,7 +191,7 @@ return -// Used to equip an item to the mob. Mainly to prevent copypasta for collect_not_del. +// Used to equip an item to the mob. Mainly to prevent copypasta for collect_not_del. //override_collect temporarily allows equip_or_collect without enabling it for the job. Mostly used to prevent weirdness with hand equips when the player is missing one /datum/outfit/proc/equip_item(mob/living/carbon/human/H, path, slot, var/set_no_remove = FALSE, var/override_collect = FALSE) var/obj/item/I @@ -313,7 +313,7 @@ if(suit_store) equip_item(H, suit_store, slot_s_store) - //Hand equips. If person is missing an arm or hand it attempts to put it in the other hand. + //Hand equips. If person is missing an arm or hand it attempts to put it in the other hand. //Override_collect should attempt to collect any items that can't be equipped regardless of collect_not_del settings for the outfit. if(l_hand) var/obj/item/organ/external/O @@ -497,7 +497,7 @@ . = GetAssignment(H) if (. && . != "Unassigned" && H?.mind?.selected_faction) - if (!H.mind.selected_faction.is_default && H.mind.selected_faction.title_suffix) + if (H.mind.selected_faction.title_suffix) . += " ([H.mind.selected_faction.title_suffix])" /datum/outfit/proc/get_id_rank(mob/living/carbon/human/H) diff --git a/code/game/jobs/faction/hephaestus.dm b/code/game/jobs/faction/hephaestus.dm index abcd816ecdb..3569e5ee94f 100644 --- a/code/game/jobs/faction/hephaestus.dm +++ b/code/game/jobs/faction/hephaestus.dm @@ -46,7 +46,7 @@ "Hangar Technician" = /datum/outfit/job/hangar_tech/hephaestus, "Shaft Miner" = /datum/outfit/job/mining/hephaestus, "Machinist" = /datum/outfit/job/machinist/hephaestus, - "Engineer" = /datum/outfit/job/engineer/zavodskoi, + "Engineer" = /datum/outfit/job/engineer/hephaestus, "Atmospheric Technician" = /datum/outfit/job/atmos/hephaestus, "Engineering Apprentice" = /datum/outfit/job/intern_eng/hephaestus, "Corporate Liaison" = /datum/outfit/job/representative/hephaestus @@ -63,6 +63,7 @@ uniform = /obj/item/clothing/under/rank/machinist/heph id = /obj/item/card/id/hephaestus + suit = null /datum/outfit/job/mining/hephaestus name = "Shaft Miner - Hephaestus" diff --git a/code/game/jobs/faction/idris.dm b/code/game/jobs/faction/idris.dm index 8245c4ceeb6..b8d855f27f7 100644 --- a/code/game/jobs/faction/idris.dm +++ b/code/game/jobs/faction/idris.dm @@ -93,12 +93,14 @@ name = "Chef - Idris" uniform = /obj/item/clothing/under/rank/chef/idris + suit = null + head = null id = /obj/item/card/id/idris /datum/outfit/job/hydro/idris name = "Gardener - Idris" - uniform = /obj/item/clothing/under/rank/chef/idris + uniform = /obj/item/clothing/under/rank/hydroponics/idris head = /obj/item/clothing/head/bandana/hydro/idris suit = null id = /obj/item/card/id/idris diff --git a/code/game/jobs/faction/nanotrasen.dm b/code/game/jobs/faction/nanotrasen.dm index ea46d398a02..e67d6b709b1 100644 --- a/code/game/jobs/faction/nanotrasen.dm +++ b/code/game/jobs/faction/nanotrasen.dm @@ -39,28 +39,6 @@ allowed_role_types = NT_ROLES - titles_to_loadout = list( - "Bartender" = /datum/outfit/job/bartender/nt, - "Chef" = /datum/outfit/job/chef/nt, - "Gardener" = /datum/outfit/job/hydro/nt, - "Janitor" = /datum/outfit/job/janitor/nt, - "Librarian" = /datum/outfit/job/librarian/nt, - "Service Manager" = /datum/outfit/job/service_manager/nt, - "Physician" = /datum/outfit/job/doctor/nt, - "Surgeon" = /datum/outfit/job/doctor/surgeon/nt, - "Pharmacist" = /datum/outfit/job/pharmacist/nt, - "Psychiatrist" = /datum/outfit/job/psychiatrist/nt, - "Psychologist" = /datum/outfit/job/psychiatrist/nt, - "First Responder" = /datum/outfit/job/med_tech/nt, - "Medical Intern" = /datum/outfit/job/intern_med/nt, - "Xenobiologist" = /datum/outfit/job/scientist/nt, - "Xenobotanist" = /datum/outfit/job/scientist/nt, - "Xenobiologist" = /datum/outfit/job/scientist/nt, - "Xenobotanist" = /datum/outfit/job/scientist/nt, - "Lab Assistant" = /datum/outfit/job/intern_sci/nt, - "Xenoarcheologist"= /datum/outfit/job/scientist/xenoarcheologist/nt - ) - /datum/faction/nano_trasen/get_corporate_objectives(var/mission_level) var/objective switch(mission_level) @@ -78,96 +56,3 @@ "Have [rand(3,10)] crewmembers buy Getmore products from the vendors") return objective - -/datum/outfit/job/doctor/nt - name = "Physician - NanoTrasen" - - uniform = /obj/item/clothing/under/rank/medical/nt - suit = null - -/datum/outfit/job/doctor/surgeon/nt - name = "Surgeon - NanoTrasen" - - uniform = /obj/item/clothing/under/rank/medical/surgeon/nt - suit = null - -/datum/outfit/job/pharmacist/nt - name = "Pharmacist - NanoTrasen" - - uniform = /obj/item/clothing/under/rank/pharmacist/nt - suit = null - -/datum/outfit/job/psychiatrist/nt - name = "Psychiatrist - NanoTrasen" - - uniform = /obj/item/clothing/under/rank/psych/nt - suit = null - -/datum/outfit/job/med_tech/nt - name = "First Responder - NanoTrasen" - - uniform = /obj/item/clothing/under/rank/medical/first_responder/nt - suit = null - -/datum/outfit/job/intern_med/nt - name = "Medical Intern - NanoTrasen" - - uniform = /obj/item/clothing/under/rank/medical/intern/nt - -/datum/outfit/job/scientist/nt - name = "Scientist - NanoTrasen" - - uniform = /obj/item/clothing/under/rank/scientist/nt - suit = null - -/datum/outfit/job/scientist/xenoarcheologist/nt - name = "Xenoarcheologist - NanoTrasen" - - uniform = /obj/item/clothing/under/rank/xenoarcheologist/nt - suit = null - -/datum/outfit/job/intern_sci/nt - name = "Lab Assistant - NanoTrasen" - - uniform = /obj/item/clothing/under/rank/scientist/intern/nt - suit = null - -/datum/outfit/job/bartender/nt - name = "Bartender - NanoTrasen" - - uniform = /obj/item/clothing/under/rank/bartender/nt - head = /obj/item/clothing/head/bartender/nt - id = /obj/item/card/id/idris - -/datum/outfit/job/chef/nt - name = "Chef - NanoTrasen" - - uniform = /obj/item/clothing/under/rank/chef/nt - suit = null - -/datum/outfit/job/hydro/nt - name = "Gardener - NanoTrasen" - - uniform = /obj/item/clothing/under/rank/chef/nt - head = /obj/item/clothing/head/bandana/hydro/nt - suit = null - -/datum/outfit/job/janitor/nt - name = "Janitor - NanoTrasen" - - uniform = /obj/item/clothing/under/rank/janitor/nt - head = /obj/item/clothing/head/softcap/janitor/nt - suit = null - -/datum/outfit/job/librarian/nt - name = "Librarian - NanoTrasen" - - uniform = /obj/item/clothing/under/librarian/nt - -/datum/outfit/job/service_manager/nt - name = "Service Manager - NanoTrasen" - jobtype = /datum/job/service_manager - - uniform = /obj/item/clothing/under/rank/service_manager/nt - head = /obj/item/clothing/head/service_manager/nt - suit = /obj/item/clothing/suit/storage/service_manager/nt \ No newline at end of file diff --git a/code/game/jobs/faction/orion_express.dm b/code/game/jobs/faction/orion_express.dm index 87f14f9727b..7f4d428b628 100644 --- a/code/game/jobs/faction/orion_express.dm +++ b/code/game/jobs/faction/orion_express.dm @@ -53,6 +53,7 @@ /datum/outfit/job/machinist/orion name = "Machinist - Orion Express" uniform = /obj/item/clothing/under/rank/machinist/orion + suit = null /datum/outfit/job/mining/orion name = "Shaft Miner - Orion Express" diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index 04b53a86bd7..dfdc47fca5e 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -15,7 +15,7 @@ "} title_suffix = "PMC" - allowed_role_types = NT_ROLES + allowed_role_types = PMC_ROLES allowed_species_types = list( /datum/species/human, @@ -70,6 +70,7 @@ name = "Security Cadet - PMC" uniform = /obj/item/clothing/under/rank/cadet/pmc + suit = null id = /obj/item/card/id/pmc /datum/outfit/job/forensics/pmc diff --git a/code/game/jobs/faction/unaffiliated.dm b/code/game/jobs/faction/unaffiliated.dm index 84dad85205a..4db2c13f0c0 100644 --- a/code/game/jobs/faction/unaffiliated.dm +++ b/code/game/jobs/faction/unaffiliated.dm @@ -11,7 +11,6 @@ allowed_role_types = list( /datum/job/passenger, - /datum/job/journalist, /datum/job/merchant, /datum/job/consular ) diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index 55f706dfc05..af067434566 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -19,7 +19,7 @@ title_suffix = "Zeng" - allowed_role_types = HEPH_ROLES + allowed_role_types = ZENG_ROLES allowed_species_types = list( /datum/species/human, @@ -65,32 +65,38 @@ name = "Physician - Zeng-Hu" uniform = /obj/item/clothing/under/rank/medical/zeng - suit = /obj/item/clothing/suit/storage/toggle/labcoat/zeng +// suit = /obj/item/clothing/suit/storage/toggle/labcoat/zeng + suit = null id = /obj/item/card/id/zeng_hu /datum/outfit/job/doctor/surgeon/zeng_hu name = "Surgeon - Zeng-Hu" uniform = /obj/item/clothing/under/rank/medical/surgeon/zeng - suit = /obj/item/clothing/suit/storage/toggle/labcoat/zeng +// suit = /obj/item/clothing/suit/storage/toggle/labcoat/zeng + suit = null id = /obj/item/card/id/zeng_hu /datum/outfit/job/pharmacist/zeng_hu name = "Pharmacist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/pharmacist/zeng - suit = /obj/item/clothing/suit/storage/toggle/labcoat/zeng +// suit = /obj/item/clothing/suit/storage/toggle/labcoat/zeng + suit = null id = /obj/item/card/id/zeng_hu /datum/outfit/job/psychiatrist/zeng_hu name = "Psychiatrist - Zeng-Hu" +// suit = /obj/item/clothing/suit/storage/toggle/labcoat/zeng + suit = null uniform = /obj/item/clothing/under/rank/psych/zeng id = /obj/item/card/id/zeng_hu /datum/outfit/job/med_tech/zeng_hu name = "First Responder - Zeng-Hu" + suit = null uniform = /obj/item/clothing/under/rank/medical/first_responder/zeng id = /obj/item/card/id/zeng_hu @@ -104,14 +110,16 @@ name = "Scientist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/scientist/zeng - suit = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/alt +// suit = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/alt + suit = null id = /obj/item/card/id/zeng_hu /datum/outfit/job/scientist/xenoarcheologist/zeng_hu name = "Xenoarcheologist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/xenoarcheologist/zeng - suit = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/alt +// suit = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/alt + suit = null id = /obj/item/card/id/zeng_hu /datum/outfit/job/intern_sci/zeng_hu diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 88aa51bb529..3548b42c782 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -2,7 +2,7 @@ title = "Service Manager" flag = SERVICE_MANAGER departments = list(DEPARTMENT_CIVILIAN = JOBROLE_SUPERVISOR) - department_flag = CIVILIAN + department_flag = ENGSEC faction = "Station" total_positions = 1 spawn_positions = 1 @@ -24,7 +24,9 @@ name = "Service Manager" jobtype = /datum/job/service_manager - uniform = /obj/item/clothing/under/rank/service_manager + uniform = /obj/item/clothing/under/rank/service_manager/nt + head = /obj/item/clothing/head/service_manager/nt + suit = /obj/item/clothing/suit/storage/service_manager/nt tab_pda = /obj/item/modular_computer/handheld/pda/civilian wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian @@ -58,7 +60,8 @@ name = "Bartender" jobtype = /datum/job/bartender - uniform = /obj/item/clothing/under/rank/bartender + uniform = /obj/item/clothing/under/rank/bartender/nt + head = /obj/item/clothing/head/bartender/nt shoes = /obj/item/clothing/shoes/black tab_pda = /obj/item/modular_computer/handheld/pda/civilian/bartender @@ -93,9 +96,9 @@ name = "Chef" jobtype = /datum/job/chef - uniform = /obj/item/clothing/under/rank/chef - suit = /obj/item/clothing/suit/chef - head = /obj/item/clothing/head/chefhat + uniform = /obj/item/clothing/under/rank/chef/nt + suit = /obj/item/clothing/suit/chef/nt + head = /obj/item/clothing/head/headbando/chef_nt shoes = /obj/item/clothing/shoes/black tab_pda = /obj/item/modular_computer/handheld/pda/civilian @@ -133,8 +136,9 @@ name = "Gardener" jobtype = /datum/job/hydro - uniform = /obj/item/clothing/under/rank/hydroponics - suit = /obj/item/clothing/suit/apron + uniform = /obj/item/clothing/under/rank/hydroponics/nt +// suit = /obj/item/clothing/suit/apron + head = /obj/item/clothing/head/bandana/hydro/nt shoes = /obj/item/clothing/shoes/black suit_store = /obj/item/device/analyzer/plant_analyzer @@ -181,7 +185,8 @@ name = "Janitor" jobtype = /datum/job/janitor - uniform = /obj/item/clothing/under/rank/janitor + uniform = /obj/item/clothing/under/rank/janitor/nt + head = /obj/item/clothing/head/softcap/janitor/nt shoes = /obj/item/clothing/shoes/black tab_pda = /obj/item/modular_computer/handheld/pda/civilian/janitor @@ -273,7 +278,7 @@ name = "Librarian" jobtype = /datum/job/librarian - uniform = /obj/item/clothing/under/suit_jacket/red + uniform = /obj/item/clothing/under/librarian/nt shoes = /obj/item/clothing/shoes/black r_pocket = /obj/item/barcodescanner l_hand = /obj/item/storage/bag/books @@ -367,7 +372,7 @@ //Operations /datum/job/operations_manager title = "Operations Manager" - flag = QUARTERMASTER + flag = OPERATIONS_MANAGER departments = list(DEPARTMENT_CARGO = JOBROLE_SUPERVISOR, DEPARTMENT_COMMAND) department_flag = CIVILIAN faction = "Station" @@ -497,9 +502,9 @@ /datum/job/machinist title = "Machinist" - flag = MACHINIST + flag = ROBOTICIST departments = SIMPLEDEPT(DEPARTMENT_CARGO) - department_flag = CIVILIAN + department_flag = MEDSCI faction = "Station" total_positions = 2 spawn_positions = 2 diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index e52dd8a3ec2..12122672d6c 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -97,8 +97,8 @@ base_name = "Physician" jobtype = /datum/job/doctor - uniform = /obj/item/clothing/under/rank/medical - suit = /obj/item/clothing/suit/storage/toggle/labcoat/medical + uniform = /obj/item/clothing/under/rank/medical/nt + //suit = /obj/item/clothing/suit/storage/toggle/labcoat/medical shoes = /obj/item/clothing/shoes/medical id = /obj/item/card/id/white suit_store = /obj/item/device/flashlight/pen @@ -121,8 +121,8 @@ name = "Surgeon" jobtype = /datum/job/doctor - uniform = /obj/item/clothing/under/rank/medical/blue - suit = /obj/item/clothing/suit/storage/toggle/labcoat/surgeon + uniform = /obj/item/clothing/under/rank/medical/surgeon/nt +// suit = /obj/item/clothing/suit/storage/toggle/labcoat/surgeon shoes = /obj/item/clothing/shoes/surgeon /datum/outfit/job/doctor/surgeon/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) @@ -162,8 +162,8 @@ name = "Pharmacist" jobtype = /datum/job/pharmacist - uniform = /obj/item/clothing/under/rank/pharmacist - suit = /obj/item/clothing/suit/storage/toggle/labcoat/pharmacist + uniform = /obj/item/clothing/under/rank/pharmacist/nt +// suit = /obj/item/clothing/suit/storage/toggle/labcoat/pharmacist shoes = /obj/item/clothing/shoes/chemist id = /obj/item/card/id/white @@ -207,8 +207,8 @@ base_name = "Psychiatrist" jobtype = /datum/job/psychiatrist - uniform = /obj/item/clothing/under/rank/psych - suit = /obj/item/clothing/suit/storage/toggle/labcoat/psych + uniform = /obj/item/clothing/under/rank/psych/nt +// suit = /obj/item/clothing/suit/storage/toggle/labcoat/psych shoes = /obj/item/clothing/shoes/psych id = /obj/item/card/id/white @@ -250,7 +250,7 @@ base_name = "First Responder" jobtype = /datum/job/med_tech - uniform = /obj/item/clothing/under/rank/medical/first_responder + uniform = /obj/item/clothing/under/rank/medical/first_responder/nt shoes = /obj/item/clothing/shoes/jackboots id = /obj/item/card/id/white @@ -292,7 +292,7 @@ name = "Medical Intern" jobtype = /datum/job/intern_med - uniform = /obj/item/clothing/under/rank/medical/intern + uniform = /obj/item/clothing/under/rank/medical/intern/nt shoes = /obj/item/clothing/shoes/medical headset = /obj/item/device/radio/headset/headset_med bowman = /obj/item/device/radio/headset/headset_med/alt diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index b0335b82b10..4c24a685458 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -81,8 +81,8 @@ name = "Scientist" jobtype = /datum/job/scientist - uniform = /obj/item/clothing/under/rank/scientist - suit = /obj/item/clothing/suit/storage/toggle/labcoat/science + uniform = /obj/item/clothing/under/rank/scientist/nt +// suit = /obj/item/clothing/suit/storage/toggle/labcoat/science shoes = /obj/item/clothing/shoes/science id = /obj/item/card/id/white @@ -102,7 +102,7 @@ /datum/outfit/job/scientist/xenoarcheologist name = "Xenoarcheologist" - uniform = /obj/item/clothing/under/rank/xenoarcheologist + uniform = /obj/item/clothing/under/rank/xenoarcheologist/nt /datum/job/xenobiologist title = "Xenobiologist" @@ -125,17 +125,12 @@ minimal_player_age = 14 outfit = /datum/outfit/job/scientist/xenobiologist - alt_outfits = list("Xenobotanist"=/datum/outfit/job/scientist/xenobiologist/xenobotanist) /datum/outfit/job/scientist/xenobiologist name = "Xenobiologist" jobtype = /datum/job/xenobiologist tab_pda = /obj/item/modular_computer/handheld/pda/research -/datum/outfit/job/scientist/xenobiologist/xenobotanist - name = "Xenobotanist" - uniform = /obj/item/clothing/under/rank/scientist/botany - /datum/job/intern_sci title = "Lab Assistant" flag = INTERN_SCI @@ -155,7 +150,7 @@ name = "Lab Assistant" jobtype = /datum/job/intern_sci - uniform = /obj/item/clothing/under/rank/scientist/intern + uniform = /obj/item/clothing/under/rank/scientist/intern/nt shoes = /obj/item/clothing/shoes/science headset = /obj/item/device/radio/headset/headset_sci bowman = /obj/item/device/radio/headset/headset_sci/alt diff --git a/code/game/jobs/job/ship_crew.dm b/code/game/jobs/job/ship_crew.dm index 7549daf244c..44d02798d22 100644 --- a/code/game/jobs/job/ship_crew.dm +++ b/code/game/jobs/job/ship_crew.dm @@ -52,7 +52,7 @@ shoes = /obj/item/clothing/shoes/black /datum/job/passenger - title = "passenger" + title = "Passenger" flag = PASSENGER departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN) department_flag = CIVILIAN diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 2bbe494b353..289d1e7f686 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -14,6 +14,8 @@ var/const/CYBORG =(1<<9) var/const/INTERN_SEC =(1<<10) var/const/INTERN_ENG =(1<<11) var/const/BRIDGE_CREW =(1<<12) +var/const/SERVICE_MANAGER =(1<<13) +var/const/OPERATIONS_MANAGER =(1<<14) var/const/MEDSCI =(1<<1) @@ -40,7 +42,7 @@ var/const/BOTANIST =(1<<2) var/const/CHEF =(1<<3) var/const/JANITOR =(1<<4) var/const/LIBRARIAN =(1<<5) -var/const/QUARTERMASTER =(1<<6) +var/const/PASSENGER =(1<<6) var/const/CARGOTECH =(1<<7) var/const/MINER =(1<<8) var/const/LAWYER =(1<<9) @@ -50,9 +52,6 @@ var/const/CONSULAR =(1<<12) var/const/MERCHANT =(1<<13) var/const/JOURNALIST =(1<<14) var/const/ASSISTANT =(1<<15) -var/const/MACHINIST =(1<<16) -var/const/SERVICE_MANAGER =(1<<17) -var/const/PASSENGER =(1<<18) var/list/command_positions = list( diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 989edf78faa..149449a8b34 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -10,8 +10,8 @@ desc = "A headhand used by chefs. This one is in NanoTrasen's colors." icon = 'icons/obj/contained_items/department_uniforms/service.dmi' contained_sprite = TRUE - icon_state = "idris_manager_fedora" - item_state = "idris_manager_fedora" + icon_state = "nt_chef_headband" + item_state = "nt_chef_headband" /obj/item/clothing/head/surgery/hairnet name = "hairnet" diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index d534dff546c..b5593883379 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -344,19 +344,17 @@ /obj/item/clothing/under/rank/service_manager name = "service manager's jumpsuit" desc = "The uniform worn by the managers of the ship service crew." - icon = 'icons/obj/contained_items/department_uniforms/command.dmi' + icon = 'icons/obj/contained_items/department_uniforms/service.dmi' icon_state = "hop" item_state = "b_suit" contained_sprite = TRUE /obj/item/clothing/under/rank/service_manager/nt - icon = 'icons/obj/contained_items/department_uniforms/command.dmi' icon_state = "nt_service_manager" item_state = "nt_service_manager" contained_sprite = TRUE /obj/item/clothing/under/rank/service_manager/idris - icon = 'icons/obj/contained_items/department_uniforms/command.dmi' icon_state = "idris_service_manager" item_state = "idris_service_manager" contained_sprite = TRUE @@ -371,11 +369,11 @@ /obj/item/clothing/under/rank/machinist/heph icon = 'icons/obj/contained_items/department_uniforms/operations.dmi' contained_sprite = TRUE - icon_state = "orion_tech" - item_state = "orion_tech" + icon_state = "heph_machinist" + item_state = "heph_machinist" /obj/item/clothing/under/rank/machinist/orion icon = 'icons/obj/contained_items/department_uniforms/operations.dmi' contained_sprite = TRUE - icon_state = "orion_tech" - item_state = "orion_tech" \ No newline at end of file + icon_state = "orion_machinist" + item_state = "orion_machinist" \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm index 3c2341883f6..8801a43e611 100644 --- a/code/modules/clothing/under/jobs/engineering.dm +++ b/code/modules/clothing/under/jobs/engineering.dm @@ -20,13 +20,13 @@ siemens_coefficient = 0.75 /obj/item/clothing/under/rank/atmospheric_technician/heph - icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi' icon_state = "heph_atmos" item_state = "heph_atmos" contained_sprite = TRUE /obj/item/clothing/under/rank/atmospheric_technician/zavod - icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi' icon_state = "zav_atmos" item_state = "zav_atmos" contained_sprite = TRUE @@ -43,13 +43,13 @@ siemens_coefficient = 0.75 /obj/item/clothing/under/rank/engineer/heph - icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi' icon_state = "heph_engineer" item_state = "heph_engineer" contained_sprite = TRUE /obj/item/clothing/under/rank/engineer/zavod - icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi' icon_state = "zav_engineer" item_state = "zav_engineer" contained_sprite = TRUE @@ -61,13 +61,13 @@ worn_state = "engine_app" /obj/item/clothing/under/rank/engineer/apprentice/heph - icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi' icon_state = "heph_apprentice" item_state = "heph_apprentice" contained_sprite = TRUE /obj/item/clothing/under/rank/engineer/apprentice/zavod - icon = 'icons/obj/contained_items/department_uniforms/science.dmi' + icon = 'icons/obj/contained_items/department_uniforms/engineering.dmi' icon_state = "zav_apprentice" item_state = "zav_apprentice" contained_sprite = TRUE diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 8de73ae3560..8f195341c51 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -193,7 +193,7 @@ worn_state = "scrubsblack" /obj/item/clothing/under/rank/medical/zeng - icon = 'icons/obj/contained_items/department_uniforms/security.dmi' + icon = 'icons/obj/contained_items/department_uniforms/medical.dmi' icon_state = "zeng_phys" item_state = "zeng_phys" contained_sprite = TRUE diff --git a/icons/obj/contained_items/department_uniforms/security.dmi b/icons/obj/contained_items/department_uniforms/security.dmi index c8ebd37f6b81ce86e682e9e9de51bd7fd4dfed77..02a950bdb1ecc31d46d8fdaf8eee1419c72356ca 100644 GIT binary patch delta 2989 zcmYk8dpy(oAIEJr)?9{MyBJa_vFRp1cM*r=R=KRX6y4O}kTbXS-4dppk`$-Zru5q) zw^NKEhgnJ1a^f2fDVtb5rQ z&(4;psahw6nx)ph0PDxV^k&XEy9B_;ib4lS^{XlO6g9A^#8QRoOMx(kxWPpqn<&L? zIAURTe|qR-RUXnH2Gwir4j5+B7pg_n`q<)p@l8B8j4 z!v4`>6;!zbd~w@bfd^A{5ZNC{Bql3k*rU6L-KL>6q%a0G=Lc9Lpz_^hXW-K_4U2Yx zo#&&F3Au2qq|RQmOuCMsCvtaF>gi=duQ(5O_!e~1Ac))Q4JqeMD)*ilJHOY!yNK8# zK?r`I;QX`{AFT9X-PE(JcNzbQRVtix_(eVZhE24883$T^%9EOQd-YZQrkd_|;C+z* z zJanyiyQZ+A;ST)6t$xSCur|jFGd?EYR-qB(GN54XSuB;e!35O`oIb}XBBTSXo~{aBhWg!OCaf^`w$bu;1x@ zTO3WDg%d_D<_56J>K1zWLRQ2AswMz@32b+C@dHeal!LuVC0*uMA&y4AOX_h1iXSjZ zc0h;`cxnJbQTGCq%^7kbD|Pt}QQ4cXR60GBocN0Mr|Em0w8FowF92~PWqa0P#_;dM zb^)lqxh?qzABU@ z)OxKSWL%N?ajpehs)XovY#q;cbKW~@(_DV@)ZGppi$KrZ)OICW+$}Ce>ij*uEU3b* zF&S@kx#7!&ehP2*$Vy1EVFM6cc6?(YDC9NM8`iD=0GjX5F57ibXA?-abGNe#ul07e zYErOHzOHyf_F$(5aY{6#!+=jdAtqh5SX{O!>8cJS_2g2`ff>dIb6Vf2O+oX;(=-Z$w^DmkICoQIamIXhnpi71C5xdvGOS4J>q? z6THVm4RMLAP5K6`k3z6@J!R7~azpC>EoGWcL%SBJPr#yuDwfUZ={iu$h#FABnPofVO`~F?+U?}3wR26C*(K=NvwRv zugPF~3Z0Q@d+LMYGGTOBUvwP8MtuVXsDsD?UVA1kl1y9+JJy27DK)1)<8ULK1Q|E( zi8vGY#__~}%y=tZ#*LuS{$(j#b&k{Ke00ziJ$@>0n^WJE&M2u!THm~Rw722FiqZI%OT;6_>iPqq zIonu6WxNgZTzw3#{*8mjk8}gFAt79SmZO8yWXwjoj>Phsilnx(m-D*$3zjZ=XW^#* zph|u;67TOd@kthEp>#L5$VaCoZ^GOntV2r>6BAQFr#uKrs{XQzPv4%UOK-%}c*oii;{0_}~klntdX?7o=nfOkelD_tL zNaqr6y}8e8iVl;zr{sLJupGl*HNhJHAi{T+zXLT01|+Rj%QxOVd>zb=`1@Kp&u=c! zd%a3HEj=B0i-g<}{;9c=8ZzvSZJN+LrXrnA z%NwZqt^oL`1<16tHGmt867|*i8%rYHvsEHp1Fh+X>dJ(pfA+f_dLh$f!1O*B#Y3Zp zmIG$guoahvAH)No7^@%yYCicR7l(VueVbS)jBdaUNGw7r8G`np#15mr8C%68hF10r;7qTaCttg)b%{x+qdFJe_-4B+firz{wPzoPO%4Il zTIjHs`Wz=%xa1%9rOiM{gtwyRIR-*60wn+y@T4~XSNjt5-nGA$z4F8sb{<#IdsFkk zGk|cBymk>lqwZvs>daqh6W>+Ss9tN;+Auy(sr=s~M|*E{*_(3b_go{{5SJwW?>TIj z=C4u*E5vWr8o)0kf!;=6@z_{eP)G(&<8o$F)`1tnP+FVK2zMLv;FAGdBQtJDb3<@O zNUTJ8+-6h|5Jy|dEj(#?%#2fKeo2boCW}aa6~8*ap%*In_{vTRH=dKWm9MeIxAW!G zXui}(t#h4kgl>1L{N%rmMtc_NRyyKsl#8l{!;dhAc#+~e!wwyAPcOQBN=EC5;x9N*tZTzn*CA oSmq?6Lcf65OQ|`0eV-ONWX09;=tTIY357L&ay#N$?h=0Ge~vWqApigX delta 2990 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