Merge branch 'master' into upp_ship

code/game/machinery/vending/vendor_types/crew/medical.dm

@@ -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),
@@ -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),
@@ -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),
 

code/game/machinery/vending/vendor_types/crew/senior_officers.dm

@@ -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),
 

code/game/machinery/vending/vendor_types/crew/synthetic.dm

@@ -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),

code/game/objects/items/devices/helmet_visors.dm

@@ -84,18 +84,6 @@
 	name = "advanced medical optic"
 	helmet_overlay = "med_sight_left"
 
-/obj/item/device/helmet_visor/medical/advanced/activate_visor(obj/item/clothing/head/helmet/marine/attached_helmet, mob/living/carbon/human/user)
-	. = ..()
-
-	var/datum/action/item_action/view_publications/helmet_visor/publication_action = new(attached_helmet)
-	publication_action.give_to(user)
-
-/obj/item/device/helmet_visor/medical/advanced/deactivate_visor(obj/item/clothing/head/helmet/marine/attached_helmet, mob/living/carbon/human/user)
-	. = ..()
-
-	var/datum/action/item_action/view_publications/helmet_visor/publication_action = locate() in attached_helmet.actions
-	qdel(publication_action)
-
 /obj/item/device/helmet_visor/medical/advanced/can_toggle(mob/living/carbon/human/user)
 	. = ..()
 	if(!.)

code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm

@@ -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)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -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)

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -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)

code/global.dm

@@ -120,7 +120,7 @@ var/list/AAlarmWireColorToIndex
 #define MAX_EMOTE_LEN 256
 #define MAX_PAPER_MESSAGE_LEN 3072
 #define MAX_BOOK_MESSAGE_LEN 9216
-#define MAX_NAME_LEN 26
+#define MAX_NAME_LEN 28
 
 /// 3 minutes in the station.
 #define shuttle_time_in_station 3 MINUTES

code/modules/client/preferences_gear.dm

@@ -161,6 +161,16 @@ var/global/list/gear_datums_by_name = list()
 	display_name = "USCM balaclava, tan"
 	path = /obj/item/clothing/mask/rebreather/scarf/tan
 
+/datum/gear/mask/uscm/skull_balaclava_blue
+	display_name = "USCM balaclava, blue skull"
+	path = /obj/item/clothing/mask/rebreather/skull
+	cost = 4
+
+/datum/gear/mask/uscm/skull_balaclava_black
+	display_name = "USCM balaclava, black skull"
+	path = /obj/item/clothing/mask/rebreather/skull/black
+	cost = 4
+
 /datum/gear/headwear
 	category = "Headwear"
 	cost = 3
@@ -876,6 +886,11 @@ var/global/list/gear_datums_by_name = list()
 	display_name = "Facepaint, black"
 	path = /obj/item/facepaint/black
 
+/datum/gear/misc/facepaint_skull
+	display_name = "Facepaint, skull"
+	path = /obj/item/facepaint/skull
+	cost = 3
+
 /datum/gear/misc/facepaint_body
 	display_name = "Fullbody paint"
 	path = /obj/item/facepaint/sniper

code/modules/clothing/glasses/hud.dm

@@ -13,7 +13,7 @@
 	flags_armor_protection = 0
 	toggleable = TRUE
 	hud_type = MOB_HUD_MEDICAL_ADVANCED
-	actions_types = list(/datum/action/item_action/toggle, /datum/action/item_action/view_publications)
+	actions_types = list(/datum/action/item_action/toggle)
 	req_skill = SKILL_MEDICAL
 	req_skill_level = SKILL_MEDICAL_MEDIC
 

code/modules/clothing/head/soft_caps.dm

@@ -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."

code/modules/clothing/shoes/miscellaneous.dm

@@ -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
@@ -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"

code/modules/clothing/suits/marine_coat.dm

@@ -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

code/modules/clothing/under/jobs/medsci.dm

@@ -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"
@@ -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"

code/modules/clothing/under/marine_uniform.dm

@@ -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"
@@ -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."

code/modules/clothing/under/ties.dm

@@ -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."
@@ -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"

code/modules/cm_marines/Donator_Items.dm

@@ -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"