Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Outfit improvements #19896

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
1 change: 1 addition & 0 deletions aurorastation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3749,6 +3749,7 @@
#include "code\unit_tests\object_tests.dm"
#include "code\unit_tests\observation_tests.dm"
#include "code\unit_tests\origins_tests.dm"
#include "code\unit_tests\outfit_tests.dm"
#include "code\unit_tests\overmap_tests.dm"
#include "code\unit_tests\power_tests.dm"
#include "code\unit_tests\recipe_tests.dm"
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystems/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@ SUBSYSTEM_DEF(jobs)
var/uniform = job.get_outfit(H)
if(!uniform) // silicons don't have uniforms or gear
return
var/obj/outfit/U = new uniform
var/datum/outfit/U = new uniform
var/spawned_uniform = FALSE
var/spawned_suit = FALSE
for(var/item in prefs.gear)
Expand Down
4 changes: 2 additions & 2 deletions code/controllers/subsystems/virtual_reality.dm
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@ SUBSYSTEM_DEF(virtualreality)
H.real_name = user.real_name
H.UpdateAppearance()

H.preEquipOutfit(/obj/outfit/admin/virtual_reality, FALSE)
H.equipOutfit(/obj/outfit/admin/virtual_reality, FALSE)
H.preEquipOutfit(/datum/outfit/admin/virtual_reality, FALSE)
H.equipOutfit(/datum/outfit/admin/virtual_reality, FALSE)

mind_transfer(user, H)
to_chat(H, SPAN_NOTICE("You are now in control of a virtual reality body. Dying will return you to your original body."))
12 changes: 6 additions & 6 deletions code/datums/outfits/ert/ap_eridani.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/obj/outfit/admin/ert/ap_eridani
/datum/outfit/admin/ert/ap_eridani
name = "Eridani Asset Protection Specialist"

uniform = /obj/item/clothing/under/rank/security/pmc/epmc
Expand Down Expand Up @@ -39,10 +39,10 @@

id_iff = IFF_ERIDANI

/obj/outfit/admin/ert/ap_eridani/get_id_access()
/datum/outfit/admin/ert/ap_eridani/get_id_access()
return get_distress_access()

/obj/outfit/admin/ert/ap_eridani/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/datum/outfit/admin/ert/ap_eridani/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
Expand All @@ -56,7 +56,7 @@
var/obj/item/clothing/shoes/jackboots/toeless/shoes = new(src)
H.equip_to_slot_if_possible(shoes, slot_shoes)

/obj/outfit/admin/ert/ap_eridani/lead
/datum/outfit/admin/ert/ap_eridani/lead
name = "Eridani Section Leader"

uniform = /obj/item/clothing/under/rank/security/pmc/epmc/alt
Expand All @@ -82,7 +82,7 @@
/obj/item/melee/telebaton = 1
)

/obj/outfit/admin/ert/ap_eridani/doctor
/datum/outfit/admin/ert/ap_eridani/doctor
name = "Eridani Medical Officer"

uniform = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc
Expand Down Expand Up @@ -126,7 +126,7 @@
/obj/item/storage/pill_bottle/mortaphenyl = 1
)

/obj/outfit/admin/ert/ap_eridani/corpsman
/datum/outfit/admin/ert/ap_eridani/corpsman
name = "Eridani Corpsman"

uniform = /obj/item/clothing/under/rank/medical/paramedic/pmc/epmc
Expand Down
12 changes: 6 additions & 6 deletions code/datums/outfits/ert/biesel.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/obj/outfit/admin/ert/tcaf
/datum/outfit/admin/ert/tcaf
name = "Republican Fleet Legionary"
uniform = /obj/item/clothing/under/legion/tcaf
suit = /obj/item/clothing/suit/space/void/tcaf
Expand Down Expand Up @@ -33,7 +33,7 @@
)
id_iff = IFF_TCFL

/obj/outfit/admin/ert/tcaf/post_equip(mob/living/carbon/human/H, visualsOnly)
/datum/outfit/admin/ert/tcaf/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
if(isvaurca(H))
H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/vaurca/tactical(H), slot_wear_mask)
Expand All @@ -51,10 +51,10 @@
var/obj/item/clothing/shoes/magboots/boots = new(H)
H.equip_to_slot_if_possible(boots, slot_shoes)

/obj/outfit/admin/ert/tcaf/get_id_access(mob/living/carbon/human/H)
/datum/outfit/admin/ert/tcaf/get_id_access(mob/living/carbon/human/H)
return get_distress_access()

/obj/outfit/admin/ert/tcaf/medic
/datum/outfit/admin/ert/tcaf/medic
name = "Republican Fleet Medic"
belt = /obj/item/storage/belt/medical/paramedic/combat
glasses = /obj/item/clothing/glasses/hud/health
Expand Down Expand Up @@ -91,7 +91,7 @@
/obj/item/shield/energy/legion = 1
)

/obj/outfit/admin/ert/tcaf/engi
/datum/outfit/admin/ert/tcaf/engi
name = "Republican Fleet Engineer"
belt = /obj/item/storage/belt/utility/very_full
belt_contents = null
Expand All @@ -118,5 +118,5 @@
/obj/item/grenade/frag = 2
)

/obj/outfit/admin/ert/tcaf/officer
/datum/outfit/admin/ert/tcaf/officer
accessory = /obj/item/clothing/accessory/legion
22 changes: 11 additions & 11 deletions code/datums/outfits/ert/coalition.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/obj/outfit/admin/ert/coalition
/datum/outfit/admin/ert/coalition
name = "Coalition Ranger ERT"
uniform = /obj/item/clothing/under/tactical
shoes = /obj/item/clothing/shoes/magboots
Expand All @@ -23,10 +23,10 @@
accessory = /obj/item/clothing/accessory/holster/hip/brown
accessory_contents = list(/obj/item/gun/projectile/colt = 1)

/obj/outfit/admin/ert/coalition/get_id_access()
/datum/outfit/admin/ert/coalition/get_id_access()
return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_COALITION, ACCESS_COALITION_NAVY)

/obj/outfit/admin/ert/coalition/medic
/datum/outfit/admin/ert/coalition/medic
name = "Coalition Medic"
belt = /obj/item/storage/belt/medical/paramedic/combat
back = /obj/item/storage/backpack/satchel/med
Expand Down Expand Up @@ -55,7 +55,7 @@
/obj/item/reagent_containers/glass/bottle/perconol = 1
)

/obj/outfit/admin/ert/coalition/sapper
/datum/outfit/admin/ert/coalition/sapper
name = "Coalition Sapper"
back = /obj/item/storage/backpack/duffel/eng
belt = /obj/item/storage/belt/utility/very_full
Expand All @@ -72,7 +72,7 @@

belt_contents = null

/obj/outfit/admin/ert/coalition/leader
/datum/outfit/admin/ert/coalition/leader
name = "Coalition Team Leader"
head = null
suit = null
Expand All @@ -90,7 +90,7 @@
/obj/item/grenade/flashbang = 1
)

/obj/outfit/admin/ert/konyang
/datum/outfit/admin/ert/konyang
name = "KASF Emergency Responder"
uniform = /obj/item/clothing/under/rank/konyang/space
suit = /obj/item/clothing/suit/space/void/sol/konyang
Expand All @@ -116,15 +116,15 @@
/obj/item/melee/energy/sword/knife/sol = 1
)

/obj/outfit/admin/ert/konyang/get_id_access()
/datum/outfit/admin/ert/konyang/get_id_access()
return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_COALITION, ACCESS_COALITION_NAVY, ACCESS_KONYANG_POLICE)

/obj/outfit/admin/ert/konyang/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/datum/outfit/admin/ert/konyang/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(H.isSynthetic())
H.equip_to_slot_or_del(new /obj/item/device/suit_cooling_unit(H), slot_back)

/obj/outfit/admin/ert/konyang/medic
/datum/outfit/admin/ert/konyang/medic
name = "KASF Medic"
belt = /obj/item/storage/belt/medical/paramedic/combat
back = /obj/item/storage/backpack/satchel/med
Expand Down Expand Up @@ -153,7 +153,7 @@
/obj/item/melee/energy/sword/knife/sol = 1
)

/obj/outfit/admin/ert/konyang/sapper
/datum/outfit/admin/ert/konyang/sapper
name = "KASF Sapper"
back = /obj/item/storage/backpack/industrial
belt = /obj/item/storage/belt/utility/very_full
Expand All @@ -174,6 +174,6 @@

belt_contents = null

/obj/outfit/admin/ert/konyang/leader
/datum/outfit/admin/ert/konyang/leader
name = "KASF Officer"
uniform = /obj/item/clothing/under/rank/konyang/space/officer
16 changes: 8 additions & 8 deletions code/datums/outfits/ert/deathsquad.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/obj/outfit/admin/deathsquad
/datum/outfit/admin/deathsquad
name = "Asset Protection"

uniform = /obj/item/clothing/under/ert
Expand Down Expand Up @@ -27,16 +27,16 @@

id_iff = IFF_DEATHSQUAD

/obj/outfit/admin/deathsquad/leader
/datum/outfit/admin/deathsquad/leader
name = "Asset Protection Lead"

l_pocket = /obj/item/pinpointer
r_hand = /obj/item/device/orbital_dropper/icarus_drones

/obj/outfit/admin/deathsquad/get_id_access()
/datum/outfit/admin/deathsquad/get_id_access()
return get_all_accesses()

/obj/outfit/admin/deathsquad/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/datum/outfit/admin/deathsquad/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
Expand Down Expand Up @@ -79,19 +79,19 @@

id_iff = IFF_DEATHSQUAD

/obj/outfit/admin/deathsquad/nt
/datum/outfit/admin/deathsquad/nt
name = "NanoTrasen Asset Protection Trooper"

back = /obj/item/rig/ert/ntassetprotection
/obj/outfit/admin/deathsquad/nt/leader
/datum/outfit/admin/deathsquad/nt/leader
name = "NanoTrasen Asset Protection Lead"

back = /obj/item/rig/ert/ntassetprotection/lead

/obj/outfit/admin/deathsquad/nt/get_id_access()
/datum/outfit/admin/deathsquad/nt/get_id_access()
return get_all_accesses()

/obj/outfit/admin/deathsquad/nt/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
/datum/outfit/admin/deathsquad/nt/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
Expand Down
12 changes: 6 additions & 6 deletions code/datums/outfits/ert/dominia.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/obj/outfit/admin/ert/dominia
/datum/outfit/admin/ert/dominia
name = "Imperial Fleet Responder"
uniform = /obj/item/clothing/under/dominia/fleet/armsman
suit = /obj/item/clothing/suit/space/void/dominia/voidsman
Expand Down Expand Up @@ -28,16 +28,16 @@
/obj/item/handcuffs/ziptie = 1
)

/obj/outfit/admin/ert/dominia/get_id_access()
/datum/outfit/admin/ert/dominia/get_id_access()
return list(ACCESS_DISTRESS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_IMPERIAL_FLEET_VOIDSMAN_SHIP)

/obj/outfit/admin/ert/dominia/post_equip(mob/living/carbon/human/H, visualsOnly)
/datum/outfit/admin/ert/dominia/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
if(H?.shoes)
var/obj/item/clothing/shoes/magboots/boots = new(H)
H.equip_to_slot_if_possible(boots, slot_shoes)

/obj/outfit/admin/ert/dominia/medic
/datum/outfit/admin/ert/dominia/medic
name = "Imperial Fleet Medic"
uniform = /obj/item/clothing/under/dominia/fleet
glasses = /obj/item/clothing/glasses/hud/health
Expand Down Expand Up @@ -68,7 +68,7 @@
/obj/item/reagent_containers/glass/bottle/perconol = 1
)

/obj/outfit/admin/ert/dominia/engi
/datum/outfit/admin/ert/dominia/engi
name = "Imperial Fleet Sapper"
uniform = /obj/item/clothing/under/dominia/fleet
back = /obj/item/storage/backpack/duffel/eng
Expand All @@ -84,7 +84,7 @@
)
belt_contents = null

/obj/outfit/admin/ert/dominia/officer
/datum/outfit/admin/ert/dominia/officer
name = "Imperial Fleet Officer"
uniform = /obj/item/clothing/under/dominia/fleet/officer
belt_contents = list(
Expand Down
10 changes: 5 additions & 5 deletions code/datums/outfits/ert/einstein.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/obj/outfit/admin/ert/einstein
/datum/outfit/admin/ert/einstein
name = "Einstein Engines ERT"
uniform = /obj/item/clothing/under/rank/security/einstein
shoes = /obj/item/clothing/shoes/jackboots
Expand Down Expand Up @@ -27,10 +27,10 @@
)
id_iff = IFF_EE

/obj/outfit/admin/ert/einstein/get_id_access()
/datum/outfit/admin/ert/einstein/get_id_access()
return get_distress_access_lesser()

/obj/outfit/admin/ert/einstein/medic
/datum/outfit/admin/ert/einstein/medic
name = "Einstein Medic"
belt = /obj/item/storage/belt/medical/paramedic/combat
glasses = /obj/item/clothing/glasses/hud/health
Expand Down Expand Up @@ -60,7 +60,7 @@
/obj/item/reagent_containers/glass/bottle/perconol = 1
)

/obj/outfit/admin/ert/einstein/engi
/datum/outfit/admin/ert/einstein/engi
name = "Einstein Engineer"
uniform = /obj/item/clothing/under/rank/engineer/einstein
back = /obj/item/storage/backpack/industrial
Expand All @@ -81,7 +81,7 @@
)
belt_contents = null

/obj/outfit/admin/ert/einstein/leader
/datum/outfit/admin/ert/einstein/leader
name = "Einstein Squad Leader"
back = /obj/item/rig/merc/einstein
l_hand = /obj/item/gun/energy/gun/nuclear
Expand Down
12 changes: 6 additions & 6 deletions code/datums/outfits/ert/elyra.dm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/obj/outfit/admin/ert/elyran_trooper
/datum/outfit/admin/ert/elyran_trooper
name = "Elyran Navy Crewman"

uniform = /obj/item/clothing/under/rank/elyran_fatigues
Expand Down Expand Up @@ -28,10 +28,10 @@
accessory = /obj/item/clothing/accessory/holster/hip/brown
accessory_contents = list(/obj/item/gun/projectile/sec/lethal = 1)

/obj/outfit/admin/ert/elyran_trooper/get_id_access()
/datum/outfit/admin/ert/elyran_trooper/get_id_access()
return get_distress_access()

/obj/outfit/admin/ert/elyran_trooper/leader
/datum/outfit/admin/ert/elyran_trooper/leader
name = "Elyran Navy Officer"

uniform = /obj/item/clothing/under/rank/elyran_fatigues/commander
Expand All @@ -47,7 +47,7 @@
l_hand = /obj/item/gun/projectile/plasma


/obj/outfit/admin/ert/elyran_trooper/engineer
/datum/outfit/admin/ert/elyran_trooper/engineer
name = "Elyran Navy Engineer"

back = /obj/item/storage/backpack/duffel/eng
Expand All @@ -62,7 +62,7 @@

belt_contents = null

/obj/outfit/admin/ert/elyran_trooper/medical
/datum/outfit/admin/ert/elyran_trooper/medical
name = "Elyran Navy Corpsman"

belt = /obj/item/storage/belt/medical/paramedic/combat
Expand Down Expand Up @@ -92,7 +92,7 @@
/obj/item/reagent_containers/glass/bottle/perconol = 1
)

/obj/outfit/admin/ert/elyran_trooper/heavy
/datum/outfit/admin/ert/elyran_trooper/heavy
name = "Elyran Navy Heavy Specialist"

head = null
Expand Down
Loading
Loading