diff --git a/code/game/machinery/vending/vendor_types/crew/corporate_liaison.dm b/code/game/machinery/vending/vendor_types/crew/corporate_liaison.dm new file mode 100644 index 000000000000..69261115ecaa --- /dev/null +++ b/code/game/machinery/vending/vendor_types/crew/corporate_liaison.dm @@ -0,0 +1,84 @@ +//------------ CL CLOTHING VENDOR--------------- + +GLOBAL_LIST_INIT(cm_vending_clothing_dress_corporate_liaison, list( + list("SUITS AND UNDERSHIRTS", 0, null, null, null), + list("Black Suit Pants", 0, /obj/item/clothing/under/liaison_suit/black, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_RECOMMENDED), + list("Blue Suit Pants", 0, /obj/item/clothing/under/liaison_suit/blue, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Brown Suit Pants", 0, /obj/item/clothing/under/liaison_suit/brown, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("White Suit Pants", 0, /obj/item/clothing/under/liaison_suit/corporate_formal, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Liaison's Tan Suit", 0, /obj/item/clothing/under/liaison_suit, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Liaison's Charcoal Suit", 0, /obj/item/clothing/under/liaison_suit/charcoal, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Liaison's White Suit", 0, /obj/item/clothing/under/liaison_suit/formal, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Liaison's Blue Blazer", 0, /obj/item/clothing/under/liaison_suit/blazer, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Liaison's Suspenders", 0, /obj/item/clothing/under/liaison_suit/suspenders, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Liaison's Skirt", 0, /obj/item/clothing/under/blackskirt, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Trainee's Uniform", 0, /obj/item/clothing/under/suit_jacket/trainee, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Country Club Outfit", 0, /obj/item/clothing/under/liaison_suit/ivy, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Orange Outfit", 0, /obj/item/clothing/under/liaison_suit/orange, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Corporate Casual", 0, /obj/item/clothing/under/liaison_suit/field, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Grey Workwear", 0, /obj/item/clothing/under/colonist/workwear, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Khaki Workwear", 0, /obj/item/clothing/under/colonist/workwear/khaki, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Pink Workwear", 0, /obj/item/clothing/under/colonist/workwear/pink, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + list("Green Workwear", 0, /obj/item/clothing/under/colonist/workwear/green, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_REGULAR), + + list("SUIT", 0, null, null, null), + list("Black Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate/black, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), + list("Khaki Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Brown Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate/brown, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Blue Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate/blue, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Formal Suit Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/corporate/formal, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Grey Bomber Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/bomber/grey, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Red Bomber Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/bomber/red, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Khaki Bomber Jacket", 0, /obj/item/clothing/suit/storage/jacket/marine/bomber, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Brown Bomber Jacket", 0, /obj/item/clothing/suit/storage/bomber, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Black Bomber Jacket", 0, /obj/item/clothing/suit/storage/bomber/alt, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Liaison's Winter Coat", 0, /obj/item/clothing/suit/storage/snow_suit/liaison, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Labcoat", 0, /obj/item/clothing/suit/storage/labcoat, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Grey Vest", 0, /obj/item/clothing/suit/storage/jacket/marine/vest/grey, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Brown Vest", 0, /obj/item/clothing/suit/storage/jacket/marine/vest, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + list("Tan Vest", 0, /obj/item/clothing/suit/storage/jacket/marine/vest/tan, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + + list("TIES", 0, null, null, null), + list("Black Tie", 0, /obj/item/clothing/accessory/black, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), + list("Red Tie", 0, /obj/item/clothing/accessory/red, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Purple Tie", 0, /obj/item/clothing/accessory/purple, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Blue Tie", 0, /obj/item/clothing/accessory/blue, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Green Tie", 0, /obj/item/clothing/accessory/green, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Gold Tie", 0, /obj/item/clothing/accessory/gold, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + list("Special Tie", 0, /obj/item/clothing/accessory/horrible, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), + + list("GLASSES", 0, null, null, null), + list("BiMex Shades", 0, /obj/item/clothing/glasses/sunglasses/big, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_RECOMMENDED), + list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), + list("Sunglasses", 0, /obj/item/clothing/glasses/sunglasses, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), + list("Prescription Sunglasses", 0, /obj/item/clothing/glasses/sunglasses/prescription, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), + list("Prescription Glasses", 0, /obj/item/clothing/glasses/regular/hipster, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), + + list("GLOVES", 0, null, null, null), + list("Black Gloves", 0, /obj/item/clothing/gloves/black, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_RECOMMENDED), + list("Dress Gloves", 0, /obj/item/clothing/gloves/marine/dress, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_REGULAR), + + list("SHOES", 0, null, null, null), + list("Laceup Shoes, Black", 0, /obj/item/clothing/shoes/laceup, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_RECOMMENDED), + list("Laceup Shoes, Brown", 0, /obj/item/clothing/shoes/laceup/brown, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_REGULAR), + list("Sneakers, Black", 0, /obj/item/clothing/shoes/black, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_REGULAR), + list("Corporate Boots", 0, /obj/item/clothing/shoes/marine/corporate, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_REGULAR), + + list("HATS", 0, null, null, null), + list("Black Beret", 0, /obj/item/clothing/head/beret/cm/black/civilian, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("White Beret", 0, /obj/item/clothing/head/beret/cm/white/civilian, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Fedora", 0, /obj/item/clothing/head/fedora, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + +)) + +/obj/structure/machinery/cm_vending/clothing/dress/corporate_liaison + name = "\improper Corporate Liaison's Personal Wardrobe" + desc = "A wardrobe containing all the clothes an executive would ever need." + icon_state = "wardrobe_vendor" + vendor_theme = VENDOR_THEME_USCM + show_points = FALSE + req_access = list() + vendor_role = list(JOB_CORPORATE_LIAISON, JOB_SURVIVOR, JOB_TRAINEE, JOB_JUNIOR_EXECUTIVE, JOB_EXECUTIVE, JOB_SENIOR_EXECUTIVE, JOB_EXECUTIVE_SPECIALIST, JOB_EXECUTIVE_SUPERVISOR, JOB_ASSISTANT_MANAGER, JOB_DIVISION_MANAGER, JOB_CHIEF_EXECUTIVE, JOB_DIRECTOR, JOB_WY_GOON_RESEARCHER) + +/obj/structure/machinery/cm_vending/clothing/dress/corporate_liaison/get_listed_products(mob/user) + return GLOB.cm_vending_clothing_dress_corporate_liaison diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 88605cb3b792..44d1e0a8bd0b 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -221,8 +221,8 @@ flags_equip_slot = SLOT_EYES|SLOT_FACE /obj/item/clothing/glasses/regular/hipster - name = "Sunglasses" - desc = "They cut the sun and keep things fun. Why would you ever wear these indoors, or on a night operation. Are you trying to get yourself hurt?" + name = "Prescription Glasses" + desc = "Boring glasses, makes you look smart and potentially reputable." icon_state = "hipster_glasses" item_state = "hipster_glasses" flags_equip_slot = SLOT_EYES|SLOT_FACE diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index 86527457bfce..7e1c1d8d08d2 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -88,6 +88,16 @@ name = "USCM Squad Beret" desc = "For those who want to show pride and have nothing to lose (in their head, at least)." +/obj/item/clothing/head/beret/cm/white/civilian + name = "White Beret" + desc = "A nice fashionable beret, popular with executives." + icon_state = "s_beret" + +/obj/item/clothing/head/beret/cm/black/civilian + name = "Black Beret" + desc = "A nice fashionable beret, popular with executives." + icon_state = "beret_black" + /obj/item/clothing/head/beret/cm/squadberet/equipped(mob/user, slot) . = ..() self_set() diff --git a/code/modules/clothing/shoes/marine_shoes.dm b/code/modules/clothing/shoes/marine_shoes.dm index 7855075c2fb4..937416943958 100644 --- a/code/modules/clothing/shoes/marine_shoes.dm +++ b/code/modules/clothing/shoes/marine_shoes.dm @@ -163,6 +163,8 @@ /obj/item/clothing/shoes/marine/corporate name = "rugged boots" desc = "These synth-leather boots seem high quality when first worn, but quickly detoriate, especially in the environments the corporate security members these are issued to operate in. Still, better than nothing." + +/obj/item/clothing/shoes/marine/corporate/knife spawn_item_type = /obj/item/attachable/bayonet /obj/item/clothing/shoes/marine/ress diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 1a49dc7fe10f..91ae13958e46 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -141,6 +141,7 @@ icon_state = "laceups" /obj/item/clothing/shoes/laceup/brown + name = "brown laceup shoes" icon_state = "laceups_brown" /obj/item/clothing/shoes/swimmingfins diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 74cb5ea552ee..52635c63600a 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -840,7 +840,7 @@ worn_state = "liaison_formal" /obj/item/clothing/under/liaison_suit/suspenders - name = "liaison's attire" + name = "liaison's suspenders" desc = "A collared shirt, complimented by a pair of suspenders. Worn by Weyland-Yutani employees who ask the tough questions. Smells faintly of cigars and bad acting." icon_state = "liaison_suspenders" worn_state = "liaison_suspenders" @@ -863,6 +863,12 @@ icon_state = "corporate_ivy" worn_state = "corporate_ivy" +/obj/item/clothing/under/liaison_suit/orange + name = "orange outfit" + desc = "A pair of black pants paired with a very Wey-Yu orange shirt. A popular look with those in the corporate world that conduct the majority of their business from Weyland Yutani offices." + icon_state = "corporate_orange" + worn_state = "corporate_orange" + /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." diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index 9e688037860b..d84cf766c4fc 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -706,7 +706,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) @@ -731,7 +731,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/lead, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) diff --git a/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm b/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm index eb04cbd5a94e..6db2882ddf82 100644 --- a/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm +++ b/code/modules/gear_presets/survivors/kutjevo/preset_kutjevo.dm @@ -33,7 +33,7 @@ add_random_kutjevo_survivor_equipment(new_human) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife(new_human), WEAR_FEET) ..() /datum/equipment_preset/survivor/doctor/kutjevo diff --git a/code/modules/gear_presets/survivors/lv_624/preset_lv.dm b/code/modules/gear_presets/survivors/lv_624/preset_lv.dm index a56432b80b89..462075142698 100644 --- a/code/modules/gear_presets/survivors/lv_624/preset_lv.dm +++ b/code/modules/gear_presets/survivors/lv_624/preset_lv.dm @@ -86,7 +86,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife(new_human), WEAR_FEET) ..() /datum/equipment_preset/survivor/corporate/lv diff --git a/code/modules/gear_presets/survivors/misc.dm b/code/modules/gear_presets/survivors/misc.dm index f0cf368d4936..a6ed27cbb91a 100644 --- a/code/modules/gear_presets/survivors/misc.dm +++ b/code/modules/gear_presets/survivors/misc.dm @@ -185,7 +185,7 @@ Everything below isn't used or out of place. new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) diff --git a/code/modules/gear_presets/survivors/survivors.dm b/code/modules/gear_presets/survivors/survivors.dm index 65e5a8f4c123..d90d31ef3880 100644 --- a/code/modules/gear_presets/survivors/survivors.dm +++ b/code/modules/gear_presets/survivors/survivors.dm @@ -18,6 +18,74 @@ var/survivor_variant = CIVILIAN_SURVIVOR + dress_under = list( + /obj/item/clothing/under/liaison_suit/black, + /obj/item/clothing/under/liaison_suit/blue, + /obj/item/clothing/under/liaison_suit/brown, + /obj/item/clothing/under/liaison_suit/corporate_formal, + /obj/item/clothing/under/liaison_suit, + /obj/item/clothing/under/liaison_suit/charcoal, + /obj/item/clothing/under/liaison_suit/formal, + /obj/item/clothing/under/liaison_suit/blazer, + /obj/item/clothing/under/liaison_suit/suspenders, + /obj/item/clothing/under/blackskirt, + /obj/item/clothing/under/suit_jacket/trainee, + /obj/item/clothing/under/liaison_suit/ivy, + /obj/item/clothing/under/liaison_suit/orange, + /obj/item/clothing/under/liaison_suit/field, + /obj/item/clothing/under/colonist/workwear, + /obj/item/clothing/under/colonist/workwear/khaki, + /obj/item/clothing/under/colonist/workwear/pink, + /obj/item/clothing/under/colonist/workwear/green, + ) + dress_over = list( + /obj/item/clothing/suit/storage/jacket/marine/corporate/black, + /obj/item/clothing/suit/storage/jacket/marine/corporate, + /obj/item/clothing/suit/storage/jacket/marine/corporate/brown, + /obj/item/clothing/suit/storage/jacket/marine/corporate/blue, + /obj/item/clothing/suit/storage/jacket/marine/corporate/black, + /obj/item/clothing/suit/storage/jacket/marine/bomber/grey, + /obj/item/clothing/suit/storage/jacket/marine/bomber/red, + /obj/item/clothing/suit/storage/jacket/marine/bomber, + /obj/item/clothing/suit/storage/bomber, + /obj/item/clothing/suit/storage/bomber/alt, + /obj/item/clothing/suit/storage/snow_suit/liaison, + /obj/item/clothing/suit/storage/labcoat, + /obj/item/clothing/suit/storage/jacket/marine/vest/grey, + /obj/item/clothing/suit/storage/jacket/marine/vest, + /obj/item/clothing/suit/storage/jacket/marine/vest/tan, + /obj/item/clothing/suit/storage/webbing, + ) + dress_extra = list( + /obj/item/clothing/accessory/black, + /obj/item/clothing/accessory/red, + /obj/item/clothing/accessory/purple, + /obj/item/clothing/accessory/blue, + /obj/item/clothing/accessory/green, + /obj/item/clothing/accessory/gold, + /obj/item/clothing/accessory/horrible, + /obj/item/clothing/glasses/sunglasses/big, + /obj/item/clothing/glasses/sunglasses/aviator, + /obj/item/clothing/glasses/sunglasses, + /obj/item/clothing/glasses/sunglasses/prescription, + /obj/item/clothing/glasses/regular/hipster, + ) + dress_gloves = list( + /obj/item/clothing/gloves/black, + /obj/item/clothing/gloves/marine/dress, + ) + dress_shoes = list( + /obj/item/clothing/shoes/laceup, + /obj/item/clothing/shoes/laceup/brown, + /obj/item/clothing/shoes/black, + /obj/item/clothing/shoes/marine/corporate, + ) + dress_hat = list( + /obj/item/clothing/head/fedora, + /obj/item/clothing/head/beret/cm/black/civilian, + /obj/item/clothing/head/beret/cm/white/civilian, + ) + /datum/equipment_preset/survivor/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(MALE, FEMALE) var/datum/preferences/A = new diff --git a/code/modules/gear_presets/survivors/trijent/preset_trijent.dm b/code/modules/gear_presets/survivors/trijent/preset_trijent.dm index 100f83518565..3c9926de69aa 100644 --- a/code/modules/gear_presets/survivors/trijent/preset_trijent.dm +++ b/code/modules/gear_presets/survivors/trijent/preset_trijent.dm @@ -17,7 +17,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/sec(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife(new_human), WEAR_FEET) ..() /datum/equipment_preset/survivor/colonial_marshal/trijent diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index ba4a8a684321..38a07f8ee874 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -53,22 +53,73 @@ minimap_icon = "cl" minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN - utility_under = list(/obj/item/clothing/under/liaison_suit/black) - utility_hat = list() - utility_gloves = list() - utility_shoes = list(/obj/item/clothing/shoes/laceup) - utility_extra = list(/obj/item/clothing/under/liaison_suit/blue) - - service_under = list(/obj/item/clothing/under/liaison_suit/field) - service_over = list() - service_hat = list() - service_shoes = list(/obj/item/clothing/shoes/laceup) - - dress_under = list(/obj/item/clothing/under/liaison_suit/corporate_formal) - dress_over = list() - dress_hat = list() - dress_gloves = list(/obj/item/clothing/gloves/marine/dress) - dress_shoes = list(/obj/item/clothing/shoes/laceup) + dress_under = list( + /obj/item/clothing/under/liaison_suit/black, + /obj/item/clothing/under/liaison_suit/blue, + /obj/item/clothing/under/liaison_suit/brown, + /obj/item/clothing/under/liaison_suit/corporate_formal, + /obj/item/clothing/under/liaison_suit, + /obj/item/clothing/under/liaison_suit/charcoal, + /obj/item/clothing/under/liaison_suit/formal, + /obj/item/clothing/under/liaison_suit/blazer, + /obj/item/clothing/under/liaison_suit/suspenders, + /obj/item/clothing/under/blackskirt, + /obj/item/clothing/under/suit_jacket/trainee, + /obj/item/clothing/under/liaison_suit/ivy, + /obj/item/clothing/under/liaison_suit/orange, + /obj/item/clothing/under/liaison_suit/field, + /obj/item/clothing/under/colonist/workwear, + /obj/item/clothing/under/colonist/workwear/khaki, + /obj/item/clothing/under/colonist/workwear/pink, + /obj/item/clothing/under/colonist/workwear/green, + ) + dress_over = list( + /obj/item/clothing/suit/storage/jacket/marine/corporate/black, + /obj/item/clothing/suit/storage/jacket/marine/corporate, + /obj/item/clothing/suit/storage/jacket/marine/corporate/brown, + /obj/item/clothing/suit/storage/jacket/marine/corporate/blue, + /obj/item/clothing/suit/storage/jacket/marine/corporate/black, + /obj/item/clothing/suit/storage/jacket/marine/bomber/grey, + /obj/item/clothing/suit/storage/jacket/marine/bomber/red, + /obj/item/clothing/suit/storage/jacket/marine/bomber, + /obj/item/clothing/suit/storage/bomber, + /obj/item/clothing/suit/storage/bomber/alt, + /obj/item/clothing/suit/storage/snow_suit/liaison, + /obj/item/clothing/suit/storage/labcoat, + /obj/item/clothing/suit/storage/jacket/marine/vest/grey, + /obj/item/clothing/suit/storage/jacket/marine/vest, + /obj/item/clothing/suit/storage/jacket/marine/vest/tan, + /obj/item/clothing/suit/storage/webbing, + ) + dress_extra = list( + /obj/item/clothing/accessory/black, + /obj/item/clothing/accessory/red, + /obj/item/clothing/accessory/purple, + /obj/item/clothing/accessory/blue, + /obj/item/clothing/accessory/green, + /obj/item/clothing/accessory/gold, + /obj/item/clothing/accessory/horrible, + /obj/item/clothing/glasses/sunglasses/big, + /obj/item/clothing/glasses/sunglasses/aviator, + /obj/item/clothing/glasses/sunglasses, + /obj/item/clothing/glasses/sunglasses/prescription, + /obj/item/clothing/glasses/regular/hipster, + ) + dress_gloves = list( + /obj/item/clothing/gloves/black, + /obj/item/clothing/gloves/marine/dress, + ) + dress_shoes = list( + /obj/item/clothing/shoes/laceup, + /obj/item/clothing/shoes/laceup/brown, + /obj/item/clothing/shoes/black, + /obj/item/clothing/shoes/marine/corporate, + ) + dress_hat = list( + /obj/item/clothing/head/fedora, + /obj/item/clothing/head/beret/cm/black/civilian, + /obj/item/clothing/head/beret/cm/white/civilian, + ) /datum/equipment_preset/uscm_ship/liaison/New() . = ..() diff --git a/code/modules/gear_presets/wy.dm b/code/modules/gear_presets/wy.dm index 75349115b47c..6cfccab00036 100644 --- a/code/modules/gear_presets/wy.dm +++ b/code/modules/gear_presets/wy.dm @@ -10,6 +10,74 @@ languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) var/headset_type = /obj/item/device/radio/headset/distress/WY + dress_under = list( + /obj/item/clothing/under/liaison_suit/black, + /obj/item/clothing/under/liaison_suit/blue, + /obj/item/clothing/under/liaison_suit/brown, + /obj/item/clothing/under/liaison_suit/corporate_formal, + /obj/item/clothing/under/liaison_suit, + /obj/item/clothing/under/liaison_suit/charcoal, + /obj/item/clothing/under/liaison_suit/formal, + /obj/item/clothing/under/liaison_suit/blazer, + /obj/item/clothing/under/liaison_suit/suspenders, + /obj/item/clothing/under/blackskirt, + /obj/item/clothing/under/suit_jacket/trainee, + /obj/item/clothing/under/liaison_suit/ivy, + /obj/item/clothing/under/liaison_suit/orange, + /obj/item/clothing/under/liaison_suit/field, + /obj/item/clothing/under/colonist/workwear, + /obj/item/clothing/under/colonist/workwear/khaki, + /obj/item/clothing/under/colonist/workwear/pink, + /obj/item/clothing/under/colonist/workwear/green, + ) + dress_over = list( + /obj/item/clothing/suit/storage/jacket/marine/corporate/black, + /obj/item/clothing/suit/storage/jacket/marine/corporate, + /obj/item/clothing/suit/storage/jacket/marine/corporate/brown, + /obj/item/clothing/suit/storage/jacket/marine/corporate/blue, + /obj/item/clothing/suit/storage/jacket/marine/corporate/black, + /obj/item/clothing/suit/storage/jacket/marine/bomber/grey, + /obj/item/clothing/suit/storage/jacket/marine/bomber/red, + /obj/item/clothing/suit/storage/jacket/marine/bomber, + /obj/item/clothing/suit/storage/bomber, + /obj/item/clothing/suit/storage/bomber/alt, + /obj/item/clothing/suit/storage/snow_suit/liaison, + /obj/item/clothing/suit/storage/labcoat, + /obj/item/clothing/suit/storage/jacket/marine/vest/grey, + /obj/item/clothing/suit/storage/jacket/marine/vest, + /obj/item/clothing/suit/storage/jacket/marine/vest/tan, + /obj/item/clothing/suit/storage/webbing, + ) + dress_extra = list( + /obj/item/clothing/accessory/black, + /obj/item/clothing/accessory/red, + /obj/item/clothing/accessory/purple, + /obj/item/clothing/accessory/blue, + /obj/item/clothing/accessory/green, + /obj/item/clothing/accessory/gold, + /obj/item/clothing/accessory/horrible, + /obj/item/clothing/glasses/sunglasses/big, + /obj/item/clothing/glasses/sunglasses/aviator, + /obj/item/clothing/glasses/sunglasses, + /obj/item/clothing/glasses/sunglasses/prescription, + /obj/item/clothing/glasses/regular/hipster, + ) + dress_gloves = list( + /obj/item/clothing/gloves/black, + /obj/item/clothing/gloves/marine/dress, + ) + dress_shoes = list( + /obj/item/clothing/shoes/laceup, + /obj/item/clothing/shoes/laceup/brown, + /obj/item/clothing/shoes/black, + /obj/item/clothing/shoes/marine/corporate, + ) + dress_hat = list( + /obj/item/clothing/head/fedora, + /obj/item/clothing/head/beret/cm/black/civilian, + /obj/item/clothing/head/beret/cm/white/civilian, + ) + /datum/equipment_preset/wy/New() . = ..() access += get_access(ACCESS_LIST_WY_BASE) diff --git a/code/modules/gear_presets/wy_goons.dm b/code/modules/gear_presets/wy_goons.dm index c67f82176c93..a15e9b443302 100644 --- a/code/modules/gear_presets/wy_goons.dm +++ b/code/modules/gear_presets/wy_goons.dm @@ -70,7 +70,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) @@ -104,7 +104,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/engineerpack/ert, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) @@ -141,7 +141,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/lead, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/weapon/baton, WEAR_IN_BACK) @@ -167,12 +167,80 @@ paygrades = list(PAY_SHORT_CCMO = JOB_PLAYTIME_TIER_0) skills = /datum/skills/researcher + dress_under = list( + /obj/item/clothing/under/liaison_suit/black, + /obj/item/clothing/under/liaison_suit/blue, + /obj/item/clothing/under/liaison_suit/brown, + /obj/item/clothing/under/liaison_suit/corporate_formal, + /obj/item/clothing/under/liaison_suit, + /obj/item/clothing/under/liaison_suit/charcoal, + /obj/item/clothing/under/liaison_suit/formal, + /obj/item/clothing/under/liaison_suit/blazer, + /obj/item/clothing/under/liaison_suit/suspenders, + /obj/item/clothing/under/blackskirt, + /obj/item/clothing/under/suit_jacket/trainee, + /obj/item/clothing/under/liaison_suit/ivy, + /obj/item/clothing/under/liaison_suit/orange, + /obj/item/clothing/under/liaison_suit/field, + /obj/item/clothing/under/colonist/workwear, + /obj/item/clothing/under/colonist/workwear/khaki, + /obj/item/clothing/under/colonist/workwear/pink, + /obj/item/clothing/under/colonist/workwear/green, + ) + dress_over = list( + /obj/item/clothing/suit/storage/jacket/marine/corporate/black, + /obj/item/clothing/suit/storage/jacket/marine/corporate, + /obj/item/clothing/suit/storage/jacket/marine/corporate/brown, + /obj/item/clothing/suit/storage/jacket/marine/corporate/blue, + /obj/item/clothing/suit/storage/jacket/marine/corporate/black, + /obj/item/clothing/suit/storage/jacket/marine/bomber/grey, + /obj/item/clothing/suit/storage/jacket/marine/bomber/red, + /obj/item/clothing/suit/storage/jacket/marine/bomber, + /obj/item/clothing/suit/storage/bomber, + /obj/item/clothing/suit/storage/bomber/alt, + /obj/item/clothing/suit/storage/snow_suit/liaison, + /obj/item/clothing/suit/storage/labcoat, + /obj/item/clothing/suit/storage/jacket/marine/vest/grey, + /obj/item/clothing/suit/storage/jacket/marine/vest, + /obj/item/clothing/suit/storage/jacket/marine/vest/tan, + /obj/item/clothing/suit/storage/webbing, + ) + dress_extra = list( + /obj/item/clothing/accessory/black, + /obj/item/clothing/accessory/red, + /obj/item/clothing/accessory/purple, + /obj/item/clothing/accessory/blue, + /obj/item/clothing/accessory/green, + /obj/item/clothing/accessory/gold, + /obj/item/clothing/accessory/horrible, + /obj/item/clothing/glasses/sunglasses/big, + /obj/item/clothing/glasses/sunglasses/aviator, + /obj/item/clothing/glasses/sunglasses, + /obj/item/clothing/glasses/sunglasses/prescription, + /obj/item/clothing/glasses/regular/hipster, + ) + dress_gloves = list( + /obj/item/clothing/gloves/black, + /obj/item/clothing/gloves/marine/dress, + ) + dress_shoes = list( + /obj/item/clothing/shoes/laceup, + /obj/item/clothing/shoes/laceup/brown, + /obj/item/clothing/shoes/black, + /obj/item/clothing/shoes/marine/corporate, + ) + dress_hat = list( + /obj/item/clothing/head/fedora, + /obj/item/clothing/head/beret/cm/black/civilian, + /obj/item/clothing/head/beret/cm/white/civilian, + ) + /datum/equipment_preset/goon/researcher/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science, WEAR_EYES) 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/suit/storage/labcoat, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/corporate/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/handheld_distress_beacon, WEAR_IN_BACK) diff --git a/colonialmarines.dme b/colonialmarines.dme index 8b48448326cb..e3189c10baa4 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -997,6 +997,7 @@ #include "code\game\machinery\vending\vendor_types\antag\antag_guns_sorted.dm" #include "code\game\machinery\vending\vendor_types\crew\combat_correspondent.dm" #include "code\game\machinery\vending\vendor_types\crew\commanding_officer.dm" +#include "code\game\machinery\vending\vendor_types\crew\corporate_liaison.dm" #include "code\game\machinery\vending\vendor_types\crew\engineering.dm" #include "code\game\machinery\vending\vendor_types\crew\medical.dm" #include "code\game\machinery\vending\vendor_types\crew\mp.dm" diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index 2dd645697684..c957814e9f3b 100644 Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi index 923a26b55c20..626de8fa5dd5 100644 Binary files a/icons/obj/items/clothing/cm_hats.dmi and b/icons/obj/items/clothing/cm_hats.dmi differ diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi index e444d7a5a40a..6ab40c6c5970 100644 Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ diff --git a/icons/obj/structures/machinery/vending.dmi b/icons/obj/structures/machinery/vending.dmi index 3098aadca8be..ba45e612ca22 100644 Binary files a/icons/obj/structures/machinery/vending.dmi and b/icons/obj/structures/machinery/vending.dmi differ diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 2764da8aaa78..079067d7938a 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -2461,10 +2461,10 @@ icon_state = "SE-out" }, /obj/structure/machinery/door_control{ + access_modified = 1; id = "OTStore"; name = "Shutters"; pixel_y = -24; - access_modified = 1; req_one_access_txt = "35" }, /obj/structure/surface/rack, @@ -3293,12 +3293,12 @@ /obj/structure/machinery/faxmachine/uscm/command, /obj/item/device/megaphone, /obj/structure/machinery/computer/cameras/almayer_brig{ - dir = 8; desc = "Used to access the various cameras in the security brig."; + dir = 8; + layer = 2.99; name = "brig cameras console"; - pixel_y = 12; pixel_x = 17; - layer = 2.99 + pixel_y = 12 }, /turf/open/floor/almayer/plate, /area/almayer/command/cic) @@ -12176,8 +12176,8 @@ /area/almayer/hallways/lower/starboard_midship_hallway) "bMg" = ( /obj/structure/pipes/vents/pump/no_boom/gas{ - vent_tag = "Synth Bay"; - dir = 8 + dir = 8; + vent_tag = "Synth Bay" }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) @@ -16114,8 +16114,8 @@ desc = "A pneumatic delivery unit."; icon_state = "delivery_engi"; name = "Returns"; - pixel_y = 28; - pixel_x = 25 + pixel_x = 25; + pixel_y = 28 }, /obj/structure/surface/rack, /turf/open/floor/almayer/aicore/no_build, @@ -16407,54 +16407,10 @@ /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) "cOY" = ( -/obj/item/clothing/under/blackskirt{ - desc = "A stylish skirt, in a business-black and red colour scheme."; - name = "liaison's skirt" - }, -/obj/item/clothing/under/suit_jacket/charcoal{ - desc = "A professional black suit and blue tie. A combination popular among government agents and corporate Yes-Men alike."; - name = "liaison's black suit" - }, -/obj/item/clothing/under/suit_jacket/navy{ - desc = "A navy suit and red tie, intended for the Almayer's finest. And accountants."; - name = "liaison's navy suit" - }, -/obj/item/clothing/under/suit_jacket/trainee, -/obj/item/clothing/under/liaison_suit/charcoal, -/obj/item/clothing/under/liaison_suit/blazer, -/obj/item/clothing/suit/storage/snow_suit/liaison, -/obj/item/clothing/gloves/black, -/obj/item/clothing/gloves/marine/dress, -/obj/item/clothing/glasses/sunglasses/big, -/obj/item/clothing/accessory/blue, -/obj/item/clothing/accessory/red, /obj/structure/machinery/status_display{ pixel_x = -32 }, -/obj/item/clothing/accessory/black, -/obj/item/clothing/accessory/green, -/obj/item/clothing/accessory/gold, -/obj/item/clothing/accessory/purple, -/obj/item/clothing/under/liaison_suit/corporate_formal, -/obj/item/clothing/under/liaison_suit/field, -/obj/item/clothing/under/liaison_suit/ivy, -/obj/item/clothing/under/liaison_suit/blue, -/obj/item/clothing/under/liaison_suit/brown, -/obj/item/clothing/under/liaison_suit/black, -/obj/item/clothing/suit/storage/jacket/marine/vest, -/obj/item/clothing/suit/storage/jacket/marine/vest/grey, -/obj/item/clothing/suit/storage/jacket/marine/vest/tan, -/obj/item/clothing/suit/storage/jacket/marine/bomber, -/obj/item/clothing/suit/storage/jacket/marine/bomber/red, -/obj/item/clothing/suit/storage/jacket/marine/bomber/grey, -/obj/item/clothing/suit/storage/jacket/marine/corporate, -/obj/item/clothing/suit/storage/jacket/marine/corporate/black, -/obj/item/clothing/suit/storage/jacket/marine/corporate/blue, -/obj/item/clothing/suit/storage/jacket/marine/corporate/brown, -/obj/item/clothing/suit/storage/jacket/marine/corporate/formal, -/obj/structure/closet/cabinet{ - storage_capacity = 35 - }, +/obj/structure/machinery/cm_vending/clothing/dress/corporate_liaison, /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) "cPg" = ( @@ -17730,8 +17686,8 @@ /obj/structure/machinery/door_control{ id = "ARES JoeCryo"; name = "ARES WorkingJoe Bay Shutters"; - req_one_access_txt = "91;92"; - pixel_x = 24 + pixel_x = 24; + req_one_access_txt = "91;92" }, /obj/structure/machinery/camera/autoname/almayer/containment/ares{ autoname = 0; @@ -18019,9 +17975,9 @@ layer = 3.3 }, /obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; autoname = 0; - c_tag = "AI - Secondary Processors" + c_tag = "AI - Secondary Processors"; + dir = 8 }, /turf/open/floor/almayer/aicore/no_build/ai_floor2, /area/almayer/command/airoom) @@ -19567,10 +19523,10 @@ req_one_access_txt = "90;91;92" }, /obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 4; - pixel_y = -8; autoname = 0; - c_tag = "AI - Main Staircase" + c_tag = "AI - Main Staircase"; + dir = 4; + pixel_y = -8 }, /obj/effect/step_trigger/clone_cleaner, /turf/open/floor/almayer/aicore/no_build/ai_silver/west, @@ -19832,8 +19788,8 @@ pixel_y = 10 }, /obj/structure/machinery/computer/cameras/almayer_brig{ - dir = 4; desc = "Used to access the various cameras in the security brig."; + dir = 4; name = "brig cameras console"; pixel_y = -11 }, @@ -20216,13 +20172,13 @@ desc = "A large handheld tool used to override various machine functions. Primarily used to pulse Airlock and APC wires on a shortwave frequency. It contains a small data buffer as well. This one is comically oversized. Made in Texas."; icon_state = "multitool_big"; name = "\improper Oversized Security Access Tuner"; - pixel_y = 11; - pixel_x = 4 + pixel_x = 4; + pixel_y = 11 }, /obj/item/stack/sheet/cardboard/medium_stack{ - pixel_y = -6; + layer = 3.01; pixel_x = -7; - layer = 3.01 + pixel_y = -6 }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) @@ -20903,9 +20859,9 @@ "eGr" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; autoname = 0; - c_tag = "AI - Records" + c_tag = "AI - Records"; + dir = 8 }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) @@ -21261,9 +21217,9 @@ /obj/structure/machinery/door_control{ id = "ARES StairsLock"; name = "ARES Exterior Lockdown"; + pixel_x = 6; pixel_y = -24; - req_one_access_txt = "91;92"; - pixel_x = 6 + req_one_access_txt = "91;92" }, /obj/structure/surface/table/reinforced/almayer_B{ indestructible = 1; @@ -21342,10 +21298,10 @@ pixel_x = 1 }, /obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; - pixel_y = 2; autoname = 0; - c_tag = "AI - Reception Exterior" + c_tag = "AI - Reception Exterior"; + dir = 8; + pixel_y = 2 }, /turf/open/floor/almayer/silver/east, /area/almayer/hallways/upper/midship_hallway) @@ -22220,8 +22176,8 @@ /area/almayer/medical/containment/cell/cl) "flf" = ( /obj/structure/pipes/vents/pump/no_boom/gas{ - vent_tag = "Records"; - dir = 1 + dir = 1; + vent_tag = "Records" }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) @@ -22237,9 +22193,9 @@ /area/almayer/maint/upper/u_a_p) "flL" = ( /obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; autoname = 0; - c_tag = "AI - SynthBay" + c_tag = "AI - SynthBay"; + dir = 8 }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) @@ -22950,10 +22906,10 @@ /area/almayer/hallways/lower/repair_bay) "fCI" = ( /obj/structure/machinery/door/poddoor/shutters/almayer{ + dir = 4; id = "ARES JoeCryo"; name = "\improper ARES Synth Bay Shutters"; - plane = -7; - dir = 4 + plane = -7 }, /obj/structure/pipes/standard/simple/hidden/supply/no_boom{ dir = 4 @@ -23587,9 +23543,9 @@ /area/almayer/maint/hull/lower/l_f_s) "fQD" = ( /obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; autoname = 0; - c_tag = "AI - Core Chamber" + c_tag = "AI - Core Chamber"; + dir = 8 }, /turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3, /area/almayer/command/airoom) @@ -25222,10 +25178,10 @@ "gDh" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ access_modified = 1; + dir = 1; name = "\improper Security Vault"; req_access = null; - req_one_access_txt = "91;92"; - dir = 1 + req_one_access_txt = "91;92" }, /obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown/aicore{ plane = -6 @@ -29230,9 +29186,9 @@ plane = -7 }, /obj/structure/disposalpipe/up/almayer{ + dir = 2; id = "ares_vault_in"; - name = "aicore"; - dir = 2 + name = "aicore" }, /obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown, /turf/open/floor/almayer/no_build/test_floor4, @@ -30441,8 +30397,8 @@ }, /obj/structure/machinery/computer/secure_data{ dir = 4; - pixel_y = 23; - layer = 2.99 + layer = 2.99; + pixel_y = 23 }, /turf/open/floor/almayer/red/west, /area/almayer/shipboard/brig/processing) @@ -31476,15 +31432,15 @@ /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/secure_data{ dir = 4; - pixel_y = 19; - layer = 2.99 + layer = 2.99; + pixel_y = 19 }, /obj/structure/machinery/computer/cameras/almayer_brig{ - dir = 4; desc = "Used to access the various cameras in the security brig."; + dir = 4; + layer = 2.99; name = "brig cameras console"; - pixel_y = 5; - layer = 2.99 + pixel_y = 5 }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/chief_mp_office) @@ -31928,9 +31884,9 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/surface/table/reinforced/almayer_blend, /obj/item/desk_bell{ + anchored = 1; pixel_x = -6; - pixel_y = 10; - anchored = 1 + pixel_y = 10 }, /turf/open/floor/almayer/test_floor4, /area/almayer/squads/req) @@ -37050,13 +37006,13 @@ pixel_y = 10 }, /obj/item/stack/cable_coil{ - pixel_y = 1; - pixel_x = 8 + pixel_x = 8; + pixel_y = 1 }, /obj/item/stack/sheet/cardboard/small_stack{ - pixel_y = 2; + layer = 3.01; pixel_x = -3; - layer = 3.01 + pixel_y = 2 }, /turf/open/floor/almayer, /area/almayer/squads/alpha_bravo_shared) @@ -38735,9 +38691,9 @@ pixel_x = -32 }, /obj/structure/machinery/light{ + alpha = 0; dir = 8; - pixel_x = -32; - alpha = 0 + pixel_x = -32 }, /turf/open/floor/almayer/silver/west, /area/almayer/command/computerlab) @@ -39336,8 +39292,8 @@ "mAe" = ( /obj/structure/window/framed/almayer/aicore/hull/black/hijack_bustable, /obj/structure/machinery/door/poddoor/almayer/blended/ai_lockdown{ - plane = -6; - dir = 4 + dir = 4; + plane = -6 }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) @@ -39466,10 +39422,10 @@ "mCx" = ( /obj/structure/machinery/door/airlock/almayer/secure/reinforced{ access_modified = 1; + dir = 1; name = "\improper AI Reception"; req_access = null; - req_one_access_txt = "91;92"; - dir = 1 + req_one_access_txt = "91;92" }, /obj/effect/step_trigger/clone_cleaner, /obj/structure/machinery/door/poddoor/shutters/almayer{ @@ -40363,10 +40319,10 @@ req_one_access_txt = "90;91;92" }, /obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; - pixel_y = 2; + autoname = 0; c_tag = "AI - Main Corridor"; - autoname = 0 + dir = 8; + pixel_y = 2 }, /turf/open/floor/almayer/aicore/no_build/ai_silver/east, /area/almayer/command/airoom) @@ -40668,8 +40624,8 @@ /obj/structure/machinery/door_control{ id = "ARES JoeCryo"; name = "ARES WorkingJoe Bay Shutters"; - req_one_access_txt = "91;92"; - pixel_x = -24 + pixel_x = -24; + req_one_access_txt = "91;92" }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) @@ -42029,8 +41985,8 @@ }, /obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ dir = 4; - pixel_y = -12; - name = "Remote dropship navigation computer" + name = "Remote dropship navigation computer"; + pixel_y = -12 }, /turf/open/floor/almayer/redfull, /area/almayer/living/offices/flight) @@ -43098,10 +43054,10 @@ /area/almayer/hallways/upper/midship_hallway) "nZm" = ( /obj/structure/machinery/door_control{ + access_modified = 1; id = "OTStore"; name = "Shutters"; pixel_y = 24; - access_modified = 1; req_one_access_txt = "35" }, /obj/effect/decal/warning_stripes{ @@ -43409,8 +43365,8 @@ unslashable = 1 }, /obj/structure/machinery/computer/working_joe{ - layer = 3.3; dir = 4; + layer = 3.3; pixel_y = 6 }, /turf/open/floor/almayer/aicore/no_build, @@ -44489,8 +44445,8 @@ /area/almayer/command/cichallway) "oBD" = ( /obj/structure/pipes/vents/pump/no_boom/gas{ - vent_tag = "Access Hall"; - dir = 8 + dir = 8; + vent_tag = "Access Hall" }, /turf/open/floor/almayer/aicore/no_build/ai_silver/east, /area/almayer/command/airoom) @@ -44689,8 +44645,8 @@ "oEA" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/weapon/gun/shotgun/pump{ - starting_attachment_types = list(/obj/item/attachable/stock/shotgun); - pixel_y = 9 + pixel_y = 9; + starting_attachment_types = list(/obj/item/attachable/stock/shotgun) }, /obj/item/stack/sheet/cardboard/small_stack{ layer = 3.01 @@ -45799,8 +45755,8 @@ "pax" = ( /obj/effect/step_trigger/clone_cleaner, /obj/structure/pipes/vents/pump/no_boom/gas{ - vent_tag = "Reception"; - dir = 8 + dir = 8; + vent_tag = "Reception" }, /turf/open/floor/almayer/aicore/glowing/no_build/ai_floor3, /area/almayer/command/airoom) @@ -46284,8 +46240,8 @@ "pmV" = ( /obj/structure/pipes/standard/simple/hidden/supply/no_boom, /obj/structure/machinery/computer/tech_control{ - pixel_y = 16; - density = 0 + density = 0; + pixel_y = 16 }, /turf/open/floor/almayer/no_build/ai_floors, /area/almayer/command/airoom) @@ -48477,9 +48433,9 @@ /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/surface/table/reinforced/almayer_blend/north, /obj/item/desk_bell{ + anchored = 1; pixel_x = -6; - pixel_y = -8; - anchored = 1 + pixel_y = -8 }, /turf/open/floor/almayer/test_floor4, /area/almayer/squads/req) @@ -48824,9 +48780,9 @@ /area/almayer/maint/hull/lower/l_f_p) "qpY" = ( /obj/structure/machinery/cryopod/right{ + dir = 4; layer = 3.1; - pixel_y = 13; - dir = 4 + pixel_y = 13 }, /turf/open/floor/almayer/aicore/no_build/ai_cargo, /area/almayer/command/airoom) @@ -51696,8 +51652,8 @@ desc = "A pneumatic delivery unit."; icon_state = "delivery_engi"; name = "Security Vault"; - pixel_y = 28; - pixel_x = -24 + pixel_x = -24; + pixel_y = 28 }, /obj/structure/disposalpipe/trunk{ dir = 1 @@ -56014,9 +55970,9 @@ /area/almayer/maint/hull/lower/stern) "tmV" = ( /obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 8; autoname = 0; - c_tag = "AI - SecVault" + c_tag = "AI - SecVault"; + dir = 8 }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) @@ -56131,9 +56087,9 @@ req_access_txt = "8" }, /obj/item/desk_bell{ + anchored = 1; pixel_x = -6; - pixel_y = 10; - anchored = 1 + pixel_y = 10 }, /obj/structure/machinery/door/firedoor/border_only/almayer, /turf/open/floor/almayer/sterile_green, @@ -56771,9 +56727,9 @@ desc = "An outlet for the pneumatic delivery system."; icon_state = "delivery_outlet"; name = "returns outlet"; + pixel_x = -7; pixel_y = 28; - range = 0; - pixel_x = -7 + range = 0 }, /turf/open/floor/almayer/no_build/test_floor4, /area/almayer/command/airoom) @@ -56871,9 +56827,9 @@ /area/almayer/hallways/upper/port) "tCC" = ( /obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 1; + autoname = 0; c_tag = "AI - Reception Interior"; - autoname = 0 + dir = 1 }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) @@ -59887,15 +59843,15 @@ unslashable = 1 }, /obj/item/paper_bin/uscm{ - pixel_y = 6; - pixel_x = -12 + pixel_x = -12; + pixel_y = 6 }, /obj/item/tool/pen{ pixel_x = -14 }, /obj/structure/machinery/aicore_lockdown{ - pixel_y = 4; - pixel_x = 3 + pixel_x = 3; + pixel_y = 4 }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) @@ -60988,13 +60944,13 @@ unslashable = 1 }, /obj/structure/machinery/computer/working_joe{ - layer = 3.3; - dir = 8 + dir = 8; + layer = 3.3 }, /obj/item/desk_bell/ares{ - pixel_y = 14; + anchored = 1; pixel_x = -5; - anchored = 1 + pixel_y = 14 }, /turf/open/floor/almayer/aicore/no_build, /area/almayer/command/airoom) @@ -61054,14 +61010,14 @@ "vqI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/device/camera_film{ + layer = 3.03; pixel_x = 4; - pixel_y = 1; - layer = 3.03 + pixel_y = 1 }, /obj/item/stack/sheet/cardboard/small_stack{ + layer = 3.02; pixel_x = -5; - pixel_y = 3; - layer = 3.02 + pixel_y = 3 }, /turf/open/floor/almayer, /area/almayer/squads/charlie_delta_shared) @@ -61743,9 +61699,9 @@ layer = 3.3 }, /obj/structure/machinery/camera/autoname/almayer/containment/ares{ - dir = 4; + autoname = 0; c_tag = "AI - Primary Processors"; - autoname = 0 + dir = 4 }, /turf/open/floor/almayer/aicore/no_build/ai_floor2, /area/almayer/command/airoom) @@ -65788,8 +65744,8 @@ "xeU" = ( /obj/structure/machinery/door/airlock/almayer/generic{ name = "\improper Laundry Room"; - req_one_access = list(19,7); - req_access = list() + req_access = list(); + req_one_access = list(19,7) }, /turf/open/floor/almayer/test_floor4, /area/almayer/engineering/laundry) @@ -66027,8 +65983,8 @@ pixel_y = 27 }, /obj/structure/machinery/computer/cameras/almayer_brig{ - dir = 4; desc = "Used to access the various cameras in the security brig."; + dir = 4; name = "brig cameras console" }, /turf/open/floor/almayer/red/west, @@ -66178,9 +66134,9 @@ }, /obj/structure/machinery/computer/shuttle/dropship/flight/remote_control{ dir = 8; + name = "Remote dropship navigation computer"; pixel_y = 12; - shuttleId = "dropship_alamo"; - name = "Remote dropship navigation computer" + shuttleId = "dropship_alamo" }, /turf/open/floor/almayer/redfull, /area/almayer/living/offices/flight) @@ -66597,8 +66553,8 @@ /area/almayer/living/briefing) "xwU" = ( /obj/structure/pipes/vents/pump/no_boom/gas{ - vent_tag = "Comms"; - dir = 1 + dir = 1; + vent_tag = "Comms" }, /turf/open/floor/almayer/aicore/no_build/ai_plates, /area/almayer/command/airoom)