From 762da01f71094a4390e838d15df0475dcd21a425 Mon Sep 17 00:00:00 2001 From: Vekter Date: Thu, 3 Aug 2023 08:51:42 -0500 Subject: [PATCH] Fixes formatting for derelict and syndicate drone job names (#77303) ## About The Pull Request These were using the generic "ghost role" job names instead of the defines that it's supposed to. This should fix it. Note: This touches code I'm not intimately familiar with, but I did test this and it works fine. ## Why It's Good For The Game Fixes #76922 ## Changelog :cl: Vekter fix: Fixes formatting for derelict and syndicate drone job names. They should no longer tell you they're "the Ghost Role" when spawning as them. /:cl: --- code/__DEFINES/role_preferences.dm | 2 ++ code/modules/jobs/jobs.dm | 2 ++ .../friendly/drone/extra_drone_types.dm | 12 ++++++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm index 238308afb144f..187c70881f8af 100644 --- a/code/__DEFINES/role_preferences.dm +++ b/code/__DEFINES/role_preferences.dm @@ -95,6 +95,8 @@ #define ROLE_SKELETON "Skeleton" #define ROLE_ZOMBIE "Zombie" #define ROLE_MAINTENANCE_DRONE "Maintenance Drone" +#define ROLE_DERELICT_DRONE "Derelict Drone" +#define ROLE_SYNDICATE_DRONE "Syndicate Drone" #define ROLE_BATTLECRUISER_CREW "Battlecruiser Crew" #define ROLE_BATTLECRUISER_CAPTAIN "Battlecruiser Captain" #define ROLE_VENUSHUMANTRAP "Venus Human Trap" diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 5eea0d7fc4691..a0b0ebee560e8 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -21,6 +21,8 @@ GLOBAL_LIST_INIT(exp_specialmap, list( ROLE_SPACE_BAR_PATRON, ROLE_LAVALAND_SYNDICATE, ROLE_MAINTENANCE_DRONE, + ROLE_DERELICT_DRONE, + ROLE_SYNDICATE_DRONE, ROLE_VENUSHUMANTRAP, ROLE_GHOST_ROLE, ), // Ghost roles diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm index 6c60bc855633c..38c3585271ab4 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm @@ -65,7 +65,11 @@ you_are_text = "You are a Syndicate Maintenance Drone." flavour_text = "In a prior life, you maintained a Nanotrasen Research Station. Abducted from your home, you were given some upgrades... and now serve an enemy of your former masters." important_text = "" - spawner_job_path = /datum/job/ghost_role + spawner_job_path = /datum/job/syndrone + +/datum/job/syndrone + title = ROLE_SYNDICATE_DRONE + policy_index = ROLE_SYNDICATE_DRONE /obj/effect/mob_spawn/ghost_role/drone/syndrone/badass name = "badass syndrone shell" @@ -120,7 +124,11 @@ you_are_text = "You are a drone on Kosmicheskaya Stantsiya 13." flavour_text = "Something has brought you out of hibernation, and the station is in gross disrepair." important_text = "Build, repair, maintain and improve the station that housed you on activation." - spawner_job_path = /datum/job/ghost_role + spawner_job_path = /datum/job/derelict_drone + +/datum/job/derelict_drone + title = ROLE_DERELICT_DRONE + policy_index = ROLE_DERELICT_DRONE /mob/living/simple_animal/drone/derelict name = "derelict drone"