From 82a08f4cee166375e772f7f37b8d5bd3cc7a32c4 Mon Sep 17 00:00:00 2001 From: mikomyazaki Date: Thu, 17 Mar 2022 22:49:09 +0000 Subject: [PATCH] Removes service manager. --- code/__defines/jobs.dm | 4 +- code/game/jobs/faction/idris.dm | 7 --- code/game/jobs/job/civilian.dm | 50 +++----------------- code/game/jobs/jobs.dm | 1 - code/modules/clothing/head/jobs.dm | 18 +------ code/modules/clothing/under/jobs/civilian.dm | 20 +------- maps/sccv_horizon/placeholder-2_deck_2.dmm | 3 -- 7 files changed, 10 insertions(+), 93 deletions(-) diff --git a/code/__defines/jobs.dm b/code/__defines/jobs.dm index 49a737a43c8..670d0c30312 100644 --- a/code/__defines/jobs.dm +++ b/code/__defines/jobs.dm @@ -1,6 +1,6 @@ #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, /datum/job/ai, /datum/job/cyborg, /datum/job/visitor) #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 SERVICE_ROLES list(/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/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) @@ -18,4 +18,4 @@ #define ZENG_ROLES list(SCIENCE_ROLES, MEDICAL_ROLES, ALL_FACTION_ROLES) #define HEPH_ROLES list(OPERATIONS_ROLES, ENGINEERING_ROLES, ALL_FACTION_ROLES) #define ORION_ROLES list(OPERATIONS_ROLES, ALL_FACTION_ROLES) -#define SCC_ROLES list(COMMAND_ROLES) \ No newline at end of file +#define SCC_ROLES list(COMMAND_ROLES) diff --git a/code/game/jobs/faction/idris.dm b/code/game/jobs/faction/idris.dm index ae1c5d3bb90..fc3308415f7 100644 --- a/code/game/jobs/faction/idris.dm +++ b/code/game/jobs/faction/idris.dm @@ -50,7 +50,6 @@ "Gardener" = /datum/outfit/job/hydro/idris, "Janitor" = /datum/outfit/job/janitor/idris, "Librarian" = /datum/outfit/job/librarian/idris, - "Service Manager" = /datum/outfit/job/service_manager/idris, "Corporate Liaison" = /datum/outfit/job/representative/idris ) @@ -121,12 +120,6 @@ uniform = /obj/item/clothing/under/librarian/idris id = /obj/item/card/id/idris -/datum/outfit/job/service_manager/idris - name = "Service Manager - Idris" - jobtype = /datum/job/service_manager - - uniform = /obj/item/clothing/under/rank/service_manager/idris - /datum/outfit/job/representative/idris name = "Idris Corporate Liaison" diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index ed422c811d8..6f51b025a90 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -1,41 +1,3 @@ -/datum/job/service_manager - title = "Service Manager" - flag = SERVICE_MANAGER - departments = list(DEPARTMENT_CIVILIAN = JOBROLE_SUPERVISOR) - department_flag = ENGSEC - faction = "Station" - total_positions = 1 - spawn_positions = 1 - supervisors = "the executive officer" - selection_color = "#90524b" - economic_modifier = 5 - - minimum_character_age = 25 - - access = list(access_bar, access_janitor, access_construction, access_crematorium, access_kitchen, access_hydroponics,access_chapel_office, access_library, access_janitor, access_journalist) - minimal_access = list(access_bar, access_janitor, access_construction, access_crematorium, access_kitchen, access_hydroponics,access_chapel_office, access_library, access_janitor, access_journalist) - - ideal_character_age = 40 - - blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) - outfit = /datum/outfit/job/service_manager - -/datum/outfit/job/service_manager - name = "Service Manager" - jobtype = /datum/job/service_manager - - uniform = /obj/item/clothing/under/rank/service_manager/nt - head = /obj/item/clothing/head/service_manager/nt - - tab_pda = /obj/item/modular_computer/handheld/pda/civilian - wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian - tablet = /obj/item/modular_computer/handheld/preset/civilian - - headset = /obj/item/device/radio/headset/headset_service - bowman = /obj/item/device/radio/headset/headset_service/alt - double_headset = /obj/item/device/radio/headset/alt/double/service - wrist_radio = /obj/item/device/radio/headset/wrist/service - /datum/job/bartender title = "Bartender" flag = BARTENDER @@ -44,7 +6,7 @@ faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the service manager" + supervisors = "the executive officer" selection_color = "#90524b" minimum_character_age = 18 @@ -82,7 +44,7 @@ faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the service manager" + supervisors = "the executive officer" selection_color = "#90524b" minimum_character_age = 18 @@ -122,7 +84,7 @@ faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the service manager" + supervisors = "the executive officer" selection_color = "#90524b" minimum_character_age = 18 @@ -173,7 +135,7 @@ faction = "Station" total_positions = 2 spawn_positions = 2 - supervisors = "the service manager" + supervisors = "the executive officer" selection_color = "#90524b" access = list(access_janitor, access_maint_tunnels, access_engine, access_research, access_sec_doors, access_medical) minimal_access = list(access_janitor, access_engine, access_research, access_sec_doors, access_medical) @@ -263,7 +225,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "the service manager" + supervisors = "the executive officer" selection_color = "#90524b" access = list(access_library, access_maint_tunnels) minimal_access = list(access_library) @@ -319,7 +281,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "the service manager" + supervisors = "the executive officer" selection_color = "#90524b" access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels) minimal_access = list(access_morgue, access_chapel_office, access_crematorium) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 289d1e7f686..f3cf35f00be 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -100,7 +100,6 @@ var/list/cargo_positions = list( ) var/list/civilian_positions = list( - "Service Manager", "Corporate Liaison", "Consular Officer", "Bartender", diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 66630627d1a..d5f83f8b65b 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -183,22 +183,6 @@ icon_state = "corp" item_state = "corp" -/obj/item/clothing/head/service_manager - name = "service manager fedora" - desc = "A hat issued to the service manager." - -/obj/item/clothing/head/service_manager/nt - icon = 'icons/obj/contained_items/department_uniforms/service.dmi' - contained_sprite = TRUE - icon_state = "nt_manager_fedora" - item_state = "nt_manager_fedora" - -/obj/item/clothing/head/service_manager/idris - icon = 'icons/obj/contained_items/department_uniforms/service.dmi' - contained_sprite = TRUE - icon_state = "idris_manager_fedora" - item_state = "idris_manager_fedora" - /obj/item/clothing/head/flatcap/bartender name = "bartender flatcap" desc = "An simple hat issued to bartenders." @@ -216,4 +200,4 @@ icon = 'icons/obj/contained_items/department_uniforms/service.dmi' contained_sprite = TRUE icon_state = "nt_bartender_flatcap" - item_state = "nt_bartender_flatcap" \ No newline at end of file + item_state = "nt_bartender_flatcap" diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 24f12820e02..3c10a53c75c 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -342,24 +342,6 @@ item_state = "executive_officer" contained_sprite = TRUE -/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/service.dmi' - icon_state = "hop" - item_state = "b_suit" - contained_sprite = TRUE - -/obj/item/clothing/under/rank/service_manager/nt - icon_state = "nt_service_manager" - item_state = "nt_service_manager" - contained_sprite = TRUE - -/obj/item/clothing/under/rank/service_manager/idris - icon_state = "idris_service_manager" - item_state = "idris_service_manager" - contained_sprite = TRUE - /obj/item/clothing/under/rank/machinist name = "machinist's jumpsuit" desc = "A practical uniform designed for industrial work." @@ -377,4 +359,4 @@ icon = 'icons/obj/contained_items/department_uniforms/operations.dmi' contained_sprite = TRUE icon_state = "orion_machinist" - item_state = "orion_machinist" \ No newline at end of file + item_state = "orion_machinist" diff --git a/maps/sccv_horizon/placeholder-2_deck_2.dmm b/maps/sccv_horizon/placeholder-2_deck_2.dmm index 61488ac67f2..cc44010aa55 100644 --- a/maps/sccv_horizon/placeholder-2_deck_2.dmm +++ b/maps/sccv_horizon/placeholder-2_deck_2.dmm @@ -30699,9 +30699,6 @@ /area/engineering/engine_room/tesla) "tfl" = ( /obj/structure/bed/stool/padded/red, -/obj/effect/landmark/start{ - name = "Service Manager" - }, /turf/simulated/floor/lino/grey, /area/crew_quarters/cafeteria) "tfr" = (