diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index 92bdae19f78..b664178df56 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -82,21 +82,6 @@ var/list/outfits_decls_by_type_ J.toggle() J.toggle_valve() -// A proc for non-human species, specially Unathi and Tajara, since they e.g. -// can't normally wear gloves as humans. Correct this issue by trying again, but -// apply some changes to the said item. -// -// Currently checks for gloves -// -// If you want to add more items that has species restriction, consider follow- -// ing the same format as the gloves shown in the code below. Thanks. -/decl/hierarchy/outfit/proc/check_and_try_equip_xeno(mob/living/carbon/human/H) - var/datum/species/S = H.species - if (!S || istype(S, /datum/species/human)) // null failcheck & get out here you damn humans - return - -// end of check_and_try_equip_xeno - /decl/hierarchy/outfit/proc/equip(mob/living/carbon/human/H, var/rank, var/assignment) equip_base(H) @@ -160,7 +145,6 @@ var/list/outfits_decls_by_type_ H.put_in_r_hand(new r_hand(H)) if(H.species) H.species.equip_survival_gear(H, flags&OUTFIT_EXTENDED_SURVIVAL) - check_and_try_equip_xeno(H) /decl/hierarchy/outfit/proc/equip_id(mob/living/carbon/human/H, rank, assignment) if(!id_slot || !id_type) diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index 79d20404272..8b24537ca77 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -118,10 +118,14 @@ /obj/item/weapon/card/id/silver/secretary/New() ..() + assignment = "Command Secretary" + rank = "Command Secretary" access |= list(access_heads) /obj/item/weapon/card/id/silver/hop/New() ..() + assignment = "Head of Personnel" + rank = "Head of Personnel" access |= list(access_security, access_sec_doors, access_brig, access_forensics_lockers, access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, @@ -136,6 +140,8 @@ item_state = "gold_id" /obj/item/weapon/card/id/gold/captain/New() + assignment = "Colony Director" + rank = "Colony Director" access = get_all_station_access() ..() @@ -196,27 +202,39 @@ /obj/item/weapon/card/id/medical/doctor/New() ..() + assignment = "Medical Doctor" + rank = "Medical Doctor" access |= list(access_morgue, access_surgery, access_virology, access_eva) /obj/item/weapon/card/id/medical/chemist/New() ..() + assignment = "Chemist" + rank = "Chemist" access |= list(access_chemistry) /obj/item/weapon/card/id/medical/geneticist/New() ..() + assignment = "Geneticist" + rank = "Geneticist" access |= list(access_morgue, access_genetics) /obj/item/weapon/card/id/medical/psychiatrist/New() ..() + assignment = "Psychiatrist" + rank = "Psychiatrist" access |= list(access_psychiatrist) /obj/item/weapon/card/id/medical/paramedic/New() ..() + assignment = "Paramedic" + rank = "Paramedic" access |= list(access_morgue, access_eva, access_maint_tunnels, access_external_airlocks) /obj/item/weapon/card/id/medical/head name = "identification card" desc = "A card which represents care and compassion." + assignment = "Chief Medical Officer" + rank = "Chief Medical Officer" icon_state = "medGold" primary_color = rgb(189,237,237) secondary_color = rgb(255,223,127) @@ -235,20 +253,28 @@ /obj/item/weapon/card/id/security/officer/New() ..() + assignment = "Assignment" + rank = "Security Officer" access |= list(access_brig) /obj/item/weapon/card/id/security/detective/New() ..() + assignment = "Detective" + rank = "Detective" access |= list(access_forensics_lockers, access_morgue) /obj/item/weapon/card/id/security/warden/New() ..() + assignment = "Warden" + rank = "Warden" access |= list(access_brig, access_armory) /obj/item/weapon/card/id/security/head name = "identification card" desc = "A card which represents honor and protection." icon_state = "secGold" + assignment = "Head of Security" + rank = "Head of Security" primary_color = rgb(189,47,0) secondary_color = rgb(255,223,127) @@ -268,16 +294,22 @@ /obj/item/weapon/card/id/engineering/engineer/New() ..() + assignment = "Station Engineer" + rank = "Station Engineer" access |= list(access_engine_equip, access_tech_storage) /obj/item/weapon/card/id/engineering/atmos/New() ..() + assignment = "Atmospheric Technician" + rank = "Atmospheric Technician" access |= list(access_atmospherics, access_emergency_storage) /obj/item/weapon/card/id/engineering/head name = "identification card" desc = "A card which represents creativity and ingenuity." icon_state = "engGold" + assignment = "Chief Engineer" + rank = "Chief Engineer" primary_color = rgb(189,94,0) secondary_color = rgb(255,223,127) @@ -296,20 +328,28 @@ /obj/item/weapon/card/id/science/scientist/New() ..() + assignment = "Scientist" + rank = "Scientist" access |= list(access_tox, access_tox_storage, access_xenoarch) /obj/item/weapon/card/id/science/xenobiologist/New() ..() + assignment = "Xenobiologist" + rank = "Xenobiologist" access |= list(access_xenobiology, access_hydroponics, access_tox_storage) /obj/item/weapon/card/id/science/roboticist/New() ..() + assignment = "Roboticist" + rank = "Roboticist" access |= list(access_robotics, access_tech_storage, access_morgue) /obj/item/weapon/card/id/science/head name = "identification card" desc = "A card which represents knowledge and reasoning." icon_state = "sciGold" + assignment = "Research Director" + rank = "Research Director" primary_color = rgb(142,47,142) secondary_color = rgb(255,223,127) @@ -329,16 +369,22 @@ /obj/item/weapon/card/id/cargo/cargo_tech/New() ..() + assignment = "Cargo Technician" + rank = "Cargo Technician" access |= list(access_maint_tunnels, access_cargo, access_cargo_bot) /obj/item/weapon/card/id/cargo/mining/New() ..() + assignment = "Shaft Miner" + rank = "Shaft Miner" access |= list(access_mining, access_mining_station) /obj/item/weapon/card/id/cargo/head name = "identification card" desc = "A card which represents service and planning." icon_state = "cargoGold" + assignment = "Quartermaster" + rank = "Quartermaster" primary_color = rgb(142,94,0) secondary_color = rgb(255,223,127) @@ -350,36 +396,52 @@ name = "identification card" desc = "A card issued to station civilian staff." icon_state = "civ" + assignment = "Assistant" + rank = "Assistant" primary_color = rgb(0,94,142) secondary_color = rgb(95,159,191) access = list() /obj/item/weapon/card/id/civilian/bartender/New() ..() + assignment = "Bartender" + rank = "Bartender" access |= list(access_bar) /obj/item/weapon/card/id/civilian/botanist/New() ..() + assignment = "Gardener" + rank = "Gardener" access |= list(access_hydroponics) /obj/item/weapon/card/id/civilian/chaplain/New() ..() + assignment = "Chaplain" + rank = "Chaplain" access |= list(access_chapel_office, access_crematorium) /obj/item/weapon/card/id/civilian/chef/New() ..() + assignment = "Chef" + rank = "Chef" access |= list(access_kitchen) /obj/item/weapon/card/id/civilian/internal_affairs_agent/New() ..() + assignment = "Internal Affairs Agent" + rank = "Internal Affairs Agent" access |= list(access_lawyer, access_sec_doors, access_heads) /obj/item/weapon/card/id/civilian/janitor/New() ..() + assignment = "Janitor" + rank = "Janitor" access |= list(access_janitor, access_maint_tunnels) /obj/item/weapon/card/id/civilian/librarian/New() ..() + assignment = "Librarian" + rank = "Librarian" access |= list(access_library) /obj/item/weapon/card/id/civilian/head //This is not the HoP. There's no position that uses this right now. diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index c7e5484cc91..bf2c579afbe 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -401,13 +401,14 @@ return feedback_add_details("admin_verb","SEQ") - dressup_human(H, outfit) + dressup_human(H, outfit, TRUE) /proc/dressup_human(var/mob/living/carbon/human/H, var/decl/hierarchy/outfit/outfit, var/undress = TRUE) + world << "dressup_human" if(!H || !outfit) return if(undress) - H.delete_inventory(TRUE) + H.delete_inventory() outfit.equip(H) log_and_message_admins("changed the equipment of [key_name(H)] to [outfit.name].")