diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 614110403a3..af3b6d39d7e 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -372,6 +372,7 @@ if(ACCESS_CENT_BAR) return "Code Scotch" +/*//SKYRAT EDIT - CARD - MOVED TO MODULAR /proc/get_all_jobs() return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", @@ -383,6 +384,7 @@ /proc/get_all_centcom_jobs() return list("Central Command","VIP Guest","Custodian","Thunderdome Overseer","CentCom Official","Medical Officer","Research Officer","Special Ops Officer","Admiral","CentCom Commander","CentCom Bartender","Private Security Force") +*///Skyrat Edit End /obj/item/proc/GetJobName() //Used in secHUD icon generation var/obj/item/card/id/I = GetID() diff --git a/modular_skyrat/modules/card/access.dm b/modular_skyrat/modules/card/access.dm new file mode 100644 index 00000000000..ba108c28519 --- /dev/null +++ b/modular_skyrat/modules/card/access.dm @@ -0,0 +1,23 @@ +//moved from code/modules/jobs/access.dm +/proc/get_all_jobs() //All on-station jobs go here. + return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", + "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", + "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Paramedic", "Chemist", "Geneticist", "Virologist", "Psychologist", + "Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer", "Prisoner", "Blueshield") + +/proc/get_all_job_icons() //For all existing HUD icons, Things a HoP or someone with an agent card might realistically apply, but not a real job. Also ghost role / event stuffs. + return get_all_jobs() + list("Emergency Response Team Commander", "Security Response Officer", "Engineering Response Officer", "Medical Response Officer", "Entertainment Response Officer", "Religious Response Officer", "Janitorial Response Officer", "Death Commando", + "Operative", "Tradepost Officer", "CentCom Psychologist", "Bluespace Tech", "Syndicate Overlord", "Syndicate Operative", "Syndicate Ship Captain", + "Charlie Station Security Officer", "Charlie Station Scientist", "Charlie Station Engineer", "Charlie Station Assistant", "Charlie Station Botanist", "Charlie Station Curator", "Charlie Station Lawyer", "Charlie Station Chaplain", "Charlie Station Bartender", "Charlie Station Cook", + "Charlie Station Janitor", "Charlie Station Clown", "Charlie Station Mime", "Charlie Station Quartermaster", "Charlie Station Cargo Technician", "Charlie Station Shaft Miner", "Charlie Station Atmospheric Technician", "Charlie Station Virologist", "Charlie Station Chemist", + "Charlie Station Paramedic", "Charlie Station Psychologist", "Charlie Station Medical Doctor", "Charlie Station Geneticist", "Charlie Station Roboticist", "Charlie Station Warden", "Charlie Station Detective", "Charlie Station Prisoner", "Charlie Station Head Of Security", + "Charlie Station Head Of Personnel", "Charlie Station Chief Engineer", "Charlie Station Research Director", "Charlie Station Chief Medical Officer", "Charlie Station Captain","CentCom Assistant","CentCom Botanist","CentCom Curator","CentCom Lawyer","CentCom Chaplain", + "CentCom Bartender","CentCom Cook","CentCom Janitor","CentCom Clown","CentCom Mime","CentCom Quartermaster","CentCom Cargo Technician","CentCom Shaft Miner","CentCom Atmospheric Technician","CentCom Station Engineer","CentCom Virologist","CentCom Chemist","CentCom Paramedic", + "CentCom Medical Doctor","CentCom Medical Doctor","CentCom Geneticist","CentCom Scientist","CentCom Roboticist","CentCom Warden","CentCom Detective","CentCom Security Officer","CentCom Prisoner","Admiral", "Protective Custody", "VIP Guest", "Custodian","Medical Officer", + "Research Officer","Special Ops Officer","Private Security Force","CentCom Commander","Service Guest","Guest Comedian","Private Trader","Independent Technician","Long Term Patient","Research Subject","Independent Researcher","Security Contractor", "DonkCo Diplomat", + "Cybersun Diplomat","Interdyne Chemist","Syndicate","Syndicate Prisoner","Nuclear Operative","Assault Operative","Lizard","Moth","Kobold","Cutie","Station Admiral","Corporate Liaison","Chief Engineering Officer","Chief Research Officer","Chief Master At Arms", + "Investigative Officer","Brig Officer","Master At Arms","Corporate Lawyer","Station Medical Officer","Bioweapons Technician","Engine Technicinan","Genetics Researcher","Researcher","Robotics Technician","Chef","Counsel","Sanitation Technician","Deck Officer", + "Deck Crewman") + +/proc/get_all_centcom_jobs() //Admin-only jobs or jobs that nobody would care if it was a generic nanotrasen logo. + return list("Central Command","Thunderdome Overseer","CentCom Official") diff --git a/modular_skyrat/modules/card/card.dm b/modular_skyrat/modules/card/card.dm new file mode 100644 index 00000000000..74ea8b478ea --- /dev/null +++ b/modular_skyrat/modules/card/card.dm @@ -0,0 +1,81 @@ +/obj/item/card + icon = 'modular_skyrat/modules/card/card.dmi' + +/obj/item/card/id/syndicate_command + uses_overlays = TRUE + +/obj/item/card/id/syndicate_command/crew_id + uses_overlays = TRUE + +/obj/item/card/id/syndicate_command/captain_id + uses_overlays = TRUE + +/obj/item/card/id/centcom + uses_overlays = TRUE + +/obj/item/card/id/ert + icon_state = "gold" + uses_overlays = TRUE + +/obj/item/card/id/ert/security + icon_state = "centcom" + uses_overlays = TRUE + +/obj/item/card/id/ert/engineer + icon_state = "centcom" + uses_overlays = TRUE + +/obj/item/card/id/ert/medical + icon_state = "centcom" + uses_overlays = TRUE + +/obj/item/card/id/ert/chaplain + icon_state = "centcom" + uses_overlays = TRUE + +/obj/item/card/id/ert/janitor + icon_state = "centcom" + uses_overlays = TRUE + +/obj/item/card/id/ert/clown + icon_state = "centcom" + uses_overlays = TRUE + +/obj/item/card/id/ert/deathsquad + icon_state = "syndie" + uses_overlays = TRUE + +/obj/item/card/id/debug + icon_state = "centcom" + uses_overlays = TRUE + +/obj/item/card/id/prisoner + icon_state = "orange" + uses_overlays = TRUE + +/obj/item/card/id/prisoner/one + uses_overlays = FALSE + +/obj/item/card/id/prisoner/two + uses_overlays = FALSE + +/obj/item/card/id/prisoner/three + uses_overlays = FALSE + +/obj/item/card/id/prisoner/four + uses_overlays = FALSE + +/obj/item/card/id/prisoner/five + uses_overlays = FALSE + +/obj/item/card/id/prisoner/six + uses_overlays = FALSE + +/obj/item/card/id/prisoner/seven + uses_overlays = FALSE + +/obj/item/card/id/away + uses_overlays = TRUE + +/obj/item/card/id/debug/bst + icon_state = "bluespacetech" diff --git a/modular_skyrat/modules/card/card.dmi b/modular_skyrat/modules/card/card.dmi new file mode 100644 index 00000000000..b0072039d78 Binary files /dev/null and b/modular_skyrat/modules/card/card.dmi differ diff --git a/tgstation.dme b/tgstation.dme index b0b4d276d0f..227e91d1fba 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3438,6 +3438,8 @@ #include "modular_skyrat\modules\blueshield\code\modules\clothing\under\jobs\Plasmaman\security.dm" #include "modular_skyrat\modules\blueshield\code\modules\jobs\job_types\blueshield.dm" #include "modular_skyrat\modules\blueshield\code\modules\projectiles\guns\energy\special.dm" +#include "modular_skyrat\modules\card\access.dm" +#include "modular_skyrat\modules\card\card.dm" #include "modular_skyrat\modules\cargo\code\bloat.dm" #include "modular_skyrat\modules\cargo\code\goodies.dm" #include "modular_skyrat\modules\cargo\code\packs.dm"