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

Adds Amory's clothes here, from both PRs I made on CM #105

Merged
merged 4 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion code/game/machinery/vending/vendor_types/crew/medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_doctor, list(
list("UNIFORM (CHOOSE 1)", 0, null, null, null),
list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),

list("ARMOR (CHOOSE 1)", 0, null, null, null),
Expand Down Expand Up @@ -96,7 +97,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_nurse, list(
list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Medical Nurse Scrubs", 0, /obj/item/clothing/under/rank/medical/nurse, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),
list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),

list("ARMOR (CHOOSE 1)", 0, null, null, null),
list("Labcoat", 0, /obj/item/clothing/suit/storage/labcoat, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR),
Expand Down Expand Up @@ -152,6 +153,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_researcher, list(
list("UNIFORM (CHOOSE 1)", 0, null, null, null),
list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Researcher Uniform", 0, /obj/item/clothing/under/marine/officer/researcher, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY),

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_cmo, list(
list("UNIFORM (CHOOSE 1)", 0, null, null, null),
list("Green Scrubs", 0, /obj/item/clothing/under/rank/medical/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED),
list("Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Light Blue Scrubs", 0, /obj/item/clothing/under/rank/medical/lightblue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Purple Scrubs", 0, /obj/item/clothing/under/rank/medical/purple, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),
list("Doctor Uniform", 0, /obj/item/clothing/under/rank/medical, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR),

Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/vending/vendor_types/crew/synthetic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth, list(
GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list(
list("USCM UNIFORMS", 0, null, null, null),
list("Medical Scrubs, Blue", 12, /obj/item/clothing/under/rank/medical/blue, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, Light Blue", 0, /obj/item/clothing/under/rank/medical/lightblue, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, Green", 12, /obj/item/clothing/under/rank/medical/green, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, Purple", 12, /obj/item/clothing/under/rank/medical/purple, null, VENDOR_ITEM_REGULAR),
list("Medical Scrubs, White", 12, /obj/item/clothing/under/rank/medical, null, VENDOR_ITEM_REGULAR),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes)
new /obj/item/storage/belt/medical/full(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/under/rank/medical/lightblue(src)
new /obj/item/clothing/under/rank/medical/purple(src)
new /obj/item/clothing/mask/surgical(src)
new /obj/item/clothing/head/surgery/green(src)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
new /obj/item/clothing/gloves/latex(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/under/rank/medical/lightblue(src)
new /obj/item/clothing/under/rank/medical/purple(src)
new /obj/item/clothing/head/surgery/green(src)
new /obj/item/clothing/head/surgery/blue(src)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@
. = ..()
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/under/rank/medical(src)
new /obj/item/clothing/under/rank/medical/lightblue(src)
new /obj/item/clothing/under/rank/medical/blue(src)
new /obj/item/clothing/under/rank/medical/green(src)
new /obj/item/clothing/under/rank/medical/purple(src)
Expand Down
12 changes: 12 additions & 0 deletions code/modules/clothing/head/soft_caps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,18 @@
cap_color = "ferret"
black_market_value = 25

/obj/item/clothing/head/soft/trucker
name = "\improper blue trucker hat"
desc = "It's a blue trucker hat."
icon_state = "truckercap_bluesoft"
cap_color = "truckercap_blue"

/obj/item/clothing/head/soft/trucker/red
name = "\improper red trucker hat"
desc = "It's a red trucker hat."
icon_state = "truckercap_redsoft"
cap_color = "truckercap_red"

/obj/item/clothing/head/soft/sec
name = "security cap"
desc = "It's baseball hat in tasteful red color."
Expand Down
5 changes: 4 additions & 1 deletion code/modules/clothing/shoes/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
/obj/item/clothing/shoes/sandal
desc = "A pair of rather plain, wooden sandals."
name = "sandals"
icon_state = "wizard"
icon_state = "sandals"
flags_armor_protection = 0

/obj/item/clothing/shoes/sandal/marisa
Expand Down Expand Up @@ -140,6 +140,9 @@
desc = "The height of fashion, and they're pre-polished!"
icon_state = "laceups"

/obj/item/clothing/shoes/laceup/brown
icon_state = "laceups_brown"

/obj/item/clothing/shoes/swimmingfins
desc = "Help you swim good."
name = "swimming fins"
Expand Down
82 changes: 82 additions & 0 deletions code/modules/clothing/suits/marine_coat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -287,3 +287,85 @@
icon_state = "wc_suit"
item_state = "wc_suit"
contained_sprite = TRUE

//==================Corporate Liaison==================\\

/obj/item/clothing/suit/storage/jacket/marine/vest
name = "brown vest"
desc = "A casual brown vest."
icon_state = "vest_brown"
item_state = "vest_brown"
has_buttons = FALSE
flags_atom = NO_SNOW_TYPE

/obj/item/clothing/suit/storage/jacket/marine/vest/tan
name = "tan vest"
desc = "A casual tan vest."
icon_state = "vest_tan"
item_state = "vest_tan"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/vest/grey
name = "grey vest"
desc = "A casual grey vest."
icon_state = "vest_grey"
item_state = "vest_grey"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/corporate
name = "khaki suit jacket"
desc = "A khaki suit jacket."
icon_state = "corporate_ivy"
item_state = "corporate_ivy"
has_buttons = FALSE
flags_atom = NO_SNOW_TYPE

/obj/item/clothing/suit/storage/jacket/marine/corporate/formal
name = "formal suit jacket"
desc = "An ivory suit jacket; a Weyland-Yutani corporate badge is attached to the right lapel."
icon_state = "corporate_formal"
item_state = "corporate_formal"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/corporate/black
name = "black suit jacket"
desc = "A black suit jacket."
icon_state = "corporate_black"
item_state = "corporate_black"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/corporate/brown
name = "brown suit jacket"
desc = "A brown suit jacket."
icon_state = "corporate_brown"
item_state = "corporate_brown"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/corporate/blue
name = "blue suit jacket"
desc = "A blue suit jacket."
icon_state = "corporate_blue"
item_state = "corporate_blue"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/bomber
name = "khaki bomber jacket"
desc = "A khaki bomber jacket popular among stationeers and blue-collar workers everywhere."
icon_state = "jacket_khaki"
item_state = "jacket_khaki"
has_buttons = FALSE
flags_atom = NO_SNOW_TYPE

/obj/item/clothing/suit/storage/jacket/marine/bomber/red
name = "red bomber jacket"
desc = "A reddish-brown bomber jacket popular among stationeers and blue-collar workers everywhere."
icon_state = "jacket_red"
item_state = "jacket_red"
has_buttons = FALSE

/obj/item/clothing/suit/storage/jacket/marine/bomber/grey
name = "grey bomber jacket"
desc = "A blue-grey bomber jacket popular among stationeers and blue-collar workers everywhere."
icon_state = "jacket_grey"
item_state = "jacket_grey"
has_buttons = FALSE
19 changes: 13 additions & 6 deletions code/modules/clothing/under/jobs/medsci.dm
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,12 @@
armor_internaldamage = CLOTHING_ARMOR_LOW
item_state_slots = list(WEAR_BODY = "medical")

/obj/item/clothing/under/rank/medical/nurse
name = "medical nurse scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one features an orange armband."
icon_state = "scrubsnurse"
item_state = "scrubsnurse"
item_state_slots = list(WEAR_BODY = "scrubsnurse")
/obj/item/clothing/under/rank/medical/lightblue
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in light blue."
icon_state = "scrubslightblue"
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubslightblue")

/obj/item/clothing/under/rank/medical/blue
name = "medical scrubs"
Expand All @@ -187,6 +187,13 @@
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubspurple")

/obj/item/clothing/under/rank/medical/orange
name = "medical scrubs"
desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in prisoner orange."
icon_state = "scrubsorange"
flags_jumpsuit = FALSE
item_state_slots = list(WEAR_BODY = "scrubsorange")

/obj/item/clothing/under/rank/psych
desc = "A basic white jumpsuit. It has turquoise markings that denote the wearer as a psychiatrist."
name = "psychiatrist's jumpsuit"
Expand Down
39 changes: 39 additions & 0 deletions code/modules/clothing/under/marine_uniform.dm
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,9 @@
has_sensor = UNIFORM_NO_SENSORS
suit_restricted = list(/obj/item/clothing/suit/storage/marine/veteran/bear)

item_icons = list(
WEAR_BODY = 'icons/mob/humans/onmob/uniform_1.dmi',
)

/obj/item/clothing/under/marine/veteran/UPP
name = "\improper UPP fatigues"
Expand Down Expand Up @@ -804,6 +807,42 @@
icon_state = "liaison_blue_blazer"
worn_state = "liaison_blue_blazer"

/obj/item/clothing/under/liaison_suit/field
name = "corporate casual"
desc = "A pair of dark brown slacks paired with a dark blue button-down shirt. A popular look among those in the corporate world that conduct the majority of their business from night clubs."
icon_state = "corporate_field"
worn_state = "corporate_field"

/obj/item/clothing/under/liaison_suit/ivy
name = "country club outfit"
desc = "A pair of khaki slacks paired with a light blue button-down shirt. A popular look with those in the corporate world that conduct the majority of their business from country clubs."
icon_state = "corporate_ivy"
worn_state = "corporate_ivy"

/obj/item/clothing/under/liaison_suit/corporate_formal
name = "white suit pants"
desc = "A pair of ivory slacks paired with a white shirt. A popular pairing for formal corporate events."
icon_state = "corporate_formal"
worn_state = "corporate_formal"

/obj/item/clothing/under/liaison_suit/black
name = "black suit pants"
desc = "A pair of black slacks paired with a white shirt. The most common pairing among corporate workers."
icon_state = "corporate_black"
worn_state = "corporate_black"

/obj/item/clothing/under/liaison_suit/brown
name = "brown suit pants"
desc = "A pair of brown slacks paired with a white shirt. A common pairing among corporate workers."
icon_state = "corporate_brown"
worn_state = "corporate_brown"

/obj/item/clothing/under/liaison_suit/blue
name = "blue suit pants"
desc = "A pair of blue slacks paired with a white shirt. A common pairing among corporate workers."
icon_state = "corporate_blue"
worn_state = "corporate_blue"

/obj/item/clothing/under/marine/reporter
name = "combat correspondent uniform"
desc = "A relaxed and robust uniform fit for any potential reporting needs."
Expand Down
21 changes: 21 additions & 0 deletions code/modules/clothing/under/ties.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,22 @@
name = "red tie"
icon_state = "redtie"

/obj/item/clothing/accessory/green
name = "green tie"
icon_state = "greentie"

/obj/item/clothing/accessory/black
name = "black tie"
icon_state = "blacktie"

/obj/item/clothing/accessory/gold
name = "gold tie"
icon_state = "goldtie"

/obj/item/clothing/accessory/purple
name = "purple tie"
icon_state = "purpletie"

/obj/item/clothing/accessory/horrible
name = "horrible tie"
desc = "A neosilk clip-on tie. This one is disgusting."
Expand Down Expand Up @@ -342,6 +358,11 @@
desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and green."
icon_state = "medgreen"

/obj/item/clothing/accessory/armband/nurse
name = "nurse armband"
desc = "An armband, worn by the rookie nurses to display they are still not doctors. This one is dark red."
icon_state = "nurse"

//patches
/obj/item/clothing/accessory/patch
name = "USCM patch"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/cm_marines/Donator_Items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1309,8 +1309,8 @@
/obj/item/clothing/shoes/marine/fluff/vintage //CKEY=vintagepalmer
name = "Vintage Sandals"
desc = "Vintage Sandals, suitable for only the highest class of hipster. DONOR ITEM"
icon_state = "wizard"
item_state = "wizard"
icon_state = "sandals"
item_state = "sandals"

/obj/item/clothing/shoes/marine/fluff/feodrich //CKEY=feodrich (UNIQUE)
name = "Doom Shoes"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/gear_presets/cmb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@

//clothes
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/ICC, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/mod88, WEAR_IN_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88, WEAR_IN_ACCESSORY)
Expand Down Expand Up @@ -372,7 +372,7 @@
//clothes
new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/pen, WEAR_R_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/suspenders, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blue, WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/health/ceramic_plate, WEAR_ACCESSORY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest, WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_J_STORE)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/gear_presets/corpses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
)

/datum/equipment_preset/corpse/security/liaison/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY)
if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD])
add_ice_colony_survivor_equipment(new_human)
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
assignment = "Interstellar Commerce Commission Corporate Liaison"

/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/corsat/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
assignment = "Interstellar Commerce Commission Corporate Liaison"

/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/nv/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/corporate_formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest/black(new_human), WEAR_JACKET)
new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_J_STORE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
assignment = "Shivas Snowball Corporate Liaison"

/datum/equipment_preset/survivor/corporate/shiva/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/formal(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/black(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR)
new_human.equip_to_slot_or_del(new /obj/item/clothing/head/ushanka(new_human), WEAR_HEAD)
new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf(new_human), WEAR_FACE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
assignment = "Solaris Ridge Corporate Liaison"

/datum/equipment_preset/survivor/corporate/solaris/load_gear(mob/living/carbon/human/new_human)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/outing/red(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/ivy(new_human), WEAR_BODY)
new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR)
if(new_human.disabilities & NEARSIGHTED)
new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/prescription(new_human), WEAR_EYES)
Expand Down
Loading
Loading