From f4a4948afac5c880da354a0909169601163fe392 Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Fri, 13 Sep 2024 23:29:59 +0200 Subject: [PATCH 1/8] Outfit improvements --- aurorastation.dme | 1 + code/controllers/subsystems/job.dm | 2 +- .../controllers/subsystems/virtual_reality.dm | 4 +- code/datums/outfits/ert/ap_eridani.dm | 12 +- code/datums/outfits/ert/biesel.dm | 12 +- code/datums/outfits/ert/coalition.dm | 22 +- code/datums/outfits/ert/deathsquad.dm | 16 +- code/datums/outfits/ert/dominia.dm | 12 +- code/datums/outfits/ert/einstein.dm | 10 +- code/datums/outfits/ert/elyra.dm | 12 +- code/datums/outfits/ert/fsf.dm | 12 +- code/datums/outfits/ert/hephaestus_ert.dm | 12 +- code/datums/outfits/ert/iac.dm | 10 +- code/datums/outfits/ert/izweski.dm | 16 +- code/datums/outfits/ert/kataphract.dm | 18 +- code/datums/outfits/ert/kosmostrelki.dm | 16 +- code/datums/outfits/ert/mercenary.dm | 10 +- code/datums/outfits/ert/nt_ert.dm | 10 +- code/datums/outfits/ert/qukala.dm | 18 +- code/datums/outfits/ert/scc_ert.dm | 10 +- code/datums/outfits/ert/syndicate.dm | 4 +- code/datums/outfits/ert/tcfl.dm | 18 +- code/datums/outfits/ert/vaurca.dm | 32 +- code/datums/outfits/ert/zavod.dm | 12 +- code/datums/outfits/ert/zenghu.dm | 10 +- code/datums/outfits/event/outfit_events.dm | 18 +- .../outfits/event/outfit_generic/_generic.dm | 4 +- .../event/outfit_generic/engineering.dm | 2 +- .../outfits/event/outfit_generic/medical.dm | 2 +- .../outfits/event/outfit_generic/science.dm | 2 +- .../outfits/event/outfit_generic/security.dm | 2 +- code/datums/outfits/event/outfit_killers.dm | 10 +- code/datums/outfits/event/outfit_megacorps.dm | 14 +- .../datums/outfits/event/outfit_nanotrasen.dm | 42 +- code/datums/outfits/event/outfit_scc.dm | 8 +- code/datums/outfits/event/outfit_tfcl.dm | 4 +- code/datums/outfits/outfit.dm | 647 ++++++++++-------- code/datums/outfits/outfit_admin.dm | 24 +- code/datums/outfits/outfit_antag.dm | 64 +- code/game/antagonist/outsider/burglar.dm | 4 +- code/game/antagonist/outsider/jockey.dm | 4 +- code/game/antagonist/outsider/loner.dm | 4 +- code/game/antagonist/outsider/mercenary.dm | 4 +- code/game/antagonist/outsider/ninja.dm | 4 +- code/game/antagonist/outsider/raider.dm | 4 +- .../game/antagonist/outsider/raider_techno.dm | 4 +- code/game/antagonist/outsider/technomancer.dm | 8 +- code/game/antagonist/station/highlander.dm | 4 +- code/game/gamemodes/antagspawner.dm | 4 +- code/game/jobs/faction/hephaestus.dm | 48 +- code/game/jobs/faction/idris.dm | 72 +- code/game/jobs/faction/nanotrasen.dm | 4 +- code/game/jobs/faction/orion_express.dm | 64 +- code/game/jobs/faction/pmc.dm | 68 +- code/game/jobs/faction/zavodskoi.dm | 84 +-- code/game/jobs/faction/zeng_hu.dm | 72 +- code/game/jobs/job/captain.dm | 14 +- code/game/jobs/job/civilian.dm | 52 +- code/game/jobs/job/engineering.dm | 26 +- code/game/jobs/job/event.dm | 22 +- code/game/jobs/job/hra.dm | 6 +- code/game/jobs/job/job.dm | 17 +- code/game/jobs/job/medical.dm | 46 +- code/game/jobs/job/outsider/merchant.dm | 10 +- code/game/jobs/job/outsider/representative.dm | 28 +- code/game/jobs/job/science.dm | 28 +- code/game/jobs/job/security.dm | 40 +- code/game/jobs/job/ship_crew.dm | 12 +- code/modules/admin/verbs/debug.dm | 50 +- code/modules/awaymissions/corpse.dm | 2 +- .../background/citizenship/citizenship.dm | 4 +- code/modules/background/citizenship/human.dm | 30 +- code/modules/background/citizenship/ipc.dm | 4 +- code/modules/background/citizenship/skrell.dm | 10 +- code/modules/background/citizenship/tajara.dm | 24 +- code/modules/background/citizenship/unathi.dm | 10 +- code/modules/background/citizenship/vaurca.dm | 18 +- .../ghostroles/spawner/human/admin/admin.dm | 14 +- .../ghostroles/spawner/human/admin/ccia.dm | 18 +- .../ghostroles/spawner/human/emergencypod.dm | 100 +-- .../modules/ghostroles/spawner/human/human.dm | 4 +- .../ghostroles/spawner/human/merchant.dm | 2 +- code/modules/ghostroles/spawner/human/pra.dm | 8 +- .../spawner/human/responseteams/ap_eridani.dm | 8 +- .../human/responseteams/corporate/einstein.dm | 8 +- .../responseteams/corporate/hephaestus.dm | 8 +- .../human/responseteams/corporate/nt_ert.dm | 6 +- .../human/responseteams/corporate/scc_ert.dm | 8 +- .../human/responseteams/corporate/zavod.dm | 8 +- .../human/responseteams/corporate/zenghu.dm | 8 +- .../spawner/human/responseteams/deathsquad.dm | 4 +- .../human/responseteams/human/biesel.dm | 8 +- .../human/responseteams/human/coalition.dm | 16 +- .../human/responseteams/human/dominia.dm | 8 +- .../human/responseteams/human/elyra.dm | 10 +- .../spawner/human/responseteams/human/fsf.dm | 10 +- .../spawner/human/responseteams/iac.dm | 6 +- .../spawner/human/responseteams/mercenary.dm | 8 +- .../human/responseteams/skrell/qukala.dm | 10 +- .../spawner/human/responseteams/syndicate.dm | 4 +- .../responseteams/tajara/kosmostrelki.dm | 12 +- .../spawner/human/responseteams/tcfl.dm | 8 +- .../human/responseteams/unathi/izweski.dm | 8 +- .../human/responseteams/unathi/kataphracts.dm | 8 +- .../human/responseteams/vaurca/klax.dm | 8 +- .../human/responseteams/vaurca/zora.dm | 8 +- .../ghostroles/spawner/human/visitor.dm | 2 +- .../ghostroles/spawner/human/zenghu.dm | 4 +- code/modules/mob/inventory.dm | 4 +- code/modules/mob/living/carbon/slime/items.dm | 4 +- code/unit_tests/outfit_tests.dm | 111 +++ html/changelogs/archive/2024-03.yml | 2 +- .../changelogs/fluffyghost-outfitsmadness.yml | 61 ++ .../cult_base/cult_base_ghostroles.dm | 18 +- .../point_verdant/point_verdant_ghostroles.dm | 102 +-- .../pirate_base/pirate_base_ghostroles.dm | 16 +- .../romanovich/grand_romanovich_ghostroles.dm | 22 +- .../mining_jack/mining_jack_ghostroles.dm | 6 +- .../peoples_station_ghostroles.dm | 14 +- .../saniorios_outpost_ghostroles.dm | 6 +- .../tajara/scrapper/scrapper_ghostroles.dm | 6 +- .../tajara_safehouse_ghostroles.dm | 8 +- .../ihss_reclamation_ghostroles.dm | 18 +- .../tret_industrial_complex_ghostroles.dm | 22 +- .../tcaf_corvette/tcaf_corvette_ghostroles.dm | 16 +- .../tcfl_peacekeeper_ship_ghostroles.dm | 16 +- .../coc/coc_ranger/coc_ship_ghostroles.dm | 12 +- .../coc/coc_scarab/coc_scarab_ghostroles.dm | 10 +- .../coc_surveyor/coc_surveyor_ghostroles.dm | 8 +- .../gadpathur_patrol_ghostroles.dm | 18 +- .../diona_rokz_ship_ghostroles.dm | 10 +- .../diona_serz_ship_ghostroles.dm | 12 +- .../dominian_corvette_ghostroles.dm | 18 +- .../dominian_science_vessel_ghostroles.dm | 24 +- .../dominian_unathi_privateer_ghostroles.dm | 14 +- .../dpra/hailstorm/hailstorm_ghostroles.dm | 14 +- .../ships/einstein/ee_spy_ship_ghostroles.dm | 12 +- .../elyra_corvette_ghostroles.dm | 22 +- .../freebooter/freebooter_ship_ghostroles.dm | 12 +- .../golden_deep/golden_deep_ghostroles.dm | 14 +- .../fishing_league_trawler_ghostroles.dm | 12 +- .../hegemony_corvette/hegemony_ghostroles.dm | 26 +- .../merchant_freighter_ghostroles.dm | 16 +- .../miners_guild/miners_guild_ghostroles.dm | 8 +- .../ships/heph/cyclops/cyclops_ghostroles.dm | 20 +- .../heph_security/heph_security_ghostroles.dm | 12 +- .../ships/iac/iac_rescue_ship_ghostroles.dm | 16 +- .../ships/idris/idris_cruiser_ghostroles.dm | 14 +- .../kataphracts/kataphract_ship_ghostroles.dm | 26 +- .../air_konyang/air_konyang_ghostroles.dm | 8 +- .../einstein_shuttle/einstein_shuttle.dm | 12 +- .../ipc_refugee_ship_ghostroles.dm | 12 +- .../konyang/kasf_ship/kasf_ship_ghostroles.dm | 20 +- .../water_barge/water_barge_ghostroles.dm | 6 +- .../lone_spacer/lone_spacer_ghostroles.dm | 8 +- .../nka_merchant/nka_merchant_ghostroles.dm | 14 +- .../orion/orion_express_ship_ghostroles.dm | 12 +- .../database_freighter_ghostroles.dm | 10 +- .../pra/headmaster/headmaster_ghostroles.dm | 14 +- .../sadar_scout/sadar_scout_ghostroles.dm | 10 +- .../ships/scc/scc_scout_ship_ghostroles.dm | 32 +- .../sol_merc/fsf_patrol_ship_ghostroles.dm | 12 +- .../sol_pirate/sfa_patrol_ship_ghostroles.dm | 12 +- .../sol/sol_ssmd/ssmd_ship_ghostroles.dm | 26 +- .../tajara/circus/adhomian_circus_roles.dm | 28 +- .../tajaran_smuggler_ghostroles.dm | 10 +- .../tirakqi_smuggler_ghostroles.dm | 20 +- .../tramp_freighter_ghostroles.dm | 12 +- .../hiskyn/unathi_pirate_hiskyn_ghostroles.dm | 10 +- .../unathi_pirate_izharshan_ghostroles.dm | 10 +- .../tarwa/unathi_pirate_tarwa_ghostroles.dm | 14 +- .../militia_ship_ghostroles.dm | 12 +- .../ships/xanu/xanu_frigate_ghostroles.dm | 14 +- .../ships/yacht_civ/yacht_civ_ghostroles.dm | 4 +- .../exoplanets/adhomai/adhomai_amohdan.dm | 4 +- .../exoplanets/adhomai/adhomai_archeology.dm | 4 +- .../exoplanets/adhomai/adhomai_bar.dm | 12 +- .../exoplanets/adhomai/adhomai_deserter.dm | 4 +- .../exoplanets/adhomai/adhomai_hunting.dm | 8 +- .../adhomai/adhomai_raskariim_hideout.dm | 5 +- .../exoplanets/adhomai/adhomai_silo.dm | 6 +- .../adhomai/adhomai_sole_rock_nomad.dm | 4 +- .../exoplanets/adhomai/adhomai_village.dm | 4 +- .../exoplanets/adhomai/ala_base.dm | 10 +- .../exoplanets/adhomai/nka_base.dm | 10 +- .../adhomai/north_pole_nka_expedition.dm | 12 +- .../exoplanets/adhomai/pra_base.dm | 10 +- .../exoplanets/adhomai/pra_mining_camp.dm | 8 +- .../exoplanets/adhomai/psis_outpost.dm | 6 +- .../exoplanets/burzsia/burzsia_mining.dm | 12 +- .../grove/crashsurvivors/crashsurvivors.dm | 8 +- .../exoplanets/konyang/fireoutpost.dm | 4 +- .../exoplanets/konyang/homestead.dm | 4 +- .../exoplanets/konyang/pirate_moonshine.dm | 2 +- .../exoplanets/konyang/pirate_outpost.dm | 4 +- .../exoplanets/konyang/stranded_police.dm | 2 +- .../exoplanets/konyang/telecomms_outpost.dm | 6 +- .../exoplanets/konyang/village.dm | 4 +- .../exoplanets/moghes/moghes_bar.dm | 18 +- .../exoplanets/moghes/moghes_diona_traders.dm | 14 +- .../moghes/moghes_gawgaryn_bikers.dm | 12 +- .../moghes/moghes_gawgaryn_riders.dm | 4 +- .../exoplanets/moghes/moghes_guild_mining.dm | 2 +- .../exoplanets/moghes/moghes_guwandi.dm | 6 +- .../exoplanets/moghes/moghes_hegemony_base.dm | 4 +- .../exoplanets/moghes/moghes_heph_mining.dm | 14 +- .../moghes/moghes_kataphract_wasteland.dm | 8 +- .../exoplanets/moghes/moghes_kung_fu.dm | 6 +- .../exoplanets/moghes/moghes_siakh.dm | 6 +- .../exoplanets/moghes/moghes_skakh.dm | 8 +- .../exoplanets/moghes/moghes_thakh.dm | 12 +- .../moghes/moghes_untouched_village.dm | 6 +- .../moghes/moghes_wasteland_dorviza.dm | 10 +- .../moghes/moghes_wasteland_izwesk.dm | 4 +- .../moghes/moghes_wasteland_klax.dm | 10 +- .../moghes/moghes_wasteland_mikuetz.dm | 6 +- .../moghes/moghes_wasteland_ozeuoi.dm | 6 +- .../moghes/moghes_wasteland_priests.dm | 6 +- .../moghes/moghes_wasteland_queendom.dm | 8 +- .../moghes/moghes_wasteland_reclaimer.dm | 4 +- .../moghes/moghes_wasteland_vihnmes.dm | 12 +- .../exoplanets/ouerea/ouerea_autakh.dm | 14 +- .../exoplanets/ouerea/ouerea_bar.dm | 18 +- .../exoplanets/ouerea/ouerea_farm.dm | 6 +- .../exoplanets/ouerea/ouerea_freewater.dm | 6 +- .../exoplanets/ouerea/ouerea_guild_mining.dm | 2 +- .../exoplanets/ouerea/ouerea_hegemony_base.dm | 4 +- .../exoplanets/ouerea/ouerea_heph_mining.dm | 12 +- .../exoplanets/ouerea/ouerea_village.dm | 10 +- .../exoplanets/raskara/raskara_okon.dm | 6 +- .../uueoaesa/heph_mining_station.dm | 4 +- .../uueoaesa/miners_guild_outpost.dm | 2 +- .../exoplanets/uueoaesa/pid_kois_farm.dm | 6 +- 233 files changed, 2121 insertions(+), 1857 deletions(-) create mode 100644 code/unit_tests/outfit_tests.dm create mode 100644 html/changelogs/fluffyghost-outfitsmadness.yml diff --git a/aurorastation.dme b/aurorastation.dme index 16e9bde7339..4a43b184faa 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3745,6 +3745,7 @@ #include "code\unit_tests\object_tests.dm" #include "code\unit_tests\observation_tests.dm" #include "code\unit_tests\origins_tests.dm" +#include "code\unit_tests\outfit_tests.dm" #include "code\unit_tests\overmap_tests.dm" #include "code\unit_tests\power_tests.dm" #include "code\unit_tests\recipe_tests.dm" diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index 0e9d729fbdd..4657d7711f6 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -888,7 +888,7 @@ SUBSYSTEM_DEF(jobs) var/uniform = job.get_outfit(H) if(!uniform) // silicons don't have uniforms or gear return - var/obj/outfit/U = new uniform + var/datum/outfit/U = new uniform var/spawned_uniform = FALSE var/spawned_suit = FALSE for(var/item in prefs.gear) diff --git a/code/controllers/subsystems/virtual_reality.dm b/code/controllers/subsystems/virtual_reality.dm index 42c2ddbf583..931cd077b5b 100644 --- a/code/controllers/subsystems/virtual_reality.dm +++ b/code/controllers/subsystems/virtual_reality.dm @@ -265,8 +265,8 @@ SUBSYSTEM_DEF(virtualreality) H.real_name = user.real_name H.UpdateAppearance() - H.preEquipOutfit(/obj/outfit/admin/virtual_reality, FALSE) - H.equipOutfit(/obj/outfit/admin/virtual_reality, FALSE) + H.preEquipOutfit(/datum/outfit/admin/virtual_reality, FALSE) + H.equipOutfit(/datum/outfit/admin/virtual_reality, FALSE) mind_transfer(user, H) to_chat(H, SPAN_NOTICE("You are now in control of a virtual reality body. Dying will return you to your original body.")) diff --git a/code/datums/outfits/ert/ap_eridani.dm b/code/datums/outfits/ert/ap_eridani.dm index 9aa2c68273b..5befb5468a8 100644 --- a/code/datums/outfits/ert/ap_eridani.dm +++ b/code/datums/outfits/ert/ap_eridani.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/ap_eridani +/datum/outfit/admin/ert/ap_eridani name = "Eridani Asset Protection Specialist" uniform = /obj/item/clothing/under/rank/security/pmc/epmc @@ -39,10 +39,10 @@ id_iff = IFF_ERIDANI -/obj/outfit/admin/ert/ap_eridani/get_id_access() +/datum/outfit/admin/ert/ap_eridani/get_id_access() return get_distress_access() -/obj/outfit/admin/ert/ap_eridani/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/ert/ap_eridani/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -56,7 +56,7 @@ var/obj/item/clothing/shoes/jackboots/toeless/shoes = new(src) H.equip_to_slot_if_possible(shoes, slot_shoes) -/obj/outfit/admin/ert/ap_eridani/lead +/datum/outfit/admin/ert/ap_eridani/lead name = "Eridani Section Leader" uniform = /obj/item/clothing/under/rank/security/pmc/epmc/alt @@ -82,7 +82,7 @@ /obj/item/melee/telebaton = 1 ) -/obj/outfit/admin/ert/ap_eridani/doctor +/datum/outfit/admin/ert/ap_eridani/doctor name = "Eridani Medical Officer" uniform = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc @@ -126,7 +126,7 @@ /obj/item/storage/pill_bottle/mortaphenyl = 1 ) -/obj/outfit/admin/ert/ap_eridani/corpsman +/datum/outfit/admin/ert/ap_eridani/corpsman name = "Eridani Corpsman" uniform = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc diff --git a/code/datums/outfits/ert/biesel.dm b/code/datums/outfits/ert/biesel.dm index 533f8b03026..19c2278b2f0 100644 --- a/code/datums/outfits/ert/biesel.dm +++ b/code/datums/outfits/ert/biesel.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/tcaf +/datum/outfit/admin/ert/tcaf name = "Republican Fleet Legionary" uniform = /obj/item/clothing/under/legion/tcaf suit = /obj/item/clothing/suit/space/void/tcaf @@ -32,7 +32,7 @@ ) id_iff = IFF_TCFL -/obj/outfit/admin/ert/tcaf/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/ert/tcaf/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() if(isvaurca(H)) H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/tactical(H), slot_wear_mask) @@ -50,10 +50,10 @@ var/obj/item/clothing/shoes/magboots/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) -/obj/outfit/admin/ert/tcaf/get_id_access(mob/living/carbon/human/H) +/datum/outfit/admin/ert/tcaf/get_id_access(mob/living/carbon/human/H) return get_distress_access() -/obj/outfit/admin/ert/tcaf/medic +/datum/outfit/admin/ert/tcaf/medic name = "Republican Fleet Medic" belt = /obj/item/storage/belt/medical/paramedic/combat glasses = /obj/item/clothing/glasses/hud/health @@ -89,7 +89,7 @@ /obj/item/shield/energy/legion = 1 ) -/obj/outfit/admin/ert/tcaf/engi +/datum/outfit/admin/ert/tcaf/engi name = "Republican Fleet Engineer" belt = /obj/item/storage/belt/utility/very_full belt_contents = null @@ -115,5 +115,5 @@ /obj/item/grenade/frag = 2 ) -/obj/outfit/admin/ert/tcaf/officer +/datum/outfit/admin/ert/tcaf/officer accessory = /obj/item/clothing/accessory/legion diff --git a/code/datums/outfits/ert/coalition.dm b/code/datums/outfits/ert/coalition.dm index 27149d042e0..def02bc2540 100644 --- a/code/datums/outfits/ert/coalition.dm +++ b/code/datums/outfits/ert/coalition.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/coalition +/datum/outfit/admin/ert/coalition name = "Coalition Ranger ERT" uniform = /obj/item/clothing/under/tactical shoes = /obj/item/clothing/shoes/magboots @@ -23,10 +23,10 @@ accessory = /obj/item/clothing/accessory/holster/hip/brown accessory_contents = list(/obj/item/gun/projectile/colt = 1) -/obj/outfit/admin/ert/coalition/get_id_access() +/datum/outfit/admin/ert/coalition/get_id_access() return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_COALITION, ACCESS_COALITION_NAVY) -/obj/outfit/admin/ert/coalition/medic +/datum/outfit/admin/ert/coalition/medic name = "Coalition Medic" belt = /obj/item/storage/belt/medical/paramedic/combat back = /obj/item/storage/backpack/satchel/med @@ -55,7 +55,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/obj/outfit/admin/ert/coalition/sapper +/datum/outfit/admin/ert/coalition/sapper name = "Coalition Sapper" back = /obj/item/storage/backpack/duffel/eng belt = /obj/item/storage/belt/utility/very_full @@ -72,7 +72,7 @@ belt_contents = null -/obj/outfit/admin/ert/coalition/leader +/datum/outfit/admin/ert/coalition/leader name = "Coalition Team Leader" head = null suit = null @@ -90,7 +90,7 @@ /obj/item/grenade/flashbang = 1 ) -/obj/outfit/admin/ert/konyang +/datum/outfit/admin/ert/konyang name = "KASF Emergency Responder" uniform = /obj/item/clothing/under/rank/konyang/space suit = /obj/item/clothing/suit/space/void/sol/konyang @@ -116,15 +116,15 @@ /obj/item/melee/energy/sword/knife/sol = 1 ) -/obj/outfit/admin/ert/konyang/get_id_access() +/datum/outfit/admin/ert/konyang/get_id_access() return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_COALITION, ACCESS_COALITION_NAVY, ACCESS_KONYANG_POLICE) -/obj/outfit/admin/ert/konyang/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/ert/konyang/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(H.isSynthetic()) H.equip_to_slot_or_del(new /obj/item/device/suit_cooling_unit(H), slot_back) -/obj/outfit/admin/ert/konyang/medic +/datum/outfit/admin/ert/konyang/medic name = "KASF Medic" belt = /obj/item/storage/belt/medical/paramedic/combat back = /obj/item/storage/backpack/satchel/med @@ -153,7 +153,7 @@ /obj/item/melee/energy/sword/knife/sol = 1 ) -/obj/outfit/admin/ert/konyang/sapper +/datum/outfit/admin/ert/konyang/sapper name = "KASF Sapper" back = /obj/item/storage/backpack/industrial belt = /obj/item/storage/belt/utility/very_full @@ -174,6 +174,6 @@ belt_contents = null -/obj/outfit/admin/ert/konyang/leader +/datum/outfit/admin/ert/konyang/leader name = "KASF Officer" uniform = /obj/item/clothing/under/rank/konyang/space/officer diff --git a/code/datums/outfits/ert/deathsquad.dm b/code/datums/outfits/ert/deathsquad.dm index 807d1574315..5a62d7c4eec 100644 --- a/code/datums/outfits/ert/deathsquad.dm +++ b/code/datums/outfits/ert/deathsquad.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/deathsquad +/datum/outfit/admin/deathsquad name = "Asset Protection" uniform = /obj/item/clothing/under/ert @@ -27,16 +27,16 @@ id_iff = IFF_DEATHSQUAD -/obj/outfit/admin/deathsquad/leader +/datum/outfit/admin/deathsquad/leader name = "Asset Protection Lead" l_pocket = /obj/item/pinpointer r_hand = /obj/item/device/orbital_dropper/icarus_drones -/obj/outfit/admin/deathsquad/get_id_access() +/datum/outfit/admin/deathsquad/get_id_access() return get_all_accesses() -/obj/outfit/admin/deathsquad/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/deathsquad/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -79,19 +79,19 @@ id_iff = IFF_DEATHSQUAD -/obj/outfit/admin/deathsquad/nt +/datum/outfit/admin/deathsquad/nt name = "NanoTrasen Asset Protection Trooper" back = /obj/item/rig/ert/ntassetprotection -/obj/outfit/admin/deathsquad/nt/leader +/datum/outfit/admin/deathsquad/nt/leader name = "NanoTrasen Asset Protection Lead" back = /obj/item/rig/ert/ntassetprotection/lead -/obj/outfit/admin/deathsquad/nt/get_id_access() +/datum/outfit/admin/deathsquad/nt/get_id_access() return get_all_accesses() -/obj/outfit/admin/deathsquad/nt/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/deathsquad/nt/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return diff --git a/code/datums/outfits/ert/dominia.dm b/code/datums/outfits/ert/dominia.dm index a65b3e2dd71..20ad6997db9 100644 --- a/code/datums/outfits/ert/dominia.dm +++ b/code/datums/outfits/ert/dominia.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/dominia +/datum/outfit/admin/ert/dominia name = "Imperial Fleet Responder" uniform = /obj/item/clothing/under/dominia/fleet/armsman suit = /obj/item/clothing/suit/space/void/dominia/voidsman @@ -28,16 +28,16 @@ /obj/item/handcuffs/ziptie = 1 ) -/obj/outfit/admin/ert/dominia/get_id_access() +/datum/outfit/admin/ert/dominia/get_id_access() return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_IMPERIAL_FLEET_VOIDSMAN_SHIP) -/obj/outfit/admin/ert/dominia/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/ert/dominia/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() if(H?.shoes) var/obj/item/clothing/shoes/magboots/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) -/obj/outfit/admin/ert/dominia/medic +/datum/outfit/admin/ert/dominia/medic name = "Imperial Fleet Medic" uniform = /obj/item/clothing/under/dominia/fleet glasses = /obj/item/clothing/glasses/hud/health @@ -68,7 +68,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/obj/outfit/admin/ert/dominia/engi +/datum/outfit/admin/ert/dominia/engi name = "Imperial Fleet Sapper" uniform = /obj/item/clothing/under/dominia/fleet back = /obj/item/storage/backpack/duffel/eng @@ -84,7 +84,7 @@ ) belt_contents = null -/obj/outfit/admin/ert/dominia/officer +/datum/outfit/admin/ert/dominia/officer name = "Imperial Fleet Officer" uniform = /obj/item/clothing/under/dominia/fleet/officer belt_contents = list( diff --git a/code/datums/outfits/ert/einstein.dm b/code/datums/outfits/ert/einstein.dm index a4e83b04b72..46f7a8ca481 100644 --- a/code/datums/outfits/ert/einstein.dm +++ b/code/datums/outfits/ert/einstein.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/einstein +/datum/outfit/admin/ert/einstein name = "Einstein Engines ERT" uniform = /obj/item/clothing/under/rank/security/einstein shoes = /obj/item/clothing/shoes/jackboots @@ -27,10 +27,10 @@ ) id_iff = IFF_EE -/obj/outfit/admin/ert/einstein/get_id_access() +/datum/outfit/admin/ert/einstein/get_id_access() return get_distress_access_lesser() -/obj/outfit/admin/ert/einstein/medic +/datum/outfit/admin/ert/einstein/medic name = "Einstein Medic" belt = /obj/item/storage/belt/medical/paramedic/combat glasses = /obj/item/clothing/glasses/hud/health @@ -60,7 +60,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/obj/outfit/admin/ert/einstein/engi +/datum/outfit/admin/ert/einstein/engi name = "Einstein Engineer" uniform = /obj/item/clothing/under/rank/engineer/einstein back = /obj/item/storage/backpack/industrial @@ -81,7 +81,7 @@ ) belt_contents = null -/obj/outfit/admin/ert/einstein/leader +/datum/outfit/admin/ert/einstein/leader name = "Einstein Squad Leader" back = /obj/item/rig/merc/einstein l_hand = /obj/item/gun/energy/gun/nuclear diff --git a/code/datums/outfits/ert/elyra.dm b/code/datums/outfits/ert/elyra.dm index 0d253b3e5fa..a8315f39528 100644 --- a/code/datums/outfits/ert/elyra.dm +++ b/code/datums/outfits/ert/elyra.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/elyran_trooper +/datum/outfit/admin/ert/elyran_trooper name = "Elyran Navy Crewman" uniform = /obj/item/clothing/under/rank/elyran_fatigues @@ -28,10 +28,10 @@ accessory = /obj/item/clothing/accessory/holster/hip/brown accessory_contents = list(/obj/item/gun/projectile/sec/lethal = 1) -/obj/outfit/admin/ert/elyran_trooper/get_id_access() +/datum/outfit/admin/ert/elyran_trooper/get_id_access() return get_distress_access() -/obj/outfit/admin/ert/elyran_trooper/leader +/datum/outfit/admin/ert/elyran_trooper/leader name = "Elyran Navy Officer" uniform = /obj/item/clothing/under/rank/elyran_fatigues/commander @@ -47,7 +47,7 @@ l_hand = /obj/item/gun/projectile/plasma -/obj/outfit/admin/ert/elyran_trooper/engineer +/datum/outfit/admin/ert/elyran_trooper/engineer name = "Elyran Navy Engineer" back = /obj/item/storage/backpack/duffel/eng @@ -62,7 +62,7 @@ belt_contents = null -/obj/outfit/admin/ert/elyran_trooper/medical +/datum/outfit/admin/ert/elyran_trooper/medical name = "Elyran Navy Corpsman" belt = /obj/item/storage/belt/medical/paramedic/combat @@ -92,7 +92,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/obj/outfit/admin/ert/elyran_trooper/heavy +/datum/outfit/admin/ert/elyran_trooper/heavy name = "Elyran Navy Heavy Specialist" head = null diff --git a/code/datums/outfits/ert/fsf.dm b/code/datums/outfits/ert/fsf.dm index 7bd9b3fb594..f58feb6bd14 100644 --- a/code/datums/outfits/ert/fsf.dm +++ b/code/datums/outfits/ert/fsf.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/fsf +/datum/outfit/admin/ert/fsf name = "Free Solarian Fleets Marine" uniform = /obj/item/clothing/under/rank/sol/marine @@ -30,10 +30,10 @@ id_iff = IFF_FSF -/obj/outfit/admin/ert/fsf/get_id_access() +/datum/outfit/admin/ert/fsf/get_id_access() return get_distress_access_lesser() -/obj/outfit/admin/ert/fsf/medic +/datum/outfit/admin/ert/fsf/medic name = "Free Solarian Fleets Medic" belt = /obj/item/storage/belt/medical/paramedic/combat @@ -65,7 +65,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/obj/outfit/admin/ert/fsf/sapper +/datum/outfit/admin/ert/fsf/sapper name = "Free Solarian Fleets Sapper" back = /obj/item/storage/backpack/duffel/eng @@ -89,7 +89,7 @@ belt_contents = null -/obj/outfit/admin/ert/fsf/leader +/datum/outfit/admin/ert/fsf/leader name = "Free Solarian Fleets Fireteam Leader" l_hand = /obj/item/gun/projectile/automatic/rifle/sol r_hand = null @@ -107,7 +107,7 @@ /obj/item/handcuffs/ziptie = 2 ) -/obj/outfit/admin/ert/fsf/synth +/datum/outfit/admin/ert/fsf/synth name = "Free Solarian Fleets Synthetic Unit" uniform = /obj/item/clothing/under/rank/sol diff --git a/code/datums/outfits/ert/hephaestus_ert.dm b/code/datums/outfits/ert/hephaestus_ert.dm index 278942ba0b4..d96e351aa70 100644 --- a/code/datums/outfits/ert/hephaestus_ert.dm +++ b/code/datums/outfits/ert/hephaestus_ert.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/hephaestus +/datum/outfit/admin/ert/hephaestus name = "Hephaestus Asset Protection" uniform = /obj/item/clothing/under/rank/security/heph shoes = /obj/item/clothing/shoes/jackboots @@ -35,15 +35,15 @@ id_iff = IFF_HEPH -/obj/outfit/admin/ert/hephaestus/get_id_access() +/datum/outfit/admin/ert/hephaestus/get_id_access() return get_distress_access() -/obj/outfit/admin/ert/hephaestuss/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/ert/hephaestuss/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.shoes) var/obj/item/clothing/shoes/magboots/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) -/obj/outfit/admin/ert/hephaestus/medic +/datum/outfit/admin/ert/hephaestus/medic name = "Hephaestus Medic" belt = /obj/item/storage/belt/medical/paramedic/combat glasses = /obj/item/clothing/glasses/hud/health @@ -77,7 +77,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/obj/outfit/admin/ert/hephaestus/engi +/datum/outfit/admin/ert/hephaestus/engi name = "Hephaestus Engineer" back = /obj/item/storage/backpack/duffel/heph belt = /obj/item/storage/belt/utility/very_full @@ -98,6 +98,6 @@ ) belt_contents = null -/obj/outfit/admin/ert/hephaestus/leader +/datum/outfit/admin/ert/hephaestus/leader name = "Hephaestus Squad Leader" uniform = /obj/item/clothing/under/rank/captain/hephaestus diff --git a/code/datums/outfits/ert/iac.dm b/code/datums/outfits/ert/iac.dm index be76d844794..7040bb67be8 100644 --- a/code/datums/outfits/ert/iac.dm +++ b/code/datums/outfits/ert/iac.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/iac +/datum/outfit/admin/ert/iac name = "IAC Doctor" uniform = /obj/item/clothing/under/rank/iacjumpsuit @@ -38,10 +38,10 @@ id_iff = IFF_IAC -/obj/outfit/admin/ert/iac/get_id_access() +/datum/outfit/admin/ert/iac/get_id_access() return get_distress_access() -/obj/outfit/admin/iac/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/iac/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -55,7 +55,7 @@ var/obj/item/clothing/shoes/footwraps = new(src) H.equip_to_slot_if_possible(footwraps, slot_shoes) -/obj/outfit/admin/ert/iac/bodyguard +/datum/outfit/admin/ert/iac/bodyguard name = "IAC Bodyguard" accessory = /obj/item/clothing/accessory/storage/black_vest @@ -85,7 +85,7 @@ /obj/item/device/flashlight/flare = 1 ) -/obj/outfit/admin/ert/iac/paramedic +/datum/outfit/admin/ert/iac/paramedic name = "IAC Paramedic" head = /obj/item/clothing/head/helmet/iachelmet diff --git a/code/datums/outfits/ert/izweski.dm b/code/datums/outfits/ert/izweski.dm index aae7e0269ad..9f636d38e53 100644 --- a/code/datums/outfits/ert/izweski.dm +++ b/code/datums/outfits/ert/izweski.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/izweski +/datum/outfit/admin/ert/izweski name = "Izweski Navy Crewman" uniform = /obj/item/clothing/under/unathi/izweski head = /obj/item/clothing/head/helmet/space/void/hegemony @@ -21,15 +21,15 @@ ) id = /obj/item/card/id -/obj/outfit/admin/ert/izweski/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/ert/izweski/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.shoes) var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) -/obj/outfit/admin/ert/izweski/get_id_access() +/datum/outfit/admin/ert/izweski/get_id_access() return get_distress_access_lesser() -/obj/outfit/admin/ert/izweski/medic +/datum/outfit/admin/ert/izweski/medic name = "Izweski Navy Medic" belt = /obj/item/storage/belt/medical/paramedic/combat back = /obj/item/storage/backpack/satchel/hegemony @@ -54,7 +54,7 @@ gloves = /obj/item/clothing/gloves/latex/nitrile/unathi r_pocket = /obj/item/melee/energy/sword/hegemony -/obj/outfit/admin/ert/izweski/klax +/datum/outfit/admin/ert/izweski/klax name = "Izweski Navy K'lax" uniform = /obj/item/clothing/under/vaurca head = /obj/item/clothing/head/helmet/unathi/klax @@ -73,7 +73,7 @@ /obj/item/ammo_casing/slugger = 5 ) -/obj/outfit/admin/ert/izweski/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/ert/izweski/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.wear_mask && H.species.has_organ[BP_PHORON_RESERVE]) var/obj/item/organ/internal/vaurca/preserve/preserve = H.internal_organs_by_name[BP_PHORON_RESERVE] H.internal = preserve @@ -84,7 +84,7 @@ H.update_body() -/obj/outfit/admin/ert/izweski/leader +/datum/outfit/admin/ert/izweski/leader name = "Izweski Navy Squad Leader" uniform = /obj/item/clothing/under/unathi/izweski/officer l_hand = /obj/item/melee/hammer/powered/hegemony @@ -102,4 +102,4 @@ /obj/item/handcuffs/ziptie = 2 ) -/obj/outfit/admin/ert/izweski/leader/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/ert/izweski/leader/post_equip(mob/living/carbon/human/H, visualsOnly) diff --git a/code/datums/outfits/ert/kataphract.dm b/code/datums/outfits/ert/kataphract.dm index 8f34c23a522..fae071f5452 100644 --- a/code/datums/outfits/ert/kataphract.dm +++ b/code/datums/outfits/ert/kataphract.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/kataphract +/datum/outfit/admin/ert/kataphract name = "Kataphract-Hopeful" uniform = /obj/item/clothing/under/unathi @@ -29,7 +29,7 @@ id_iff = IFF_KATAPHRACT -/obj/outfit/admin/ert/kataphract/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/ert/kataphract/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.w_uniform) H.w_uniform.color = pick("#42b360", "#b68029", "#5574c2") H.w_uniform.accent_color = H.w_uniform.color @@ -37,10 +37,10 @@ var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) -/obj/outfit/admin/ert/kataphract/get_id_access() +/datum/outfit/admin/ert/kataphract/get_id_access() return get_distress_access_lesser() -/obj/outfit/admin/ert/kataphract/klax +/datum/outfit/admin/ert/kataphract/klax name = "Kataphract-Hopeful Klax" uniform = /obj/item/clothing/under/vaurca @@ -63,7 +63,7 @@ /obj/item/reagent_containers/food/snacks/koisbar_clean = 3 ) -/obj/outfit/admin/ert/kataphract/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/ert/kataphract/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.wear_mask && H.species.has_organ[BP_PHORON_RESERVE]) var/obj/item/organ/internal/vaurca/preserve/preserve = H.internal_organs_by_name[BP_PHORON_RESERVE] H.internal = preserve @@ -78,7 +78,7 @@ var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) -/obj/outfit/admin/ert/kataphract/specialist +/datum/outfit/admin/ert/kataphract/specialist name = "Kataphract-Hopeful Spec." head = /obj/item/clothing/head/helmet/space/void/kataphract/spec @@ -107,21 +107,21 @@ /obj/item/reagent_containers/hypospray/autoinjector/coagzolug = 1 ) -/obj/outfit/admin/ert/kataphract/specialist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/ert/kataphract/specialist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.w_uniform) H.w_uniform.color = pick("#42b360", "#b68029", "#5574c2") if(H?.shoes) var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) -/obj/outfit/admin/ert/kataphract/leader +/datum/outfit/admin/ert/kataphract/leader name = "Kataphract Knight" head = /obj/item/clothing/head/helmet/space/void/kataphract/lead suit = /obj/item/clothing/suit/space/void/kataphract/lead glasses = /obj/item/clothing/glasses/thermal -/obj/outfit/admin/ert/kataphract/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/ert/kataphract/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.w_uniform) H.w_uniform.color = pick("#42b360", "#b68029", "#5574c2") if(H?.shoes) diff --git a/code/datums/outfits/ert/kosmostrelki.dm b/code/datums/outfits/ert/kosmostrelki.dm index 13ebb6958f2..84ce65f9b3b 100644 --- a/code/datums/outfits/ert/kosmostrelki.dm +++ b/code/datums/outfits/ert/kosmostrelki.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/pra_cosmonaut +/datum/outfit/admin/ert/pra_cosmonaut name = "Kosmostrelki Trooper" id = /obj/item/card/id/ert @@ -24,10 +24,10 @@ r_pocket = /obj/item/crowbar/red l_hand = /obj/item/martial_manual/tajara -/obj/outfit/admin/ert/pra_cosmonaut/get_id_access() +/datum/outfit/admin/ert/pra_cosmonaut/get_id_access() return get_distress_access() -/obj/outfit/admin/ert/pra_cosmonaut/commissar +/datum/outfit/admin/ert/pra_cosmonaut/commissar name = "Kosmostrelki Commissar" uniform = /obj/item/clothing/under/tajaran/cosmonaut/commissar @@ -53,7 +53,7 @@ accessory = /obj/item/clothing/accessory/hadii_pin l_hand = /obj/item/martial_manual/tajara -/obj/outfit/admin/ert/pra_cosmonaut/commander +/datum/outfit/admin/ert/pra_cosmonaut/commander name = "Kosmostrelki Commander" back = /obj/item/storage/backpack/satchel/leather @@ -76,7 +76,7 @@ l_pocket = /obj/item/device/megaphone l_hand = /obj/item/martial_manual/tajara -/obj/outfit/admin/ert/pra_cosmonaut/tesla +/datum/outfit/admin/ert/pra_cosmonaut/tesla name = "Tesla Trooper" r_hand = /obj/item/gun/energy/rifle/icelance l_hand = /obj/item/rig/tesla @@ -95,13 +95,13 @@ /obj/item/material/knife/trench = 1 ) -/obj/outfit/admin/ert/pra_cosmonaut/tesla/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/ert/pra_cosmonaut/tesla/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) var/obj/item/organ/A = new /obj/item/organ/internal/augment/tesla/advanced(H) var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) A.replaced(H, affected) H.update_body() -/obj/outfit/admin/ert/pra_cosmonaut/medic +/datum/outfit/admin/ert/pra_cosmonaut/medic name = "Kosmostrelki Combat Medic" gloves = /obj/item/clothing/gloves/latex/nitrile/tajara @@ -134,7 +134,7 @@ l_hand = /obj/item/martial_manual/tajara -/obj/outfit/admin/ert/pra_cosmonaut/engineer +/datum/outfit/admin/ert/pra_cosmonaut/engineer name = "Kosmostrelki Sapper" gloves = /obj/item/clothing/gloves/yellow/specialt diff --git a/code/datums/outfits/ert/mercenary.dm b/code/datums/outfits/ert/mercenary.dm index de562683a36..54e3727ef10 100644 --- a/code/datums/outfits/ert/mercenary.dm +++ b/code/datums/outfits/ert/mercenary.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/mercenary +/datum/outfit/admin/ert/mercenary name = "Mercenary Freelancer" uniform = /obj/item/clothing/under/syndicate @@ -34,10 +34,10 @@ id_iff = IFF_FREELANCER -/obj/outfit/admin/ert/mercenary/get_id_access() +/datum/outfit/admin/ert/mercenary/get_id_access() return get_distress_access_lesser() -/obj/outfit/admin/ert/mercenary/specialist +/datum/outfit/admin/ert/mercenary/specialist name = "Mercenary Freelancer Medic" glasses = /obj/item/clothing/glasses/hud/health/aviator @@ -67,7 +67,7 @@ /obj/item/material/knife/trench = 1 ) -/obj/outfit/admin/ert/mercenary/engineer +/datum/outfit/admin/ert/mercenary/engineer name = "Mercenary Freelancer Combat Engineer" belt = /obj/item/storage/belt/military @@ -97,7 +97,7 @@ /obj/item/device/flashlight/flare = 1, ) -/obj/outfit/admin/ert/mercenary/leader +/datum/outfit/admin/ert/mercenary/leader name = "Mercenary Freelancer Leader" l_hand = /obj/item/gun/projectile/automatic/rifle/shorty r_hand = null diff --git a/code/datums/outfits/ert/nt_ert.dm b/code/datums/outfits/ert/nt_ert.dm index ef1448a06b4..e905ae45ec3 100644 --- a/code/datums/outfits/ert/nt_ert.dm +++ b/code/datums/outfits/ert/nt_ert.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/nanotrasen +/datum/outfit/admin/ert/nanotrasen name = "NanoTrasen ERT Responder" uniform = /obj/item/clothing/under/ert @@ -20,10 +20,10 @@ /obj/item/ammo_magazine/a556/ap = 1 ) -/obj/outfit/admin/ert/nanotrasen/get_id_access() +/datum/outfit/admin/ert/nanotrasen/get_id_access() return get_all_station_access() | get_centcom_access("Emergency Response Team") -/obj/outfit/admin/ert/nanotrasen/specialist +/datum/outfit/admin/ert/nanotrasen/specialist name = "NanoTrasen ERT Engineer Specialist" belt = /obj/item/storage/belt/utility/full @@ -31,7 +31,7 @@ belt_contents = null -/obj/outfit/admin/ert/nanotrasen/specialist/medical +/datum/outfit/admin/ert/nanotrasen/specialist/medical name = "NanoTrasen ERT Medical Specialist" belt = /obj/item/storage/belt/medical/paramedic/combat @@ -48,7 +48,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/obj/outfit/admin/ert/nanotrasen/leader +/datum/outfit/admin/ert/nanotrasen/leader name = "NanoTrasen ERT Leader" back = /obj/item/rig/ert diff --git a/code/datums/outfits/ert/qukala.dm b/code/datums/outfits/ert/qukala.dm index 1db5971cf7a..42492822784 100644 --- a/code/datums/outfits/ert/qukala.dm +++ b/code/datums/outfits/ert/qukala.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/qukala +/datum/outfit/admin/ert/qukala name = "Qukala Emergency Responder" uniform = /obj/item/clothing/under/skrell/qukala shoes = /obj/item/clothing/shoes/jackboots/kala @@ -37,7 +37,7 @@ /obj/item/crowbar/red = 1 ) -/obj/outfit/admin/ert/qukala/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/ert/qukala/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() if(isvaurca(H)) H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/tactical(H), slot_wear_mask) @@ -59,10 +59,10 @@ else H.equip_or_collect(new /obj/item/gun/energy/fedpistol/nopsi(src), slot_in_backpack) -/obj/outfit/admin/ert/qukala/get_id_access() +/datum/outfit/admin/ert/qukala/get_id_access() return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_SKRELL) -/obj/outfit/admin/ert/qukala/medic +/datum/outfit/admin/ert/qukala/medic name = "Qukala Medic" suit = /obj/item/clothing/suit/space/void/kala/med head = /obj/item/clothing/head/helmet/space/void/kala/med @@ -99,7 +99,7 @@ /obj/item/roller/hover = 1 ) -/obj/outfit/admin/ert/qukala/engi +/datum/outfit/admin/ert/qukala/engi name = "Qukala Engineer" suit = /obj/item/clothing/suit/space/void/kala/engineering head = /obj/item/clothing/head/helmet/space/void/kala/engineering @@ -125,7 +125,7 @@ ) belt_contents = null -/obj/outfit/admin/ert/qukala/heavy +/datum/outfit/admin/ert/qukala/heavy name = "Qukala Heavy Trooper" suit = null head = null @@ -139,9 +139,9 @@ /obj/item/gun/energy/fedpistol = 1 ) -/obj/outfit/admin/ert/qukala/heavy/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/ert/qukala/heavy/post_equip(mob/living/carbon/human/H, visualsOnly) -/obj/outfit/admin/ert/qukala/officer +/datum/outfit/admin/ert/qukala/officer suit = /obj/item/clothing/suit/space/void/kala/leader head = /obj/item/clothing/head/helmet/space/void/kala/leader accessory = /obj/item/clothing/accessory/holster/hip @@ -149,7 +149,7 @@ /obj/item/gun/energy/fedpistol = 1 ) -/obj/outfit/admin/ert/qukala/officer/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/ert/qukala/officer/post_equip(mob/living/carbon/human/H, visualsOnly) if(H?.shoes) var/obj/item/clothing/shoes/magboots/advance/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) diff --git a/code/datums/outfits/ert/scc_ert.dm b/code/datums/outfits/ert/scc_ert.dm index 71b706de92b..cda4b4c4b56 100644 --- a/code/datums/outfits/ert/scc_ert.dm +++ b/code/datums/outfits/ert/scc_ert.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/scc +/datum/outfit/admin/ert/scc name = "ERT Security Specialist (SCC)" uniform = /obj/item/clothing/under/rank/security @@ -17,10 +17,10 @@ /obj/item/ammo_magazine/a556/ap = 1 ) -/obj/outfit/admin/ert/scc/get_id_access() +/datum/outfit/admin/ert/scc/get_id_access() return get_all_station_access() | get_centcom_access("Emergency Response Team") -/obj/outfit/admin/ert/scc/engineer +/datum/outfit/admin/ert/scc/engineer name = "ERT Engineering Specialist (SCC)" belt = /obj/item/storage/belt/utility/full @@ -28,7 +28,7 @@ belt_contents = null -/obj/outfit/admin/ert/scc/medic +/datum/outfit/admin/ert/scc/medic name = "ERT Medical Specialist (SCC)" belt = /obj/item/storage/belt/medical/paramedic/combat @@ -45,7 +45,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/obj/outfit/admin/ert/scc/commander +/datum/outfit/admin/ert/scc/commander name = "ERT Commander (SCC)" back = /obj/item/rig/ert/scc diff --git a/code/datums/outfits/ert/syndicate.dm b/code/datums/outfits/ert/syndicate.dm index 598ce874563..e5c33c8536c 100644 --- a/code/datums/outfits/ert/syndicate.dm +++ b/code/datums/outfits/ert/syndicate.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/deathsquad/syndicate +/datum/outfit/admin/deathsquad/syndicate name = "Syndicate Commando" uniform = /obj/item/clothing/under/syndicate @@ -24,7 +24,7 @@ id_iff = IFF_SYNDICATE -/obj/outfit/admin/deathsquad/syndicate/leader +/datum/outfit/admin/deathsquad/syndicate/leader name = "Syndicate Commando Lead" l_pocket = /obj/item/pinpointer diff --git a/code/datums/outfits/ert/tcfl.dm b/code/datums/outfits/ert/tcfl.dm index 83b4cd62028..d7eba534ed9 100644 --- a/code/datums/outfits/ert/tcfl.dm +++ b/code/datums/outfits/ert/tcfl.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/legion +/datum/outfit/admin/ert/legion name = "TCFL Volunteer" head = /obj/item/clothing/head/beret/legion/field @@ -14,7 +14,7 @@ id_iff = IFF_TCFL -/obj/outfit/admin/ert/legion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/ert/legion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(isvaurca(H)) H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask) @@ -22,23 +22,23 @@ H.internal = preserve H.internals.icon_state = "internal1" -/obj/outfit/admin/ert/legion/get_id_access() +/datum/outfit/admin/ert/legion/get_id_access() return get_distress_access() -/obj/outfit/admin/ert/legion/specialist +/datum/outfit/admin/ert/legion/specialist name = "TCFL Legionnaire" accessory = /obj/item/clothing/accessory/legion/specialist -/obj/outfit/admin/ert/legion/leader +/datum/outfit/admin/ert/legion/leader name = "TCFL Prefect" accessory = /obj/item/clothing/accessory/legion -/obj/outfit/admin/ert/legion/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/ert/legion/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) .=..() var/obj/item/card/id/distress/legion/I = H.wear_id I.access += (ACCESS_CENT_SPECOPS) -/obj/outfit/admin/ert/legion/pilot +/datum/outfit/admin/ert/legion/pilot name = "TCFL Dropship Pilot" uniform = /obj/item/clothing/under/legion/pilot head = /obj/item/clothing/head/helmet/pilot/legion @@ -51,7 +51,7 @@ backpack_contents = null -/obj/outfit/admin/ert/legion/sentinel +/datum/outfit/admin/ert/legion/sentinel name = "TCFL Sentinel" head = /obj/item/clothing/head/beret/legion/sentinel uniform = /obj/item/clothing/under/legion/sentinel @@ -79,7 +79,7 @@ /obj/item/melee/telebaton = 1 ) -/obj/outfit/admin/ert/legion/sentinel/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/ert/legion/sentinel/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) .=..() var/obj/item/card/id/distress/legion/I = H.wear_id I.access += (ACCESS_CENT_SPECOPS) diff --git a/code/datums/outfits/ert/vaurca.dm b/code/datums/outfits/ert/vaurca.dm index 7e78c749170..bd3c039a816 100644 --- a/code/datums/outfits/ert/vaurca.dm +++ b/code/datums/outfits/ert/vaurca.dm @@ -1,5 +1,5 @@ //Zo'ra -/obj/outfit/admin/ert/zora +/datum/outfit/admin/ert/zora name = "Zo'ra Warrior" uniform = /obj/item/clothing/under/vaurca shoes = /obj/item/clothing/shoes/vaurca @@ -27,7 +27,7 @@ /obj/item/handcuffs/ziptie = 2 ) -/obj/outfit/admin/ert/zora/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/ert/zora/post_equip(mob/living/carbon/human/H, visualsOnly) var/obj/item/organ/internal/vaurca/preserve/preserve = H.internal_organs_by_name[BP_PHORON_RESERVE] H.internal = preserve H.internals.icon_state = "internal1" @@ -47,10 +47,10 @@ if(H?.glasses) H.glasses.color = "#391610" -/obj/outfit/admin/ert/zora/get_id_access() +/datum/outfit/admin/ert/zora/get_id_access() return get_distress_access_lesser() -/obj/outfit/admin/ert/zora/medic +/datum/outfit/admin/ert/zora/medic name = "Zo'ra Field Biotechnician" belt = /obj/item/storage/belt/medical/paramedic/combat gloves = /obj/item/clothing/gloves/latex/nitrile/vaurca @@ -79,7 +79,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/obj/outfit/admin/ert/zora/medic/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/ert/zora/medic/post_equip(mob/living/carbon/human/H, visualsOnly) var/obj/item/organ/internal/vaurca/preserve/preserve = H.internal_organs_by_name[BP_PHORON_RESERVE] H.internal = preserve H.internals.icon_state = "internal1" @@ -104,7 +104,7 @@ var/obj/item/card/id/I = H.wear_id I.access += (ACCESS_MEDICAL) //so the hud works -/obj/outfit/admin/ert/zora/engi +/datum/outfit/admin/ert/zora/engi name = "Zo'ra Sapper" belt = /obj/item/storage/belt/utility/very_full accessory = /obj/item/clothing/accessory/storage/brown_vest @@ -121,7 +121,7 @@ ) belt_contents = null -/obj/outfit/admin/ert/zora/engi/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/ert/zora/engi/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() var/obj/item/organ/C = new /obj/item/organ/internal/augment/tool/correctivelens/glare_dampener(H) var/obj/item/organ/external/affectedC = H.get_organ(C.parent_organ) @@ -131,7 +131,7 @@ D.replaced(H, affectedD) H.update_body() -/obj/outfit/admin/ert/zora/heavy +/datum/outfit/admin/ert/zora/heavy name = "Zo'ra Heavy" r_hand = /obj/item/gun/energy/vaurca/gatlinglaser back = /obj/item/rig/vaurca @@ -142,7 +142,7 @@ backpack_contents = list() //K'lax -/obj/outfit/admin/ert/klax +/datum/outfit/admin/ert/klax name = "K'lax Warrior" uniform = /obj/item/clothing/under/vaurca shoes = /obj/item/clothing/shoes/vaurca @@ -171,7 +171,7 @@ /obj/item/handcuffs/ziptie = 2 ) -/obj/outfit/admin/ert/klax/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/ert/klax/post_equip(mob/living/carbon/human/H, visualsOnly) var/obj/item/organ/internal/vaurca/preserve/preserve = H.internal_organs_by_name[BP_PHORON_RESERVE] H.internal = preserve H.internals.icon_state = "internal1" @@ -191,10 +191,10 @@ if(H?.glasses) H.glasses.color = "#0e3a11" -/obj/outfit/admin/ert/klax/get_id_access() +/datum/outfit/admin/ert/klax/get_id_access() return get_distress_access_lesser() -/obj/outfit/admin/ert/klax/medic +/datum/outfit/admin/ert/klax/medic name = "K'lax Field Biotechnician" belt = /obj/item/storage/belt/medical/paramedic/combat gloves = /obj/item/clothing/gloves/latex/nitrile/vaurca @@ -225,7 +225,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/obj/outfit/admin/ert/klax/medic/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/ert/klax/medic/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() var/obj/item/organ/grasper = new /obj/item/organ/external/hand/right/vaurca/medical(H) var/obj/item/organ/external/arm = H.get_organ(grasper.parent_organ) @@ -237,7 +237,7 @@ var/obj/item/card/id/I = H.wear_id I.access += (ACCESS_MEDICAL) //so the hud works -/obj/outfit/admin/ert/klax/engi +/datum/outfit/admin/ert/klax/engi name = "K'lax Sapper" belt = /obj/item/storage/belt/utility/very_full accessory = /obj/item/clothing/accessory/storage/brown_vest @@ -255,7 +255,7 @@ ) belt_contents = null -/obj/outfit/admin/ert/klax/engi/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/ert/klax/engi/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() var/obj/item/organ/weld = new /obj/item/organ/internal/augment/tool/correctivelens/glare_dampener(H) var/obj/item/organ/external/head = H.get_organ(weld.parent_organ) @@ -265,7 +265,7 @@ tool.replaced(H, hand) H.update_body() -/obj/outfit/admin/ert/klax/heavy +/datum/outfit/admin/ert/klax/heavy name = "K'lax Heavy" r_hand = /obj/item/melee/energy/vaurca_zweihander back = /obj/item/rig/vaurca diff --git a/code/datums/outfits/ert/zavod.dm b/code/datums/outfits/ert/zavod.dm index 2372f6b5d4c..8d14f163508 100644 --- a/code/datums/outfits/ert/zavod.dm +++ b/code/datums/outfits/ert/zavod.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/zavodskoi +/datum/outfit/admin/ert/zavodskoi name = "Zavodskoi Asset Protection" uniform = /obj/item/clothing/under/rank/security/zavod/zavodsec shoes = /obj/item/clothing/shoes/jackboots @@ -28,15 +28,15 @@ ) id_iff = IFF_ZAVOD -/obj/outfit/admin/ert/zavodskoi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/ert/zavodskoi/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.shoes) var/obj/item/clothing/shoes/magboots/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) -/obj/outfit/admin/ert/zavodskoi/get_id_access() +/datum/outfit/admin/ert/zavodskoi/get_id_access() return get_distress_access() -/obj/outfit/admin/ert/zavodskoi/medic +/datum/outfit/admin/ert/zavodskoi/medic name = "Zavodskoi Medic" belt = /obj/item/storage/belt/medical/paramedic/combat glasses = /obj/item/clothing/glasses/hud/health @@ -66,7 +66,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/obj/outfit/admin/ert/zavodskoi/engi +/datum/outfit/admin/ert/zavodskoi/engi name = "Zavodskoi Engineer" uniform = /obj/item/clothing/under/rank/engineer/zavod back = /obj/item/storage/backpack/duffel/zavod @@ -87,7 +87,7 @@ ) belt_contents = null -/obj/outfit/admin/ert/zavodskoi/lead +/datum/outfit/admin/ert/zavodskoi/lead name = "Zavodskoi Squad Leader" accessory_contents = list( /obj/item/gun/projectile/revolver = 1 diff --git a/code/datums/outfits/ert/zenghu.dm b/code/datums/outfits/ert/zenghu.dm index 76cad4697cc..314a656f005 100644 --- a/code/datums/outfits/ert/zenghu.dm +++ b/code/datums/outfits/ert/zenghu.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/ert/zeng +/datum/outfit/admin/ert/zeng name = "Zeng-Hu ERT" uniform = /obj/item/clothing/under/rank/security/zeng shoes = /obj/item/clothing/shoes/jackboots @@ -26,10 +26,10 @@ ) id_iff = IFF_ZENGHU -/obj/outfit/admin/ert/zeng/get_id_access() +/datum/outfit/admin/ert/zeng/get_id_access() return get_distress_access() -/obj/outfit/admin/ert/zeng/medic +/datum/outfit/admin/ert/zeng/medic name = "Zeng-Hu Medic" uniform = /obj/item/clothing/under/rank/medical/paramedic/zeng belt = /obj/item/storage/belt/medical/paramedic/combat @@ -58,7 +58,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/obj/outfit/admin/ert/zeng/engineer +/datum/outfit/admin/ert/zeng/engineer name = "Zeng-Hu Engineer" back = /obj/item/storage/backpack/duffel/zeng belt = /obj/item/storage/belt/utility/very_full @@ -76,7 +76,7 @@ ) belt_contents = null -/obj/outfit/admin/ert/zeng/leader +/datum/outfit/admin/ert/zeng/leader name = "Zeng-Hu Squad Leader" accessory_contents = list( /obj/item/gun/energy/decloner = 1 diff --git a/code/datums/outfits/event/outfit_events.dm b/code/datums/outfits/event/outfit_events.dm index 6f3aa8ce717..95b4d3b9373 100644 --- a/code/datums/outfits/event/outfit_events.dm +++ b/code/datums/outfits/event/outfit_events.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/event/lance +/datum/outfit/admin/event/lance name = "Lancer" uniform = /obj/item/clothing/under/lance @@ -38,13 +38,13 @@ id_iff = IFF_LANCER var/id_access = "Lancer" -/obj/outfit/admin/event/lance/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/event/lance/post_equip(mob/living/carbon/human/H, visualsOnly) organize_voidsuit(H) -/obj/outfit/admin/event/lance/get_id_access() +/datum/outfit/admin/event/lance/get_id_access() return get_syndicate_access(id_access) -/obj/outfit/admin/event/lance/engineer +/datum/outfit/admin/event/lance/engineer name = "Lance Engineer" back = /obj/item/gun/projectile/shotgun/pump/combat/sol @@ -65,7 +65,7 @@ ) id_access = "Lance Engineer" -/obj/outfit/admin/event/lance/medic +/datum/outfit/admin/event/lance/medic name = "Lance Medic" gloves = /obj/item/clothing/gloves/latex/nitrile @@ -91,7 +91,7 @@ ) id_access = "Lance Medic" -/obj/outfit/admin/event/lance/operative +/datum/outfit/admin/event/lance/operative name = "Lance Operative" uniform = /obj/item/clothing/under/dress/lance_dress/male @@ -108,10 +108,10 @@ ) id_access = "Lance Operative" -/obj/outfit/admin/event/lance/operative/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/event/lance/operative/post_equip(mob/living/carbon/human/H, visualsOnly) return -/obj/outfit/admin/event/sol_marine +/datum/outfit/admin/event/sol_marine name = "Solarian Marine" uniform = /obj/item/clothing/under/rank/sol @@ -144,7 +144,7 @@ id_iff = IFF_SOL -/obj/outfit/admin/event/sol_marine/heavy +/datum/outfit/admin/event/sol_marine/heavy name = "Heavy Solarian Marine" head = null diff --git a/code/datums/outfits/event/outfit_generic/_generic.dm b/code/datums/outfits/event/outfit_generic/_generic.dm index 02cd199c935..aa47d66e5f1 100644 --- a/code/datums/outfits/event/outfit_generic/_generic.dm +++ b/code/datums/outfits/event/outfit_generic/_generic.dm @@ -1,5 +1,5 @@ -/obj/outfit/admin/generic +/datum/outfit/admin/generic name = "Generic Outfit" uniform = list( @@ -65,7 +65,7 @@ SPECIES_VAURCA_WARRIOR = /obj/item/clothing/shoes/vaurca ) -/obj/outfit/admin/generic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/generic/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(isvaurca(H)) H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/filter(H), slot_wear_mask) diff --git a/code/datums/outfits/event/outfit_generic/engineering.dm b/code/datums/outfits/event/outfit_generic/engineering.dm index e32747f06ff..04ca4596bca 100644 --- a/code/datums/outfits/event/outfit_generic/engineering.dm +++ b/code/datums/outfits/event/outfit_generic/engineering.dm @@ -1,5 +1,5 @@ -/obj/outfit/admin/generic/engineer +/datum/outfit/admin/generic/engineer name = "Generic Engineer Outfit" uniform = list( diff --git a/code/datums/outfits/event/outfit_generic/medical.dm b/code/datums/outfits/event/outfit_generic/medical.dm index 89d825052ea..af720bd1c02 100644 --- a/code/datums/outfits/event/outfit_generic/medical.dm +++ b/code/datums/outfits/event/outfit_generic/medical.dm @@ -1,5 +1,5 @@ -/obj/outfit/admin/generic/medical +/datum/outfit/admin/generic/medical name = "Generic Medical Outfit" uniform = list( diff --git a/code/datums/outfits/event/outfit_generic/science.dm b/code/datums/outfits/event/outfit_generic/science.dm index f87cf6f4fcc..bc0fcc36e94 100644 --- a/code/datums/outfits/event/outfit_generic/science.dm +++ b/code/datums/outfits/event/outfit_generic/science.dm @@ -1,5 +1,5 @@ -/obj/outfit/admin/generic/science +/datum/outfit/admin/generic/science name = "Generic Science Outfit" uniform = list( diff --git a/code/datums/outfits/event/outfit_generic/security.dm b/code/datums/outfits/event/outfit_generic/security.dm index 6744ebf85a3..26a5d76d11d 100644 --- a/code/datums/outfits/event/outfit_generic/security.dm +++ b/code/datums/outfits/event/outfit_generic/security.dm @@ -1,5 +1,5 @@ -/obj/outfit/admin/generic/security +/datum/outfit/admin/generic/security name = "Generic Outfit" uniform = list( diff --git a/code/datums/outfits/event/outfit_killers.dm b/code/datums/outfits/event/outfit_killers.dm index 1df554af4d0..3b2c22a51e5 100644 --- a/code/datums/outfits/event/outfit_killers.dm +++ b/code/datums/outfits/event/outfit_killers.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/killer +/datum/outfit/admin/killer name = "Masked Killer" uniform = /obj/item/clothing/under/overalls @@ -14,13 +14,13 @@ r_hand = /obj/item/material/twohanded/fireaxe id = null -/obj/outfit/admin/killer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/killer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) for(var/obj/item/carried_item in H.contents) if(!istype(carried_item, /obj/item/implant))//If it's not an implant. carried_item.add_blood(H)//Oh yes, there will be blood... -/obj/outfit/admin/killer/assassin +/datum/outfit/admin/killer/assassin name = "Assassin" uniform = /obj/item/clothing/under/suit_jacket @@ -35,7 +35,7 @@ pda = /obj/item/modular_computer/handheld/pda/command id_iff = IFF_SYNDICATE -/obj/outfit/admin/killer/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/killer/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) var/obj/item/storage/secure/briefcase/sec_briefcase = new(H) for(var/obj/item/briefcase_item in sec_briefcase) qdel(briefcase_item) @@ -47,5 +47,5 @@ sec_briefcase.contents += new /obj/item/plastique H.equip_to_slot_or_del(sec_briefcase, slot_l_hand) -/obj/outfit/admin/killer/assassin/get_id_access() +/datum/outfit/admin/killer/assassin/get_id_access() return get_all_station_access() diff --git a/code/datums/outfits/event/outfit_megacorps.dm b/code/datums/outfits/event/outfit_megacorps.dm index 5307d622902..b579b0920ca 100644 --- a/code/datums/outfits/event/outfit_megacorps.dm +++ b/code/datums/outfits/event/outfit_megacorps.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/megacorp/hephaestus_trooper +/datum/outfit/admin/megacorp/hephaestus_trooper name = "Hephaestus Asset Protection" uniform = /obj/item/clothing/under/rank/engineer/apprentice/heph @@ -28,7 +28,7 @@ ) id_iff = IFF_HEPH -/obj/outfit/admin/megacorp/hephaestus_trooper/heavy +/datum/outfit/admin/megacorp/hephaestus_trooper/heavy name = "Hephaestus Heavy Asset Protection" back = /obj/item/gun/projectile/shotgun/pump/combat @@ -41,7 +41,7 @@ /obj/item/ammo_casing/shotgun/pellet = 8 ) -/obj/outfit/admin/megacorp/zenghu_trooper +/datum/outfit/admin/megacorp/zenghu_trooper name = "Zeng Hu Pharmaceuticals Asset Protection" uniform = /obj/item/clothing/under/rank/medical/paramedic/zeng @@ -71,7 +71,7 @@ ) id_iff = IFF_ZENGHU -/obj/outfit/admin/megacorp/zenghu_trooper/heavy +/datum/outfit/admin/megacorp/zenghu_trooper/heavy name = "Zeng Hu Pharmaceuticals Heavy Asset Protection" gloves = /obj/item/clothing/gloves/force @@ -79,7 +79,7 @@ accessory_contents = list(/obj/item/gun/energy/decloner = 1) -/obj/outfit/admin/megacorp/zavodskoi_trooper +/datum/outfit/admin/megacorp/zavodskoi_trooper name = "Zavodskoi Interstellar Asset Protection" uniform = /obj/item/clothing/under/rank/security/zavod @@ -115,7 +115,7 @@ ) id_iff = IFF_ZAVOD -/obj/outfit/admin/megacorp/zavodskoi_trooper/heavy +/datum/outfit/admin/megacorp/zavodskoi_trooper/heavy name = "Zavodskoi Interstellar Heavy Asset Protection" gloves = /obj/item/clothing/gloves/force @@ -130,7 +130,7 @@ /obj/item/ammo_magazine/c762/sol = 2 ) -/obj/outfit/admin/megacorp/einstein_trooper/heavy +/datum/outfit/admin/megacorp/einstein_trooper/heavy name = "Einstein Engines Asset Protection" uniform = /obj/item/clothing/under/rank/einstein diff --git a/code/datums/outfits/event/outfit_nanotrasen.dm b/code/datums/outfits/event/outfit_nanotrasen.dm index afe186fa79c..7d98094e2b2 100644 --- a/code/datums/outfits/event/outfit_nanotrasen.dm +++ b/code/datums/outfits/event/outfit_nanotrasen.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/nt +/datum/outfit/admin/nt name = "NanoTrasen Representative" uniform = /obj/item/clothing/under/rank/centcom @@ -16,10 +16,10 @@ id_icon = "centcom" var/id_access = "NanoTrasen Representative" -/obj/outfit/admin/nt/get_id_access() +/datum/outfit/admin/nt/get_id_access() return get_all_station_access() | get_centcom_access(id_access) -/obj/outfit/admin/nt/officer +/datum/outfit/admin/nt/officer name = "NanoTrasen Navy Officer" uniform = /obj/item/clothing/under/rank/centcom_officer @@ -27,7 +27,7 @@ head = /obj/item/clothing/head/beret/centcom/officer l_pocket = /obj/item/device/orbital_dropper/icarus_drones -/obj/outfit/admin/nt/captain +/datum/outfit/admin/nt/captain name = "NanoTrasen Navy Captain" uniform = /obj/item/clothing/under/rank/centcom_captain @@ -35,7 +35,7 @@ head = /obj/item/clothing/head/beret/centcom/captain l_pocket = /obj/item/device/orbital_dropper/icarus_drones -/obj/outfit/admin/nt/protection_detail +/datum/outfit/admin/nt/protection_detail name = "ERT Protection Detail" uniform = /obj/item/clothing/under/ccpolice @@ -62,7 +62,7 @@ id_icon = "ccia" id_access = "CCIA Agent" -/obj/outfit/admin/nt/protection_detail/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/nt/protection_detail/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H && H.belt) @@ -83,7 +83,7 @@ H.belt.contents += shield -/obj/outfit/admin/nt/ert_commander +/datum/outfit/admin/nt/ert_commander name = "ERT Commander" uniform = /obj/item/clothing/under/rank/centcom_commander @@ -106,7 +106,7 @@ id_access = "BlackOps Commander" -/obj/outfit/admin/nt/cciaa +/datum/outfit/admin/nt/cciaa name = "CCIA Agent" uniform = /obj/item/clothing/under/rank/centcom_officer @@ -128,7 +128,7 @@ id_icon = "ccia" id_access = "CCIA Agent" -/obj/outfit/admin/nt/vip +/datum/outfit/admin/nt/vip name = "Very Important Person" uniform = /obj/item/clothing/under/suit_jacket/nt_skirtsuit @@ -138,7 +138,7 @@ id = /obj/item/card/id/ccia l_pocket = /obj/item/reagent_containers/spray/pepper -/obj/outfit/admin/nt/odinsec +/datum/outfit/admin/nt/odinsec name = "NTCC Odin Security Specialist" uniform = /obj/item/clothing/under/ccpolice @@ -171,7 +171,7 @@ id_access = "Odin Security" -/obj/outfit/admin/nt/odinsec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/nt/odinsec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H && H.w_uniform) @@ -182,7 +182,7 @@ var/obj/item/clothing/under/rank/U = H.w_uniform U.attach_accessory(null, holster) -/obj/outfit/admin/nt/specops +/datum/outfit/admin/nt/specops name = "Special Operations Officer" uniform = /obj/item/clothing/under/syndicate/combat @@ -202,7 +202,7 @@ id_access = "Death Commando" -/obj/outfit/admin/nt/bssb +/datum/outfit/admin/nt/bssb name = "BSSB Agent" uniform = /obj/item/clothing/under/rank/bssb @@ -226,14 +226,14 @@ id_icon = "bssb" id_access = "CCIA Agent" -/obj/outfit/admin/nt/bssb/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/nt/bssb/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.wear_suit) var/obj/item/clothing/accessory/badge/bssb/senior/badge = new(src) var/obj/item/clothing/U = H.wear_suit U.attach_accessory(null, badge) -/obj/outfit/admin/nt/bssb/guard +/datum/outfit/admin/nt/bssb/guard name = "BSSB Escort" suit = /obj/item/clothing/suit/storage/toggle/bssb/armor @@ -261,14 +261,14 @@ /obj/item/clothing/head/helmet = 1 ) -/obj/outfit/admin/nt/bssb/guard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/nt/bssb/guard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.wear_suit) var/obj/item/clothing/accessory/badge/bssb/badge = new(src) var/obj/item/clothing/U = H.wear_suit U.attach_accessory(null, badge) -/obj/outfit/admin/nt/odindoc +/datum/outfit/admin/nt/odindoc name = "NTCC Odin Medical Specialist" uniform = /obj/item/clothing/under/rank/medical/surgeon/zavod @@ -307,7 +307,7 @@ id_access = "Medical Doctor" -/obj/outfit/admin/nt/odinpharm +/datum/outfit/admin/nt/odinpharm name = "NTCC Odin Pharmacy Specialist" uniform = /obj/item/clothing/under/rank/medical/pharmacist @@ -324,7 +324,7 @@ id_access = "Medical Doctor" -/obj/outfit/admin/nt/odinbartender +/datum/outfit/admin/nt/odinbartender name = "NTCC Odin Bartender" uniform = /obj/item/clothing/under/rank/bartender @@ -334,7 +334,7 @@ id_access = "Service" -/obj/outfit/admin/nt/odinchef +/datum/outfit/admin/nt/odinchef name = "NTCC Odin Chef" uniform = /obj/item/clothing/under/rank/chef @@ -346,7 +346,7 @@ id_access = "Service" -/obj/outfit/admin/nt/odinjanitor +/datum/outfit/admin/nt/odinjanitor name = "NTCC Odin Sanitation Specialist" uniform = /obj/item/clothing/under/rank/janitor diff --git a/code/datums/outfits/event/outfit_scc.dm b/code/datums/outfits/event/outfit_scc.dm index 18cbbc19004..735149bd901 100644 --- a/code/datums/outfits/event/outfit_scc.dm +++ b/code/datums/outfits/event/outfit_scc.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/scc +/datum/outfit/admin/scc name = "SCC Agent" uniform = /obj/item/clothing/under/rank/scc @@ -20,17 +20,17 @@ id_icon = "centcom" var/id_access = "SCC Agent" -/obj/outfit/admin/scc/get_id_access() +/datum/outfit/admin/scc/get_id_access() return get_all_station_access() | get_centcom_access(id_access) -/obj/outfit/admin/scc/executive +/datum/outfit/admin/scc/executive name = "SCC Executive" uniform = /obj/item/clothing/under/rank/scc/executive id_access = "SCC Executive" -/obj/outfit/admin/scc/bodyguard +/datum/outfit/admin/scc/bodyguard name = "SCC Bodyguard" head = /obj/item/clothing/head/helmet/merc/scc diff --git a/code/datums/outfits/event/outfit_tfcl.dm b/code/datums/outfits/event/outfit_tfcl.dm index ed3fe8fd70f..a1356ffa131 100644 --- a/code/datums/outfits/event/outfit_tfcl.dm +++ b/code/datums/outfits/event/outfit_tfcl.dm @@ -1,4 +1,4 @@ -/obj/outfit/admin/tcfl +/datum/outfit/admin/tcfl name = "TCFL Legate" uniform = /obj/item/clothing/under/legion/legate @@ -27,5 +27,5 @@ id_iff = IFF_TCFL var/id_access = "NanoTrasen Representative" -/obj/outfit/admin/tcfl/get_id_access() +/datum/outfit/admin/tcfl/get_id_access() return get_all_accesses() | get_centcom_access(id_access) diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index 78a3ad415e7..749bf01d5e7 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -1,41 +1,108 @@ +/** + * # Outfit datums + * + * This is a clean system of applying outfits to mobs, if you need to equip someone in a uniform + * this is the way to do it cleanly and properly. + * + * You can also specify an outfit datum on a job to have it auto equipped to the mob on join + * + * /mob/living/carbon/human/proc/equipOutfit(outfit) is the mob level proc to equip an outfit + * and you pass it the relevant datum outfit + * + * outfits can also be saved as json blobs downloadable by a client and then can be uploaded + * by that user to recreate the outfit, this is used by admins to allow for custom event outfits + * that can be restored at a later date + */ +/datum/outfit + ///Name of the outfit (shows up in the equip admin verb) + var/name = "Naked" -/// General outfit abstraction. -/// To be used for both a mob's outfit (for a ghostspawner, ship/station job, corpse), -/// where the outfit is applied to the mob. -/// But also for "standalone" outfits (just items spawned in a locker, on the floor), -/// where the outfit items are "spilled" onto the floor (not all items, does not spawn IDs for example). -/obj/outfit - name = "Naked" - icon = 'icons/effects/map_effects.dmi' - icon_state = "outfit" - - /// If spilling onto the floor, prob chance for the item to spill. - var/spill_prob = 98 - /// If spilling onto the floor, if true, items to spill will be shuffled. - var/spill_shuffle = TRUE - - var/collect_not_del = FALSE + /// Type path of item to go in the idcard slot + var/id = null - //The following vars can either be a path or a list of paths - //If a list of paths is supplied a random item from that list is selected + /// Type path of item to go in uniform slot var/uniform = null + + /// Type path of item to go in suit slot var/suit = null - var/back = null // Mutually exclusive with and will override backpack choices below. Use for RIGs, tanks, etc. + + /** + * Type path of item to go in suit storage slot + * + * (make sure it's valid for that suit) + */ + var/suit_store = null + + /// Type path of item to go in back slot, mutually exclusive with and will override backpack choices. Use for RIGs, tanks, etc. + var/back = null + + /** + * list of items that should go in the backpack of the user + * + * Format of this list should be: list(path=count,otherpath=count) + */ + var/list/backpack_contents = null + + + /// Type path of item to go in belt slot var/belt = null + + /** + * list of items that should go in the belt of the user + * + * Format of this list should be: list(path=count,otherpath=count) + */ + var/list/belt_contents = null + + /// Type path of item to go in the glasses slot + var/glasses = null + + /// Type path of item to go in gloves slot var/gloves = null - var/wrist = null - var/shoes = null + /// Type path of item to go in head slot var/head = null + + /// Type path of item to go in mask slot var/mask = null - var/l_ear = null - var/r_ear = null - var/glasses = null + /// Type path of item to go in shoes slot + var/shoes = null + + /// Type path of item for left pocket slot var/l_pocket = null + + /// Type path of item for right pocket slot var/r_pocket = null - var/suit_store = null + + ///Type path of item to go in the right hand + var/l_hand = null + + //Type path of item to go in left hand + var/r_hand = null + + /// Any clothing accessory item var/accessory = null + + /** + * Any implants the mob should start implanted with + * + * Format of this list is (typepath, typepath, typepath) + */ + var/list/implants = null + + + /*########################### + AURORA SNOWFLAKE VARS + ###########################*/ + + var/collect_not_del = FALSE + + var/wrist = null + + var/l_ear = null + var/r_ear = null + var/suit_accessory = null // species specific item paths, in the form of @@ -46,10 +113,6 @@ var/list/species_gloves var/list/species_shoes - //The following vars must be paths - var/l_hand = null - var/r_hand = null - var/id = null var/pda = null var/radio = null @@ -84,86 +147,32 @@ var/id_iff = IFF_DEFAULT // when spawning in, the ID will be set to this iff, preventing friendly fire - var/internals_slot = null //ID of slot containing a gas tank - var/list/backpack_contents = list() //In the list(path=count,otherpath=count) format var/list/accessory_contents = list() - var/list/belt_contents = list() //In the list(path=count,otherpath=count) format - var/list/implants = null //A list of implants that should be implanted + var/list/spells = list() // A list of spells to grant -/obj/outfit/Initialize(mapload, ...) - . = ..() - // if loc is not null, means the outfit was mapped in or spawned manually - if(loc!=null) - spill() - -/// Spawn the items on the loc turf. -/// Delete self later. -/obj/outfit/proc/spill() - // get a list of item types to spawn - var/list/items = list( - uniform, - suit, - back, - belt, - gloves, - wrist, - shoes, - - head, - mask, - l_ear, - r_ear, - glasses, - - l_pocket, - r_pocket, - suit_store, - accessory, - suit_accessory, - - l_hand, - r_hand, - pda, - radio, - - backpack, - ) - - // add contents to the list - for(var/c in backpack_contents) - items += c - for(var/c in accessory_contents) - items += c - for(var/c in belt_contents) - items += c - - // shuffle - if(spill_shuffle) - items = shuffle(items) - - // go over each item - for(var/i in items) - if(i && prob(spill_prob)) - spill_item(i) - - // and finally delete self - qdel(src) - -/obj/outfit/proc/spill_item(var/path) - if(islist(path)) - path = pick(path) - if(path && ispath(path)) - new path(loc) - -/obj/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + +/** + * Called at the start of the equip proc + * + * Override to change the value of the slots depending on client prefs, species and + * other such sources of change + * + * Extra Arguments + * * visualsOnly true if this is only for display (in the character setup screen) + * + * If visualsOnly is true, you can omit any work that doesn't visually appear on the character sprite + */ +/datum/outfit/proc/pre_equip(mob/living/carbon/human/user, visualsOnly = FALSE) + SHOULD_NOT_SLEEP(TRUE) + //to be overriden for customization depending on client prefs,species etc if(allow_backbag_choice) - switch(H.backbag) + switch(user.backbag) if (OUTFIT_NOTHING) back = null if (OUTFIT_BACKPACK) - switch(H.backbag_style) + switch(user.backbag_style) if (OUTFIT_JOBSPECIFIC) back = backpack if (OUTFIT_GENERIC) @@ -171,7 +180,7 @@ if (OUTFIT_FACTIONSPECIFIC) back = backpack_faction ? backpack_faction : backpack // some may not have faction specific; fall back on job backpack if needed if (OUTFIT_SATCHEL) - switch(H.backbag_style) + switch(user.backbag_style) if (OUTFIT_JOBSPECIFIC) back = satchel if (OUTFIT_GENERIC) @@ -179,7 +188,7 @@ if (OUTFIT_FACTIONSPECIFIC) back = satchel_faction ? satchel_faction : satchel if (OUTFIT_SATCHEL_ALT) // Leather Satchel - switch(H.backbag_style) + switch(user.backbag_style) if (OUTFIT_JOBSPECIFIC) back = satchel_alt if (OUTFIT_GENERIC) @@ -187,7 +196,7 @@ if (OUTFIT_FACTIONSPECIFIC) back = satchel_alt_faction ? satchel_alt_faction : satchel_alt if (OUTFIT_DUFFELBAG) - switch(H.backbag_style) + switch(user.backbag_style) if (OUTFIT_JOBSPECIFIC) back = dufflebag if (OUTFIT_GENERIC) @@ -195,7 +204,7 @@ if (OUTFIT_FACTIONSPECIFIC) back = dufflebag_faction ? dufflebag_faction : dufflebag if (OUTFIT_MESSENGERBAG) - switch(H.backbag_style) + switch(user.backbag_style) if (OUTFIT_JOBSPECIFIC) back = messengerbag if (OUTFIT_GENERIC) @@ -203,7 +212,7 @@ if (OUTFIT_FACTIONSPECIFIC) back = messengerbag_faction ? messengerbag_faction : messengerbag if (OUTFIT_RUCKSACK) - switch(H.backbag_style) + switch(user.backbag_style) if (OUTFIT_JOBSPECIFIC) back = rucksack if (OUTFIT_GENERIC) @@ -211,7 +220,7 @@ if (OUTFIT_FACTIONSPECIFIC) back = rucksack_faction ? rucksack_faction : rucksack if (OUTFIT_POCKETBOOK) - switch(H.backbag_style) + switch(user.backbag_style) if (OUTFIT_JOBSPECIFIC) back = pocketbook if (OUTFIT_GENERIC) @@ -221,8 +230,8 @@ else back = backpack //Department backpack - if (H.backbag_color >= 2) // if theres a color switch em out for a recolorable one - switch (H.backbag) + if (user.backbag_color >= 2) // if theres a color switch em out for a recolorable one + switch (user.backbag) if (OUTFIT_POCKETBOOK) back = /obj/item/storage/backpack/satchel/pocketbook/recolorable if (OUTFIT_RUCKSACK) @@ -233,9 +242,9 @@ if(back) if(islist(back)) back = pick(back) - var/obj/item/storage/backpack/B = new back(H) - if (H.backbag == OUTFIT_SATCHEL_ALT || H.backbag == OUTFIT_RUCKSACK || H.backbag == OUTFIT_POCKETBOOK) - switch (H.backbag_color) + var/obj/item/storage/backpack/B = new back(user) + if (user.backbag == OUTFIT_SATCHEL_ALT || user.backbag == OUTFIT_RUCKSACK || user.backbag == OUTFIT_POCKETBOOK) + switch (user.backbag_color) if (OUTFIT_NOTHING) B.color = null if (OUTFIT_BLUE) @@ -258,7 +267,7 @@ B.color = "#3d2711" else B.color = null - switch(H.backbag_strap) + switch(user.backbag_strap) if(OUTFIT_NOTHING) B.alpha_mask = "hidden" if(OUTFIT_THIN) @@ -267,14 +276,14 @@ B.alpha_mask = "normal" if(OUTFIT_THICK) B.alpha_mask = null - if(isvaurca(H, TRUE)) - H.equip_or_collect(B, slot_r_hand) + if(isvaurca(user, TRUE)) + user.equip_or_collect(B, slot_r_hand) else - H.equip_or_collect(B, slot_back) + user.equip_or_collect(B, slot_back) var/datum/callback/radio_callback if(allow_headset_choice) - switch(H.headset_choice) + switch(user.headset_choice) if (OUTFIT_NOTHING) l_ear = null if (OUTFIT_BOWMAN) @@ -284,7 +293,7 @@ if (OUTFIT_WRISTRAD, OUTFIT_THIN_WRISTRAD) l_ear = null wrist = wrist_radio - if(H.headset_choice == OUTFIT_THIN_WRISTRAD) + if(user.headset_choice == OUTFIT_THIN_WRISTRAD) radio_callback = CALLBACK(src, PROC_REF(turn_into_thinset)) if(OUTFIT_CLIPON) l_ear = null @@ -292,18 +301,37 @@ else l_ear = headset //Department headset if(l_ear) - equip_item(H, l_ear, slot_l_ear, callback = radio_callback) + equip_item(user, l_ear, slot_l_ear, callback = radio_callback) else if (wrist) - equip_item(H, wrist, slot_wrists, callback = radio_callback) + equip_item(user, wrist, slot_wrists, callback = radio_callback) -/obj/outfit/proc/turn_into_thinset(var/obj/item/device/radio/headset/wrist/radio) +/** + * Called after the equip proc has finished + * + * All items are on the mob at this point, use this proc to toggle internals + * fiddle with id bindings and accesses etc + * + * **This process can and does sleep, and should never be waited upon, but only invoked asyncronously (`INVOKE_ASYNC`)** + * + * Extra Arguments + * * visualsOnly true if this is only for display (in the character setup screen) + * + * If visualsOnly is true, you can omit any work that doesn't visually appear on the character sprite + */ +/datum/outfit/proc/post_equip(mob/living/carbon/human/user, visualsOnly = FALSE) + //to be overridden for toggling internals, id binding, access etc + return + +/datum/outfit/proc/turn_into_thinset(var/obj/item/device/radio/headset/wrist/radio) if(istype(radio)) radio.icon_state = replacetext(radio.icon_state, "wrist", "thin") radio.item_state = replacetext(radio.item_state, "wrist", "thin") // Used to equip an item to the mob. Mainly to prevent copypasta for collect_not_del. //override_collect temporarily allows equip_or_collect without enabling it for the job. Mostly used to prevent weirdness with hand equips when the player is missing one -/obj/outfit/proc/equip_item(mob/living/carbon/human/H, path, slot, var/override_collect = FALSE, var/item_color, var/datum/callback/callback) +/datum/outfit/proc/equip_item(mob/living/carbon/human/user, path, slot, override_collect = FALSE, item_color, datum/callback/callback) + SHOULD_NOT_SLEEP(TRUE) + var/obj/item/I if(isnum(path)) //Check if parameter is not numeric. Must be a path, list of paths or name of a gear datum @@ -311,32 +339,34 @@ if(islist(path)) //If its a list, select a random item var/itempath = pick(path) - I = new itempath(H) + I = new itempath(user) else if(gear_datums[path]) //If its something else, we´ll check if its a gearpath and try to spawn it var/datum/gear/G = gear_datums[path] I = G.spawn_random() else - I = new path(H) //As fallback treat it as a path + I = new path(user) //As fallback treat it as a path if(I && callback) callback.Invoke(I) if(collect_not_del || override_collect) - H.equip_or_collect(I, slot) + user.equip_or_collect(I, slot) else - H.equip_to_slot_or_del(I, slot) + user.equip_to_slot_or_del(I, slot) + +/datum/outfit/proc/equip_uniform_accessory(mob/living/carbon/human/user) + SHOULD_NOT_SLEEP(TRUE) -/obj/outfit/proc/equip_uniform_accessory(mob/living/carbon/human/H) - if(!H) + if(!user) return if(islist(accessory)) accessory = pick(accessory) - var/obj/item/clothing/under/U = H.get_equipped_item(slot_w_uniform) + var/obj/item/clothing/under/U = user.get_equipped_item(slot_w_uniform) if(U) var/obj/item/clothing/accessory/A = new accessory - U.attach_accessory(H, A) + U.attach_accessory(user, A) if(!accessory_contents.len) return @@ -350,108 +380,134 @@ else if(istype(A, /obj/item/clothing/accessory/holster)) var/obj/item/clothing/accessory/holster/holster = A var/w_type = accessory_contents[1] - var/obj/item/W = new w_type(H.loc) + var/obj/item/W = new w_type(user.loc) if(W) - holster.holster(W, H) + holster.holster(W, user) + +/datum/outfit/proc/equip_suit_accessory(mob/living/carbon/human/user) + SHOULD_NOT_SLEEP(TRUE) -/obj/outfit/proc/equip_suit_accessory(mob/living/carbon/human/H) - if(!H) + if(!user) return - var/obj/item/clothing/suit/S = H.get_equipped_item(slot_wear_suit) + var/obj/item/clothing/suit/S = user.get_equipped_item(slot_wear_suit) if(S) var/obj/item/clothing/accessory/A = new suit_accessory - S.attach_accessory(H, A) + S.attach_accessory(user, A) /** - * This proc handles actions done after the outfit was equipped, - * eg. toggling internals, personalizations or similar + * Equips all defined types and paths to the mob passed in * - * This process can and does sleep, and should never be waited upon, but only invoked asyncronously (`INVOKE_ASYNC`) + * Extra Arguments + * * visualsOnly true if this is only for display (in the character setup screen) + * + * If visualsOnly is true, you can omit any work that doesn't visually appear on the character sprite */ -/obj/outfit/proc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) - //to be overriden for changing items post equip (such as toggeling internals, ...) - -/obj/outfit/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/proc/equip(mob/living/carbon/human/user, visualsOnly = FALSE) SHOULD_NOT_SLEEP(TRUE) + + pre_equip(user, visualsOnly) + //Start with uniform,suit,backpack for additional slots if(back) - equip_item(H, back, slot_back) + equip_item(user, back, slot_back) + if(uniform) - equip_item(H, uniform, slot_w_uniform) + equip_item(user, uniform, slot_w_uniform) if(accessory) - equip_uniform_accessory(H) + equip_uniform_accessory(user) + var/got_suit = FALSE if(length(species_suit)) - var/path = species_suit[H.species.name] + var/path = species_suit[user.species.name] if(path) got_suit = TRUE - equip_item(H, path, slot_wear_suit) + equip_item(user, path, slot_wear_suit) if(suit_accessory) - equip_suit_accessory(H) + equip_suit_accessory(user) if(suit && !got_suit) - equip_item(H, suit, slot_wear_suit) + equip_item(user, suit, slot_wear_suit) if(suit_accessory) - equip_suit_accessory(H) + equip_suit_accessory(user) + if(belt) - equip_item(H, belt, slot_belt) + equip_item(user, belt, slot_belt) + + var/got_gloves = FALSE if(length(species_gloves)) - var/path = species_gloves[H.species.name] + var/path = species_gloves[user.species.name] if(path) got_gloves = TRUE - equip_item(H, path, slot_gloves) + equip_item(user, path, slot_gloves) + if(gloves && !got_gloves) - equip_item(H, gloves, slot_gloves) + equip_item(user, gloves, slot_gloves) + if(wrist) - equip_item(H, wrist, slot_wrists) + equip_item(user, wrist, slot_wrists) + + var/got_shoes = FALSE if(length(species_shoes)) - var/path = species_shoes[H.species.name] + var/path = species_shoes[user.species.name] if(path) got_shoes = TRUE - equip_item(H, path, slot_shoes) + equip_item(user, path, slot_shoes) if(shoes && !got_shoes) - equip_item(H, shoes, slot_shoes) + equip_item(user, shoes, slot_shoes) + + var/got_head = FALSE if(length(species_head)) - var/path = species_head[H.species.name] + var/path = species_head[user.species.name] if(path) got_head = TRUE - equip_item(H, path, slot_head) + equip_item(user, path, slot_head) + if(head && !got_head) - equip_item(H, head, slot_head) + equip_item(user, head, slot_head) + + if(mask) - equip_item(H, mask, slot_wear_mask) + equip_item(user, mask, slot_wear_mask) + if(l_ear) - equip_item(H, l_ear, slot_l_ear) + equip_item(user, l_ear, slot_l_ear) + if(r_ear) - equip_item(H, r_ear, slot_r_ear) + equip_item(user, r_ear, slot_r_ear) + if(glasses) - equip_item(H, glasses, slot_glasses) + equip_item(user, glasses, slot_glasses) if(suit_store) - equip_item(H, suit_store, slot_s_store) + equip_item(user, suit_store, slot_s_store) //Hand equips. If person is missing an arm or hand it attempts to put it in the other hand. //Override_collect should attempt to collect any items that can't be equipped regardless of collect_not_del settings for the outfit. if(l_hand) var/obj/item/organ/external/O - O = H.organs_by_name[BP_L_HAND] + O = user.organs_by_name[BP_L_HAND] + if(!O || !O.is_usable()) - equip_item(H, l_hand, slot_r_hand, override_collect = TRUE) + equip_item(user, l_hand, slot_r_hand, override_collect = TRUE) + else - equip_item(H, l_hand, slot_l_hand, override_collect = TRUE) + equip_item(user, l_hand, slot_l_hand, override_collect = TRUE) + if(r_hand) var/obj/item/organ/external/O - O = H.organs_by_name[BP_R_HAND] + O = user.organs_by_name[BP_R_HAND] + if(!O || !O.is_usable()) - equip_item(H, r_hand, slot_l_hand, override_collect = TRUE) + equip_item(user, r_hand, slot_l_hand, override_collect = TRUE) + else - equip_item(H, r_hand, slot_r_hand, override_collect = TRUE) + equip_item(user, r_hand, slot_r_hand, override_collect = TRUE) if(allow_pda_choice) - switch(H.pda_choice) + switch(user.pda_choice) if (OUTFIT_NOTHING) pda = null if (OUTFIT_TABLET) @@ -462,8 +518,8 @@ pda = tab_pda if(pda && !visualsOnly) - var/obj/item/I = new pda(H) - switch(H.pda_choice) + var/obj/item/I = new pda(user) + switch(user.pda_choice) if(OUTFIT_TAB_PDA) I.desc_extended += "For its many years of service, this model has held a virtual monopoly for PDA models for NanoTrasen. The secret? A lapel pin affixed to the back." if(OUTFIT_PDA_OLD) @@ -479,90 +535,104 @@ I.icon = 'icons/obj/pda_smart.dmi' I.desc_extended += "NanoTrasen originally designed this as a portable media player. Unfortunately, Royalty-free and corporate-approved ukulele isn't particularly popular." I.update_icon() - if(!H.wrists && H.pda_choice == OUTFIT_WRISTBOUND) - H.equip_or_collect(I, slot_wrists) + if(!user.wrists && user.pda_choice == OUTFIT_WRISTBOUND) + user.equip_or_collect(I, slot_wrists) else - H.equip_or_collect(I, slot_wear_id) + user.equip_or_collect(I, slot_wear_id) if(!visualsOnly) // Items in pockets or backpack don't show up on mob's icon. if(l_pocket) - equip_item(H, l_pocket, slot_l_store) + equip_item(user, l_pocket, slot_l_store) if(r_pocket) - equip_item(H, r_pocket, slot_r_store) + equip_item(user, r_pocket, slot_r_store) + + if(user.back) // you would think, right - if(H.back) // you would think, right for(var/path in backpack_contents) var/number = backpack_contents[path] for(var/i in 1 to number) - H.equip_or_collect(new path(H), slot_in_backpack) + user.equip_or_collect(new path(user), slot_in_backpack) + else var/obj/item/storage/storage_item - if(!H.l_hand) - storage_item = new /obj/item/storage/bag/plasticbag(H) - H.equip_to_slot_or_del(storage_item, slot_l_hand) - if(!storage_item && !H.r_hand) - storage_item = new /obj/item/storage/bag/plasticbag(H) - H.equip_to_slot_or_del(storage_item, slot_r_hand) + if(!user.l_hand) + storage_item = new /obj/item/storage/bag/plasticbag(user) + user.equip_to_slot_or_del(storage_item, slot_l_hand) + + if(!storage_item && !user.r_hand) + storage_item = new /obj/item/storage/bag/plasticbag(user) + user.equip_to_slot_or_del(storage_item, slot_r_hand) + if(storage_item) for(var/path in backpack_contents) var/number = backpack_contents[path] for(var/i in 1 to number) - storage_item.handle_item_insertion(new path(H.loc), TRUE) + storage_item.handle_item_insertion(new path(user.loc), TRUE) + + for(var/path in belt_contents) var/number = belt_contents[path] for(var/i in 1 to number) - H.equip_or_collect(new path(H), slot_in_belt) + user.equip_or_collect(new path(user), slot_in_belt) if(id) var/obj/item/modular_computer/personal_computer - if(istype(H.wear_id, /obj/item/modular_computer)) - personal_computer = H.wear_id - else if(istype(H.wrists, /obj/item/modular_computer)) - personal_computer = H.wrists - var/obj/item/ID = new id(H) - imprint_idcard(H, ID) + + if(istype(user.wear_id, /obj/item/modular_computer)) + personal_computer = user.wear_id + + else if(istype(user.wrists, /obj/item/modular_computer)) + personal_computer = user.wrists + + var/obj/item/ID = new id(user) + + imprint_idcard(user, ID) + if(personal_computer?.card_slot) addtimer(CALLBACK(src, PROC_REF(register_pda), personal_computer, ID), 2 SECOND) + else - H.equip_or_collect(ID, slot_wear_id) + user.equip_or_collect(ID, slot_wear_id) - INVOKE_ASYNC(src, PROC_REF(post_equip), H, visualsOnly) + INVOKE_ASYNC(src, PROC_REF(post_equip), user, visualsOnly) if(!visualsOnly) - apply_fingerprints(H) + apply_fingerprints(user) if(implants) for(var/implant_type in implants) - var/obj/item/implant/I = new implant_type(H) - if(I.implanted(H)) - I.forceMove(H) - I.imp_in = H + var/obj/item/implant/I = new implant_type(user) + if(I.implanted(user)) + I.forceMove(user) + I.imp_in = user I.implanted = 1 - var/obj/item/organ/external/affected = H.get_organ(BP_HEAD) + var/obj/item/organ/external/affected = user.get_organ(BP_HEAD) affected.implants += I I.part = affected if(spells) for(var/spell in spells) var/spell/new_spell = new spell - H.add_spell(new_spell) + user.add_spell(new_spell) if(spells[spell] > 1) for(var/i = 1 to spells[spell]) new_spell.empower_spell() - H.update_body() - return 1 + user.update_body() + return TRUE // this proc takes all the scattered voidsuit pieces and reassembles them into one piece -/obj/outfit/proc/organize_voidsuit(mob/living/carbon/human/H, var/add_magboots = TRUE) - var/obj/item/tank/T = H.s_store - H.unEquip(T, TRUE) +/datum/outfit/proc/organize_voidsuit(mob/living/carbon/human/user, var/add_magboots = TRUE) + SHOULD_NOT_SLEEP(TRUE) - var/obj/item/clothing/suit/space/void/VS = H.wear_suit - H.unEquip(VS, TRUE) + var/obj/item/tank/T = user.s_store + user.unEquip(T, TRUE) - var/obj/item/clothing/head/helmet/VH = H.head - H.unEquip(VH, TRUE, VS) + var/obj/item/clothing/suit/space/void/VS = user.wear_suit + user.unEquip(VS, TRUE) + + var/obj/item/clothing/head/helmet/VH = user.head + user.unEquip(VH, TRUE, VS) VS.helmet = VH T.forceMove(VS) @@ -572,77 +642,100 @@ var/obj/item/clothing/shoes/magboots/M = new /obj/item/clothing/shoes/magboots(VH) VS.boots = M - H.equip_to_slot_if_possible(VS, slot_wear_suit) + user.equip_to_slot_if_possible(VS, slot_wear_suit) + +/** + * Apply a fingerprint from the passed in human to all items in the outfit + * + * Used for forensics setup when the mob is first equipped at roundstart + * essentially calls add_fingerprint to every defined item on the human + * + */ +/datum/outfit/proc/apply_fingerprints(mob/living/carbon/human/user) + SHOULD_NOT_SLEEP(TRUE) -/obj/outfit/proc/apply_fingerprints(mob/living/carbon/human/H) - if(!istype(H)) + if(!istype(user)) return - if(H.back) - H.back.add_fingerprint(H, 1) //The 1 sets a flag to ignore gloves - for(var/obj/item/I in H.back.contents) - I.add_fingerprint(H, 1) - if(H.wear_id) - H.wear_id.add_fingerprint(H, 1) - if(H.w_uniform) - H.w_uniform.add_fingerprint(H, 1) - if(H.wear_suit) - H.wear_suit.add_fingerprint(H, 1) - if(H.wear_mask) - H.wear_mask.add_fingerprint(H, 1) - if(H.head) - H.head.add_fingerprint(H, 1) - if(H.shoes) - H.shoes.add_fingerprint(H, 1) - if(H.gloves) - H.gloves.add_fingerprint(H, 1) - if(H.wrists) - H.wrists.add_fingerprint(H, 1) - if(H.l_ear) - H.l_ear.add_fingerprint(H, 1) - if(H.r_ear) - H.r_ear.add_fingerprint(H, 1) - if(H.glasses) - H.glasses.add_fingerprint(H, 1) - if(H.belt) - H.belt.add_fingerprint(H, 1) - for(var/obj/item/I in H.belt.contents) - I.add_fingerprint(H, 1) - if(H.s_store) - H.s_store.add_fingerprint(H, 1) - if(H.l_store) - H.l_store.add_fingerprint(H, 1) - if(H.r_store) - H.r_store.add_fingerprint(H, 1) + if(user.back) + user.back.add_fingerprint(user, 1) //The 1 sets a flag to ignore gloves + for(var/obj/item/I in user.back.contents) + I.add_fingerprint(user, 1) + if(user.wear_id) + user.wear_id.add_fingerprint(user, 1) + if(user.w_uniform) + user.w_uniform.add_fingerprint(user, 1) + if(user.wear_suit) + user.wear_suit.add_fingerprint(user, 1) + if(user.wear_mask) + user.wear_mask.add_fingerprint(user, 1) + if(user.head) + user.head.add_fingerprint(user, 1) + if(user.shoes) + user.shoes.add_fingerprint(user, 1) + if(user.gloves) + user.gloves.add_fingerprint(user, 1) + if(user.wrists) + user.wrists.add_fingerprint(user, 1) + if(user.l_ear) + user.l_ear.add_fingerprint(user, 1) + if(user.r_ear) + user.r_ear.add_fingerprint(user, 1) + if(user.glasses) + user.glasses.add_fingerprint(user, 1) + if(user.belt) + user.belt.add_fingerprint(user, 1) + for(var/obj/item/I in user.belt.contents) + I.add_fingerprint(user, 1) + if(user.s_store) + user.s_store.add_fingerprint(user, 1) + if(user.l_store) + user.l_store.add_fingerprint(user, 1) + if(user.r_store) + user.r_store.add_fingerprint(user, 1) return 1 -/obj/outfit/proc/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C) - if(istype(C)) - C.access = get_id_access(H) - C.rank = get_id_rank(H) - C.assignment = get_id_assignment(H) - addtimer(CALLBACK(H, TYPE_PROC_REF(/mob, set_id_info), C), 1 SECOND) // Delay a moment to allow an icon update to happen. +/datum/outfit/proc/imprint_idcard(mob/living/carbon/human/user, obj/item/card/id/idcard) + SHOULD_NOT_SLEEP(TRUE) + + if(istype(idcard)) + idcard.access = get_id_access(user) + idcard.rank = get_id_rank(user) + idcard.assignment = get_id_assignment(user) + addtimer(CALLBACK(user, TYPE_PROC_REF(/mob, set_id_info), idcard), 1 SECOND) // Delay a moment to allow an icon update to happen. + + if(user.mind && user.mind.initial_account) + idcard.associated_account_number = user.mind.initial_account.account_number - if(H.mind && H.mind.initial_account) - C.associated_account_number = H.mind.initial_account.account_number +/datum/outfit/proc/register_pda(obj/item/modular_computer/computer_to_register, obj/item/card/id/idcard) + SHOULD_NOT_SLEEP(TRUE) -/obj/outfit/proc/register_pda(obj/item/modular_computer/P, obj/item/card/id/I) - if(!P.card_slot) + if(!computer_to_register.card_slot) return - P.card_slot.insert_id(I) - if(P.card_slot.stored_card && !P.hidden) - P.set_autorun("ntnrc_client") - P.enable_computer(null, TRUE) // passing null because we don't want the UI to open - P.minimize_program() -/obj/outfit/proc/get_id_access(mob/living/carbon/human/H) + computer_to_register.card_slot.insert_id(idcard) + if(computer_to_register.card_slot.stored_card && !computer_to_register.hidden) + computer_to_register.set_autorun("ntnrc_client") + + // passing null because we don't want the UI to open + INVOKE_ASYNC(computer_to_register, TYPE_PROC_REF(/obj/item/modular_computer, enable_computer), null, TRUE) + + INVOKE_ASYNC(computer_to_register, TYPE_PROC_REF(/obj/item/modular_computer, minimize_program)) + +/datum/outfit/proc/get_id_access(mob/living/carbon/human/user) + SHOULD_NOT_SLEEP(TRUE) + return list() -/obj/outfit/proc/get_id_assignment(mob/living/carbon/human/H, var/ignore_suffix = FALSE) - . = GetAssignment(H) +/datum/outfit/proc/get_id_assignment(mob/living/carbon/human/user, ignore_suffix = FALSE) + SHOULD_NOT_SLEEP(TRUE) + + . = GetAssignment(user) - if (. && . != "Unassigned" && H?.mind?.selected_faction && !ignore_suffix) - if (H.mind.selected_faction.title_suffix) - . += " ([H.mind.selected_faction.title_suffix])" + if (. && . != "Unassigned" && user?.mind?.selected_faction && !ignore_suffix) + if (user.mind.selected_faction.title_suffix) + . += " ([user.mind.selected_faction.title_suffix])" + +/datum/outfit/proc/get_id_rank(mob/living/carbon/human/user) + SHOULD_NOT_SLEEP(TRUE) -/obj/outfit/proc/get_id_rank(mob/living/carbon/human/H) - return GetAssignment(H) + return GetAssignment(user) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 17853eed5fc..719b23ca0eb 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -1,19 +1,19 @@ -/obj/outfit/admin +/datum/outfit/admin var/id_icon -/obj/outfit/admin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(!visualsOnly) if(H.mind) H.mind.assigned_role = name H.job = name -/obj/outfit/admin/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C) +/datum/outfit/admin/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C) ..() if(id_icon) C.icon_state = id_icon -/obj/outfit/admin/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() if(!visualsOnly) if(H?.wear_suit && istype(H.wear_suit, /obj/item/clothing/suit/space/void)) @@ -32,10 +32,10 @@ head.refit_for_species(H.species.bodytype) -/obj/outfit/admin/random_employee +/datum/outfit/admin/random_employee name = "Random Employee" -/obj/outfit/admin/random_employee/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/random_employee/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(!visualsOnly) //Select a random job, set the assigned_role / job var and equip it @@ -51,7 +51,7 @@ job.equip(H, FALSE, FALSE, alt_title) -/obj/outfit/admin/random +/datum/outfit/admin/random name = "Random Civilian" uniform = "suit selection" @@ -68,7 +68,7 @@ /obj/item/storage/backpack/duffel ) -/obj/outfit/admin/random/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/random/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(!visualsOnly) if(prob(10)) //Equip something smokable @@ -99,19 +99,19 @@ var/datum/gear/G = gear_datums["gloves selection"] H.equip_or_collect(G.spawn_random(), slot_gloves) -/obj/outfit/admin/random/visitor +/datum/outfit/admin/random/visitor name = "Random Visitor" id = /obj/item/card/id pda = /obj/item/modular_computer/handheld/pda/civilian -/obj/outfit/admin/random/visitor/get_id_assignment() +/datum/outfit/admin/random/visitor/get_id_assignment() return "Visitor" -/obj/outfit/admin/random/visitor/get_id_rank() +/datum/outfit/admin/random/visitor/get_id_rank() return "Visitor" -/obj/outfit/admin/virtual_reality +/datum/outfit/admin/virtual_reality name = "Virtual Reality Outfit" uniform = /obj/item/clothing/under/chameleon suit = /obj/item/clothing/suit/chameleon diff --git a/code/datums/outfits/outfit_antag.dm b/code/datums/outfits/outfit_antag.dm index 9ae66e017e2..fb630e168c1 100644 --- a/code/datums/outfits/outfit_antag.dm +++ b/code/datums/outfits/outfit_antag.dm @@ -1,6 +1,6 @@ // Anything that's coded as an "antagonist" that needs outfits should go here, unless it's an ERT. -/obj/outfit/admin/syndicate +/datum/outfit/admin/syndicate name = "Syndicate Agent" allow_backbag_choice = TRUE @@ -30,7 +30,7 @@ var/id_access = "Syndicate Operative" var/uplink_uses = DEFAULT_TELECRYSTAL_AMOUNT -/obj/outfit/admin/syndicate/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/syndicate/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -46,11 +46,11 @@ if(istype(tag)) tag.modify_tag_data(TRUE) -/obj/outfit/admin/syndicate/get_id_access() +/datum/outfit/admin/syndicate/get_id_access() return get_syndicate_access(id_access) -/obj/outfit/admin/syndicate/operative +/datum/outfit/admin/syndicate/operative name = "Syndicate Operative" suit = /obj/item/clothing/suit/space/void/merc @@ -75,7 +75,7 @@ /obj/item/clothing/shoes/combat = 1 ) -/obj/outfit/admin/syndicate/officer +/datum/outfit/admin/syndicate/officer name = "Syndicate Officer" head = /obj/item/clothing/head/beret/red @@ -99,7 +99,7 @@ ) id_access = "Syndicate Operative Leader" -/obj/outfit/admin/syndicate/spy +/datum/outfit/admin/syndicate/spy name = "Syndicate Spy" uniform = /obj/item/clothing/under/suit_jacket/really_black shoes = /obj/item/clothing/shoes/sneakers/black/noslip @@ -112,7 +112,7 @@ // Syndicate Auxiliary Outfits (ninja, merc, etc.) -/obj/outfit/admin/syndicate/ninja +/datum/outfit/admin/syndicate/ninja name = "Infiltrator" allow_backbag_choice = FALSE @@ -141,14 +141,14 @@ id_access = "Syndicate Agent" -/obj/outfit/admin/syndicate/ninja/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/syndicate/ninja/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return H.equip_to_slot_or_del(new /obj/item/device/special_uplink/ninja(H, H.mind), slot_l_store) -/obj/outfit/admin/syndicate/mercenary +/datum/outfit/admin/syndicate/mercenary name = "Mercenary" uniform = /obj/item/clothing/under/syndicate @@ -165,7 +165,7 @@ id_iff = IFF_MERCENARY -/obj/outfit/admin/syndicate/mercenary/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/syndicate/mercenary/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -173,7 +173,7 @@ if(!H.shoes) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes) -/obj/outfit/admin/syndicate/mercenary/loner +/datum/outfit/admin/syndicate/mercenary/loner name = "Loner" l_ear = /obj/item/device/radio/headset/syndicate @@ -188,7 +188,7 @@ id_iff = IFF_LONER id_access = "Lone Operative" -/obj/outfit/admin/syndicate/raider +/datum/outfit/admin/syndicate/raider name = "Raider" allow_backbag_choice = FALSE @@ -339,7 +339,7 @@ backpack_contents = list() -/obj/outfit/admin/syndicate/raider/equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/syndicate/raider/equip(mob/living/carbon/human/H, visualsOnly = FALSE) new /obj/random/backpack(H.loc) var/obj/item/storage/backpack/bag @@ -374,7 +374,7 @@ return ..() -/obj/outfit/admin/syndicate/raider/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/syndicate/raider/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -389,7 +389,7 @@ if(W) W.handle_item_insertion(passport) -/obj/outfit/admin/syndicate/burglar +/datum/outfit/admin/syndicate/burglar name = "Burglar" allow_backbag_choice = FALSE @@ -435,7 +435,7 @@ id_iff = IFF_BURGLAR -/obj/outfit/admin/syndicate/burglar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/syndicate/burglar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -492,7 +492,7 @@ W.handle_item_insertion(passport) -/obj/outfit/admin/syndicate/jockey +/datum/outfit/admin/syndicate/jockey name = "Jockey" allow_backbag_choice = FALSE @@ -529,7 +529,7 @@ id_iff = IFF_JOCKEY -/obj/outfit/admin/syndicate/jockey/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/syndicate/jockey/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -553,7 +553,7 @@ // Non-syndicate antag outfits -/obj/outfit/admin/highlander +/datum/outfit/admin/highlander name = "Highlander" uniform = /obj/item/clothing/under/kilt @@ -566,7 +566,7 @@ id = /obj/item/card/id/highlander id_iff = IFF_HIGHLANDER -/obj/outfit/admin/highlander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/highlander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -576,7 +576,7 @@ W.name = "[H.real_name]'s ID" W.registered_name = H.real_name -/obj/outfit/admin/syndicate/cultist +/datum/outfit/admin/syndicate/cultist name = "Cultist" allow_backbag_choice = FALSE @@ -596,10 +596,10 @@ id_iff = IFF_CULTIST -/obj/outfit/admin/syndicate/cultist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/syndicate/cultist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) return -/obj/outfit/admin/syndicate/cultist/super +/datum/outfit/admin/syndicate/cultist/super name = "Super Cultist" head = /obj/item/clothing/head/helmet/space/cult @@ -607,7 +607,7 @@ suit_store = /obj/item/gun/energy/rifle/cult -/obj/outfit/admin/syndicate/raider_techno +/datum/outfit/admin/syndicate/raider_techno name = "Raider Techno" allow_backbag_choice = FALSE @@ -628,7 +628,7 @@ id_iff = IFF_BLUESPACE -/obj/outfit/admin/syndicate/raider_techno/equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/syndicate/raider_techno/equip(mob/living/carbon/human/H, visualsOnly = FALSE) var/list/loadouts = list("Nature", "Techno", "Cobra", "Brawler", "Shimmer") if(H.gender in list(FEMALE, PLURAL, NEUTER)) loadouts += list("Storm", "Sorceress") @@ -670,7 +670,7 @@ back = /obj/item/technomancer_core/summoner return ..() -/obj/outfit/admin/syndicate/raider_techno/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/syndicate/raider_techno/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -693,14 +693,14 @@ if(catalog) catalog.bind_to_owner(H) -/obj/outfit/admin/golem +/datum/outfit/admin/golem name = "Bluespace Golem" allow_backbag_choice = FALSE l_ear = /obj/item/device/radio/headset/bluespace id_iff = IFF_BLUESPACE -/obj/outfit/admin/techomancer +/datum/outfit/admin/techomancer name = "Technomancer" allow_backbag_choice = FALSE @@ -720,7 +720,7 @@ var/id_assignment = "Technomagus" -/obj/outfit/admin/techomancer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/techomancer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -738,7 +738,7 @@ if(catalog) catalog.bind_to_owner(H) -/obj/outfit/admin/techomancer/apprentice +/datum/outfit/admin/techomancer/apprentice name = "Technomancer Apprentice" head = /obj/item/clothing/head/chameleon/technomancer @@ -750,7 +750,7 @@ id_assignment = "Techno-apprentice" -/obj/outfit/admin/techomancer/apprentice/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/admin/techomancer/apprentice/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() if(visualsOnly) return @@ -760,7 +760,7 @@ of your own. You also have a catalog, to purchase your own functions and equipment as you see fit.") to_chat(H, "It would be wise to speak to your master, and learn what their plans are for today. Your clothing is holographic, you should change its look before leaving.") -/obj/outfit/admin/techomancer/golem +/datum/outfit/admin/techomancer/golem name = "Technomancer Golem" head = null diff --git a/code/game/antagonist/outsider/burglar.dm b/code/game/antagonist/outsider/burglar.dm index c52b8a9015a..f49ab73be2a 100644 --- a/code/game/antagonist/outsider/burglar.dm +++ b/code/game/antagonist/outsider/burglar.dm @@ -46,8 +46,8 @@ var/datum/antagonist/burglar/burglars if(I.loc != player) qdel(I) - player.preEquipOutfit(/obj/outfit/admin/syndicate/burglar, FALSE) - player.equipOutfit(/obj/outfit/admin/syndicate/burglar, FALSE) + player.preEquipOutfit(/datum/outfit/admin/syndicate/burglar, FALSE) + player.equipOutfit(/datum/outfit/admin/syndicate/burglar, FALSE) player.force_update_limbs() player.update_eyes() player.regenerate_icons() diff --git a/code/game/antagonist/outsider/jockey.dm b/code/game/antagonist/outsider/jockey.dm index e29dcf82c09..c0c2c117866 100644 --- a/code/game/antagonist/outsider/jockey.dm +++ b/code/game/antagonist/outsider/jockey.dm @@ -45,8 +45,8 @@ var/datum/antagonist/jockey/jockeys if(I.loc != player) qdel(I) - player.preEquipOutfit(/obj/outfit/admin/syndicate/jockey, FALSE) - player.equipOutfit(/obj/outfit/admin/syndicate/jockey, FALSE) + player.preEquipOutfit(/datum/outfit/admin/syndicate/jockey, FALSE) + player.equipOutfit(/datum/outfit/admin/syndicate/jockey, FALSE) player.force_update_limbs() player.update_eyes() player.regenerate_icons() diff --git a/code/game/antagonist/outsider/loner.dm b/code/game/antagonist/outsider/loner.dm index 16d9029d991..5b30620ec47 100644 --- a/code/game/antagonist/outsider/loner.dm +++ b/code/game/antagonist/outsider/loner.dm @@ -37,8 +37,8 @@ var/datum/antagonist/loner/loners if(I.loc != player) qdel(I) - player.preEquipOutfit(/obj/outfit/admin/syndicate/mercenary/loner, FALSE) - player.equipOutfit(/obj/outfit/admin/syndicate/mercenary/loner, FALSE) + player.preEquipOutfit(/datum/outfit/admin/syndicate/mercenary/loner, FALSE) + player.equipOutfit(/datum/outfit/admin/syndicate/mercenary/loner, FALSE) player.set_psi_rank(PSI_RANK_HARMONIOUS) var/singleton/psionic_power/P = GET_SINGLETON(/singleton/psionic_power/zona_absorption) P.apply(player) diff --git a/code/game/antagonist/outsider/mercenary.dm b/code/game/antagonist/outsider/mercenary.dm index 0dcfc3c6513..e1c3fb3fac6 100644 --- a/code/game/antagonist/outsider/mercenary.dm +++ b/code/game/antagonist/outsider/mercenary.dm @@ -46,8 +46,8 @@ var/datum/antagonist/mercenary/mercs if(I.loc != player) qdel(I) - player.preEquipOutfit(/obj/outfit/admin/syndicate/mercenary, FALSE) - player.equipOutfit(/obj/outfit/admin/syndicate/mercenary, FALSE) + player.preEquipOutfit(/datum/outfit/admin/syndicate/mercenary, FALSE) + player.equipOutfit(/datum/outfit/admin/syndicate/mercenary, FALSE) player.force_update_limbs() player.update_eyes() player.regenerate_icons() diff --git a/code/game/antagonist/outsider/ninja.dm b/code/game/antagonist/outsider/ninja.dm index 0266b967449..76ba736333a 100644 --- a/code/game/antagonist/outsider/ninja.dm +++ b/code/game/antagonist/outsider/ninja.dm @@ -111,8 +111,8 @@ var/datum/antagonist/ninja/ninjas player.drop_from_inventory(I) if(I.loc != player) qdel(I) - player.preEquipOutfit(/obj/outfit/admin/syndicate/ninja, FALSE) - player.equipOutfit(/obj/outfit/admin/syndicate/ninja, FALSE) + player.preEquipOutfit(/datum/outfit/admin/syndicate/ninja, FALSE) + player.equipOutfit(/datum/outfit/admin/syndicate/ninja, FALSE) player.force_update_limbs() player.update_eyes() player.regenerate_icons() diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index e883e64e9f5..f2102d1b78e 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -130,8 +130,8 @@ var/datum/antagonist/raider/raiders if(I.loc != player) qdel(I) - player.preEquipOutfit(/obj/outfit/admin/syndicate/raider, FALSE) - player.equipOutfit(/obj/outfit/admin/syndicate/raider, FALSE) + player.preEquipOutfit(/datum/outfit/admin/syndicate/raider, FALSE) + player.equipOutfit(/datum/outfit/admin/syndicate/raider, FALSE) player.force_update_limbs() player.update_eyes() player.regenerate_icons() diff --git a/code/game/antagonist/outsider/raider_techno.dm b/code/game/antagonist/outsider/raider_techno.dm index a66b57f7a51..ed3e3c1f13e 100644 --- a/code/game/antagonist/outsider/raider_techno.dm +++ b/code/game/antagonist/outsider/raider_techno.dm @@ -54,8 +54,8 @@ var/datum/antagonist/raider_techno/raider_techno if(I.loc != player) qdel(I) - player.preEquipOutfit(/obj/outfit/admin/syndicate/raider_techno, FALSE) - player.equipOutfit(/obj/outfit/admin/syndicate/raider_techno, FALSE) + player.preEquipOutfit(/datum/outfit/admin/syndicate/raider_techno, FALSE) + player.equipOutfit(/datum/outfit/admin/syndicate/raider_techno, FALSE) player.force_update_limbs() player.update_eyes() player.regenerate_icons() diff --git a/code/game/antagonist/outsider/technomancer.dm b/code/game/antagonist/outsider/technomancer.dm index 807b1c7d60d..cb18a748cdf 100644 --- a/code/game/antagonist/outsider/technomancer.dm +++ b/code/game/antagonist/outsider/technomancer.dm @@ -37,14 +37,14 @@ var/datum/antagonist/technomancer/technomancers if(!..()) return FALSE - technomancer_mob.preEquipOutfit(/obj/outfit/admin/techomancer, FALSE) - technomancer_mob.equipOutfit(/obj/outfit/admin/techomancer, FALSE) + technomancer_mob.preEquipOutfit(/datum/outfit/admin/techomancer, FALSE) + technomancer_mob.equipOutfit(/datum/outfit/admin/techomancer, FALSE) return TRUE /datum/antagonist/technomancer/proc/equip_apprentice(var/mob/living/carbon/human/technomancer_mob) - technomancer_mob.preEquipOutfit(/obj/outfit/admin/techomancer/apprentice, FALSE) - technomancer_mob.equipOutfit(/obj/outfit/admin/techomancer/apprentice, FALSE) + technomancer_mob.preEquipOutfit(/datum/outfit/admin/techomancer/apprentice, FALSE) + technomancer_mob.equipOutfit(/datum/outfit/admin/techomancer/apprentice, FALSE) return TRUE /datum/antagonist/technomancer/check_victory() diff --git a/code/game/antagonist/station/highlander.dm b/code/game/antagonist/station/highlander.dm index df59546b84b..e9568b27ac7 100644 --- a/code/game/antagonist/station/highlander.dm +++ b/code/game/antagonist/station/highlander.dm @@ -41,8 +41,8 @@ var/datum/antagonist/highlander/highlanders if(I.loc != player) qdel(I) - player.preEquipOutfit(/obj/outfit/admin/highlander, FALSE) - player.equipOutfit(/obj/outfit/admin/highlander, FALSE) + player.preEquipOutfit(/datum/outfit/admin/highlander, FALSE) + player.equipOutfit(/datum/outfit/admin/highlander, FALSE) player.force_update_limbs() player.update_eyes() player.regenerate_icons() diff --git a/code/game/gamemodes/antagspawner.dm b/code/game/gamemodes/antagspawner.dm index 02397cd776c..e31e16d0e1d 100644 --- a/code/game/gamemodes/antagspawner.dm +++ b/code/game/gamemodes/antagspawner.dm @@ -57,7 +57,7 @@ icon_state = "locator" mob_type = /mob/living/carbon/human ghost_role_id = "technoapprentice" - var/outfit_type = /obj/outfit/admin/techomancer/apprentice + var/outfit_type = /datum/outfit/admin/techomancer/apprentice var/preserve_appearance = FALSE /obj/item/antag_spawner/technomancer_apprentice/attack_self(var/mob/user) @@ -97,5 +97,5 @@ desc = "A teleportation device, which will bring a powerful synthetic helper to you." mob_type = /mob/living/carbon/human/technomancer_golem ghost_role_id = "technogolem" - outfit_type = /obj/outfit/admin/techomancer/golem + outfit_type = /datum/outfit/admin/techomancer/golem preserve_appearance = TRUE diff --git a/code/game/jobs/faction/hephaestus.dm b/code/game/jobs/faction/hephaestus.dm index 1860d96ac7d..2245bff7287 100644 --- a/code/game/jobs/faction/hephaestus.dm +++ b/code/game/jobs/faction/hephaestus.dm @@ -38,21 +38,21 @@ ) titles_to_loadout = list( - "Hangar Technician" = /obj/outfit/job/hangar_tech/hephaestus, - "Shaft Miner" = /obj/outfit/job/mining/hephaestus, - "Machinist" = /obj/outfit/job/machinist/hephaestus, - "Engineer" = /obj/outfit/job/engineer/hephaestus, - "Atmospheric Technician" = /obj/outfit/job/atmos/hephaestus, - "Engineering Apprentice" = /obj/outfit/job/intern_eng/hephaestus, - "Atmospherics Apprentice" = /obj/outfit/job/intern_atmos/hephaestus, - "Corporate Reporter" = /obj/outfit/job/journalist/hephaestus, - "Corporate Liaison" = /obj/outfit/job/representative/hephaestus, - "Off-Duty Crew Member" = /obj/outfit/job/visitor/hephaestus, - "Engineering Personnel" = /obj/outfit/job/engineer/event/hephaestus, - "Operations Personnel" = /obj/outfit/job/hangar_tech/event/hephaestus + "Hangar Technician" = /datum/outfit/job/hangar_tech/hephaestus, + "Shaft Miner" = /datum/outfit/job/mining/hephaestus, + "Machinist" = /datum/outfit/job/machinist/hephaestus, + "Engineer" = /datum/outfit/job/engineer/hephaestus, + "Atmospheric Technician" = /datum/outfit/job/atmos/hephaestus, + "Engineering Apprentice" = /datum/outfit/job/intern_eng/hephaestus, + "Atmospherics Apprentice" = /datum/outfit/job/intern_atmos/hephaestus, + "Corporate Reporter" = /datum/outfit/job/journalist/hephaestus, + "Corporate Liaison" = /datum/outfit/job/representative/hephaestus, + "Off-Duty Crew Member" = /datum/outfit/job/visitor/hephaestus, + "Engineering Personnel" = /datum/outfit/job/engineer/event/hephaestus, + "Operations Personnel" = /datum/outfit/job/hangar_tech/event/hephaestus ) -/obj/outfit/job/hangar_tech/hephaestus +/datum/outfit/job/hangar_tech/hephaestus name = "Hangar Technician - Hephaestus" uniform = /obj/item/clothing/under/rank/hangar_technician/heph @@ -63,7 +63,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/heph messengerbag_faction = /obj/item/storage/backpack/messenger/heph -/obj/outfit/job/machinist/hephaestus +/datum/outfit/job/machinist/hephaestus name = "Machinist - Hephaestus" uniform = /obj/item/clothing/under/rank/machinist/heph @@ -74,7 +74,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/heph messengerbag_faction = /obj/item/storage/backpack/messenger/heph -/obj/outfit/job/mining/hephaestus +/datum/outfit/job/mining/hephaestus name = "Shaft Miner - Hephaestus" uniform = /obj/item/clothing/under/rank/miner/heph @@ -85,7 +85,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/heph messengerbag_faction = /obj/item/storage/backpack/messenger/heph -/obj/outfit/job/engineer/hephaestus +/datum/outfit/job/engineer/hephaestus name = "Engineer - Hephaestus" uniform = /obj/item/clothing/under/rank/engineer/heph @@ -97,7 +97,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/heph messengerbag_faction = /obj/item/storage/backpack/messenger/heph -/obj/outfit/job/atmos/hephaestus +/datum/outfit/job/atmos/hephaestus name = "Atmospheric Technician - Hephaestus" uniform = /obj/item/clothing/under/rank/atmospheric_technician/heph @@ -109,7 +109,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/heph messengerbag_faction = /obj/item/storage/backpack/messenger/heph -/obj/outfit/job/intern_eng/hephaestus +/datum/outfit/job/intern_eng/hephaestus name = "Engineering Apprentice - Hephaestus" uniform = /obj/item/clothing/under/rank/engineer/apprentice/heph @@ -121,7 +121,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/heph messengerbag_faction = /obj/item/storage/backpack/messenger/heph -/obj/outfit/job/intern_atmos/hephaestus +/datum/outfit/job/intern_atmos/hephaestus name = "Atmospherics Apprentice - Hephaestus" uniform = /obj/item/clothing/under/rank/engineer/apprentice/heph @@ -133,7 +133,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/heph messengerbag_faction = /obj/item/storage/backpack/messenger/heph -/obj/outfit/job/representative/hephaestus +/datum/outfit/job/representative/hephaestus name = "Hephaestus Corporate Liaison" head = /obj/item/clothing/head/beret/corporate/heph @@ -154,7 +154,7 @@ /obj/item/stamp/hephaestus = 1 ) -/obj/outfit/job/journalist/hephaestus +/datum/outfit/job/journalist/hephaestus name = "Corporate Reporter - Hephaestus" uniform = /obj/item/clothing/under/librarian/heph @@ -166,7 +166,7 @@ messengerbag_faction = /obj/item/storage/backpack/messenger/heph -/obj/outfit/job/visitor/hephaestus +/datum/outfit/job/visitor/hephaestus name = "Off-Duty Crew Member - Hephaestus" id = /obj/item/card/id/hephaestus @@ -176,7 +176,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/heph messengerbag_faction = /obj/item/storage/backpack/messenger/heph -/obj/outfit/job/hangar_tech/event/hephaestus +/datum/outfit/job/hangar_tech/event/hephaestus name = "Operations Personnel - Hephaestus" uniform = /obj/item/clothing/under/rank/hangar_technician/heph @@ -187,7 +187,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/heph messengerbag_faction = /obj/item/storage/backpack/messenger/heph -/obj/outfit/job/engineer/event/hephaestus +/datum/outfit/job/engineer/event/hephaestus name = "Engineering Personnel - Hephaestus" uniform = /obj/item/clothing/under/rank/engineer/heph diff --git a/code/game/jobs/faction/idris.dm b/code/game/jobs/faction/idris.dm index 010e2768e4b..51ea399a174 100644 --- a/code/game/jobs/faction/idris.dm +++ b/code/game/jobs/faction/idris.dm @@ -45,28 +45,28 @@ ) titles_to_loadout = list( - "Security Officer" = /obj/outfit/job/officer/idris, - "Warden" = /obj/outfit/job/warden/idris, - "Security Cadet" = /obj/outfit/job/intern_sec/officer/idris, - "Investigator Intern" = /obj/outfit/job/intern_sec/forensics/idris, - "Investigator" =/obj/outfit/job/forensics/idris, - "Bartender" = /obj/outfit/job/bartender/idris, - "Chef" = /obj/outfit/job/chef/idris, - "Gardener" = /obj/outfit/job/hydro/idris, - "Hydroponicist" = /obj/outfit/job/hydro/idris, - "Janitor" = /obj/outfit/job/janitor/idris, - "Librarian" = /obj/outfit/job/librarian/idris, - "Curator" = /obj/outfit/job/librarian/idris/curator, - "Tech Support" = /obj/outfit/job/librarian/idris/tech_support, - "Corporate Reporter" = /obj/outfit/job/journalist/idris, - "Chaplain" = /obj/outfit/job/chaplain/idris, - "Corporate Liaison" = /obj/outfit/job/representative/idris, - "Off-Duty Crew Member" = /obj/outfit/job/visitor/idris, - "Security Personnel" = /obj/outfit/job/officer/event/idris, - "Service Personnel" = /obj/outfit/job/bartender/idris + "Security Officer" = /datum/outfit/job/officer/idris, + "Warden" = /datum/outfit/job/warden/idris, + "Security Cadet" = /datum/outfit/job/intern_sec/officer/idris, + "Investigator Intern" = /datum/outfit/job/intern_sec/forensics/idris, + "Investigator" =/datum/outfit/job/forensics/idris, + "Bartender" = /datum/outfit/job/bartender/idris, + "Chef" = /datum/outfit/job/chef/idris, + "Gardener" = /datum/outfit/job/hydro/idris, + "Hydroponicist" = /datum/outfit/job/hydro/idris, + "Janitor" = /datum/outfit/job/janitor/idris, + "Librarian" = /datum/outfit/job/librarian/idris, + "Curator" = /datum/outfit/job/librarian/idris/curator, + "Tech Support" = /datum/outfit/job/librarian/idris/tech_support, + "Corporate Reporter" = /datum/outfit/job/journalist/idris, + "Chaplain" = /datum/outfit/job/chaplain/idris, + "Corporate Liaison" = /datum/outfit/job/representative/idris, + "Off-Duty Crew Member" = /datum/outfit/job/visitor/idris, + "Security Personnel" = /datum/outfit/job/officer/event/idris, + "Service Personnel" = /datum/outfit/job/bartender/idris ) -/obj/outfit/job/officer/idris +/datum/outfit/job/officer/idris name = "Security Officer - Idris" uniform = /obj/item/clothing/under/rank/security/idris @@ -77,7 +77,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/obj/outfit/job/warden/idris +/datum/outfit/job/warden/idris name = "Warden - Idris" head = /obj/item/clothing/head/warden/idris @@ -91,7 +91,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/obj/outfit/job/forensics/idris +/datum/outfit/job/forensics/idris name = "Investigator - Idris" uniform = /obj/item/clothing/under/det/idris @@ -103,7 +103,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/obj/outfit/job/intern_sec/officer/idris +/datum/outfit/job/intern_sec/officer/idris name = "Security Cadet - Idris" uniform = /obj/item/clothing/under/rank/cadet/idris @@ -114,7 +114,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/obj/outfit/job/intern_sec/forensics/idris +/datum/outfit/job/intern_sec/forensics/idris name = "Investigator Intern - Idris" uniform = /obj/item/clothing/under/rank/cadet/idris @@ -125,7 +125,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/obj/outfit/job/bartender/idris +/datum/outfit/job/bartender/idris name = "Bartender - Idris" uniform = /obj/item/clothing/under/rank/bartender/idris @@ -138,7 +138,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/obj/outfit/job/chef/idris +/datum/outfit/job/chef/idris name = "Chef - Idris" uniform = /obj/item/clothing/under/rank/chef/idris @@ -151,7 +151,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/obj/outfit/job/hydro/idris +/datum/outfit/job/hydro/idris name = "Gardener - Idris" uniform = /obj/item/clothing/under/rank/hydroponics/idris @@ -163,7 +163,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/obj/outfit/job/janitor/idris +/datum/outfit/job/janitor/idris name = "Janitor - Idris" uniform = /obj/item/clothing/under/rank/janitor/idris @@ -175,7 +175,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/obj/outfit/job/librarian/idris +/datum/outfit/job/librarian/idris name = "Librarian - Idris" uniform = /obj/item/clothing/under/librarian/idris @@ -186,14 +186,14 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/obj/outfit/job/librarian/idris/curator +/datum/outfit/job/librarian/idris/curator name = "Curator - Idris" jobtype = /datum/job/librarian r_pocket = /obj/item/device/price_scanner l_hand = null -/obj/outfit/job/librarian/idris/tech_support +/datum/outfit/job/librarian/idris/tech_support name = "Tech Support - Idris" jobtype = /datum/job/librarian @@ -203,7 +203,7 @@ l_hand = /obj/item/device/debugger wrist = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian -/obj/outfit/job/chaplain/idris +/datum/outfit/job/chaplain/idris name = "Chaplain - Idris" id = /obj/item/card/id/idris @@ -213,7 +213,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/obj/outfit/job/journalist/idris +/datum/outfit/job/journalist/idris name = "Corporate Reporter - Idris" uniform = /obj/item/clothing/under/librarian/idris @@ -224,7 +224,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/obj/outfit/job/representative/idris +/datum/outfit/job/representative/idris name = "Idris Corporate Liaison" head = /obj/item/clothing/head/beret/corporate/idris @@ -245,7 +245,7 @@ /obj/item/stamp/idris = 1 ) -/obj/outfit/job/visitor/idris +/datum/outfit/job/visitor/idris name = "Off-Duty Crew Member - Idris" id = /obj/item/card/id/idris @@ -255,7 +255,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/obj/outfit/job/officer/event/idris +/datum/outfit/job/officer/event/idris name = "Security Personnel - Idris" uniform = /obj/item/clothing/under/rank/security/idris diff --git a/code/game/jobs/faction/nanotrasen.dm b/code/game/jobs/faction/nanotrasen.dm index d3dd88047d8..6073c66ab33 100644 --- a/code/game/jobs/faction/nanotrasen.dm +++ b/code/game/jobs/faction/nanotrasen.dm @@ -27,7 +27,7 @@ ) titles_to_loadout = list( - "Off-Duty Crew Member" = /obj/outfit/job/visitor/nanotrasen + "Off-Duty Crew Member" = /datum/outfit/job/visitor/nanotrasen ) @@ -51,7 +51,7 @@ return objective -/obj/outfit/job/visitor/nanotrasen +/datum/outfit/job/visitor/nanotrasen name = "Off-Duty Crew Member - NanoTrasen" backpack_faction = /obj/item/storage/backpack/nt diff --git a/code/game/jobs/faction/orion_express.dm b/code/game/jobs/faction/orion_express.dm index 53109d0d3b3..fe1f1660a43 100644 --- a/code/game/jobs/faction/orion_express.dm +++ b/code/game/jobs/faction/orion_express.dm @@ -35,26 +35,26 @@ ) ) titles_to_loadout = list( - "Hangar Technician" = /obj/outfit/job/hangar_tech/orion, - "Shaft Miner" = /obj/outfit/job/mining/orion, - "Machinist" = /obj/outfit/job/machinist/orion, - "Bartender" = /obj/outfit/job/bartender/orion, - "Chef" = /obj/outfit/job/chef/orion, - "Gardener" = /obj/outfit/job/hydro/orion, - "Hydroponicist" = /obj/outfit/job/hydro/orion, - "Janitor" = /obj/outfit/job/janitor/orion, - "Librarian" = /obj/outfit/job/librarian/orion, - "Curator" = /obj/outfit/job/librarian/orion/curator, - "Tech Support" = /obj/outfit/job/librarian/orion/tech_support, - "Corporate Reporter" = /obj/outfit/job/journalist/orion, - "Chaplain" = /obj/outfit/job/chaplain/orion, - "Corporate Liaison" = /obj/outfit/job/representative/orion, - "Off-Duty Crew Member" = /obj/outfit/job/visitor/orion, - "Operations Personnel" = /obj/outfit/job/hangar_tech/event/orion, - "Service Personnel" = /obj/outfit/job/bartender/orion + "Hangar Technician" = /datum/outfit/job/hangar_tech/orion, + "Shaft Miner" = /datum/outfit/job/mining/orion, + "Machinist" = /datum/outfit/job/machinist/orion, + "Bartender" = /datum/outfit/job/bartender/orion, + "Chef" = /datum/outfit/job/chef/orion, + "Gardener" = /datum/outfit/job/hydro/orion, + "Hydroponicist" = /datum/outfit/job/hydro/orion, + "Janitor" = /datum/outfit/job/janitor/orion, + "Librarian" = /datum/outfit/job/librarian/orion, + "Curator" = /datum/outfit/job/librarian/orion/curator, + "Tech Support" = /datum/outfit/job/librarian/orion/tech_support, + "Corporate Reporter" = /datum/outfit/job/journalist/orion, + "Chaplain" = /datum/outfit/job/chaplain/orion, + "Corporate Liaison" = /datum/outfit/job/representative/orion, + "Off-Duty Crew Member" = /datum/outfit/job/visitor/orion, + "Operations Personnel" = /datum/outfit/job/hangar_tech/event/orion, + "Service Personnel" = /datum/outfit/job/bartender/orion ) -/obj/outfit/job/hangar_tech/orion +/datum/outfit/job/hangar_tech/orion name = "Hangar Technician - Orion Express" uniform = /obj/item/clothing/under/rank/hangar_technician/orion @@ -65,7 +65,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/obj/outfit/job/machinist/orion +/datum/outfit/job/machinist/orion name = "Machinist - Orion Express" uniform = /obj/item/clothing/under/rank/machinist/orion @@ -76,7 +76,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/obj/outfit/job/mining/orion +/datum/outfit/job/mining/orion name = "Shaft Miner - Orion Express" uniform = /obj/item/clothing/under/rank/miner/orion @@ -87,7 +87,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/obj/outfit/job/representative/orion +/datum/outfit/job/representative/orion name = "Orion Express Corporate Liaison" head = /obj/item/clothing/head/beret/corporate/orion @@ -102,7 +102,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/obj/outfit/job/bartender/orion +/datum/outfit/job/bartender/orion name = "Bartender - Orion Express" uniform = /obj/item/clothing/under/rank/bartender/orion @@ -115,7 +115,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/obj/outfit/job/chef/orion +/datum/outfit/job/chef/orion name = "Chef - Orion Express" uniform = /obj/item/clothing/under/rank/chef/orion @@ -128,7 +128,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/obj/outfit/job/hydro/orion +/datum/outfit/job/hydro/orion name = "Gardener - Orion Express" uniform = /obj/item/clothing/under/rank/hydroponics/orion @@ -140,7 +140,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/obj/outfit/job/janitor/orion +/datum/outfit/job/janitor/orion name = "Janitor - Orion Express" uniform = /obj/item/clothing/under/rank/janitor/orion @@ -152,7 +152,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/obj/outfit/job/librarian/orion +/datum/outfit/job/librarian/orion name = "Librarian - Orion Express" uniform = /obj/item/clothing/under/librarian/orion @@ -163,14 +163,14 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/obj/outfit/job/librarian/orion/curator +/datum/outfit/job/librarian/orion/curator name = "Curator - Orion Express" jobtype = /datum/job/librarian r_pocket = /obj/item/device/price_scanner l_hand = null -/obj/outfit/job/librarian/orion/tech_support +/datum/outfit/job/librarian/orion/tech_support name = "Tech Support - Orion Express" jobtype = /datum/job/librarian @@ -180,7 +180,7 @@ l_hand = /obj/item/device/debugger wrist = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian -/obj/outfit/job/journalist/orion +/datum/outfit/job/journalist/orion name = "Corporate Reporter - Orion Express" uniform = /obj/item/clothing/under/librarian/orion @@ -191,7 +191,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/obj/outfit/job/chaplain/orion +/datum/outfit/job/chaplain/orion name = "Chaplain - Orion Express" id = /obj/item/card/id/orion @@ -201,7 +201,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/obj/outfit/job/visitor/orion +/datum/outfit/job/visitor/orion name = "Off-Duty Crew Member - Orion Express" id = /obj/item/card/id/orion @@ -211,7 +211,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/obj/outfit/job/hangar_tech/event/orion +/datum/outfit/job/hangar_tech/event/orion name = "Hangar Technician - Orion Express" uniform = /obj/item/clothing/under/rank/hangar_technician/orion diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index a4aa7284164..61a892a6ba0 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -34,26 +34,26 @@ ) titles_to_loadout = list( - "Security Officer" = /obj/outfit/job/officer/pmc, - "Warden" = /obj/outfit/job/warden/pmc, - "Security Cadet" = /obj/outfit/job/intern_sec/officer/pmc, - "Investigator Intern" = /obj/outfit/job/intern_sec/forensics/pmc, - "Investigator" =/obj/outfit/job/forensics/pmc, - "Physician" = /obj/outfit/job/doctor/pmc, - "Surgeon" = /obj/outfit/job/doctor/surgeon/pmc, - "Pharmacist" = /obj/outfit/job/pharmacist/pmc, - "Psychiatrist" = /obj/outfit/job/psychiatrist/pmc, - "Psychologist" = /obj/outfit/job/psychiatrist/pmc, - "Paramedic" = /obj/outfit/job/med_tech/pmc, - "Medical Intern" = /obj/outfit/job/intern_med/pmc, - "Corporate Reporter" = /obj/outfit/job/journalist/pmc, - "Corporate Liaison" = /obj/outfit/job/representative/pmc, - "Off-Duty Crew Member" = /obj/outfit/job/visitor/pmc, - "Security Personnel" = /obj/outfit/job/officer/event/pmc, - "Medical Personnel" = /obj/outfit/job/med_tech/event/pmc + "Security Officer" = /datum/outfit/job/officer/pmc, + "Warden" = /datum/outfit/job/warden/pmc, + "Security Cadet" = /datum/outfit/job/intern_sec/officer/pmc, + "Investigator Intern" = /datum/outfit/job/intern_sec/forensics/pmc, + "Investigator" =/datum/outfit/job/forensics/pmc, + "Physician" = /datum/outfit/job/doctor/pmc, + "Surgeon" = /datum/outfit/job/doctor/surgeon/pmc, + "Pharmacist" = /datum/outfit/job/pharmacist/pmc, + "Psychiatrist" = /datum/outfit/job/psychiatrist/pmc, + "Psychologist" = /datum/outfit/job/psychiatrist/pmc, + "Paramedic" = /datum/outfit/job/med_tech/pmc, + "Medical Intern" = /datum/outfit/job/intern_med/pmc, + "Corporate Reporter" = /datum/outfit/job/journalist/pmc, + "Corporate Liaison" = /datum/outfit/job/representative/pmc, + "Off-Duty Crew Member" = /datum/outfit/job/visitor/pmc, + "Security Personnel" = /datum/outfit/job/officer/event/pmc, + "Medical Personnel" = /datum/outfit/job/med_tech/event/pmc ) -/obj/outfit/job/officer/pmc +/datum/outfit/job/officer/pmc name = "Security Officer - PMC" uniform = /obj/item/clothing/under/rank/security/pmc @@ -64,7 +64,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/warden/pmc +/datum/outfit/job/warden/pmc name = "Warden - PMC" head = /obj/item/clothing/head/warden/pmc @@ -78,7 +78,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/intern_sec/officer/pmc +/datum/outfit/job/intern_sec/officer/pmc name = "Security Cadet - PMC" uniform = /obj/item/clothing/under/rank/cadet/pmc @@ -89,7 +89,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/intern_sec/forensics/pmc +/datum/outfit/job/intern_sec/forensics/pmc name = "Investigator Intern - PMC" uniform = /obj/item/clothing/under/rank/cadet/pmc @@ -100,7 +100,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/forensics/pmc +/datum/outfit/job/forensics/pmc name = "Investigator - PMC" uniform = /obj/item/clothing/under/det/pmc @@ -112,7 +112,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/doctor/pmc +/datum/outfit/job/doctor/pmc name = "Physician - PMC" uniform = /obj/item/clothing/under/rank/medical/pmc @@ -125,7 +125,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/doctor/surgeon/pmc +/datum/outfit/job/doctor/surgeon/pmc name = "Surgeon - PMC" uniform = /obj/item/clothing/under/rank/medical/surgeon/pmc @@ -138,11 +138,11 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/doctor/surgeon/pmc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/doctor/surgeon/pmc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(!isskrell(H)) H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/pmc(H), slot_head) -/obj/outfit/job/pharmacist/pmc +/datum/outfit/job/pharmacist/pmc name = "Pharmacist - PMC" uniform = /obj/item/clothing/under/rank/medical/pharmacist/pmc @@ -155,7 +155,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/psychiatrist/pmc +/datum/outfit/job/psychiatrist/pmc name = "Psychiatrist - PMC" uniform = /obj/item/clothing/under/rank/medical/psych/pmc @@ -167,7 +167,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/med_tech/pmc +/datum/outfit/job/med_tech/pmc name = "Paramedic - PMC" head = /obj/item/clothing/head/softcap/pmc @@ -180,7 +180,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/intern_med/pmc +/datum/outfit/job/intern_med/pmc name = "Medical Intern - PMC" uniform = /obj/item/clothing/under/rank/medical/intern/pmc @@ -192,7 +192,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/representative/pmc +/datum/outfit/job/representative/pmc name = "PMC Corporate Liaison" head = /obj/item/clothing/head/beret/corporate/pmc @@ -207,7 +207,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/journalist/pmc +/datum/outfit/job/journalist/pmc name = "Corporate Reporter - PMC" uniform = /obj/item/clothing/under/librarian/pmc @@ -218,7 +218,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/visitor/pmc +/datum/outfit/job/visitor/pmc name = "Off-Duty Crew Member - PMC" id = /obj/item/card/id/pmc @@ -228,7 +228,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/officer/event/pmc +/datum/outfit/job/officer/event/pmc name = "Security Personnel - PMC" uniform = /obj/item/clothing/under/rank/security/pmc @@ -239,7 +239,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg -/obj/outfit/job/med_tech/event/pmc +/datum/outfit/job/med_tech/event/pmc name = "Medical Personnel - PMC" head = /obj/item/clothing/head/softcap/pmc diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm index 98b36d866d6..91b016b47c7 100644 --- a/code/game/jobs/faction/zavodskoi.dm +++ b/code/game/jobs/faction/zavodskoi.dm @@ -46,30 +46,30 @@ ) titles_to_loadout = list( - "Security Officer" = /obj/outfit/job/officer/zavodskoi, - "Warden" = /obj/outfit/job/warden/zavodskoi, - "Security Cadet" = /obj/outfit/job/intern_sec/officer/zavodskoi, - "Investigator Intern" = /obj/outfit/job/intern_sec/forensics/zavodskoi, - "Investigator" =/obj/outfit/job/forensics/zavodskoi, - "Scientist" = /obj/outfit/job/scientist/zavodskoi, - "Xenobiologist" = /obj/outfit/job/scientist/xenobiologist/zavodskoi, - "Xenobotanist" = /obj/outfit/job/scientist/xenobotanist/zavodskoi, - "Lab Assistant" = /obj/outfit/job/intern_sci/zavodskoi, - "Xenoarchaeologist"= /obj/outfit/job/scientist/xenoarchaeologist/zavodskoi, - "Anomalist"= /obj/outfit/job/scientist/anomalist/zavodskoi, - "Engineer" = /obj/outfit/job/engineer/zavodskoi, - "Atmospheric Technician" = /obj/outfit/job/atmos/zavodskoi, - "Engineering Apprentice" = /obj/outfit/job/intern_eng/zavodskoi, - "Atmospherics Apprentice" = /obj/outfit/job/intern_atmos/zavodskoi, - "Corporate Reporter" = /obj/outfit/job/journalist/zavodskoi, - "Corporate Liaison" = /obj/outfit/job/representative/zavodskoi, - "Off-Duty Crew Member" = /obj/outfit/job/visitor/zavodskoi, - "Security Personnel" = /obj/outfit/job/officer/event/zavodskoi, - "Engineering Personnel" = /obj/outfit/job/engineer/event/zavodskoi, - "Science Personnel" = /obj/outfit/job/scientist/event/zavodskoi + "Security Officer" = /datum/outfit/job/officer/zavodskoi, + "Warden" = /datum/outfit/job/warden/zavodskoi, + "Security Cadet" = /datum/outfit/job/intern_sec/officer/zavodskoi, + "Investigator Intern" = /datum/outfit/job/intern_sec/forensics/zavodskoi, + "Investigator" =/datum/outfit/job/forensics/zavodskoi, + "Scientist" = /datum/outfit/job/scientist/zavodskoi, + "Xenobiologist" = /datum/outfit/job/scientist/xenobiologist/zavodskoi, + "Xenobotanist" = /datum/outfit/job/scientist/xenobotanist/zavodskoi, + "Lab Assistant" = /datum/outfit/job/intern_sci/zavodskoi, + "Xenoarchaeologist"= /datum/outfit/job/scientist/xenoarchaeologist/zavodskoi, + "Anomalist"= /datum/outfit/job/scientist/anomalist/zavodskoi, + "Engineer" = /datum/outfit/job/engineer/zavodskoi, + "Atmospheric Technician" = /datum/outfit/job/atmos/zavodskoi, + "Engineering Apprentice" = /datum/outfit/job/intern_eng/zavodskoi, + "Atmospherics Apprentice" = /datum/outfit/job/intern_atmos/zavodskoi, + "Corporate Reporter" = /datum/outfit/job/journalist/zavodskoi, + "Corporate Liaison" = /datum/outfit/job/representative/zavodskoi, + "Off-Duty Crew Member" = /datum/outfit/job/visitor/zavodskoi, + "Security Personnel" = /datum/outfit/job/officer/event/zavodskoi, + "Engineering Personnel" = /datum/outfit/job/engineer/event/zavodskoi, + "Science Personnel" = /datum/outfit/job/scientist/event/zavodskoi ) -/obj/outfit/job/officer/zavodskoi +/datum/outfit/job/officer/zavodskoi name = "Security Officer - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/security/zavod @@ -80,7 +80,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/warden/zavodskoi +/datum/outfit/job/warden/zavodskoi name = "Warden - Zavodskoi Interstellar" head = /obj/item/clothing/head/warden/zavod @@ -94,7 +94,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/intern_sec/officer/zavodskoi +/datum/outfit/job/intern_sec/officer/zavodskoi name = "Security Cadet - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/cadet/zavod @@ -105,7 +105,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/intern_sec/forensics/zavodskoi +/datum/outfit/job/intern_sec/forensics/zavodskoi name = "Investigator Intern - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/cadet/zavod @@ -116,7 +116,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/forensics/zavodskoi +/datum/outfit/job/forensics/zavodskoi name = "Investigator - Zavodskoi Interstellar" id = /obj/item/card/id/zavodskoi/sec @@ -128,7 +128,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/scientist/zavodskoi +/datum/outfit/job/scientist/zavodskoi name = "Scientist - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/scientist/zavod @@ -141,7 +141,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/scientist/xenobiologist/zavodskoi +/datum/outfit/job/scientist/xenobiologist/zavodskoi name = "Xenobiologist - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/scientist/xenobio/zavod @@ -154,7 +154,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/scientist/xenobotanist/zavodskoi +/datum/outfit/job/scientist/xenobotanist/zavodskoi name = "Xenobotanist - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/scientist/botany/zavod @@ -162,7 +162,7 @@ id = /obj/item/card/id/zavodskoi shoes = /obj/item/clothing/shoes/sneakers/medsci/zavod -/obj/outfit/job/scientist/xenoarchaeologist/zavodskoi +/datum/outfit/job/scientist/xenoarchaeologist/zavodskoi name = "Xenoarchaeologist - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/scientist/xenoarchaeologist/zavod @@ -175,7 +175,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/scientist/anomalist/zavodskoi +/datum/outfit/job/scientist/anomalist/zavodskoi name = "Anomalist - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/scientist/anomalist/zavod @@ -188,7 +188,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/intern_sci/zavodskoi +/datum/outfit/job/intern_sci/zavodskoi name = "Lab Assistant - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/scientist/intern/zavod @@ -200,7 +200,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/engineer/zavodskoi +/datum/outfit/job/engineer/zavodskoi name = "Engineer - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/engineer/zavod @@ -212,7 +212,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/atmos/zavodskoi +/datum/outfit/job/atmos/zavodskoi name = "Atmospheric Technician - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/atmospheric_technician/zavod @@ -224,7 +224,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/intern_eng/zavodskoi +/datum/outfit/job/intern_eng/zavodskoi name = "Engineering Apprentice - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/engineer/apprentice/zavod @@ -236,7 +236,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/intern_atmos/zavodskoi +/datum/outfit/job/intern_atmos/zavodskoi name = "Atmospherics Apprentice - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/engineer/apprentice/zavod @@ -248,7 +248,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/representative/zavodskoi +/datum/outfit/job/representative/zavodskoi name = "Zavodskoi Interstellar Corporate Liaison" head = /obj/item/clothing/head/beret/corporate/zavod @@ -269,7 +269,7 @@ /obj/item/stamp/zavodskoi = 1 ) -/obj/outfit/job/journalist/zavodskoi +/datum/outfit/job/journalist/zavodskoi name = "Corporate Reporter - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/librarian/zavod @@ -280,7 +280,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/visitor/zavodskoi +/datum/outfit/job/visitor/zavodskoi name = "Off-Duty Crew Member - Zavodskoi Interstellar" id = /obj/item/card/id/zavodskoi @@ -290,7 +290,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/officer/event/zavodskoi +/datum/outfit/job/officer/event/zavodskoi name = "Security Personnel - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/security/zavod @@ -301,7 +301,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/scientist/event/zavodskoi +/datum/outfit/job/scientist/event/zavodskoi name = "Research Personnel - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/scientist/zavod @@ -314,7 +314,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/obj/outfit/job/engineer/event/zavodskoi +/datum/outfit/job/engineer/event/zavodskoi name = "Engineering Personnel - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/engineer/zavod diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index 245dd0cc5b0..8544c941851 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -40,27 +40,27 @@ ) titles_to_loadout = list( - "Physician" = /obj/outfit/job/doctor/zeng_hu, - "Surgeon" = /obj/outfit/job/doctor/surgeon/zeng_hu, - "Pharmacist" = /obj/outfit/job/pharmacist/zeng_hu, - "Psychiatrist" = /obj/outfit/job/psychiatrist/zeng_hu, - "Psychologist" = /obj/outfit/job/psychiatrist/zeng_hu, - "Paramedic" = /obj/outfit/job/med_tech/zeng_hu, - "Medical Intern" = /obj/outfit/job/intern_med/zeng_hu, - "Scientist" = /obj/outfit/job/scientist/zeng_hu, - "Xenobiologist" = /obj/outfit/job/scientist/xenobiologist/zeng_hu, - "Anomalist" = /obj/outfit/job/scientist/anomalist/zeng_hu, - "Xenobotanist" = /obj/outfit/job/scientist/xenobotanist/zeng_hu, - "Lab Assistant" = /obj/outfit/job/intern_sci/zeng_hu, - "Xenoarchaeologist"= /obj/outfit/job/scientist/xenoarchaeologist/zeng_hu, - "Corporate Reporter" = /obj/outfit/job/journalist/zeng_hu, - "Corporate Liaison" = /obj/outfit/job/representative/zeng_hu, - "Off-Duty Crew Member" = /obj/outfit/job/visitor/zeng_hu, - "Science Personnel" = /obj/outfit/job/scientist/event/zeng_hu, - "Medical Personnel" = /obj/outfit/job/med_tech/event/zeng_hu + "Physician" = /datum/outfit/job/doctor/zeng_hu, + "Surgeon" = /datum/outfit/job/doctor/surgeon/zeng_hu, + "Pharmacist" = /datum/outfit/job/pharmacist/zeng_hu, + "Psychiatrist" = /datum/outfit/job/psychiatrist/zeng_hu, + "Psychologist" = /datum/outfit/job/psychiatrist/zeng_hu, + "Paramedic" = /datum/outfit/job/med_tech/zeng_hu, + "Medical Intern" = /datum/outfit/job/intern_med/zeng_hu, + "Scientist" = /datum/outfit/job/scientist/zeng_hu, + "Xenobiologist" = /datum/outfit/job/scientist/xenobiologist/zeng_hu, + "Anomalist" = /datum/outfit/job/scientist/anomalist/zeng_hu, + "Xenobotanist" = /datum/outfit/job/scientist/xenobotanist/zeng_hu, + "Lab Assistant" = /datum/outfit/job/intern_sci/zeng_hu, + "Xenoarchaeologist"= /datum/outfit/job/scientist/xenoarchaeologist/zeng_hu, + "Corporate Reporter" = /datum/outfit/job/journalist/zeng_hu, + "Corporate Liaison" = /datum/outfit/job/representative/zeng_hu, + "Off-Duty Crew Member" = /datum/outfit/job/visitor/zeng_hu, + "Science Personnel" = /datum/outfit/job/scientist/event/zeng_hu, + "Medical Personnel" = /datum/outfit/job/med_tech/event/zeng_hu ) -/obj/outfit/job/doctor/zeng_hu +/datum/outfit/job/doctor/zeng_hu name = "Physician - Zeng-Hu" uniform = /obj/item/clothing/under/rank/medical/zeng @@ -73,7 +73,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/doctor/surgeon/zeng_hu +/datum/outfit/job/doctor/surgeon/zeng_hu name = "Surgeon - Zeng-Hu" uniform = /obj/item/clothing/under/rank/medical/surgeon/zeng @@ -86,11 +86,11 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/doctor/surgeon/zeng_hu/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/doctor/surgeon/zeng_hu/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(!isskrell(H)) H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/zeng(H), slot_head) -/obj/outfit/job/pharmacist/zeng_hu +/datum/outfit/job/pharmacist/zeng_hu name = "Pharmacist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/medical/pharmacist/zeng @@ -103,7 +103,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/psychiatrist/zeng_hu +/datum/outfit/job/psychiatrist/zeng_hu name = "Psychiatrist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/medical/psych/zeng @@ -116,7 +116,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/med_tech/zeng_hu +/datum/outfit/job/med_tech/zeng_hu name = "Paramedic - Zeng-Hu" head = /obj/item/clothing/head/softcap/zeng @@ -129,7 +129,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/intern_med/zeng_hu +/datum/outfit/job/intern_med/zeng_hu name = "Medical Intern - Zeng-Hu" uniform = /obj/item/clothing/under/rank/medical/intern/zeng @@ -141,7 +141,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/scientist/zeng_hu +/datum/outfit/job/scientist/zeng_hu name = "Scientist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/scientist/zeng @@ -154,7 +154,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/scientist/xenobiologist/zeng_hu +/datum/outfit/job/scientist/xenobiologist/zeng_hu name = "Xenobiologist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/scientist/xenobio/zeng @@ -167,7 +167,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/scientist/xenobotanist/zeng_hu +/datum/outfit/job/scientist/xenobotanist/zeng_hu name = "Xenobotanist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/scientist/botany/zeng @@ -180,7 +180,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/scientist/xenoarchaeologist/zeng_hu +/datum/outfit/job/scientist/xenoarchaeologist/zeng_hu name = "Xenoarchaeologist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/scientist/xenoarchaeologist/zeng @@ -193,7 +193,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/scientist/anomalist/zeng_hu +/datum/outfit/job/scientist/anomalist/zeng_hu name = "Xenoarchaeologist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/scientist/anomalist/zeng @@ -206,7 +206,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/intern_sci/zeng_hu +/datum/outfit/job/intern_sci/zeng_hu name = "Lab Assistant - Zeng-Hu" uniform = /obj/item/clothing/under/rank/scientist/intern/zeng @@ -218,7 +218,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/representative/zeng_hu +/datum/outfit/job/representative/zeng_hu name = "Zeng-Hu Corporate Liaison" head = /obj/item/clothing/head/beret/corporate/zeng @@ -238,7 +238,7 @@ /obj/item/gun/energy/pistol = 1, /obj/item/stamp/zeng_hu = 1 ) -/obj/outfit/job/journalist/zeng_hu +/datum/outfit/job/journalist/zeng_hu name = "Corporate Reporter - Zeng-Hu" uniform = /obj/item/clothing/under/librarian/zeng @@ -249,7 +249,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/visitor/zeng_hu +/datum/outfit/job/visitor/zeng_hu name = "Off-Duty Crew Member - Zeng-Hu" id = /obj/item/card/id/zeng_hu @@ -259,7 +259,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/med_tech/event/zeng_hu +/datum/outfit/job/med_tech/event/zeng_hu name = "Medical Personnel - Zeng-Hu" head = /obj/item/clothing/head/softcap/zeng @@ -272,7 +272,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/obj/outfit/job/scientist/event/zeng_hu +/datum/outfit/job/scientist/event/zeng_hu name = "Research Personnel - Zeng-Hu" uniform = /obj/item/clothing/under/rank/scientist/zeng diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index b74aa2786af..c5358aebab4 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -22,11 +22,11 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) SPECIES_SKRELL_AXIORI = 100 ) - outfit = /obj/outfit/job/captain + outfit = /datum/outfit/job/captain blacklisted_species = list(SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS) -/obj/outfit/job/captain +/datum/outfit/job/captain name = "Captain" jobtype = /datum/job/captain @@ -59,7 +59,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) dufflebag = /obj/item/storage/backpack/duffel/cap messengerbag = /obj/item/storage/backpack/messenger/com -/obj/outfit/job/captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(H && H.w_uniform) var/obj/item/clothing/under/U = H.w_uniform @@ -96,7 +96,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) SPECIES_SKRELL_AXIORI = 80 ) - outfit = /obj/outfit/job/xo + outfit = /datum/outfit/job/xo access = list(ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_SHIP_WEAPONS, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, @@ -110,7 +110,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/obj/outfit/job/xo +/datum/outfit/job/xo name = "Executive Officer" jobtype = /datum/job/xo @@ -155,14 +155,14 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) SPECIES_SKRELL_AXIORI = 55 ) - outfit = /obj/outfit/job/bridge_crew + outfit = /datum/outfit/job/bridge_crew access = list(ACCESS_EVA, ACCESS_HEADS, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS) minimal_access = list(ACCESS_HEADS, ACCESS_EVA, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS) blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/obj/outfit/job/bridge_crew +/datum/outfit/job/bridge_crew name = "Bridge Crew" jobtype = /datum/job/bridge_crew diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 72a0ee87826..b0eb955f35d 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -18,10 +18,10 @@ access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN) minimal_access = list(ACCESS_BAR) alt_titles = list("Barista") - outfit = /obj/outfit/job/bartender + outfit = /datum/outfit/job/bartender blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/obj/outfit/job/bartender +/datum/outfit/job/bartender name = "Bartender" jobtype = /datum/job/bartender @@ -65,10 +65,10 @@ access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN) minimal_access = list(ACCESS_KITCHEN) alt_titles = list("Cook") - outfit = /obj/outfit/job/chef + outfit = /datum/outfit/job/chef blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/obj/outfit/job/chef +/datum/outfit/job/chef name = "Chef" jobtype = /datum/job/chef @@ -115,11 +115,11 @@ access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN) minimal_access = list(ACCESS_HYDROPONICS) - outfit = /obj/outfit/job/hydro + outfit = /datum/outfit/job/hydro blacklisted_species = list(SPECIES_VAURCA_BREEDER) alt_titles = list("Hydroponicist") -/obj/outfit/job/hydro +/datum/outfit/job/hydro name = "Gardener" jobtype = /datum/job/hydro @@ -147,7 +147,7 @@ messengerbag = /obj/item/storage/backpack/messenger/hyd messengerbag_faction = /obj/item/storage/backpack/messenger/nt -/obj/outfit/job/hydro/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/hydro/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(istajara(H)) H.equip_or_collect(new /obj/item/clothing/gloves/botanic_leather/tajara(H), slot_gloves) @@ -168,11 +168,11 @@ 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) - outfit = /obj/outfit/job/janitor + outfit = /datum/outfit/job/janitor blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/obj/outfit/job/janitor +/datum/outfit/job/janitor name = "Janitor" jobtype = /datum/job/janitor @@ -208,13 +208,13 @@ access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS) minimal_access = list(ACCESS_LIBRARY) alt_titles = list("Curator", "Tech Support") - alt_outfits = list("Curator" = /obj/outfit/job/librarian/curator, "Tech Support" = /obj/outfit/job/librarian/tech_support) + alt_outfits = list("Curator" = /datum/outfit/job/librarian/curator, "Tech Support" = /datum/outfit/job/librarian/tech_support) title_accesses = list("Tech Support" = list(ACCESS_IT, ACCESS_TECH_STORAGE)) - outfit = /obj/outfit/job/librarian + outfit = /datum/outfit/job/librarian blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/obj/outfit/job/librarian +/datum/outfit/job/librarian name = "Librarian" jobtype = /datum/job/librarian @@ -238,7 +238,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/nt messengerbag_faction = /obj/item/storage/backpack/messenger/nt -/obj/outfit/job/librarian/curator +/datum/outfit/job/librarian/curator name = "Curator" jobtype = /datum/job/librarian @@ -246,7 +246,7 @@ r_pocket = /obj/item/device/price_scanner l_hand = null -/obj/outfit/job/librarian/tech_support +/datum/outfit/job/librarian/tech_support name = "Tech Support" jobtype = /datum/job/librarian @@ -257,7 +257,7 @@ l_hand = /obj/item/device/debugger wrist = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian -/obj/outfit/job/librarian/tech_support/equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/librarian/tech_support/equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(visualsOnly) r_hand = null else @@ -277,11 +277,11 @@ access = list(ACCESS_CHAPEL_OFFICE, ACCESS_MAINT_TUNNELS) minimal_access = list(ACCESS_CHAPEL_OFFICE) alt_titles = list("Presbyter", "Rabbi", "Imam", "Priest", "Priestess", "Shaman", "Counselor", "Keeper", "Shaper") - outfit = /obj/outfit/job/chaplain + outfit = /datum/outfit/job/chaplain blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/obj/outfit/job/chaplain +/datum/outfit/job/chaplain name = "Chaplain" jobtype = /datum/job/chaplain uniform = /obj/item/clothing/under/rank/chaplain @@ -302,7 +302,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/nt messengerbag_faction = /obj/item/storage/backpack/messenger/nt -/obj/outfit/job/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) @@ -358,11 +358,11 @@ minimal_access = list(ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_SHIP_WEAPONS, ACCESS_MINING_STATION, ACCESS_KEYCARD_AUTH, ACCESS_RC_ANNOUNCE, ACCESS_HEADS, ACCESS_SEC_DOORS, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_ROBOTICS, ACCESS_ENGINE, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_INTREPID) - outfit = /obj/outfit/job/operations_manager + outfit = /datum/outfit/job/operations_manager blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/obj/outfit/job/operations_manager +/datum/outfit/job/operations_manager name = "Operations Manager" jobtype = /datum/job/operations_manager @@ -407,11 +407,11 @@ access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_SHIP_WEAPONS, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION) minimal_access = list(ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_SHIP_WEAPONS, ACCESS_MAILSORTING) - outfit = /obj/outfit/job/hangar_tech + outfit = /datum/outfit/job/hangar_tech blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/obj/outfit/job/hangar_tech +/datum/outfit/job/hangar_tech name = "Hangar Technician" jobtype = /datum/job/hangar_tech @@ -449,11 +449,11 @@ access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION) minimal_access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING) - outfit = /obj/outfit/job/mining + outfit = /datum/outfit/job/mining blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/obj/outfit/job/mining +/datum/outfit/job/mining name = "Shaft Miner" jobtype = /datum/job/mining @@ -505,11 +505,11 @@ minimal_player_age = 7 - outfit = /obj/outfit/job/machinist + outfit = /datum/outfit/job/machinist blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/obj/outfit/job/machinist +/datum/outfit/job/machinist name = "Machinist" jobtype = /datum/job/machinist diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 7ca6679b95c..58114b768a4 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -28,11 +28,11 @@ ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_AI_UPLOAD, ACCESS_IT, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_NETWORK) minimal_player_age = 7 - outfit = /obj/outfit/job/chief_engineer + outfit = /datum/outfit/job/chief_engineer blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/obj/outfit/job/chief_engineer +/datum/outfit/job/chief_engineer name = "Chief Engineer" jobtype = /datum/job/chief_engineer box = /obj/item/storage/box/survival/engineer @@ -59,7 +59,7 @@ dufflebag = /obj/item/storage/backpack/duffel/ce messengerbag = /obj/item/storage/backpack/messenger/ce -/obj/outfit/job/chief_engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/chief_engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(istajara(H)) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots/toeless(H), slot_shoes) @@ -91,11 +91,11 @@ access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_LEVIATHAN) minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_LEVIATHAN) - outfit = /obj/outfit/job/engineer + outfit = /datum/outfit/job/engineer blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/obj/outfit/job/engineer +/datum/outfit/job/engineer name = "Engineer" jobtype = /datum/job/engineer box = /obj/item/storage/box/survival/engineer @@ -130,7 +130,7 @@ /obj/item/powerdrill = 1 ) -/obj/outfit/job/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(istajara(H)) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots/toeless(H), slot_shoes) @@ -160,10 +160,10 @@ access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_LEVIATHAN) minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_LEVIATHAN) - outfit = /obj/outfit/job/atmos + outfit = /datum/outfit/job/atmos blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/obj/outfit/job/atmos +/datum/outfit/job/atmos name = "Atmospheric Technician" jobtype = /datum/job/atmos box = /obj/item/storage/box/survival/engineer @@ -198,7 +198,7 @@ /obj/item/powerdrill = 1 ) -/obj/outfit/job/atmos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/atmos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(istajara(H)) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/workboots/toeless(H), slot_shoes) @@ -214,7 +214,7 @@ department_flag = ENGSEC faction = "Station" alt_titles = list("Atmospherics Apprentice") - alt_outfits = list("Atmospherics Apprentice" = /obj/outfit/job/intern_atmos) + alt_outfits = list("Atmospherics Apprentice" = /datum/outfit/job/intern_atmos) total_positions = 3 spawn_positions = 3 intro_prefix = "an" @@ -222,7 +222,7 @@ selection_color = "#c67519" access = list(ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE) minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE) - outfit = /obj/outfit/job/intern_eng + outfit = /datum/outfit/job/intern_eng blacklisted_species = list(SPECIES_VAURCA_BREEDER) minimum_character_age = list( @@ -231,7 +231,7 @@ SPECIES_SKRELL_AXIORI = 58 ) -/obj/outfit/job/intern_eng +/datum/outfit/job/intern_eng name = "Engineering Apprentice" jobtype = /datum/job/intern_eng box = /obj/item/storage/box/survival/engineer @@ -264,7 +264,7 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/engineering tablet = /obj/item/modular_computer/handheld/preset/engineering -/obj/outfit/job/intern_atmos +/datum/outfit/job/intern_atmos name = "Atmospherics Apprentice" jobtype = /datum/job/intern_eng box = /obj/item/storage/box/survival/engineer diff --git a/code/game/jobs/job/event.dm b/code/game/jobs/job/event.dm index ef8a2fb13f4..5628687ce02 100644 --- a/code/game/jobs/job/event.dm +++ b/code/game/jobs/job/event.dm @@ -20,11 +20,11 @@ access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS) minimal_access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS) minimal_player_age = 7 - outfit = /obj/outfit/job/officer/event + outfit = /datum/outfit/job/officer/event blacklisted_species = list(SPECIES_IPC_ZENGHU, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_XION_REMOTE, SPECIES_VAURCA_BULWARK, SPECIES_DIONA_COEUS, SPECIES_VAURCA_BREEDER) -/obj/outfit/job/officer/event +/datum/outfit/job/officer/event name = "Security Personnel" suit = /obj/item/clothing/suit/armor/carrier/officer head = /obj/item/clothing/head/helmet/security @@ -60,11 +60,11 @@ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST, ACCESS_PARAMEDIC) minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PARAMEDIC) - outfit = /obj/outfit/job/med_tech/event + outfit = /datum/outfit/job/med_tech/event blacklisted_species = list(SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G2, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/obj/outfit/job/med_tech/event +/datum/outfit/job/med_tech/event name = "Medical Personnel" belt = /obj/item/storage/belt/medical/paramedic belt_contents = list( @@ -103,11 +103,11 @@ access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_LEVIATHAN) minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_LEVIATHAN) - outfit = /obj/outfit/job/engineer/event + outfit = /datum/outfit/job/engineer/event blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/obj/outfit/job/engineer/event +/datum/outfit/job/engineer/event name = "Engineering Personnel" glasses = /obj/item/clothing/glasses/welding gloves = /obj/item/clothing/gloves/yellow @@ -152,10 +152,10 @@ minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_INTREPID) minimal_player_age = 14 - outfit = /obj/outfit/job/scientist/event + outfit = /datum/outfit/job/scientist/event blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/obj/outfit/job/scientist/event +/datum/outfit/job/scientist/event name = "Research Personnel" backpack_contents = list( /obj/item/storage/box/survival = 1, @@ -184,11 +184,11 @@ access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_SHIP_WEAPONS, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_ROBOTICS) minimal_access = list(ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_SHIP_WEAPONS, ACCESS_MAILSORTING) - outfit = /obj/outfit/job/hangar_tech/event + outfit = /datum/outfit/job/hangar_tech/event blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/obj/outfit/job/hangar_tech/event +/datum/outfit/job/hangar_tech/event name = "Operations Personnel" backpack_contents = list( /obj/item/storage/box/survival = 1, @@ -214,4 +214,4 @@ SPECIES_SKRELL_AXIORI = 50 ) access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN) - outfit = /obj/outfit/job/bartender + outfit = /datum/outfit/job/bartender diff --git a/code/game/jobs/job/hra.dm b/code/game/jobs/job/hra.dm index 81c68a89010..b497ac36ce8 100644 --- a/code/game/jobs/job/hra.dm +++ b/code/game/jobs/job/hra.dm @@ -18,11 +18,11 @@ minimal_access = list(ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_EVA, ACCESS_HEADS, ACCESS_MAINT_TUNNELS, ACCESS_CONSTRUCTION, ACCESS_RESEARCH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_CENT_CCIA) - outfit = /obj/outfit/job/hra + outfit = /datum/outfit/job/hra blacklisted_species = list(SPECIES_HUMAN_OFFWORLD, SPECIES_TAJARA, SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_IPC, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_ZENGHU, SPECIES_IPC_BISHOP, SPECIES_IPC_SHELL, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER, SPECIES_DIONA, SPECIES_DIONA_COEUS) -/obj/outfit/job/hra +/datum/outfit/job/hra name = "Human Resources Assistant" jobtype = /datum/job/hra @@ -56,7 +56,7 @@ /obj/item/modular_computer/laptop/preset/command = 1, ) -/obj/outfit/job/hra/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/hra/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(H && H.w_uniform) var/obj/item/clothing/under/U = H.w_uniform diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 2230fca558a..0c81997c2e5 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -35,8 +35,8 @@ var/economic_modifier = 2 // With how much does this job modify the initial account amount? var/create_record = TRUE // Do we announce/make records for people who spawn on this job? - var/obj/outfit/outfit = null - var/list/alt_outfits = null // A list of special outfits for the alt titles list("alttitle" = /obj/outfit) + var/datum/outfit/outfit = null + var/list/alt_outfits = null // A list of special outfits for the alt titles list("alttitle" = /datum/outfit) var/list/blacklisted_species = null // A blacklist of species that can't be this job var/list/blacklisted_citizenship = list() //A blacklist of citizenships that can't be this job @@ -120,8 +120,7 @@ if(!F.is_default) var/new_outfit = F.titles_to_loadout[title] if(ispath(new_outfit)) - var/obj/outfit/O = new new_outfit - O.pre_equip(H, TRUE) + var/datum/outfit/O = new new_outfit O.equip(H, TRUE) return @@ -204,7 +203,7 @@ /datum/job/proc/has_alt_title(var/mob/H, var/supplied_title, var/desired_title) return (supplied_title == desired_title) || (H.mind && H.mind.role_alt_title == desired_title) -/obj/outfit/job +/datum/outfit/job name = "Standard Gear" var/base_name = null collect_not_del = FALSE @@ -232,7 +231,7 @@ var/box = /obj/item/storage/box/survival -/obj/outfit/job/equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/equip(mob/living/carbon/human/H, visualsOnly = FALSE) back = null //Nulling the backpack here, since we already equipped the backpack in pre_equip if(box) var/spawnbox = box @@ -240,16 +239,16 @@ backpack_contents[spawnbox] = 1 . = ..() -/obj/outfit/job/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() -/obj/outfit/job/get_id_access(mob/living/carbon/human/H) +/datum/outfit/job/get_id_access(mob/living/carbon/human/H) var/datum/job/J = SSjobs.GetJobType(jobtype) if(!J) J = SSjobs.GetJob(H.job) return J.get_access(get_id_assignment(H, TRUE)) -/obj/outfit/job/get_id_rank(mob/living/carbon/human/H) +/datum/outfit/job/get_id_rank(mob/living/carbon/human/H) var/datum/job/J = SSjobs.GetJobType(jobtype) if(!J) J = SSjobs.GetJob(H.job) diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index a33f2eb1b98..8615747219a 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -27,11 +27,11 @@ ACCESS_PARAMEDIC, ACCESS_MAINT_TUNNELS, ACCESS_INTREPID, ACCESS_TELEPORTER) minimal_player_age = 10 - outfit = /obj/outfit/job/cmo + outfit = /datum/outfit/job/cmo blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/obj/outfit/job/cmo +/datum/outfit/job/cmo name = "Chief Medical Officer" jobtype = /datum/job/cmo @@ -77,7 +77,7 @@ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_EVA) minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_EVA) - outfit = /obj/outfit/job/doctor + outfit = /datum/outfit/job/doctor blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /datum/job/surgeon @@ -101,10 +101,10 @@ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_EVA) minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_GENETICS, ACCESS_EVA) - outfit = /obj/outfit/job/doctor/surgeon + outfit = /datum/outfit/job/doctor/surgeon blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/obj/outfit/job/doctor +/datum/outfit/job/doctor name = "Physician" base_name = "Physician" jobtype = /datum/job/doctor @@ -134,7 +134,7 @@ messengerbag = /obj/item/storage/backpack/messenger/med messengerbag_faction = /obj/item/storage/backpack/messenger/nt -/obj/outfit/job/doctor/surgeon +/datum/outfit/job/doctor/surgeon name = "Surgeon" jobtype = /datum/job/surgeon @@ -142,7 +142,7 @@ suit = /obj/item/clothing/suit/storage/toggle/labcoat/nt shoes = /obj/item/clothing/shoes/sneakers/medsci -/obj/outfit/job/doctor/surgeon/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/doctor/surgeon/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(!isskrell(H)) H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery(H), slot_head) @@ -166,10 +166,10 @@ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS) minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_PHARMACY, ACCESS_VIROLOGY) - outfit = /obj/outfit/job/pharmacist + outfit = /datum/outfit/job/pharmacist blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/obj/outfit/job/pharmacist +/datum/outfit/job/pharmacist name = "Pharmacist" jobtype = /datum/job/pharmacist @@ -218,11 +218,11 @@ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_PSYCHIATRIST) minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_PSYCHIATRIST) alt_titles = list("Psychologist") - outfit = /obj/outfit/job/psychiatrist - alt_outfits = list("Psychologist" = /obj/outfit/job/psychiatrist/psycho) + outfit = /datum/outfit/job/psychiatrist + alt_outfits = list("Psychologist" = /datum/outfit/job/psychiatrist/psycho) blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/obj/outfit/job/psychiatrist +/datum/outfit/job/psychiatrist name = "Psychiatrist" base_name = "Psychiatrist" jobtype = /datum/job/psychiatrist @@ -251,7 +251,7 @@ messengerbag = /obj/item/storage/backpack/messenger/psych messengerbag_faction = /obj/item/storage/backpack/messenger/nt -/obj/outfit/job/psychiatrist/psycho +/datum/outfit/job/psychiatrist/psycho name = "Psychologist" jobtype = /datum/job/psychiatrist @@ -275,11 +275,11 @@ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST, ACCESS_PARAMEDIC) minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PARAMEDIC) - outfit = /obj/outfit/job/med_tech + outfit = /datum/outfit/job/med_tech blacklisted_species = list(SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G2, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/obj/outfit/job/med_tech +/datum/outfit/job/med_tech name = "Paramedic" base_name = "Paramedic" jobtype = /datum/job/med_tech @@ -320,7 +320,7 @@ department_flag = MEDSCI faction = "Station" alt_titles = list("Paramedic Trainee", "Pharmacy Intern", "Resident Physician", "Resident Surgeon", "Resident Psychiatrist") - alt_outfits = list("Paramedic Trainee" = /obj/outfit/job/intern_med/medtech, "Pharmacy Intern" = /obj/outfit/job/intern_med/pharmacist, "Resident Surgeon" = /obj/outfit/job/intern_med/surgeon, "Resident Psychiatrist" = /obj/outfit/job/intern_med/psychiatrist) + alt_outfits = list("Paramedic Trainee" = /datum/outfit/job/intern_med/medtech, "Pharmacy Intern" = /datum/outfit/job/intern_med/pharmacist, "Resident Surgeon" = /datum/outfit/job/intern_med/surgeon, "Resident Psychiatrist" = /datum/outfit/job/intern_med/psychiatrist) alt_ages = list("Pharmacy Intern" = list( SPECIES_HUMAN = 25, SPECIES_SKRELL = 58, @@ -352,10 +352,10 @@ SPECIES_SKRELL = 50, SPECIES_SKRELL_AXIORI = 50 ) - outfit = /obj/outfit/job/intern_med + outfit = /datum/outfit/job/intern_med blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/obj/outfit/job/intern_med +/datum/outfit/job/intern_med name = "Medical Intern" jobtype = /datum/job/intern_med @@ -380,7 +380,7 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical tablet = /obj/item/modular_computer/handheld/preset/medical -/obj/outfit/job/intern_med/medtech +/datum/outfit/job/intern_med/medtech name = "Paramedic Trainee" head = /obj/item/clothing/head/softcap/nt @@ -395,7 +395,7 @@ /obj/item/storage/firstaid = 1 ) -/obj/outfit/job/intern_med/pharmacist +/datum/outfit/job/intern_med/pharmacist name = "Pharmacy Intern" shoes = /obj/item/clothing/shoes/sneakers/medsci @@ -405,16 +405,16 @@ dufflebag = /obj/item/storage/backpack/duffel/pharm messengerbag = /obj/item/storage/backpack/messenger/pharm -/obj/outfit/job/intern_med/surgeon +/datum/outfit/job/intern_med/surgeon name = "Resident Surgeon" shoes = /obj/item/clothing/shoes/sneakers/medsci -/obj/outfit/job/intern_med/surgeon/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/intern_med/surgeon/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(!isskrell(H)) H.equip_to_slot_or_del(new /obj/item/clothing/head/surgery(H), slot_head) -/obj/outfit/job/intern_med/psychiatrist +/datum/outfit/job/intern_med/psychiatrist name = "Resident Psychiatrist" shoes = /obj/item/clothing/shoes/sneakers/medsci diff --git a/code/game/jobs/job/outsider/merchant.dm b/code/game/jobs/job/outsider/merchant.dm index 9b57ca35e9f..4838f76897e 100644 --- a/code/game/jobs/job/outsider/merchant.dm +++ b/code/game/jobs/job/outsider/merchant.dm @@ -21,7 +21,7 @@ latejoin_at_spawnpoints = TRUE - outfit = /obj/outfit/job/merchant + outfit = /datum/outfit/job/merchant blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /datum/job/merchant/announce(mob/living/carbon/human/H) @@ -33,7 +33,7 @@ spawn_positions = 1 total_positions = 1 -/obj/outfit/job/merchant +/datum/outfit/job/merchant name = "Merchant" jobtype = /datum/job/merchant @@ -46,7 +46,7 @@ tablet = /obj/item/modular_computer/handheld/preset/civilian r_pocket = /obj/item/device/price_scanner -/obj/outfit/merchant_assistant +/datum/outfit/merchant_assistant name = "Merchant's Assistant" id = /obj/item/card/id/merchant tab_pda = /obj/item/modular_computer/handheld/pda/civilian/merchant @@ -85,8 +85,8 @@ /obj/item/storage/wallet/random = 1 ) -/obj/outfit/merchant_assistant/get_id_rank(mob/living/carbon/human/H) +/datum/outfit/merchant_assistant/get_id_rank(mob/living/carbon/human/H) return "Merchant's Assistant" -/obj/outfit/merchant_assistant/get_id_access() +/datum/outfit/merchant_assistant/get_id_access() return list(ACCESS_MERCHANT) diff --git a/code/game/jobs/job/outsider/representative.dm b/code/game/jobs/job/outsider/representative.dm index c52cf6edd54..6444f1e7c27 100644 --- a/code/game/jobs/job/outsider/representative.dm +++ b/code/game/jobs/job/outsider/representative.dm @@ -22,12 +22,12 @@ "Corporate Reporter" = list("NanoTrasen", "Idris Incorporated", "Hephaestus Industries", "Orion Express", "Zavodskoi Interstellar", "Zeng-Hu Pharmaceuticals", "Private Military Contracting Group", "Stellar Corporate Conglomerate"), "Freelance Journalist" = list("Independent") ) - alt_outfits = list("Freelance Journalist" = /obj/outfit/job/journalistf) + alt_outfits = list("Freelance Journalist" = /datum/outfit/job/journalistf) title_accesses = list("Corporate Reporter" = list(ACCESS_MEDICAL, ACCESS_SEC_DOORS, ACCESS_RESEARCH, ACCESS_ENGINE)) - outfit = /obj/outfit/job/journalist + outfit = /datum/outfit/job/journalist blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/obj/outfit/job/journalist +/datum/outfit/job/journalist name = "Corporate Reporter" jobtype = /datum/job/journalist @@ -53,7 +53,7 @@ /obj/item/device/tvcamera = 1 ) -/obj/outfit/job/journalistf +/datum/outfit/job/journalistf name = "Freelance Journalist" jobtype = /datum/job/journalist @@ -94,7 +94,7 @@ "Corporate Representative", "Corporate Executive" ) - outfit = /obj/outfit/job/representative + outfit = /datum/outfit/job/representative blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /datum/job/representative/after_spawn(mob/living/carbon/human/H) @@ -105,7 +105,7 @@ var/datum/faction/faction = SSjobs.GetFaction(H) LAZYDISTINCTADD(faction.allowed_role_types, REPRESENTATIVE_ROLE) -/obj/outfit/job/representative +/datum/outfit/job/representative name = "NanoTrasen Corporate Liaison" var/fax_department = "Representative's Office" jobtype = /datum/job/representative @@ -130,13 +130,13 @@ /obj/item/gun/energy/pistol = 1 ) -/obj/outfit/job/representative/post_equip(mob/living/carbon/human/H, visualsOnly) +/datum/outfit/job/representative/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() if(H && !visualsOnly) addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES) return TRUE -/obj/outfit/job/representative/proc/send_representative_mission(var/mob/living/carbon/human/H) +/datum/outfit/job/representative/proc/send_representative_mission(var/mob/living/carbon/human/H) var/faxtext = "


Directives Report

" faxtext += "Attention [name], the following directives are to be fulfilled during your stay in the station: