cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-29 03:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

The Uniformity : The Confluence of Conformity (#13773)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2022-05-13 18:08:50 +08:00
committed by GitHub
parent 72f22493a3
commit 3e8f9e0901
89 changed files with 1063 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
code/datums/outfits/ert/ap_eridani.dm
View File

@@ -1,7 +1,7 @@
/datum/outfit/admin/ert/ap_eridani
name = "Eridani Asset Protection Specialist"
uniform = /obj/item/clothing/under/rank/security/eridani
uniform = /obj/item/clothing/under/rank/security/pmc
accessory = /obj/item/clothing/accessory/holster/thigh
accessory_contents = list(/obj/item/gun/projectile/automatic/x9 = 1)
suit = /obj/item/clothing/suit/space/void/cruiser
@@ -13,7 +13,7 @@
suit_store = /obj/item/gun/energy/rifle
back = /obj/item/storage/backpack/satchel_sec
belt = /obj/item/storage/belt/military
id = /obj/item/card/id/distress/ap_eridani
id = /obj/item/card/id/distress/ap_eridani
l_ear = /obj/item/device/radio/headset/distress
l_pocket = /obj/item/grenade/chem_grenade/teargas
r_pocket = /obj/item/tank/emergency_oxygen/double
@@ -22,7 +22,7 @@
/obj/item/storage/box/survival = 1,
/obj/item/reagent_containers/hypospray/autoinjector/survival = 1,
/obj/item/storage/firstaid/regular = 1,
/obj/item/clothing/head/softcap/eri = 1,
/obj/item/clothing/head/softcap/pmc = 1,
/obj/item/gun/energy/gun/nuclear = 1,
/obj/item/storage/belt/utility/very_full = 1
)
@@ -54,14 +54,14 @@
if(!H.shoes)
var/obj/item/clothing/shoes/jackboots/toeless/shoes = new(src)
H.equip_to_slot_if_possible(shoes, slot_shoes)
H.equip_to_slot_if_possible(shoes, slot_shoes)
/datum/outfit/admin/ert/ap_eridani/lead
name = "Eridani Section Leader"
uniform = /obj/item/clothing/under/rank/security/eridani/alt
uniform = /obj/item/clothing/under/rank/warden/pmc
suit = null
head = /obj/item/clothing/head/beret/security/eri
head = /obj/item/clothing/head/beret/corporate/pmc
mask = /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba
back = /obj/item/rig/strike/distress
suit_store = null
@@ -85,10 +85,10 @@
/datum/outfit/admin/ert/ap_eridani/doctor
name = "Eridani Medical Officer"
uniform = /obj/item/clothing/under/rank/eridani_medic
uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc
suit = /obj/item/clothing/suit/storage/medical_chest_rig
suit_store = /obj/item/clothing/head/hardhat/first_responder
head = /obj/item/clothing/head/beret/security/eri
head = /obj/item/clothing/head/beret/corporate/pmc
mask = /obj/item/clothing/mask/surgical
glasses = /obj/item/clothing/glasses/hud/health/aviator
shoes = /obj/item/clothing/shoes/swat/ert
@@ -99,7 +99,7 @@
accessory_contents = list(/obj/item/gun/energy/disruptorpistol/magnum = 1)
r_ear = /obj/item/device/flashlight/pen
l_pocket = /obj/item/device/healthanalyzer
r_pocket = /obj/item/melee/telebaton
r_pocket = /obj/item/melee/telebaton
l_hand = /obj/item/clothing/head/helmet/space/void/medical
r_hand = /obj/item/clothing/suit/space/void/medical
@@ -129,10 +129,10 @@
/datum/outfit/admin/ert/ap_eridani/corpsman
name = "Eridani Corpsman"
uniform = /obj/item/clothing/under/rank/eridani_medic
uniform = /obj/item/clothing/under/rank/medical/first_responder/pmc
suit = /obj/item/clothing/suit/storage/medical_chest_rig
suit_store = /obj/item/clothing/head/hardhat/first_responder
head = /obj/item/clothing/head/softcap/eri
head = /obj/item/clothing/head/softcap/medical/pmc
mask = /obj/item/clothing/mask/surgical
glasses = /obj/item/clothing/glasses/hud/health/aviator
gloves = /obj/item/clothing/gloves/latex/nitrile

10
code/datums/outfits/event/outfit_megacorps.dm
View File

@@ -1,7 +1,7 @@
/datum/outfit/admin/megacorp/hephaestus_trooper
name = "Hephaestus Asset Protection"
uniform = /obj/item/clothing/under/rank/hephaestus/tech
uniform = /obj/item/clothing/under/rank/engineer/apprentice/heph
back = /obj/item/storage/backpack/satchel
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/magboots
@@ -44,7 +44,7 @@
/datum/outfit/admin/megacorp/zenghu_trooper
name = "Zeng Hu Pharmaceuticals Asset Protection"
uniform = /obj/item/clothing/under/rank/zeng/civilian
uniform = /obj/item/clothing/under/rank/medical/first_responder/zeng
back = /obj/item/storage/backpack/satchel
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/magboots
@@ -82,7 +82,7 @@
/datum/outfit/admin/megacorp/zavodskoi_trooper
name = "Zavodskoi Interstellar Asset Protection"
uniform = /obj/item/clothing/under/rank/zavodskoi
uniform = /obj/item/clothing/under/rank/security/zavod
back = /obj/item/storage/backpack/satchel
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/magboots
@@ -133,7 +133,7 @@
/datum/outfit/admin/megacorp/einstein_trooper/heavy
name = "Einstein Engines Asset Protection"
uniform = /obj/item/clothing/under/rank/einstein_engines
uniform = /obj/item/clothing/under/rank/engineer/heph
back = /obj/item/rig/ert/assetprotection/einstein
belt = /obj/item/storage/belt/security/tactical
shoes = null
@@ -156,4 +156,4 @@
/obj/item/handcuffs = 2,
/obj/item/grenade/frag = 1
)
id_iff = IFF_EE
id_iff = IFF_EE

11
code/datums/outfits/event/outfit_nanotrasen.dm
View File

@@ -110,7 +110,6 @@
name = "CCIA Agent"
uniform = /obj/item/clothing/under/rank/centcom_officer
suit = /obj/item/clothing/suit/storage/toggle/liaison
shoes = /obj/item/clothing/shoes/laceup
gloves = /obj/item/clothing/gloves/white
l_ear = /obj/item/device/radio/headset/ert/ccia
@@ -238,8 +237,8 @@
/datum/outfit/admin/nt/odindoc
name = "NTCC Odin Medical Specialist"
uniform = /obj/item/clothing/under/rank/medical/black
suit = /obj/item/clothing/suit/storage/toggle/labcoat/trauma
uniform = /obj/item/clothing/under/rank/medical/surgeon/zavod
suit = /obj/item/clothing/suit/storage/toggle/labcoat
shoes = /obj/item/clothing/shoes/trauma
mask = /obj/item/clothing/mask/surgical
l_hand = /obj/item/storage/firstaid/adv
@@ -269,7 +268,7 @@
/obj/item/reagent_containers/glass/bottle/dexalin_plus = 1,
/obj/item/reagent_containers/glass/bottle/butazoline = 1,
/obj/item/reagent_containers/glass/bottle/dermaline = 1,
/obj/item/reagent_containers/glass/bottle/perconol = 1
/obj/item/reagent_containers/glass/bottle/perconol = 1
)
id_access = "Medical Doctor"
@@ -277,8 +276,8 @@
/datum/outfit/admin/nt/odinpharm
name = "NTCC Odin Pharmacy Specialist"
uniform = /obj/item/clothing/under/rank/pharmacist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/pharmacist
uniform = /obj/item/clothing/under/rank/medical/pharmacist
suit = /obj/item/clothing/suit/storage/toggle/labcoat/nt
shoes = /obj/item/clothing/shoes/chemist
headset = /obj/item/device/radio/headset/headset_med
bowman = /obj/item/device/radio/headset/headset_med/alt

10
code/datums/outfits/outfit_antag.dm
View File

@@ -189,7 +189,7 @@
uniform = list(
/obj/item/clothing/under/serviceoveralls,
/obj/item/clothing/under/det,
/obj/item/clothing/under/det/zavod,
/obj/item/clothing/under/brown,
/obj/item/clothing/under/syndicate/tracksuit,
/obj/item/clothing/under/captainformal,
@@ -205,7 +205,7 @@
/obj/item/clothing/under/pants/khaki,
/obj/item/clothing/under/pants/musthang,
/obj/item/clothing/under/rank/bartender,
/obj/item/clothing/under/rank/cargo,
/obj/item/clothing/under/rank/hangar_technician/heph,
/obj/item/clothing/under/rank/chef,
/obj/item/clothing/under/rank/chaplain,
/obj/item/clothing/under/rank/engineer,
@@ -216,7 +216,7 @@
/obj/item/clothing/under/tactical,
/obj/item/clothing/under/tajaran,
/obj/item/clothing/under/tajaran/nt,
/obj/item/clothing/under/rank/hephaestus/tech,
/obj/item/clothing/under/rank/engineer/apprentice/heph,
/obj/item/clothing/under/unathi,
/obj/item/clothing/under/waiter
)
@@ -687,7 +687,7 @@
. = ..()
if(visualsOnly)
return
to_chat(H, "<b>You are the Technomancer's apprentice! Your goal is to assist them in their mission at the [station_name()].</b>")
to_chat(H, "<b>Your service has not gone unrewarded, however. Studying under them, you have learned how to use a Manipulation Core \
of your own. You also have a catalog, to purchase your own functions and equipment as you see fit.</b>")
@@ -707,4 +707,4 @@
r_pocket = /obj/item/disposable_teleporter/free
l_pocket = /obj/item/technomancer_catalog/golem
id = /obj/item/card/id/bluespace
id = /obj/item/card/id/bluespace

8
code/datums/underwear/bottom.dm
View File

@@ -82,9 +82,9 @@
name = "Shorts, Zavodskoi Interstellar"
icon_state = "shorts_necropolis"
/datum/category_item/underwear/bottom/shorts_epmc
name = "Shorts, EPMC"
icon_state = "shorts_epmc"
/datum/category_item/underwear/bottom/shorts_pmc
name = "Shorts, PMCG"
icon_state = "shorts_pmc"
/datum/category_item/underwear/bottom/midway
name = "Midway Briefs"
@@ -119,4 +119,4 @@
/datum/category_item/underwear/bottom/fishnet_lower
name = "Fishnet Bottoms"
icon_state = "fishnet_lower"
has_color = TRUE
has_color = TRUE

12
code/datums/underwear/undershirt.dm
View File

@@ -294,13 +294,13 @@
name = "Shirt, Zavodskoi Interstellar Feminine"
icon_state = "shirt_necropolis_fem"
/datum/category_item/underwear/undershirt/shirt_epmc
name = "Shirt, EPMC"
icon_state = "shirt_epmc"
/datum/category_item/underwear/undershirt/shirt_pmc
name = "Shirt, PMCG"
icon_state = "shirt_pmc"
/datum/category_item/underwear/undershirt/shirt_epmc_fem
name = "Shirt, EPMC Feminine"
icon_state = "shirt_epmc_fem"
/datum/category_item/underwear/undershirt/shirt_pmc_fem
name = "Shirt, PMCG Feminine"
icon_state = "shirt_pmc_fem"
/datum/category_item/underwear/undershirt/polo
name = "Polo"