From a6e9cae37b7863b6007ca3d9068415fd544c065f Mon Sep 17 00:00:00 2001 From: Dimach Date: Thu, 7 Dec 2023 18:37:21 +0200 Subject: [PATCH] refactor: remove outdated procs (#4003) --- code/game/jobs/access.dm | 74 +--------------------------------------- paradise.dme | 2 +- 2 files changed, 2 insertions(+), 74 deletions(-) diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 9c79e0fc33c..4908ae4b024 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -458,50 +458,7 @@ /proc/get_all_special_jobs() return list("Special Reaction Team Member", "HONKsquad", "Clown Security") -//gets the actual job rank (ignoring alt titles) -//this is used solely for sechuds -/obj/proc/GetJobRealName() - if(!istype(src, /obj/item/pda) && !istype(src,/obj/item/card/id)) - return - - var/rank - var/assignment - if(istype(src, /obj/item/pda)) - if(src:id) - rank = src:id:rank - assignment = src:id:assignment - else if(istype(src, /obj/item/card/id)) - rank = src:rank - assignment = src:assignment - - if( rank in GLOB.joblist ) - return rank - - if( assignment in GLOB.joblist ) - return assignment - - return "Unknown" - -//gets the alt title, failing that the actual job rank -//this is unused -// THEN WHY IS IT STILL HERE?? -AA07, 2020-07-31 -/obj/proc/sdsdsd() //GetJobDisplayName - if(!istype(src, /obj/item/pda) && !istype(src,/obj/item/card/id)) - return - - var/assignment - if(istype(src, /obj/item/pda)) - if(src:id) - assignment = src:id:assignment - else if(istype(src, /obj/item/card/id)) - assignment = src:assignment - - if(assignment) - return assignment - - return "Unknown" - -/proc/GetIdCard(var/mob/living/carbon/human/H) +/proc/GetIdCard(mob/living/carbon/human/H) if(H.wear_id) var/id = H.wear_id.GetID() if(id) @@ -510,35 +467,6 @@ var/obj/item/I = H.get_active_hand() return I.GetID() -/proc/FindNameFromID(var/mob/living/carbon/human/H) - ASSERT(istype(H)) - var/obj/item/card/id/C = H.get_active_hand() - if( istype(C) || istype(C, /obj/item/pda) ) - var/obj/item/card/id/ID = C - - if( istype(C, /obj/item/pda) ) - var/obj/item/pda/pda = C - ID = pda.id - if(!istype(ID)) - ID = null - - if(ID) - return ID.registered_name - - C = H.wear_id - - if( istype(C) || istype(C, /obj/item/pda) ) - var/obj/item/card/id/ID = C - - if( istype(C, /obj/item/pda) ) - var/obj/item/pda/pda = C - ID = pda.id - if(!istype(ID)) - ID = null - - if(ID) - return ID.registered_name - /proc/get_all_job_icons() //For all existing HUD icons return GLOB.joblist + list("Prisoner") diff --git a/paradise.dme b/paradise.dme index 22af0503155..08b4b2d0a40 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1143,12 +1143,12 @@ #include "code\game\objects\items\weapons\dice.dm" #include "code\game\objects\items\weapons\disks.dm" #include "code\game\objects\items\weapons\dna_injector.dm" +#include "code\game\objects\items\weapons\dna_upgrader.dm" #include "code\game\objects\items\weapons\dnascrambler.dm" #include "code\game\objects\items\weapons\explosives.dm" #include "code\game\objects\items\weapons\extinguisher.dm" #include "code\game\objects\items\weapons\flamethrower.dm" #include "code\game\objects\items\weapons\garrote.dm" -#include "code\game\objects\items\weapons\dna_upgrader.dm" #include "code\game\objects\items\weapons\gift_wrappaper.dm" #include "code\game\objects\items\weapons\handcuffs.dm" #include "code\game\objects\items\weapons\highlander_swords.dm"