From 85d27eb1d0eb55e7bc77cf628aca8f2dba2a63c8 Mon Sep 17 00:00:00 2001 From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com> Date: Sun, 10 Mar 2024 12:33:32 +0100 Subject: [PATCH] Outfits objectified (#18611) * oof * ugh * fqewavdf * 4ryh --------- Co-authored-by: DreamySkrell <> --- code/controllers/subsystems/job.dm | 2 +- .../controllers/subsystems/virtual_reality.dm | 4 +- code/datums/outfits/ert/ap_eridani.dm | 12 +- code/datums/outfits/ert/coalition.dm | 22 ++-- code/datums/outfits/ert/deathsquad.dm | 8 +- code/datums/outfits/ert/elyra.dm | 12 +- code/datums/outfits/ert/fsf.dm | 12 +- code/datums/outfits/ert/hephaestus_ert.dm | 10 +- code/datums/outfits/ert/iac.dm | 10 +- 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/scc_ert.dm | 10 +- code/datums/outfits/ert/syndicate.dm | 4 +- code/datums/outfits/ert/tcfl.dm | 18 +-- code/datums/outfits/event/outfit_events.dm | 18 +-- code/datums/outfits/event/outfit_killers.dm | 10 +- code/datums/outfits/event/outfit_megacorps.dm | 14 +-- .../datums/outfits/event/outfit_nanotrasen.dm | 40 +++---- code/datums/outfits/event/outfit_scc.dm | 8 +- code/datums/outfits/event/outfit_tfcl.dm | 4 +- code/datums/outfits/outfit.dm | 113 +++++++++++++++--- code/datums/outfits/outfit_admin.dm | 22 ++-- 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 | 44 +++---- code/game/jobs/faction/idris.dm | 68 +++++------ code/game/jobs/faction/nanotrasen.dm | 4 +- code/game/jobs/faction/orion_express.dm | 60 +++++----- code/game/jobs/faction/pmc.dm | 64 +++++----- code/game/jobs/faction/zavodskoi.dm | 74 ++++++------ code/game/jobs/faction/zeng_hu.dm | 64 +++++----- 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 | 10 +- code/game/jobs/job/hra.dm | 6 +- code/game/jobs/job/job.dm | 16 +-- code/game/jobs/job/medical.dm | 46 +++---- code/game/jobs/job/outsider/merchant.dm | 10 +- code/game/jobs/job/outsider/representative.dm | 24 ++-- code/game/jobs/job/science.dm | 24 ++-- code/game/jobs/job/security.dm | 40 +++---- code/game/jobs/job/ship_crew.dm | 12 +- code/modules/admin/verbs/debug.dm | 50 ++++---- .../background/citizenship/citizenship.dm | 2 +- code/modules/background/citizenship/human.dm | 22 ++-- code/modules/background/citizenship/ipc.dm | 4 +- code/modules/background/citizenship/skrell.dm | 6 +- code/modules/background/citizenship/tajara.dm | 12 +- code/modules/background/citizenship/unathi.dm | 6 +- code/modules/background/citizenship/vaurca.dm | 18 +-- .../ghostroles/spawner/human/admin/admin.dm | 14 +-- .../ghostroles/spawner/human/admin/ccia.dm | 16 +-- .../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 +- .../responseteams/corporate/hephaestus.dm | 8 +- .../human/responseteams/corporate/nt_ert.dm | 6 +- .../human/responseteams/corporate/scc_ert.dm | 8 +- .../spawner/human/responseteams/deathsquad.dm | 4 +- .../human/responseteams/human/coalition.dm | 16 +-- .../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 +- .../spawner/human/responseteams/syndicate.dm | 4 +- .../responseteams/tajara/kosmostrelki.dm | 12 +- .../spawner/human/responseteams/tcfl.dm | 8 +- .../human/responseteams/unathi/kataphracts.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 +- html/changelogs/DreamySkrell-outfit-obj.yml | 8 ++ icons/effects/map_effects.dmi | Bin 22762 -> 22928 bytes .../point_verdant/point_verdant_ghostroles.dm | 100 ++++++++-------- .../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 +-- .../tajara/scrapper/scrapper_ghostroles.dm | 6 +- .../tajara_safehouse_ghostroles.dm | 8 +- .../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 +-- .../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 | 12 +- .../kataphracts/kataphract_ship_ghostroles.dm | 26 ++-- .../air_konyang/air_konyang_ghostroles.dm | 8 +- .../einstein_shuttle/einstein_shuttle.dm | 10 +- .../ipc_refugee_ship_ghostroles.dm | 10 +- .../konyang/kasf_ship/kasf_ship_ghostroles.dm | 20 ++-- .../water_barge/water_barge_ghostroles.dm | 4 +- .../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 | 18 +-- .../ships/sol_ssmd/ssmd_ship_ghostroles.dm | 24 ++-- .../tajara/circus/adhomian_circus_roles.dm | 28 ++--- .../tajaran_smuggler_ghostroles.dm | 8 +- .../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 | 18 +-- .../militia_ship_ghostroles.dm | 12 +- .../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 | 4 +- .../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 | 10 +- .../grove/crashsurvivors/crashsurvivors.dm | 8 +- .../exoplanets/konyang/fireoutpost.dm | 4 +- .../exoplanets/konyang/homestead.dm | 4 +- .../konyang/infected_recovery_post.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/raskara/raskara_okon.dm | 6 +- 168 files changed, 1342 insertions(+), 1253 deletions(-) create mode 100644 html/changelogs/DreamySkrell-outfit-obj.yml diff --git a/code/controllers/subsystems/job.dm b/code/controllers/subsystems/job.dm index 0676e7a3438..c2e62787c76 100644 --- a/code/controllers/subsystems/job.dm +++ b/code/controllers/subsystems/job.dm @@ -909,7 +909,7 @@ SUBSYSTEM_DEF(jobs) var/uniform = job.get_outfit(H) if(!uniform) // silicons don't have uniforms or gear return - var/datum/outfit/U = new uniform + var/obj/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 33dd447bbba..229b9a49f3c 100644 --- a/code/controllers/subsystems/virtual_reality.dm +++ b/code/controllers/subsystems/virtual_reality.dm @@ -260,8 +260,8 @@ SUBSYSTEM_DEF(virtualreality) H.real_name = user.real_name H.UpdateAppearance() - H.preEquipOutfit(/datum/outfit/admin/virtual_reality, FALSE) - H.equipOutfit(/datum/outfit/admin/virtual_reality, FALSE) + H.preEquipOutfit(/obj/outfit/admin/virtual_reality, FALSE) + H.equipOutfit(/obj/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 48d58ecb6f4..7bd78d9901f 100644 --- a/code/datums/outfits/ert/ap_eridani.dm +++ b/code/datums/outfits/ert/ap_eridani.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/ert/ap_eridani +/obj/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 -/datum/outfit/admin/ert/ap_eridani/get_id_access() +/obj/outfit/admin/ert/ap_eridani/get_id_access() return get_distress_access() -/datum/outfit/admin/ert/ap_eridani/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) -/datum/outfit/admin/ert/ap_eridani/lead +/obj/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 ) -/datum/outfit/admin/ert/ap_eridani/doctor +/obj/outfit/admin/ert/ap_eridani/doctor name = "Eridani Medical Officer" uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc @@ -126,7 +126,7 @@ /obj/item/storage/pill_bottle/mortaphenyl = 1 ) -/datum/outfit/admin/ert/ap_eridani/corpsman +/obj/outfit/admin/ert/ap_eridani/corpsman name = "Eridani Corpsman" uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc/epmc diff --git a/code/datums/outfits/ert/coalition.dm b/code/datums/outfits/ert/coalition.dm index 1de50fa40ed..fc0a75d4b3e 100644 --- a/code/datums/outfits/ert/coalition.dm +++ b/code/datums/outfits/ert/coalition.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/ert/coalition +/obj/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) -/datum/outfit/admin/ert/coalition/get_id_access() +/obj/outfit/admin/ert/coalition/get_id_access() return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_COALITION, ACCESS_COALITION_NAVY) -/datum/outfit/admin/ert/coalition/medic +/obj/outfit/admin/ert/coalition/medic name = "Coalition Medic" belt = /obj/item/storage/belt/medical/first_responder/combat back = /obj/item/storage/backpack/satchel/med @@ -55,7 +55,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/datum/outfit/admin/ert/coalition/sapper +/obj/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 -/datum/outfit/admin/ert/coalition/leader +/obj/outfit/admin/ert/coalition/leader name = "Coalition Team Leader" head = null suit = null @@ -90,7 +90,7 @@ /obj/item/grenade/flashbang = 1 ) -/datum/outfit/admin/ert/konyang +/obj/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 ) -/datum/outfit/admin/ert/konyang/get_id_access() +/obj/outfit/admin/ert/konyang/get_id_access() return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_COALITION, ACCESS_COALITION_NAVY, ACCESS_KONYANG_POLICE) -/datum/outfit/admin/ert/konyang/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) -/datum/outfit/admin/ert/konyang/medic +/obj/outfit/admin/ert/konyang/medic name = "KASF Medic" belt = /obj/item/storage/belt/medical/first_responder/combat back = /obj/item/storage/backpack/satchel/med @@ -153,7 +153,7 @@ /obj/item/melee/energy/sword/knife/sol = 1 ) -/datum/outfit/admin/ert/konyang/sapper +/obj/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 -/datum/outfit/admin/ert/konyang/leader +/obj/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 3e081fd8616..2c3f92668ac 100644 --- a/code/datums/outfits/ert/deathsquad.dm +++ b/code/datums/outfits/ert/deathsquad.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/deathsquad +/obj/outfit/admin/deathsquad name = "Asset Protection" uniform = /obj/item/clothing/under/ert @@ -27,16 +27,16 @@ id_iff = IFF_DEATHSQUAD -/datum/outfit/admin/deathsquad/leader +/obj/outfit/admin/deathsquad/leader name = "Asset Protection Lead" l_pocket = /obj/item/pinpointer r_hand = /obj/item/device/orbital_dropper/icarus_drones -/datum/outfit/admin/deathsquad/get_id_access() +/obj/outfit/admin/deathsquad/get_id_access() return get_all_accesses() -/datum/outfit/admin/deathsquad/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/admin/deathsquad/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return diff --git a/code/datums/outfits/ert/elyra.dm b/code/datums/outfits/ert/elyra.dm index 7287c01eaeb..bd56aa0b5b3 100644 --- a/code/datums/outfits/ert/elyra.dm +++ b/code/datums/outfits/ert/elyra.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/ert/elyran_trooper +/obj/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) -/datum/outfit/admin/ert/elyran_trooper/get_id_access() +/obj/outfit/admin/ert/elyran_trooper/get_id_access() return get_distress_access() -/datum/outfit/admin/ert/elyran_trooper/leader +/obj/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 -/datum/outfit/admin/ert/elyran_trooper/engineer +/obj/outfit/admin/ert/elyran_trooper/engineer name = "Elyran Navy Engineer" back = /obj/item/storage/backpack/duffel/eng @@ -62,7 +62,7 @@ belt_contents = null -/datum/outfit/admin/ert/elyran_trooper/medical +/obj/outfit/admin/ert/elyran_trooper/medical name = "Elyran Navy Corpsman" belt = /obj/item/storage/belt/medical/first_responder/combat @@ -92,7 +92,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/datum/outfit/admin/ert/elyran_trooper/heavy +/obj/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 607d3ce4543..b5e37cbbf87 100644 --- a/code/datums/outfits/ert/fsf.dm +++ b/code/datums/outfits/ert/fsf.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/ert/fsf +/obj/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 -/datum/outfit/admin/ert/fsf/get_id_access() +/obj/outfit/admin/ert/fsf/get_id_access() return get_distress_access_lesser() -/datum/outfit/admin/ert/fsf/medic +/obj/outfit/admin/ert/fsf/medic name = "Free Solarian Fleets Medic" belt = /obj/item/storage/belt/medical/first_responder/combat @@ -65,7 +65,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/datum/outfit/admin/ert/fsf/sapper +/obj/outfit/admin/ert/fsf/sapper name = "Free Solarian Fleets Sapper" back = /obj/item/storage/backpack/industrial @@ -90,7 +90,7 @@ belt_contents = null -/datum/outfit/admin/ert/fsf/leader +/obj/outfit/admin/ert/fsf/leader name = "Free Solarian Fleets Fireteam Leader" l_hand = /obj/item/gun/projectile/automatic/rifle/sol r_hand = null @@ -108,7 +108,7 @@ /obj/item/handcuffs/ziptie = 2 ) -/datum/outfit/admin/ert/fsf/synth +/obj/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 69b2a744e75..fe1bb482094 100644 --- a/code/datums/outfits/ert/hephaestus_ert.dm +++ b/code/datums/outfits/ert/hephaestus_ert.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/ert/hephaestus +/obj/outfit/admin/ert/hephaestus name = "Hephaestus Asset Protection" uniform = /obj/item/clothing/under/rank/security/heph shoes = /obj/item/clothing/shoes/magboots @@ -32,10 +32,10 @@ id_iff = IFF_HEPH -/datum/outfit/admin/ert/hephaestus/get_id_access() +/obj/outfit/admin/ert/hephaestus/get_id_access() return get_distress_access() -/datum/outfit/admin/ert/hephaestus/medic +/obj/outfit/admin/ert/hephaestus/medic name = "Hephaestus Medic" belt = /obj/item/storage/belt/medical/first_responder/combat glasses = /obj/item/clothing/glasses/hud/health @@ -69,7 +69,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/datum/outfit/admin/ert/hephaestus/engi +/obj/outfit/admin/ert/hephaestus/engi name = "Hephaestus Engineer" back = /obj/item/storage/backpack/duffel/heph belt = /obj/item/storage/belt/utility/very_full @@ -90,6 +90,6 @@ ) belt_contents = null -/datum/outfit/admin/ert/hephaestus/leader +/obj/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 7040bb67be8..be76d844794 100644 --- a/code/datums/outfits/ert/iac.dm +++ b/code/datums/outfits/ert/iac.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/ert/iac +/obj/outfit/admin/ert/iac name = "IAC Doctor" uniform = /obj/item/clothing/under/rank/iacjumpsuit @@ -38,10 +38,10 @@ id_iff = IFF_IAC -/datum/outfit/admin/ert/iac/get_id_access() +/obj/outfit/admin/ert/iac/get_id_access() return get_distress_access() -/datum/outfit/admin/iac/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) -/datum/outfit/admin/ert/iac/bodyguard +/obj/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 ) -/datum/outfit/admin/ert/iac/paramedic +/obj/outfit/admin/ert/iac/paramedic name = "IAC Paramedic" head = /obj/item/clothing/head/helmet/iachelmet diff --git a/code/datums/outfits/ert/kataphract.dm b/code/datums/outfits/ert/kataphract.dm index dc7a5c915b7..ad9d0b7d9ee 100644 --- a/code/datums/outfits/ert/kataphract.dm +++ b/code/datums/outfits/ert/kataphract.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/ert/kataphract +/obj/outfit/admin/ert/kataphract name = "Kataphract-Hopeful" uniform = /obj/item/clothing/under/unathi @@ -28,7 +28,7 @@ id_iff = IFF_KATAPHRACT -/datum/outfit/admin/ert/kataphract/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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 @@ -36,10 +36,10 @@ var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) -/datum/outfit/admin/ert/kataphract/get_id_access() +/obj/outfit/admin/ert/kataphract/get_id_access() return get_distress_access() -/datum/outfit/admin/ert/kataphract/klax +/obj/outfit/admin/ert/kataphract/klax name = "Kataphract-Hopeful Klax" uniform = /obj/item/clothing/under/vaurca @@ -61,7 +61,7 @@ /obj/item/reagent_containers/food/snacks/koisbar_clean = 3 ) -/datum/outfit/admin/ert/kataphract/klax/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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 @@ -80,7 +80,7 @@ A.replaced(H, affected) H.update_body() -/datum/outfit/admin/ert/kataphract/specialist +/obj/outfit/admin/ert/kataphract/specialist name = "Kataphract-Hopeful Spec." head = /obj/item/clothing/head/helmet/space/void/kataphract/spec @@ -109,21 +109,21 @@ /obj/item/reagent_containers/hypospray/autoinjector/coagzolug = 1 ) -/datum/outfit/admin/ert/kataphract/specialist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) -/datum/outfit/admin/ert/kataphract/leader +/obj/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 -/datum/outfit/admin/ert/kataphract/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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 85dd8c25ae6..034ee28a94b 100644 --- a/code/datums/outfits/ert/kosmostrelki.dm +++ b/code/datums/outfits/ert/kosmostrelki.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/ert/pra_cosmonaut +/obj/outfit/admin/ert/pra_cosmonaut name = "Kosmostrelki Trooper" id = /obj/item/card/id/ert @@ -23,10 +23,10 @@ accessory = /obj/item/clothing/accessory/badge/hadii_card r_pocket = /obj/item/crowbar/red -/datum/outfit/admin/ert/pra_cosmonaut/get_id_access() +/obj/outfit/admin/ert/pra_cosmonaut/get_id_access() return get_distress_access() -/datum/outfit/admin/ert/pra_cosmonaut/commissar +/obj/outfit/admin/ert/pra_cosmonaut/commissar name = "Kosmostrelki Commissar" uniform = /obj/item/clothing/under/tajaran/cosmonaut/commissar @@ -50,7 +50,7 @@ l_pocket = /obj/item/device/megaphone accessory = /obj/item/clothing/accessory/hadii_pin -/datum/outfit/admin/ert/pra_cosmonaut/commander +/obj/outfit/admin/ert/pra_cosmonaut/commander name = "Kosmostrelki Commander" back = /obj/item/storage/backpack/satchel/leather @@ -72,7 +72,7 @@ l_pocket = /obj/item/device/megaphone -/datum/outfit/admin/ert/pra_cosmonaut/tesla +/obj/outfit/admin/ert/pra_cosmonaut/tesla name = "Tesla Trooper" r_hand = /obj/item/gun/energy/rifle/icelance l_hand = /obj/item/rig/tesla @@ -90,13 +90,13 @@ /obj/item/material/knife/trench = 1 ) -/datum/outfit/admin/ert/pra_cosmonaut/tesla/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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() -/datum/outfit/admin/ert/pra_cosmonaut/medic +/obj/outfit/admin/ert/pra_cosmonaut/medic name = "Kosmostrelki Combat Medic" gloves = /obj/item/clothing/gloves/latex/nitrile/tajara @@ -127,7 +127,7 @@ /obj/item/device/healthanalyzer = 1 ) -/datum/outfit/admin/ert/pra_cosmonaut/engineer +/obj/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 1b513937b69..16278810e09 100644 --- a/code/datums/outfits/ert/mercenary.dm +++ b/code/datums/outfits/ert/mercenary.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/ert/mercenary +/obj/outfit/admin/ert/mercenary name = "Mercenary Freelancer" uniform = /obj/item/clothing/under/syndicate @@ -34,10 +34,10 @@ id_iff = IFF_FREELANCER -/datum/outfit/admin/ert/mercenary/get_id_access() +/obj/outfit/admin/ert/mercenary/get_id_access() return get_distress_access_lesser() -/datum/outfit/admin/ert/mercenary/specialist +/obj/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 ) -/datum/outfit/admin/ert/mercenary/engineer +/obj/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, ) -/datum/outfit/admin/ert/mercenary/leader +/obj/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 ae066169ee0..f15096f8568 100644 --- a/code/datums/outfits/ert/nt_ert.dm +++ b/code/datums/outfits/ert/nt_ert.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/ert/nanotrasen +/obj/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 ) -/datum/outfit/admin/ert/nanotrasen/get_id_access() +/obj/outfit/admin/ert/nanotrasen/get_id_access() return get_all_station_access() | get_centcom_access("Emergency Response Team") -/datum/outfit/admin/ert/nanotrasen/specialist +/obj/outfit/admin/ert/nanotrasen/specialist name = "NanoTrasen ERT Engineer Specialist" belt = /obj/item/storage/belt/utility/full @@ -31,7 +31,7 @@ belt_contents = null -/datum/outfit/admin/ert/nanotrasen/specialist/medical +/obj/outfit/admin/ert/nanotrasen/specialist/medical name = "NanoTrasen ERT Medical Specialist" belt = /obj/item/storage/belt/medical/first_responder/combat @@ -48,7 +48,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/datum/outfit/admin/ert/nanotrasen/leader +/obj/outfit/admin/ert/nanotrasen/leader name = "NanoTrasen ERT Leader" back = /obj/item/rig/ert diff --git a/code/datums/outfits/ert/scc_ert.dm b/code/datums/outfits/ert/scc_ert.dm index 7b37a8c7e52..c5e5e77ddec 100644 --- a/code/datums/outfits/ert/scc_ert.dm +++ b/code/datums/outfits/ert/scc_ert.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/ert/scc +/obj/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 ) -/datum/outfit/admin/ert/scc/get_id_access() +/obj/outfit/admin/ert/scc/get_id_access() return get_all_station_access() | get_centcom_access("Emergency Response Team") -/datum/outfit/admin/ert/scc/engineer +/obj/outfit/admin/ert/scc/engineer name = "ERT Engineering Specialist (SCC)" belt = /obj/item/storage/belt/utility/full @@ -28,7 +28,7 @@ belt_contents = null -/datum/outfit/admin/ert/scc/medic +/obj/outfit/admin/ert/scc/medic name = "ERT Medical Specialist (SCC)" belt = /obj/item/storage/belt/medical/first_responder/combat @@ -45,7 +45,7 @@ /obj/item/reagent_containers/glass/bottle/perconol = 1 ) -/datum/outfit/admin/ert/scc/commander +/obj/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 e5c33c8536c..598ce874563 100644 --- a/code/datums/outfits/ert/syndicate.dm +++ b/code/datums/outfits/ert/syndicate.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/deathsquad/syndicate +/obj/outfit/admin/deathsquad/syndicate name = "Syndicate Commando" uniform = /obj/item/clothing/under/syndicate @@ -24,7 +24,7 @@ id_iff = IFF_SYNDICATE -/datum/outfit/admin/deathsquad/syndicate/leader +/obj/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 d7eba534ed9..83b4cd62028 100644 --- a/code/datums/outfits/ert/tcfl.dm +++ b/code/datums/outfits/ert/tcfl.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/ert/legion +/obj/outfit/admin/ert/legion name = "TCFL Volunteer" head = /obj/item/clothing/head/beret/legion/field @@ -14,7 +14,7 @@ id_iff = IFF_TCFL -/datum/outfit/admin/ert/legion/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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" -/datum/outfit/admin/ert/legion/get_id_access() +/obj/outfit/admin/ert/legion/get_id_access() return get_distress_access() -/datum/outfit/admin/ert/legion/specialist +/obj/outfit/admin/ert/legion/specialist name = "TCFL Legionnaire" accessory = /obj/item/clothing/accessory/legion/specialist -/datum/outfit/admin/ert/legion/leader +/obj/outfit/admin/ert/legion/leader name = "TCFL Prefect" accessory = /obj/item/clothing/accessory/legion -/datum/outfit/admin/ert/legion/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) -/datum/outfit/admin/ert/legion/pilot +/obj/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 -/datum/outfit/admin/ert/legion/sentinel +/obj/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 ) -/datum/outfit/admin/ert/legion/sentinel/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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/event/outfit_events.dm b/code/datums/outfits/event/outfit_events.dm index 95b4d3b9373..6f3aa8ce717 100644 --- a/code/datums/outfits/event/outfit_events.dm +++ b/code/datums/outfits/event/outfit_events.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/event/lance +/obj/outfit/admin/event/lance name = "Lancer" uniform = /obj/item/clothing/under/lance @@ -38,13 +38,13 @@ id_iff = IFF_LANCER var/id_access = "Lancer" -/datum/outfit/admin/event/lance/post_equip(mob/living/carbon/human/H, visualsOnly) +/obj/outfit/admin/event/lance/post_equip(mob/living/carbon/human/H, visualsOnly) organize_voidsuit(H) -/datum/outfit/admin/event/lance/get_id_access() +/obj/outfit/admin/event/lance/get_id_access() return get_syndicate_access(id_access) -/datum/outfit/admin/event/lance/engineer +/obj/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" -/datum/outfit/admin/event/lance/medic +/obj/outfit/admin/event/lance/medic name = "Lance Medic" gloves = /obj/item/clothing/gloves/latex/nitrile @@ -91,7 +91,7 @@ ) id_access = "Lance Medic" -/datum/outfit/admin/event/lance/operative +/obj/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" -/datum/outfit/admin/event/lance/operative/post_equip(mob/living/carbon/human/H, visualsOnly) +/obj/outfit/admin/event/lance/operative/post_equip(mob/living/carbon/human/H, visualsOnly) return -/datum/outfit/admin/event/sol_marine +/obj/outfit/admin/event/sol_marine name = "Solarian Marine" uniform = /obj/item/clothing/under/rank/sol @@ -144,7 +144,7 @@ id_iff = IFF_SOL -/datum/outfit/admin/event/sol_marine/heavy +/obj/outfit/admin/event/sol_marine/heavy name = "Heavy Solarian Marine" head = null diff --git a/code/datums/outfits/event/outfit_killers.dm b/code/datums/outfits/event/outfit_killers.dm index 3b2c22a51e5..1df554af4d0 100644 --- a/code/datums/outfits/event/outfit_killers.dm +++ b/code/datums/outfits/event/outfit_killers.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/killer +/obj/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 -/datum/outfit/admin/killer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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... -/datum/outfit/admin/killer/assassin +/obj/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 -/datum/outfit/admin/killer/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) -/datum/outfit/admin/killer/assassin/get_id_access() +/obj/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 3cbf6516d8c..7d3c6e547ca 100644 --- a/code/datums/outfits/event/outfit_megacorps.dm +++ b/code/datums/outfits/event/outfit_megacorps.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/megacorp/hephaestus_trooper +/obj/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 -/datum/outfit/admin/megacorp/hephaestus_trooper/heavy +/obj/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 ) -/datum/outfit/admin/megacorp/zenghu_trooper +/obj/outfit/admin/megacorp/zenghu_trooper name = "Zeng Hu Pharmaceuticals Asset Protection" uniform = /obj/item/clothing/under/rank/medical/first_responder/zeng @@ -71,7 +71,7 @@ ) id_iff = IFF_ZENGHU -/datum/outfit/admin/megacorp/zenghu_trooper/heavy +/obj/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) -/datum/outfit/admin/megacorp/zavodskoi_trooper +/obj/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 -/datum/outfit/admin/megacorp/zavodskoi_trooper/heavy +/obj/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 ) -/datum/outfit/admin/megacorp/einstein_trooper/heavy +/obj/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 410555b4bc9..b1663cb4ed1 100644 --- a/code/datums/outfits/event/outfit_nanotrasen.dm +++ b/code/datums/outfits/event/outfit_nanotrasen.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/nt +/obj/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" -/datum/outfit/admin/nt/get_id_access() +/obj/outfit/admin/nt/get_id_access() return get_all_station_access() | get_centcom_access(id_access) -/datum/outfit/admin/nt/officer +/obj/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 -/datum/outfit/admin/nt/captain +/obj/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 -/datum/outfit/admin/nt/protection_detail +/obj/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" -/datum/outfit/admin/nt/protection_detail/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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 -/datum/outfit/admin/nt/ert_commander +/obj/outfit/admin/nt/ert_commander name = "ERT Commander" uniform = /obj/item/clothing/under/rank/centcom_commander @@ -106,7 +106,7 @@ id_access = "BlackOps Commander" -/datum/outfit/admin/nt/cciaa +/obj/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" -/datum/outfit/admin/nt/odinsec +/obj/outfit/admin/nt/odinsec name = "NTCC Odin Security Specialist" uniform = /obj/item/clothing/under/ccpolice @@ -161,7 +161,7 @@ id_access = "Odin Security" -/datum/outfit/admin/nt/odinsec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/admin/nt/odinsec/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H && H.w_uniform) @@ -172,7 +172,7 @@ var/obj/item/clothing/under/rank/U = H.w_uniform U.attach_accessory(null, holster) -/datum/outfit/admin/nt/specops +/obj/outfit/admin/nt/specops name = "Special Operations Officer" uniform = /obj/item/clothing/under/syndicate/combat @@ -192,7 +192,7 @@ id_access = "Death Commando" -/datum/outfit/admin/nt/bssb +/obj/outfit/admin/nt/bssb name = "BSSB Agent" uniform = /obj/item/clothing/under/rank/bssb @@ -216,14 +216,14 @@ id_icon = "bssb" id_access = "CCIA Agent" -/datum/outfit/admin/nt/bssb/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) -/datum/outfit/admin/nt/bssb/guard +/obj/outfit/admin/nt/bssb/guard name = "BSSB Escort" suit = /obj/item/clothing/suit/storage/toggle/bssb/armor @@ -251,14 +251,14 @@ /obj/item/clothing/head/helmet = 1 ) -/datum/outfit/admin/nt/bssb/guard/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) -/datum/outfit/admin/nt/odindoc +/obj/outfit/admin/nt/odindoc name = "NTCC Odin Medical Specialist" uniform = /obj/item/clothing/under/rank/medical/surgeon/zavod @@ -297,7 +297,7 @@ id_access = "Medical Doctor" -/datum/outfit/admin/nt/odinpharm +/obj/outfit/admin/nt/odinpharm name = "NTCC Odin Pharmacy Specialist" uniform = /obj/item/clothing/under/rank/medical/pharmacist @@ -314,7 +314,7 @@ id_access = "Medical Doctor" -/datum/outfit/admin/nt/odinbartender +/obj/outfit/admin/nt/odinbartender name = "NTCC Odin Bartender" uniform = /obj/item/clothing/under/rank/bartender @@ -324,7 +324,7 @@ id_access = "Service" -/datum/outfit/admin/nt/odinchef +/obj/outfit/admin/nt/odinchef name = "NTCC Odin Chef" uniform = /obj/item/clothing/under/rank/chef @@ -336,7 +336,7 @@ id_access = "Service" -/datum/outfit/admin/nt/odinjanitor +/obj/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 735149bd901..18cbbc19004 100644 --- a/code/datums/outfits/event/outfit_scc.dm +++ b/code/datums/outfits/event/outfit_scc.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/scc +/obj/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" -/datum/outfit/admin/scc/get_id_access() +/obj/outfit/admin/scc/get_id_access() return get_all_station_access() | get_centcom_access(id_access) -/datum/outfit/admin/scc/executive +/obj/outfit/admin/scc/executive name = "SCC Executive" uniform = /obj/item/clothing/under/rank/scc/executive id_access = "SCC Executive" -/datum/outfit/admin/scc/bodyguard +/obj/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 a1356ffa131..ed3fe8fd70f 100644 --- a/code/datums/outfits/event/outfit_tfcl.dm +++ b/code/datums/outfits/event/outfit_tfcl.dm @@ -1,4 +1,4 @@ -/datum/outfit/admin/tcfl +/obj/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" -/datum/outfit/admin/tcfl/get_id_access() +/obj/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 f0622c5b8ca..30f18443ece 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -1,5 +1,19 @@ -/datum/outfit - 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 //The following vars can either be a path or a list of paths @@ -11,11 +25,13 @@ var/gloves = null var/wrist = null var/shoes = null + var/head = null var/mask = null var/l_ear = null var/r_ear = null var/glasses = null + var/l_pocket = null var/r_pocket = null var/suit_store = null @@ -74,7 +90,72 @@ var/list/implants = null //A list of implants that should be implanted var/list/spells = list() // A list of spells to grant -/datum/outfit/proc/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/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) //to be overriden for customization depending on client prefs,species etc if(allow_backbag_choice) switch(H.backbag) @@ -211,14 +292,14 @@ else if (wrist) equip_item(H, wrist, slot_wrists, callback = radio_callback) -/datum/outfit/proc/turn_into_thinset(var/obj/item/device/radio/headset/wrist/radio) +/obj/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 -/datum/outfit/proc/equip_item(mob/living/carbon/human/H, path, slot, var/override_collect = FALSE, var/item_color, var/datum/callback/callback) +/obj/outfit/proc/equip_item(mob/living/carbon/human/H, path, slot, var/override_collect = FALSE, var/item_color, var/datum/callback/callback) 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 @@ -241,7 +322,7 @@ else H.equip_to_slot_or_del(I, slot) -/datum/outfit/proc/equip_uniform_accessory(mob/living/carbon/human/H) +/obj/outfit/proc/equip_uniform_accessory(mob/living/carbon/human/H) if(!H) return @@ -266,7 +347,7 @@ if(W) holster.holster(W, H) -/datum/outfit/proc/equip_suit_accessory(mob/living/carbon/human/H) +/obj/outfit/proc/equip_suit_accessory(mob/living/carbon/human/H) if(!H) return @@ -275,10 +356,10 @@ var/obj/item/clothing/accessory/A = new suit_accessory S.attach_accessory(H, A) -/datum/outfit/proc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/proc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) //to be overriden for changing items post equip (such as toggeling internals, ...) -/datum/outfit/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/proc/equip(mob/living/carbon/human/H, visualsOnly = FALSE) //Start with uniform,suit,backpack for additional slots if(back) equip_item(H, back, slot_back) @@ -459,7 +540,7 @@ return 1 // this proc takes all the scattered voidsuit pieces and reassembles them into one piece -/datum/outfit/proc/organize_voidsuit(mob/living/carbon/human/H, var/add_magboots = TRUE) +/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) @@ -479,7 +560,7 @@ H.equip_to_slot_if_possible(VS, slot_wear_suit) -/datum/outfit/proc/apply_fingerprints(mob/living/carbon/human/H) +/obj/outfit/proc/apply_fingerprints(mob/living/carbon/human/H) if(!istype(H)) return if(H.back) @@ -520,7 +601,7 @@ H.r_store.add_fingerprint(H, 1) return 1 -/datum/outfit/proc/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C) +/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) @@ -530,7 +611,7 @@ 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/P, obj/item/card/id/I) +/obj/outfit/proc/register_pda(obj/item/modular_computer/P, obj/item/card/id/I) if(!P.card_slot) return P.card_slot.insert_id(I) @@ -539,15 +620,15 @@ P.enable_computer(null, TRUE) // passing null because we don't want the UI to open P.minimize_program() -/datum/outfit/proc/get_id_access(mob/living/carbon/human/H) +/obj/outfit/proc/get_id_access(mob/living/carbon/human/H) return list() -/datum/outfit/proc/get_id_assignment(mob/living/carbon/human/H, var/ignore_suffix = FALSE) +/obj/outfit/proc/get_id_assignment(mob/living/carbon/human/H, var/ignore_suffix = FALSE) . = GetAssignment(H) if (. && . != "Unassigned" && H?.mind?.selected_faction && !ignore_suffix) if (H.mind.selected_faction.title_suffix) . += " ([H.mind.selected_faction.title_suffix])" -/datum/outfit/proc/get_id_rank(mob/living/carbon/human/H) +/obj/outfit/proc/get_id_rank(mob/living/carbon/human/H) return GetAssignment(H) diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index bfe90784378..90e3b3ba854 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -1,22 +1,22 @@ -/datum/outfit/admin +/obj/outfit/admin var/id_icon -/datum/outfit/admin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/admin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(!visualsOnly) if(H.mind) H.mind.assigned_role = name H.job = name -/datum/outfit/admin/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C) +/obj/outfit/admin/imprint_idcard(mob/living/carbon/human/H, obj/item/card/id/C) ..() if(id_icon) C.icon_state = id_icon -/datum/outfit/admin/random_employee +/obj/outfit/admin/random_employee name = "Random Employee" -/datum/outfit/admin/random_employee/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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 @@ -32,7 +32,7 @@ job.equip(H, FALSE, FALSE, alt_title) -/datum/outfit/admin/random +/obj/outfit/admin/random name = "Random Civilian" uniform = "suit selection" @@ -49,7 +49,7 @@ /obj/item/storage/backpack/duffel ) -/datum/outfit/admin/random/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/admin/random/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(!visualsOnly) if(prob(10)) //Equip something smokable @@ -80,19 +80,19 @@ var/datum/gear/G = gear_datums["gloves selection"] H.equip_or_collect(G.spawn_random(), slot_gloves) -/datum/outfit/admin/random/visitor +/obj/outfit/admin/random/visitor name = "Random Visitor" id = /obj/item/card/id pda = /obj/item/modular_computer/handheld/pda/civilian -/datum/outfit/admin/random/visitor/get_id_assignment() +/obj/outfit/admin/random/visitor/get_id_assignment() return "Visitor" -/datum/outfit/admin/random/visitor/get_id_rank() +/obj/outfit/admin/random/visitor/get_id_rank() return "Visitor" -/datum/outfit/admin/virtual_reality +/obj/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 d026ec9d4d8..f1fd30f41c2 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. -/datum/outfit/admin/syndicate +/obj/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 -/datum/outfit/admin/syndicate/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/admin/syndicate/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -42,11 +42,11 @@ U.hidden_uplink.bluecrystals = round(uplink_uses / 2) U.hidden_uplink.tgui_menu = 1 -/datum/outfit/admin/syndicate/get_id_access() +/obj/outfit/admin/syndicate/get_id_access() return get_syndicate_access(id_access) -/datum/outfit/admin/syndicate/operative +/obj/outfit/admin/syndicate/operative name = "Syndicate Operative" suit = /obj/item/clothing/suit/space/void/merc @@ -71,7 +71,7 @@ /obj/item/clothing/shoes/combat = 1 ) -/datum/outfit/admin/syndicate/officer +/obj/outfit/admin/syndicate/officer name = "Syndicate Officer" head = /obj/item/clothing/head/beret/red @@ -95,7 +95,7 @@ ) id_access = "Syndicate Operative Leader" -/datum/outfit/admin/syndicate/spy +/obj/outfit/admin/syndicate/spy name = "Syndicate Spy" uniform = /obj/item/clothing/under/suit_jacket/really_black shoes = /obj/item/clothing/shoes/sneakers/black/noslip @@ -108,7 +108,7 @@ // Syndicate Auxiliary Outfits (ninja, merc, etc.) -/datum/outfit/admin/syndicate/ninja +/obj/outfit/admin/syndicate/ninja name = "Infiltrator" allow_backbag_choice = FALSE @@ -137,14 +137,14 @@ id_access = "Syndicate Agent" -/datum/outfit/admin/syndicate/ninja/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) -/datum/outfit/admin/syndicate/mercenary +/obj/outfit/admin/syndicate/mercenary name = "Mercenary" uniform = /obj/item/clothing/under/syndicate @@ -161,7 +161,7 @@ id_iff = IFF_MERCENARY -/datum/outfit/admin/syndicate/mercenary/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/admin/syndicate/mercenary/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -169,7 +169,7 @@ if(!H.shoes) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots/toeless(H), slot_shoes) -/datum/outfit/admin/syndicate/mercenary/loner +/obj/outfit/admin/syndicate/mercenary/loner name = "Loner" l_ear = /obj/item/device/radio/headset/syndicate @@ -184,7 +184,7 @@ id_iff = IFF_LONER id_access = "Lone Operative" -/datum/outfit/admin/syndicate/raider +/obj/outfit/admin/syndicate/raider name = "Raider" allow_backbag_choice = FALSE @@ -335,7 +335,7 @@ backpack_contents = list() -/datum/outfit/admin/syndicate/raider/equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/admin/syndicate/raider/equip(mob/living/carbon/human/H, visualsOnly = FALSE) new /obj/random/backpack(H.loc) var/obj/item/storage/backpack/bag @@ -370,7 +370,7 @@ return ..() -/datum/outfit/admin/syndicate/raider/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/admin/syndicate/raider/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -385,7 +385,7 @@ if(W) W.handle_item_insertion(passport) -/datum/outfit/admin/syndicate/burglar +/obj/outfit/admin/syndicate/burglar name = "Burglar" allow_backbag_choice = FALSE @@ -431,7 +431,7 @@ id_iff = IFF_BURGLAR -/datum/outfit/admin/syndicate/burglar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/admin/syndicate/burglar/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -488,7 +488,7 @@ W.handle_item_insertion(passport) -/datum/outfit/admin/syndicate/jockey +/obj/outfit/admin/syndicate/jockey name = "Jockey" allow_backbag_choice = FALSE @@ -525,7 +525,7 @@ id_iff = IFF_JOCKEY -/datum/outfit/admin/syndicate/jockey/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/admin/syndicate/jockey/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -549,7 +549,7 @@ // Non-syndicate antag outfits -/datum/outfit/admin/highlander +/obj/outfit/admin/highlander name = "Highlander" uniform = /obj/item/clothing/under/kilt @@ -562,7 +562,7 @@ id = /obj/item/card/id/highlander id_iff = IFF_HIGHLANDER -/datum/outfit/admin/highlander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/admin/highlander/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -572,7 +572,7 @@ W.name = "[H.real_name]'s ID" W.registered_name = H.real_name -/datum/outfit/admin/syndicate/cultist +/obj/outfit/admin/syndicate/cultist name = "Cultist" allow_backbag_choice = FALSE @@ -592,10 +592,10 @@ id_iff = IFF_CULTIST -/datum/outfit/admin/syndicate/cultist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/admin/syndicate/cultist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) return -/datum/outfit/admin/syndicate/cultist/super +/obj/outfit/admin/syndicate/cultist/super name = "Super Cultist" head = /obj/item/clothing/head/helmet/space/cult @@ -603,7 +603,7 @@ suit_store = /obj/item/gun/energy/rifle/cult -/datum/outfit/admin/syndicate/raider_techno +/obj/outfit/admin/syndicate/raider_techno name = "Raider Techno" allow_backbag_choice = FALSE @@ -624,7 +624,7 @@ id_iff = IFF_BLUESPACE -/datum/outfit/admin/syndicate/raider_techno/equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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") @@ -666,7 +666,7 @@ back = /obj/item/technomancer_core/summoner return ..() -/datum/outfit/admin/syndicate/raider_techno/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/admin/syndicate/raider_techno/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -689,14 +689,14 @@ if(catalog) catalog.bind_to_owner(H) -/datum/outfit/admin/golem +/obj/outfit/admin/golem name = "Bluespace Golem" allow_backbag_choice = FALSE l_ear = /obj/item/device/radio/headset/bluespace id_iff = IFF_BLUESPACE -/datum/outfit/admin/techomancer +/obj/outfit/admin/techomancer name = "Technomancer" allow_backbag_choice = FALSE @@ -716,7 +716,7 @@ var/id_assignment = "Technomagus" -/datum/outfit/admin/techomancer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/admin/techomancer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) return @@ -734,7 +734,7 @@ if(catalog) catalog.bind_to_owner(H) -/datum/outfit/admin/techomancer/apprentice +/obj/outfit/admin/techomancer/apprentice name = "Technomancer Apprentice" head = /obj/item/clothing/head/chameleon/technomancer @@ -746,7 +746,7 @@ id_assignment = "Techno-apprentice" -/datum/outfit/admin/techomancer/apprentice/post_equip(mob/living/carbon/human/H, visualsOnly) +/obj/outfit/admin/techomancer/apprentice/post_equip(mob/living/carbon/human/H, visualsOnly) . = ..() if(visualsOnly) return @@ -756,7 +756,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.") -/datum/outfit/admin/techomancer/golem +/obj/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 f49ab73be2a..c52b8a9015a 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(/datum/outfit/admin/syndicate/burglar, FALSE) - player.equipOutfit(/datum/outfit/admin/syndicate/burglar, FALSE) + player.preEquipOutfit(/obj/outfit/admin/syndicate/burglar, FALSE) + player.equipOutfit(/obj/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 c0c2c117866..e29dcf82c09 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(/datum/outfit/admin/syndicate/jockey, FALSE) - player.equipOutfit(/datum/outfit/admin/syndicate/jockey, FALSE) + player.preEquipOutfit(/obj/outfit/admin/syndicate/jockey, FALSE) + player.equipOutfit(/obj/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 5b30620ec47..16d9029d991 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(/datum/outfit/admin/syndicate/mercenary/loner, FALSE) - player.equipOutfit(/datum/outfit/admin/syndicate/mercenary/loner, FALSE) + player.preEquipOutfit(/obj/outfit/admin/syndicate/mercenary/loner, FALSE) + player.equipOutfit(/obj/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 e1c3fb3fac6..0dcfc3c6513 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(/datum/outfit/admin/syndicate/mercenary, FALSE) - player.equipOutfit(/datum/outfit/admin/syndicate/mercenary, FALSE) + player.preEquipOutfit(/obj/outfit/admin/syndicate/mercenary, FALSE) + player.equipOutfit(/obj/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 3daaf1c2f7a..267c359645a 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(/datum/outfit/admin/syndicate/ninja, FALSE) - player.equipOutfit(/datum/outfit/admin/syndicate/ninja, FALSE) + player.preEquipOutfit(/obj/outfit/admin/syndicate/ninja, FALSE) + player.equipOutfit(/obj/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 f796cf7b661..799488100f0 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(/datum/outfit/admin/syndicate/raider, FALSE) - player.equipOutfit(/datum/outfit/admin/syndicate/raider, FALSE) + player.preEquipOutfit(/obj/outfit/admin/syndicate/raider, FALSE) + player.equipOutfit(/obj/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 ed3e3c1f13e..a66b57f7a51 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(/datum/outfit/admin/syndicate/raider_techno, FALSE) - player.equipOutfit(/datum/outfit/admin/syndicate/raider_techno, FALSE) + player.preEquipOutfit(/obj/outfit/admin/syndicate/raider_techno, FALSE) + player.equipOutfit(/obj/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 26ab905d090..a628f767b10 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(/datum/outfit/admin/techomancer, FALSE) - technomancer_mob.equipOutfit(/datum/outfit/admin/techomancer, FALSE) + technomancer_mob.preEquipOutfit(/obj/outfit/admin/techomancer, FALSE) + technomancer_mob.equipOutfit(/obj/outfit/admin/techomancer, FALSE) return TRUE /datum/antagonist/technomancer/proc/equip_apprentice(var/mob/living/carbon/human/technomancer_mob) - technomancer_mob.preEquipOutfit(/datum/outfit/admin/techomancer/apprentice, FALSE) - technomancer_mob.equipOutfit(/datum/outfit/admin/techomancer/apprentice, FALSE) + technomancer_mob.preEquipOutfit(/obj/outfit/admin/techomancer/apprentice, FALSE) + technomancer_mob.equipOutfit(/obj/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 3a4ea295798..31b32df2a97 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(/datum/outfit/admin/highlander, FALSE) - player.equipOutfit(/datum/outfit/admin/highlander, FALSE) + player.preEquipOutfit(/obj/outfit/admin/highlander, FALSE) + player.equipOutfit(/obj/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 1869a208cc4..b90b108bc48 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 = /datum/outfit/admin/techomancer/apprentice + var/outfit_type = /obj/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 = /datum/outfit/admin/techomancer/golem + outfit_type = /obj/outfit/admin/techomancer/golem preserve_appearance = TRUE diff --git a/code/game/jobs/faction/hephaestus.dm b/code/game/jobs/faction/hephaestus.dm index 6d39ecd725b..216d1dc4127 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" = /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/hephaestus, - "Operations Personnel" = /datum/outfit/job/hangar_tech/hephaestus + "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/hephaestus, + "Operations Personnel" = /obj/outfit/job/hangar_tech/hephaestus ) -/datum/outfit/job/hangar_tech/hephaestus +/obj/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 -/datum/outfit/job/machinist/hephaestus +/obj/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 -/datum/outfit/job/mining/hephaestus +/obj/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 -/datum/outfit/job/engineer/hephaestus +/obj/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 -/datum/outfit/job/atmos/hephaestus +/obj/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 -/datum/outfit/job/intern_eng/hephaestus +/obj/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 -/datum/outfit/job/intern_atmos/hephaestus +/obj/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 -/datum/outfit/job/representative/hephaestus +/obj/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 ) -/datum/outfit/job/journalist/hephaestus +/obj/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 -/datum/outfit/job/visitor/hephaestus +/obj/outfit/job/visitor/hephaestus name = "Off-Duty Crew Member - Hephaestus" id = /obj/item/card/id/hephaestus diff --git a/code/game/jobs/faction/idris.dm b/code/game/jobs/faction/idris.dm index 7547a30d77e..7ef92a7e097 100644 --- a/code/game/jobs/faction/idris.dm +++ b/code/game/jobs/faction/idris.dm @@ -45,27 +45,27 @@ ) titles_to_loadout = list( - "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/idris + "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/idris ) -/datum/outfit/job/officer/idris +/obj/outfit/job/officer/idris name = "Security Officer - Idris" uniform = /obj/item/clothing/under/rank/security/idris @@ -76,7 +76,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/datum/outfit/job/warden/idris +/obj/outfit/job/warden/idris name = "Warden - Idris" head = /obj/item/clothing/head/warden/idris @@ -90,7 +90,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/datum/outfit/job/forensics/idris +/obj/outfit/job/forensics/idris name = "Investigator - Idris" uniform = /obj/item/clothing/under/det/idris @@ -102,7 +102,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/datum/outfit/job/intern_sec/officer/idris +/obj/outfit/job/intern_sec/officer/idris name = "Security Cadet - Idris" uniform = /obj/item/clothing/under/rank/cadet/idris @@ -113,7 +113,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/datum/outfit/job/intern_sec/forensics/idris +/obj/outfit/job/intern_sec/forensics/idris name = "Investigator Intern - Idris" uniform = /obj/item/clothing/under/rank/cadet/idris @@ -124,7 +124,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/datum/outfit/job/bartender/idris +/obj/outfit/job/bartender/idris name = "Bartender - Idris" uniform = /obj/item/clothing/under/rank/bartender/idris @@ -137,7 +137,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/datum/outfit/job/chef/idris +/obj/outfit/job/chef/idris name = "Chef - Idris" uniform = /obj/item/clothing/under/rank/chef/idris @@ -150,7 +150,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/datum/outfit/job/hydro/idris +/obj/outfit/job/hydro/idris name = "Gardener - Idris" uniform = /obj/item/clothing/under/rank/hydroponics/idris @@ -162,7 +162,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/datum/outfit/job/janitor/idris +/obj/outfit/job/janitor/idris name = "Janitor - Idris" uniform = /obj/item/clothing/under/rank/janitor/idris @@ -174,7 +174,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/datum/outfit/job/librarian/idris +/obj/outfit/job/librarian/idris name = "Librarian - Idris" uniform = /obj/item/clothing/under/librarian/idris @@ -185,14 +185,14 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/datum/outfit/job/librarian/idris/curator +/obj/outfit/job/librarian/idris/curator name = "Curator - Idris" jobtype = /datum/job/librarian r_pocket = /obj/item/device/price_scanner l_hand = null -/datum/outfit/job/librarian/idris/tech_support +/obj/outfit/job/librarian/idris/tech_support name = "Tech Support - Idris" jobtype = /datum/job/librarian @@ -202,7 +202,7 @@ l_hand = /obj/item/modular_computer/laptop/preset gloves = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian -/datum/outfit/job/chaplain/idris +/obj/outfit/job/chaplain/idris name = "Chaplain - Idris" id = /obj/item/card/id/idris @@ -212,7 +212,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/datum/outfit/job/journalist/idris +/obj/outfit/job/journalist/idris name = "Corporate Reporter - Idris" uniform = /obj/item/clothing/under/librarian/idris @@ -223,7 +223,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris -/datum/outfit/job/representative/idris +/obj/outfit/job/representative/idris name = "Idris Corporate Liaison" head = /obj/item/clothing/head/beret/corporate/idris @@ -244,7 +244,7 @@ /obj/item/stamp/idris = 1 ) -/datum/outfit/job/visitor/idris +/obj/outfit/job/visitor/idris name = "Off-Duty Crew Member - Idris" id = /obj/item/card/id/idris diff --git a/code/game/jobs/faction/nanotrasen.dm b/code/game/jobs/faction/nanotrasen.dm index 6073c66ab33..d3dd88047d8 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" = /datum/outfit/job/visitor/nanotrasen + "Off-Duty Crew Member" = /obj/outfit/job/visitor/nanotrasen ) @@ -51,7 +51,7 @@ return objective -/datum/outfit/job/visitor/nanotrasen +/obj/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 b917414b110..e7f320bd30a 100644 --- a/code/game/jobs/faction/orion_express.dm +++ b/code/game/jobs/faction/orion_express.dm @@ -35,25 +35,25 @@ ) ) titles_to_loadout = list( - "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/orion + "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/orion ) -/datum/outfit/job/hangar_tech/orion +/obj/outfit/job/hangar_tech/orion name = "Hangar Technician - Orion Express" uniform = /obj/item/clothing/under/rank/hangar_technician/orion @@ -64,7 +64,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/datum/outfit/job/machinist/orion +/obj/outfit/job/machinist/orion name = "Machinist - Orion Express" uniform = /obj/item/clothing/under/rank/machinist/orion @@ -75,7 +75,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/datum/outfit/job/mining/orion +/obj/outfit/job/mining/orion name = "Shaft Miner - Orion Express" uniform = /obj/item/clothing/under/rank/miner/orion @@ -86,7 +86,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/datum/outfit/job/representative/orion +/obj/outfit/job/representative/orion name = "Orion Express Corporate Liaison" head = /obj/item/clothing/head/beret/corporate/orion @@ -101,7 +101,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/datum/outfit/job/bartender/orion +/obj/outfit/job/bartender/orion name = "Bartender - Orion Express" uniform = /obj/item/clothing/under/rank/bartender/orion @@ -114,7 +114,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/datum/outfit/job/chef/orion +/obj/outfit/job/chef/orion name = "Chef - Orion Express" uniform = /obj/item/clothing/under/rank/chef/orion @@ -127,7 +127,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/datum/outfit/job/hydro/orion +/obj/outfit/job/hydro/orion name = "Gardener - Orion Express" uniform = /obj/item/clothing/under/rank/hydroponics/orion @@ -139,7 +139,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/datum/outfit/job/janitor/orion +/obj/outfit/job/janitor/orion name = "Janitor - Orion Express" uniform = /obj/item/clothing/under/rank/janitor/orion @@ -151,7 +151,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/datum/outfit/job/librarian/orion +/obj/outfit/job/librarian/orion name = "Librarian - Orion Express" uniform = /obj/item/clothing/under/librarian/orion @@ -162,14 +162,14 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/datum/outfit/job/librarian/orion/curator +/obj/outfit/job/librarian/orion/curator name = "Curator - Orion Express" jobtype = /datum/job/librarian r_pocket = /obj/item/device/price_scanner l_hand = null -/datum/outfit/job/librarian/orion/tech_support +/obj/outfit/job/librarian/orion/tech_support name = "Tech Support - Orion Express" jobtype = /datum/job/librarian @@ -179,7 +179,7 @@ l_hand = /obj/item/modular_computer/laptop/preset gloves = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian -/datum/outfit/job/journalist/orion +/obj/outfit/job/journalist/orion name = "Corporate Reporter - Orion Express" uniform = /obj/item/clothing/under/librarian/orion @@ -190,7 +190,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/datum/outfit/job/chaplain/orion +/obj/outfit/job/chaplain/orion name = "Chaplain - Orion Express" id = /obj/item/card/id/orion @@ -200,7 +200,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion -/datum/outfit/job/visitor/orion +/obj/outfit/job/visitor/orion name = "Off-Duty Crew Member - Orion Express" id = /obj/item/card/id/orion diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index 7fe639137aa..17b3dd2066a 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" = /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, - "First Responder" = /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/pmc, - "Medical Personnel" = /datum/outfit/job/med_tech/pmc + "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, + "First Responder" = /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/pmc, + "Medical Personnel" = /obj/outfit/job/med_tech/pmc ) -/datum/outfit/job/officer/pmc +/obj/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 -/datum/outfit/job/warden/pmc +/obj/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 -/datum/outfit/job/intern_sec/officer/pmc +/obj/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 -/datum/outfit/job/intern_sec/forensics/pmc +/obj/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 -/datum/outfit/job/forensics/pmc +/obj/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 -/datum/outfit/job/doctor/pmc +/obj/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 -/datum/outfit/job/doctor/surgeon/pmc +/obj/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 -/datum/outfit/job/doctor/surgeon/pmc/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) -/datum/outfit/job/pharmacist/pmc +/obj/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 -/datum/outfit/job/psychiatrist/pmc +/obj/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 -/datum/outfit/job/med_tech/pmc +/obj/outfit/job/med_tech/pmc name = "First Responder - 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 -/datum/outfit/job/intern_med/pmc +/obj/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 -/datum/outfit/job/representative/pmc +/obj/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 -/datum/outfit/job/journalist/pmc +/obj/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 -/datum/outfit/job/visitor/pmc +/obj/outfit/job/visitor/pmc name = "Off-Duty Crew Member - PMC" id = /obj/item/card/id/pmc diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm index 7cef1a8da76..164400adbc6 100644 --- a/code/game/jobs/faction/zavodskoi.dm +++ b/code/game/jobs/faction/zavodskoi.dm @@ -46,29 +46,29 @@ ) titles_to_loadout = list( - "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, - "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/zavodskoi, - "Engineering Personnel" = /datum/outfit/job/engineer/zavodskoi, - "Science Personnel" = /datum/outfit/job/scientist/zavodskoi + "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, + "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/zavodskoi, + "Engineering Personnel" = /obj/outfit/job/engineer/zavodskoi, + "Science Personnel" = /obj/outfit/job/scientist/zavodskoi ) -/datum/outfit/job/officer/zavodskoi +/obj/outfit/job/officer/zavodskoi name = "Security Officer - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/security/zavod @@ -79,7 +79,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/datum/outfit/job/warden/zavodskoi +/obj/outfit/job/warden/zavodskoi name = "Warden - Zavodskoi Interstellar" head = /obj/item/clothing/head/warden/zavod @@ -93,7 +93,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/datum/outfit/job/intern_sec/officer/zavodskoi +/obj/outfit/job/intern_sec/officer/zavodskoi name = "Security Cadet - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/cadet/zavod @@ -104,7 +104,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/datum/outfit/job/intern_sec/forensics/zavodskoi +/obj/outfit/job/intern_sec/forensics/zavodskoi name = "Investigator Intern - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/cadet/zavod @@ -115,7 +115,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/datum/outfit/job/forensics/zavodskoi +/obj/outfit/job/forensics/zavodskoi name = "Investigator - Zavodskoi Interstellar" id = /obj/item/card/id/zavodskoi/sec @@ -127,7 +127,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/datum/outfit/job/scientist/zavodskoi +/obj/outfit/job/scientist/zavodskoi name = "Scientist - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/scientist/zavod @@ -140,7 +140,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/datum/outfit/job/scientist/xenobiologist/zavodskoi +/obj/outfit/job/scientist/xenobiologist/zavodskoi name = "Xenobiologist - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/scientist/xenobio/zavod @@ -153,7 +153,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/datum/outfit/job/scientist/xenobotanist/zavodskoi +/obj/outfit/job/scientist/xenobotanist/zavodskoi name = "Xenobotanist - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/scientist/botany/zavod @@ -161,7 +161,7 @@ id = /obj/item/card/id/zavodskoi shoes = /obj/item/clothing/shoes/sneakers/medsci/zavod -/datum/outfit/job/scientist/xenoarchaeologist/zavodskoi +/obj/outfit/job/scientist/xenoarchaeologist/zavodskoi name = "Xenoarchaeologist - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/scientist/xenoarchaeologist/zavod @@ -174,7 +174,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/datum/outfit/job/intern_sci/zavodskoi +/obj/outfit/job/intern_sci/zavodskoi name = "Lab Assistant - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/scientist/intern/zavod @@ -186,7 +186,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/datum/outfit/job/engineer/zavodskoi +/obj/outfit/job/engineer/zavodskoi name = "Engineer - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/engineer/zavod @@ -198,7 +198,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/datum/outfit/job/atmos/zavodskoi +/obj/outfit/job/atmos/zavodskoi name = "Atmospheric Technician - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/atmospheric_technician/zavod @@ -210,7 +210,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/datum/outfit/job/intern_eng/zavodskoi +/obj/outfit/job/intern_eng/zavodskoi name = "Engineering Apprentice - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/engineer/apprentice/zavod @@ -222,7 +222,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/datum/outfit/job/intern_atmos/zavodskoi +/obj/outfit/job/intern_atmos/zavodskoi name = "Atmospherics Apprentice - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/rank/engineer/apprentice/zavod @@ -234,7 +234,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/datum/outfit/job/representative/zavodskoi +/obj/outfit/job/representative/zavodskoi name = "Zavodskoi Interstellar Corporate Liaison" head = /obj/item/clothing/head/beret/corporate/zavod @@ -255,7 +255,7 @@ /obj/item/stamp/zavodskoi = 1 ) -/datum/outfit/job/journalist/zavodskoi +/obj/outfit/job/journalist/zavodskoi name = "Corporate Reporter - Zavodskoi Interstellar" uniform = /obj/item/clothing/under/librarian/zavod @@ -266,7 +266,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod -/datum/outfit/job/visitor/zavodskoi +/obj/outfit/job/visitor/zavodskoi name = "Off-Duty Crew Member - Zavodskoi Interstellar" id = /obj/item/card/id/zavodskoi diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index 0c6d76bfdc0..1412df7d8aa 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -40,26 +40,26 @@ ) titles_to_loadout = list( - "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, - "First Responder" = /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, - "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/zeng_hu, - "Medical Personnel" = /datum/outfit/job/med_tech/zeng_hu + "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, + "First Responder" = /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, + "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/zeng_hu, + "Medical Personnel" = /obj/outfit/job/med_tech/zeng_hu ) -/datum/outfit/job/doctor/zeng_hu +/obj/outfit/job/doctor/zeng_hu name = "Physician - Zeng-Hu" uniform = /obj/item/clothing/under/rank/medical/zeng @@ -72,7 +72,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/datum/outfit/job/doctor/surgeon/zeng_hu +/obj/outfit/job/doctor/surgeon/zeng_hu name = "Surgeon - Zeng-Hu" uniform = /obj/item/clothing/under/rank/medical/surgeon/zeng @@ -85,11 +85,11 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/datum/outfit/job/doctor/surgeon/zeng_hu/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) -/datum/outfit/job/pharmacist/zeng_hu +/obj/outfit/job/pharmacist/zeng_hu name = "Pharmacist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/medical/pharmacist/zeng @@ -102,7 +102,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/datum/outfit/job/psychiatrist/zeng_hu +/obj/outfit/job/psychiatrist/zeng_hu name = "Psychiatrist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/medical/psych/zeng @@ -115,7 +115,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/datum/outfit/job/med_tech/zeng_hu +/obj/outfit/job/med_tech/zeng_hu name = "First Responder - Zeng-Hu" head = /obj/item/clothing/head/softcap/zeng @@ -128,7 +128,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/datum/outfit/job/intern_med/zeng_hu +/obj/outfit/job/intern_med/zeng_hu name = "Medical Intern - Zeng-Hu" uniform = /obj/item/clothing/under/rank/medical/intern/zeng @@ -140,7 +140,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/datum/outfit/job/scientist/zeng_hu +/obj/outfit/job/scientist/zeng_hu name = "Scientist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/scientist/zeng @@ -153,7 +153,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/datum/outfit/job/scientist/xenobiologist/zeng_hu +/obj/outfit/job/scientist/xenobiologist/zeng_hu name = "Xenobiologist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/scientist/xenobio/zeng @@ -166,7 +166,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/datum/outfit/job/scientist/xenobotanist/zeng_hu +/obj/outfit/job/scientist/xenobotanist/zeng_hu name = "Xenobotanist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/scientist/botany/zeng @@ -179,7 +179,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/datum/outfit/job/scientist/xenoarchaeologist/zeng_hu +/obj/outfit/job/scientist/xenoarchaeologist/zeng_hu name = "Xenoarchaeologist - Zeng-Hu" uniform = /obj/item/clothing/under/rank/scientist/xenoarchaeologist/zeng @@ -192,7 +192,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/datum/outfit/job/intern_sci/zeng_hu +/obj/outfit/job/intern_sci/zeng_hu name = "Lab Assistant - Zeng-Hu" uniform = /obj/item/clothing/under/rank/scientist/intern/zeng @@ -204,7 +204,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/datum/outfit/job/representative/zeng_hu +/obj/outfit/job/representative/zeng_hu name = "Zeng-Hu Corporate Liaison" head = /obj/item/clothing/head/beret/corporate/zeng @@ -224,7 +224,7 @@ /obj/item/gun/energy/pistol = 1, /obj/item/stamp/zeng_hu = 1 ) -/datum/outfit/job/journalist/zeng_hu +/obj/outfit/job/journalist/zeng_hu name = "Corporate Reporter - Zeng-Hu" uniform = /obj/item/clothing/under/librarian/zeng @@ -235,7 +235,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng -/datum/outfit/job/visitor/zeng_hu +/obj/outfit/job/visitor/zeng_hu name = "Off-Duty Crew Member - Zeng-Hu" id = /obj/item/card/id/zeng_hu diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 58c602d7e15..c0a654a534c 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -28,11 +28,11 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) SPECIES_SKRELL_AXIORI = 120 ) // Old geezer captains ftw - outfit = /datum/outfit/job/captain + outfit = /obj/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) -/datum/outfit/job/captain +/obj/outfit/job/captain name = "Captain" jobtype = /datum/job/captain @@ -64,7 +64,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 -/datum/outfit/job/captain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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 @@ -106,7 +106,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) SPECIES_SKRELL_AXIORI = 80 ) - outfit = /datum/outfit/job/xo + outfit = /obj/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, @@ -120,7 +120,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) -/datum/outfit/job/xo +/obj/outfit/job/xo name = "Executive Officer" jobtype = /datum/job/xo @@ -169,14 +169,14 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) SPECIES_SKRELL_AXIORI = 55 ) - outfit = /datum/outfit/job/bridge_crew + outfit = /obj/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) -/datum/outfit/job/bridge_crew +/obj/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 5c7b8bd253d..a96896b17d1 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 = /datum/outfit/job/bartender + outfit = /obj/outfit/job/bartender blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/datum/outfit/job/bartender +/obj/outfit/job/bartender name = "Bartender" jobtype = /datum/job/bartender @@ -64,10 +64,10 @@ access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN) minimal_access = list(ACCESS_KITCHEN) alt_titles = list("Cook") - outfit = /datum/outfit/job/chef + outfit = /obj/outfit/job/chef blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/datum/outfit/job/chef +/obj/outfit/job/chef name = "Chef" jobtype = /datum/job/chef @@ -113,11 +113,11 @@ access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN) minimal_access = list(ACCESS_HYDROPONICS) - outfit = /datum/outfit/job/hydro + outfit = /obj/outfit/job/hydro blacklisted_species = list(SPECIES_VAURCA_BREEDER) alt_titles = list("Hydroponicist") -/datum/outfit/job/hydro +/obj/outfit/job/hydro name = "Gardener" jobtype = /datum/job/hydro @@ -144,7 +144,7 @@ messengerbag = /obj/item/storage/backpack/messenger/hyd messengerbag_faction = /obj/item/storage/backpack/messenger/nt -/datum/outfit/job/hydro/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) @@ -165,11 +165,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 = /datum/outfit/job/janitor + outfit = /obj/outfit/job/janitor blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/datum/outfit/job/janitor +/obj/outfit/job/janitor name = "Janitor" jobtype = /datum/job/janitor @@ -204,13 +204,13 @@ access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS) minimal_access = list(ACCESS_LIBRARY) alt_titles = list("Curator", "Tech Support") - alt_outfits = list("Curator" = /datum/outfit/job/librarian/curator, "Tech Support" = /datum/outfit/job/librarian/tech_support) + alt_outfits = list("Curator" = /obj/outfit/job/librarian/curator, "Tech Support" = /obj/outfit/job/librarian/tech_support) title_accesses = list("Tech Support" = ACCESS_IT) - outfit = /datum/outfit/job/librarian + outfit = /obj/outfit/job/librarian blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/datum/outfit/job/librarian +/obj/outfit/job/librarian name = "Librarian" jobtype = /datum/job/librarian @@ -233,7 +233,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/nt messengerbag_faction = /obj/item/storage/backpack/messenger/nt -/datum/outfit/job/librarian/curator +/obj/outfit/job/librarian/curator name = "Curator" jobtype = /datum/job/librarian @@ -241,7 +241,7 @@ r_pocket = /obj/item/device/price_scanner l_hand = null -/datum/outfit/job/librarian/tech_support +/obj/outfit/job/librarian/tech_support name = "Tech Support" jobtype = /datum/job/librarian @@ -252,7 +252,7 @@ l_hand = /obj/item/modular_computer/laptop/preset gloves = /obj/item/modular_computer/handheld/wristbound/preset/advanced/civilian -/datum/outfit/job/librarian/tech_support/equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/job/librarian/tech_support/equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(visualsOnly) r_hand = null else @@ -272,11 +272,11 @@ access = list(ACCESS_CHAPEL_OFFICE, ACCESS_MAINT_TUNNELS) minimal_access = list(ACCESS_CHAPEL_OFFICE) alt_titles = list("Presbyter", "Rabbi", "Imam", "Priest", "Shaman", "Counselor") - outfit = /datum/outfit/job/chaplain + outfit = /obj/outfit/job/chaplain blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/datum/outfit/job/chaplain +/obj/outfit/job/chaplain name = "Chaplain" jobtype = /datum/job/chaplain uniform = /obj/item/clothing/under/rank/chaplain @@ -296,7 +296,7 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/nt messengerbag_faction = /obj/item/storage/backpack/messenger/nt -/datum/outfit/job/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/job/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(visualsOnly) @@ -352,11 +352,11 @@ SPECIES_SKRELL_AXIORI = 90 ) - outfit = /datum/outfit/job/operations_manager + outfit = /obj/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) -/datum/outfit/job/operations_manager +/obj/outfit/job/operations_manager name = "Operations Manager" jobtype = /datum/job/operations_manager @@ -400,11 +400,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 = /datum/outfit/job/hangar_tech + outfit = /obj/outfit/job/hangar_tech blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/datum/outfit/job/hangar_tech +/obj/outfit/job/hangar_tech name = "Hangar Technician" jobtype = /datum/job/hangar_tech @@ -441,11 +441,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 = /datum/outfit/job/mining + outfit = /obj/outfit/job/mining blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/datum/outfit/job/mining +/obj/outfit/job/mining name = "Shaft Miner" jobtype = /datum/job/mining @@ -496,11 +496,11 @@ minimal_player_age = 7 - outfit = /datum/outfit/job/machinist + outfit = /obj/outfit/job/machinist blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/datum/outfit/job/machinist +/obj/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 f830f263a91..2e024e28432 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -35,11 +35,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 = /datum/outfit/job/chief_engineer + outfit = /obj/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) -/datum/outfit/job/chief_engineer +/obj/outfit/job/chief_engineer name = "Chief Engineer" jobtype = /datum/job/chief_engineer box = /obj/item/storage/box/survival/engineer @@ -65,7 +65,7 @@ dufflebag = /obj/item/storage/backpack/duffel/ce messengerbag = /obj/item/storage/backpack/messenger/ce -/datum/outfit/job/chief_engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) @@ -97,11 +97,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 = /datum/outfit/job/engineer + outfit = /obj/outfit/job/engineer blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/datum/outfit/job/engineer +/obj/outfit/job/engineer name = "Engineer" jobtype = /datum/job/engineer box = /obj/item/storage/box/survival/engineer @@ -135,7 +135,7 @@ /obj/item/powerdrill = 1 ) -/datum/outfit/job/engineer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) @@ -165,10 +165,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 = /datum/outfit/job/atmos + outfit = /obj/outfit/job/atmos blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/datum/outfit/job/atmos +/obj/outfit/job/atmos name = "Atmospheric Technician" jobtype = /datum/job/atmos box = /obj/item/storage/box/survival/engineer @@ -202,7 +202,7 @@ /obj/item/powerdrill = 1 ) -/datum/outfit/job/atmos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) @@ -218,7 +218,7 @@ department_flag = ENGSEC faction = "Station" alt_titles = list("Atmospherics Apprentice") - alt_outfits = list("Atmospherics Apprentice" = /datum/outfit/job/intern_atmos) + alt_outfits = list("Atmospherics Apprentice" = /obj/outfit/job/intern_atmos) total_positions = 3 spawn_positions = 3 intro_prefix = "an" @@ -226,7 +226,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 = /datum/outfit/job/intern_eng + outfit = /obj/outfit/job/intern_eng blacklisted_species = list(SPECIES_VAURCA_BREEDER) minimum_character_age = list( @@ -235,7 +235,7 @@ SPECIES_SKRELL_AXIORI = 58 ) -/datum/outfit/job/intern_eng +/obj/outfit/job/intern_eng name = "Engineering Apprentice" jobtype = /datum/job/intern_eng box = /obj/item/storage/box/survival/engineer @@ -267,7 +267,7 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/engineering tablet = /obj/item/modular_computer/handheld/preset/engineering -/datum/outfit/job/intern_atmos +/obj/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 f2135fd8f5c..bf212493c36 100644 --- a/code/game/jobs/job/event.dm +++ b/code/game/jobs/job/event.dm @@ -20,7 +20,7 @@ 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 = /datum/outfit/job/officer + outfit = /obj/outfit/job/officer 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) @@ -44,7 +44,7 @@ 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_FIRST_RESPONDER) 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_FIRST_RESPONDER) - outfit = /datum/outfit/job/med_tech + outfit = /obj/outfit/job/med_tech blacklisted_species = list(SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G2, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) @@ -68,7 +68,7 @@ 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 = /datum/outfit/job/engineer + outfit = /obj/outfit/job/engineer blacklisted_species = list(SPECIES_VAURCA_BREEDER) @@ -94,7 +94,7 @@ minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_INTREPID) minimal_player_age = 14 - outfit = /datum/outfit/job/scientist + outfit = /obj/outfit/job/scientist blacklisted_species = list(SPECIES_VAURCA_BREEDER) /datum/job/eventops @@ -116,6 +116,6 @@ 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 = /datum/outfit/job/hangar_tech + outfit = /obj/outfit/job/hangar_tech blacklisted_species = list(SPECIES_VAURCA_BREEDER) diff --git a/code/game/jobs/job/hra.dm b/code/game/jobs/job/hra.dm index fb70c7ef7f8..2abdf4d457c 100644 --- a/code/game/jobs/job/hra.dm +++ b/code/game/jobs/job/hra.dm @@ -23,11 +23,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 = /datum/outfit/job/hra + outfit = /obj/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) -/datum/outfit/job/hra +/obj/outfit/job/hra name = "Human Resources Assistant" jobtype = /datum/job/hra @@ -61,7 +61,7 @@ /obj/item/modular_computer/laptop/preset/command = 1, ) -/datum/outfit/job/hra/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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 c4ce6189d9d..83c6a6e8c94 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -39,8 +39,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/datum/outfit/outfit = null - var/list/alt_outfits = null // A list of special outfits for the alt titles list("alttitle" = /datum/outfit) + var/obj/outfit/outfit = null + var/list/alt_outfits = null // A list of special outfits for the alt titles list("alttitle" = /obj/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 @@ -137,7 +137,7 @@ if(!F.is_default) var/new_outfit = F.titles_to_loadout[title] if(ispath(new_outfit)) - var/datum/outfit/O = new new_outfit + var/obj/outfit/O = new new_outfit O.pre_equip(H, TRUE) O.equip(H, TRUE) return @@ -207,7 +207,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) -/datum/outfit/job +/obj/outfit/job name = "Standard Gear" var/base_name = null collect_not_del = FALSE @@ -234,7 +234,7 @@ var/box = /obj/item/storage/box/survival -/datum/outfit/job/equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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 @@ -242,16 +242,16 @@ backpack_contents[spawnbox] = 1 . = ..() -/datum/outfit/job/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/outfit/job/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() -/datum/outfit/job/get_id_access(mob/living/carbon/human/H) +/obj/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)) -/datum/outfit/job/get_id_rank(mob/living/carbon/human/H) +/obj/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 d145f7a1689..fd31e85ce0d 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -32,11 +32,11 @@ SPECIES_SKRELL = 100, SPECIES_SKRELL_AXIORI = 100 ) - outfit = /datum/outfit/job/cmo + outfit = /obj/outfit/job/cmo blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/datum/outfit/job/cmo +/obj/outfit/job/cmo name = "Chief Medical Officer" jobtype = /datum/job/cmo @@ -81,7 +81,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 = /datum/outfit/job/doctor + outfit = /obj/outfit/job/doctor blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /datum/job/surgeon @@ -105,10 +105,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 = /datum/outfit/job/doctor/surgeon + outfit = /obj/outfit/job/doctor/surgeon blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/datum/outfit/job/doctor +/obj/outfit/job/doctor name = "Physician" base_name = "Physician" jobtype = /datum/job/doctor @@ -137,7 +137,7 @@ messengerbag = /obj/item/storage/backpack/messenger/med messengerbag_faction = /obj/item/storage/backpack/messenger/nt -/datum/outfit/job/doctor/surgeon +/obj/outfit/job/doctor/surgeon name = "Surgeon" jobtype = /datum/job/surgeon @@ -145,7 +145,7 @@ suit = /obj/item/clothing/suit/storage/toggle/labcoat/nt shoes = /obj/item/clothing/shoes/sneakers/medsci -/datum/outfit/job/doctor/surgeon/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) @@ -169,10 +169,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 = /datum/outfit/job/pharmacist + outfit = /obj/outfit/job/pharmacist blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/datum/outfit/job/pharmacist +/obj/outfit/job/pharmacist name = "Pharmacist" jobtype = /datum/job/pharmacist @@ -220,11 +220,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 = /datum/outfit/job/psychiatrist - alt_outfits = list("Psychologist" = /datum/outfit/job/psychiatrist/psycho) + outfit = /obj/outfit/job/psychiatrist + alt_outfits = list("Psychologist" = /obj/outfit/job/psychiatrist/psycho) blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/datum/outfit/job/psychiatrist +/obj/outfit/job/psychiatrist name = "Psychiatrist" base_name = "Psychiatrist" jobtype = /datum/job/psychiatrist @@ -252,7 +252,7 @@ messengerbag = /obj/item/storage/backpack/messenger/psych messengerbag_faction = /obj/item/storage/backpack/messenger/nt -/datum/outfit/job/psychiatrist/psycho +/obj/outfit/job/psychiatrist/psycho name = "Psychologist" jobtype = /datum/job/psychiatrist @@ -276,11 +276,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_FIRST_RESPONDER) 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_FIRST_RESPONDER) - outfit = /datum/outfit/job/med_tech + outfit = /obj/outfit/job/med_tech blacklisted_species = list(SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G2, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/datum/outfit/job/med_tech +/obj/outfit/job/med_tech name = "First Responder" base_name = "First Responder" jobtype = /datum/job/med_tech @@ -320,7 +320,7 @@ department_flag = MEDSCI faction = "Station" alt_titles = list("First Responder Trainee", "Pharmacy Intern", "Resident Physician", "Resident Surgeon", "Resident Psychiatrist") - alt_outfits = list("First Responder 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_outfits = list("First Responder 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_ages = list("Pharmacy Intern" = list( SPECIES_HUMAN = 25, SPECIES_SKRELL = 58, @@ -352,10 +352,10 @@ SPECIES_SKRELL = 50, SPECIES_SKRELL_AXIORI = 50 ) - outfit = /datum/outfit/job/intern_med + outfit = /obj/outfit/job/intern_med blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) -/datum/outfit/job/intern_med +/obj/outfit/job/intern_med name = "Medical Intern" jobtype = /datum/job/intern_med @@ -379,7 +379,7 @@ wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/medical tablet = /obj/item/modular_computer/handheld/preset/medical -/datum/outfit/job/intern_med/medtech +/obj/outfit/job/intern_med/medtech name = "First Responder Trainee" head = /obj/item/clothing/head/softcap/nt @@ -394,7 +394,7 @@ /obj/item/storage/firstaid = 1 ) -/datum/outfit/job/intern_med/pharmacist +/obj/outfit/job/intern_med/pharmacist name = "Pharmacy Intern" shoes = /obj/item/clothing/shoes/sneakers/medsci @@ -404,16 +404,16 @@ dufflebag = /obj/item/storage/backpack/duffel/pharm messengerbag = /obj/item/storage/backpack/messenger/pharm -/datum/outfit/job/intern_med/surgeon +/obj/outfit/job/intern_med/surgeon name = "Resident Surgeon" shoes = /obj/item/clothing/shoes/sneakers/medsci -/datum/outfit/job/intern_med/surgeon/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/obj/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) -/datum/outfit/job/intern_med/psychiatrist +/obj/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 b413fa35c28..f5d614389c9 100644 --- a/code/game/jobs/job/outsider/merchant.dm +++ b/code/game/jobs/job/outsider/merchant.dm @@ -26,7 +26,7 @@ latejoin_at_spawnpoints = TRUE - outfit = /datum/outfit/job/merchant + outfit = /obj/outfit/job/merchant blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /datum/job/merchant/announce(mob/living/carbon/human/H) @@ -38,7 +38,7 @@ spawn_positions = 1 total_positions = 1 -/datum/outfit/job/merchant +/obj/outfit/job/merchant name = "Merchant" jobtype = /datum/job/merchant @@ -51,7 +51,7 @@ tablet = /obj/item/modular_computer/handheld/preset/civilian r_pocket = /obj/item/device/price_scanner -/datum/outfit/merchant_assistant +/obj/outfit/merchant_assistant name = "Merchant's Assistant" id = /obj/item/card/id/merchant tab_pda = /obj/item/modular_computer/handheld/pda/civilian/merchant @@ -90,8 +90,8 @@ /obj/item/storage/wallet/random = 1 ) -/datum/outfit/merchant_assistant/get_id_rank(mob/living/carbon/human/H) +/obj/outfit/merchant_assistant/get_id_rank(mob/living/carbon/human/H) return "Merchant's Assistant" -/datum/outfit/merchant_assistant/get_id_access() +/obj/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 f3c01695630..80245641e04 100644 --- a/code/game/jobs/job/outsider/representative.dm +++ b/code/game/jobs/job/outsider/representative.dm @@ -18,12 +18,12 @@ access = list(ACCESS_JOURNALIST, ACCESS_MAINT_TUNNELS) minimal_access = list(ACCESS_JOURNALIST, ACCESS_MAINT_TUNNELS) alt_titles = list("Freelance Journalist") - alt_outfits = list("Freelance Journalist" = /datum/outfit/job/journalistf) + alt_outfits = list("Freelance Journalist" = /obj/outfit/job/journalistf) title_accesses = list("Corporate Reporter" = list(ACCESS_MEDICAL, ACCESS_SEC_DOORS, ACCESS_RESEARCH, ACCESS_ENGINE)) - outfit = /datum/outfit/job/journalist + outfit = /obj/outfit/job/journalist blacklisted_species = list(SPECIES_VAURCA_BREEDER) -/datum/outfit/job/journalist +/obj/outfit/job/journalist name = "Corporate Reporter" jobtype = /datum/job/journalist @@ -49,7 +49,7 @@ /obj/item/device/tvcamera = 1 ) -/datum/outfit/job/journalistf +/obj/outfit/job/journalistf name = "Freelance Journalist" jobtype = /datum/job/journalist @@ -90,7 +90,7 @@ "Corporate Representative", "Corporate Executive" ) - outfit = /datum/outfit/job/representative + outfit = /obj/outfit/job/representative blacklisted_species = list(SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /datum/job/consular/pre_spawn(mob/abstract/new_player/player) @@ -105,7 +105,7 @@ var/datum/faction/faction = SSjobs.GetFaction(H) LAZYDISTINCTADD(faction.allowed_role_types, REPRESENTATIVE_ROLE) -/datum/outfit/job/representative +/obj/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 ) -/datum/outfit/job/representative/post_equip(mob/living/carbon/human/H, visualsOnly) +/obj/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 -/datum/outfit/job/representative/proc/send_representative_mission(var/mob/living/carbon/human/H) +/obj/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: