diff --git a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm index 027c9bec2d1..a75e04f420a 100644 --- a/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm +++ b/code/game/machinery/vending/vendor_types/crew/pilot_officer.dm @@ -25,6 +25,7 @@ list("SIDEARMS", -1, null, null), list("88 Mod 4 Combat Pistol", 4, /obj/item/weapon/gun/pistol/mod88, VENDOR_ITEM_REGULAR), + list("VP-78 Pistol", 2, /obj/item/weapon/gun/pistol/vp78, VENDOR_ITEM_REGULAR), list("M44 Combat Revolver", 4, /obj/item/weapon/gun/revolver/m44, VENDOR_ITEM_REGULAR), list("M4A3 Service Pistol", 4, /obj/item/weapon/gun/pistol/m4a3, VENDOR_ITEM_REGULAR), list("M82F Flare Gun", 4, /obj/item/weapon/gun/flare, VENDOR_ITEM_REGULAR), @@ -62,29 +63,48 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("M30 Tactical Helmet", 0, /obj/item/clothing/head/helmet/marine/pilot, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), - list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Headset", 0, /obj/item/device/radio/headset/almayer/po, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("GLASSES (CHOOSE 1)", 0, null, null, null), + list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), + list("Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_RECOMMENDED), + list("Prescription Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health/prescription, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_RECOMMENDED), + list("Sunglasses", 0, /obj/item/clothing/glasses/sunglasses, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), + + list("MASK (CHOOSE 1)", 0, null, null, null), + list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Balaclava", 0, /obj/item/clothing/mask/balaclava, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Snow Scarf", 0, /obj/item/clothing/mask/tornscarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("ARMOR (CHOOSE 1)", 0, null, null, null), - list("M70 Flak Jacket", 0, /obj/item/clothing/suit/armor/vest/pilot, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), - list("M3-VL Pattern Flak Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest/dcc, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + list("M70 Flak Jacket", 0, /obj/item/clothing/suit/armor/vest/pilot, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), + list("M3-VL Pattern Flak Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest/dcc, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), + + list("HEADWEAR (CHOOSE 1)", 0, null, null, null), + list("M30 Tactical Helmet", 0, /obj/item/clothing/head/helmet/marine/pilot, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Officer Cap", 0, /obj/item/clothing/head/cmcap/bridge, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Beret, Green", 0, /obj/item/clothing/head/beret/cm, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Beret, Tan", 0, /obj/item/clothing/head/beret/cm/tan, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), - list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), - list("88 Mod 4 Combat Pistol", 0, /obj/item/weapon/gun/pistol/mod88, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("VP78 Pistol", 0, /obj/item/weapon/gun/pistol/vp78, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("BACKPACK (CHOOSE 1)", 0, null, null, null), + list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED), + list("Backpack", 0, /obj/item/storage/backpack/marine, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + list("Satchel", 0, /obj/item/storage/backpack/marine/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), list("BELT (CHOOSE 1)", 0, null, null, null), list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("M276 Lifesaver Bag (Full)", 0, /obj/item/storage/belt/medical/lifesaver/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), - list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("HOLSTER (CHOOSE 1)", 0, null, null, null), + list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("POUCHES (CHOOSE 2)", 0, null, null, null), list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -100,20 +120,31 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list( list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("UTILITIES", 0, null, null, null), + list("PO Flightsuit Kit", 10, /obj/effect/essentials_set/po_alternate, null, VENDOR_ITEM_REGULAR), + list("Fire Extinguisher (portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 15, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 15, /obj/item/storage/pouch/magazine/large, null, VENDOR_ITEM_REGULAR), + list("Machete Scabbard (Full)", 10, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), + list("Machete Pouch (Full)", 15, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 15, /obj/item/device/motiondetector, null, VENDOR_ITEM_RECOMMENDED), + list("Space Cleaner", 2, /obj/item/reagent_container/spray/cleaner, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Binoculars", 5,/obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), - list("GLASSES (CHOOSE 1)", 0, null, null, null), - list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), - list("Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_RECOMMENDED), - list("Sunglasses", 0, /obj/item/clothing/glasses/sunglasses, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), - - list("MASK (CHOOSE 1)", 0, null, null, null), - list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("AMMUNITION", 0, null, null, null), + list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), + list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap, null, VENDOR_ITEM_REGULAR), + list("M39 Extended Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/extended, null, VENDOR_ITEM_REGULAR), + list("M41A AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/ap, null, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/extended, null, VENDOR_ITEM_REGULAR), + list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), @@ -129,51 +160,52 @@ GLOBAL_LIST_INIT(cm_vending_clothing_pilot_officer, list( list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), - - list("AMMUNITION", 0, null, null, null), - list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), - list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap, null, VENDOR_ITEM_REGULAR), - list("M39 Extended Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/extended, null, VENDOR_ITEM_REGULAR), - list("M41A AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/ap, null, VENDOR_ITEM_REGULAR), - list("M41A Extended Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/extended, null, VENDOR_ITEM_REGULAR), - list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), - - list("UTILITIES", 0, null, null, null), - list("PO Flightsuit Kit", 10, /obj/effect/essentials_set/po_alternate, null, VENDOR_ITEM_REGULAR), - list("Fire Extinguisher (portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Large General Pouch", 15, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 15, /obj/item/storage/pouch/magazine/large, null, VENDOR_ITEM_REGULAR), - list("Machete Scabbard (Full)", 10, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), - list("Machete Pouch (Full)", 15, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), - list("Motion Detector", 15, /obj/item/device/motiondetector, null, VENDOR_ITEM_RECOMMENDED) )) GLOBAL_LIST_INIT(cm_vending_clothing_dropship_crew_chief, list( list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), list("Gloves", 0, /obj/item/clothing/gloves/yellow, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), - list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), + list("Headset", 0, /obj/item/device/radio/headset/almayer/po, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), + list("GLASSES (CHOOSE 1)", 0, null, null, null), + list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), + list("Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_RECOMMENDED), + list("Prescription Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health/prescription, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_RECOMMENDED), + list("Sunglasses", 0, /obj/item/clothing/glasses/sunglasses, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), + + list("MASK (CHOOSE 1)", 0, null, null, null), + list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Balaclava", 0, /obj/item/clothing/mask/balaclava, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("Snow Scarf", 0, /obj/item/clothing/mask/tornscarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("ARMOR (CHOOSE 1)", 0, null, null, null), - list("M70 Flak Jacket", 0, /obj/item/clothing/suit/armor/vest/pilot, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), - list("M3-VL Pattern Flak Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest/dcc, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), + list("M3-VL Pattern Flak Vest", 0, /obj/item/clothing/suit/storage/marine/light/vest/dcc, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_RECOMMENDED), + list("M70 Flak Jacket", 0, /obj/item/clothing/suit/armor/vest/pilot, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_REGULAR), - list("PERSONAL SIDEARM (CHOOSE 1)", 0, null, null, null), - list("88 Mod 4 Combat Pistol", 0, /obj/item/weapon/gun/pistol/mod88, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("VP78 Pistol", 0, /obj/item/weapon/gun/pistol/vp78, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("HEADWEAR (CHOOSE 1)", 0, null, null, null), + list("Patrol Cap", 0, /obj/item/clothing/head/cmcap, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_RECOMMENDED), + list("Beret, Green", 0, /obj/item/clothing/head/beret/cm, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + list("Beret, Tan", 0, /obj/item/clothing/head/beret/cm/tan, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_REGULAR), + + list("BACKPACK (CHOOSE 1)", 0, null, null, null), + list("Leather Satchel", 0, /obj/item/storage/backpack/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_RECOMMENDED), + list("Backpack", 0, /obj/item/storage/backpack/marine, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), + list("Satchel", 0, /obj/item/storage/backpack/marine/satchel, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_REGULAR), list("BELT (CHOOSE 1)", 0, null, null, null), list("G8-A General Utility Pouch", 0, /obj/item/storage/backpack/general_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("M276 Ammo Load Rig", 0, /obj/item/storage/belt/marine, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("M276 Lifesaver Bag (Full)", 0, /obj/item/storage/belt/medical/lifesaver/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), list("M276 Medical Storage Rig (Full)", 0, /obj/item/storage/belt/medical/full, MARINE_CAN_BUY_BELT, VENDOR_ITEM_RECOMMENDED), - list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), - list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), list("M276 Shotgun Shell Loading Rig", 0, /obj/item/storage/belt/shotgun, MARINE_CAN_BUY_BELT, VENDOR_ITEM_REGULAR), + list("HOLSTER (CHOOSE 1)", 0, null, null, null), + list("M276 M39 Holster Rig", 0, /obj/item/storage/belt/gun/m39, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("M276 M44 Holster Rig", 0, /obj/item/storage/belt/gun/m44, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("M276 M82F Holster Rig", 0, /obj/item/storage/belt/gun/flaregun, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("M276 General Pistol Holster Rig", 0, /obj/item/storage/belt/gun/m4a3, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), + list("POUCHES (CHOOSE 2)", 0, null, null, null), list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), @@ -189,21 +221,30 @@ GLOBAL_LIST_INIT(cm_vending_clothing_dropship_crew_chief, list( list("Sidearm Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), list("Sling Pouch", 0, /obj/item/storage/pouch/sling, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), + list("UTILITIES", 0, null, null, null), + list("Fire Extinguisher (portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), + list("Large General Pouch", 15, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), + list("Large Magazine Pouch", 15, /obj/item/storage/pouch/magazine/large, null, VENDOR_ITEM_REGULAR), + list("Machete Scabbard (Full)", 10, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), + list("Machete Pouch (Full)", 15, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), + list("Motion Detector", 15, /obj/item/device/motiondetector, null, VENDOR_ITEM_RECOMMENDED), + list("Space Cleaner", 2, /obj/item/reagent_container/spray/cleaner, null, VENDOR_ITEM_REGULAR), + list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR), + list("Binoculars", 5,/obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR), + list("ACCESSORIES (CHOOSE 1)", 0, null, null, null), list("Black Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Brown Webbing Vest", 0, /obj/item/clothing/accessory/storage/black_vest/brown_vest, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_RECOMMENDED), list("Shoulder Holster", 0, /obj/item/clothing/accessory/storage/holster, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), list("Webbing", 0, /obj/item/clothing/accessory/storage/webbing, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), - list("Drop Pouch", 0, /obj/item/clothing/accessory/storage/droppouch, MARINE_CAN_BUY_ACCESSORY, VENDOR_ITEM_REGULAR), - list("GLASSES (CHOOSE 1)", 0, null, null, null), - list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), - list("Medical HUD Glasses", 0, /obj/item/clothing/glasses/hud/health, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_RECOMMENDED), - list("Sunglasses", 0, /obj/item/clothing/glasses/sunglasses, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR), - - list("MASK (CHOOSE 1)", 0, null, null, null), - list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), + list("AMMUNITION", 0, null, null, null), + list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), + list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap, null, VENDOR_ITEM_REGULAR), + list("M39 Extended Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/extended, null, VENDOR_ITEM_REGULAR), + list("M41A AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/ap, null, VENDOR_ITEM_REGULAR), + list("M41A Extended Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/extended, null, VENDOR_ITEM_REGULAR), + list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), list("ATTACHMENTS", 0, null, null, null), list("Angled Grip", 10, /obj/item/attachable/angledgrip, null, VENDOR_ITEM_REGULAR), @@ -219,22 +260,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_dropship_crew_chief, list( list("Reflex Sight", 10, /obj/item/attachable/reflex, null, VENDOR_ITEM_REGULAR), list("Suppressor", 10, /obj/item/attachable/suppressor, null, VENDOR_ITEM_REGULAR), list("Vertical Grip", 10, /obj/item/attachable/verticalgrip, null, VENDOR_ITEM_REGULAR), - - list("AMMUNITION", 0, null, null, null), - list("M4RA AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/m4ra/ap, null, VENDOR_ITEM_REGULAR), - list("M39 AP Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap, null, VENDOR_ITEM_REGULAR), - list("M39 Extended Magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/extended, null, VENDOR_ITEM_REGULAR), - list("M41A AP Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/ap, null, VENDOR_ITEM_REGULAR), - list("M41A Extended Magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/extended, null, VENDOR_ITEM_REGULAR), - list("M44 Heavy Speed Loader (.44)", 10, /obj/item/ammo_magazine/revolver/heavy, null, VENDOR_ITEM_REGULAR), - - list("UTILITIES", 0, null, null, null), - list("Fire Extinguisher (portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Large General Pouch", 15, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Large Magazine Pouch", 15, /obj/item/storage/pouch/magazine/large, null, VENDOR_ITEM_REGULAR), - list("Machete Scabbard (Full)", 10, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR), - list("Machete Pouch (Full)", 15, /obj/item/storage/pouch/machete/full, null, VENDOR_ITEM_REGULAR), - list("Motion Detector", 15, /obj/item/device/motiondetector, null, VENDOR_ITEM_RECOMMENDED) )) //MARINE_CAN_BUY_SHOES MARINE_CAN_BUY_UNIFORM currently not used diff --git a/code/game/objects/effects/landmarks/landmarks.dm b/code/game/objects/effects/landmarks/landmarks.dm index a7afb80ef08..e335e54631a 100644 --- a/code/game/objects/effects/landmarks/landmarks.dm +++ b/code/game/objects/effects/landmarks/landmarks.dm @@ -420,6 +420,15 @@ job = JOB_NURSE +/obj/effect/landmark/late_join/pilot + name = "Pilot Officer late join" + job = JOB_PILOT + +/obj/effect/landmark/late_join/crewchief + name = "Dropship Crew Chief late join" + job = JOB_DROPSHIP_CREW_CHIEF + + /obj/effect/landmark/late_join/Initialize(mapload, ...) . = ..() if(squad) diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 578df21b67d..e21e23e0792 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -689,7 +689,6 @@ if(new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) @@ -739,7 +738,6 @@ if(new_human.client && new_human.client.prefs && (new_human.client.prefs.backbag == 1)) back_item = /obj/item/storage/backpack/marine - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/po(new_human), WEAR_L_EAR) new_human.equip_to_slot_or_del(new back_item(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/pilot/dcc(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index dc84289502c..fc8dc483cc1 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -4286,6 +4286,13 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering) +"art" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/sign/safety/cryo{ + pixel_x = 36 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/lower/cryo_cells) "arw" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/junction{ @@ -5450,6 +5457,7 @@ /area/almayer/command/cic) "avU" = ( /obj/effect/landmark/start/crew_chief, +/obj/effect/landmark/late_join/crewchief, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/pilotbunks) "avV" = ( @@ -5745,6 +5753,7 @@ /area/almayer/living/pilotbunks) "awY" = ( /obj/effect/landmark/start/pilot, +/obj/effect/landmark/late_join/pilot, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/pilotbunks) "awZ" = ( @@ -9849,11 +9858,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha) -"aPr" = ( -/turf/open/floor/almayer{ - icon_state = "silverfull" - }, -/area/almayer/living/cryo_cells) "aPw" = ( /turf/closed/wall/almayer/outer, /area/almayer/command/lifeboat) @@ -13722,18 +13726,6 @@ icon_state = "mono" }, /area/almayer/medical/hydroponics) -"bkU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/landmark/late_join, -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/start/senior, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "bkY" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -15736,15 +15728,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"byw" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "byC" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -16480,6 +16463,8 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) +<<<<<<< HEAD +======= "bDL" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ access_modified = 1; @@ -16495,6 +16480,7 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_m_p) +>>>>>>> master "bDO" = ( /turf/open/floor/almayer{ icon_state = "tcomms" @@ -17548,6 +17534,14 @@ icon_state = "cargo" }, /area/almayer/squads/req) +"bIt" = ( +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/late_join, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/cryo_cells) "bIw" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light{ @@ -17955,18 +17949,6 @@ /obj/item/facepaint/green, /turf/open/floor/almayer, /area/almayer/squads/bravo) -"bKD" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/pilot_officer{ - density = 0; - pixel_y = 16 - }, -/obj/structure/window{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/cryo_cells) "bKE" = ( /turf/open/floor/almayer{ dir = 4; @@ -20684,15 +20666,6 @@ icon_state = "test_floor4" }, /area/almayer/medical/medical_science) -"cbh" = ( -/obj/structure/machinery/cm_vending/clothing/pilot_officer{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/cryo_cells) "cbm" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -21031,14 +21004,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/charlie) -"cdm" = ( -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/cryo_cells) "cdn" = ( /obj/effect/landmark/ert_spawns/distress_cryo, /obj/effect/landmark/late_join, @@ -26120,6 +26085,17 @@ icon_state = "silvercorner" }, /area/almayer/command/cichallway) +<<<<<<< HEAD +"dvD" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_f_s) +"dvZ" = ( +/obj/structure/machinery/door/airlock/almayer/maint, +/obj/structure/disposalpipe/segment{ + dir = 4 +======= "dvs" = ( /obj/structure/machinery/cm_vending/clothing/vehicle_crew{ density = 0; @@ -26132,6 +26108,7 @@ "dvx" = ( /obj/structure/machinery/door/airlock/almayer/maint{ dir = 1 +>>>>>>> master }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -27626,6 +27603,14 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) +<<<<<<< HEAD +"dYc" = ( +/obj/structure/prop/invuln/overhead_pipe{ + pixel_x = 12 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_a_s) +======= "dXY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -27635,6 +27620,7 @@ icon_state = "blue" }, /area/almayer/living/pilotbunks) +>>>>>>> master "dYu" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -38339,6 +38325,54 @@ icon_state = "red" }, /area/almayer/shipboard/brig/main_office) +<<<<<<< HEAD +"igw" = ( +/obj/structure/sign/poster/ad{ + pixel_x = 30 + }, +/obj/structure/closet, +/obj/item/clothing/mask/cigarette/weed, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/lower/l_m_s) +"igP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/landmark/late_join, +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/start/senior, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) +"igS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out" + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/obj/structure/closet/emcloset, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/upper/p_bow) +"iho" = ( +/obj/structure/machinery/door/airlock/almayer/maint{ + dir = 1 + }, +/obj/structure/machinery/door/poddoor/almayer/open{ + id = "Hangar Lockdown"; + name = "\improper Hangar Lockdown Blast Door" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/maint/lower/constr) +======= +>>>>>>> master "ihw" = ( /obj/structure/machinery/cm_vending/sorted/medical, /turf/open/floor/almayer{ @@ -39080,6 +39114,15 @@ icon_state = "plate" }, /area/almayer/engineering/lower) +"ivX" = ( +/obj/structure/machinery/cm_vending/clothing/vehicle_crew{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/cryo_cells) "iwf" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -40983,13 +41026,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) -"jhb" = ( -/obj/structure/sign/safety/cryo{ - pixel_x = -6; - pixel_y = -6 - }, -/turf/closed/wall/almayer, -/area/almayer/living/cryo_cells) "jhn" = ( /turf/open/floor/almayer{ dir = 1; @@ -45067,6 +45103,18 @@ icon_state = "plating" }, /area/almayer/squads/req) +<<<<<<< HEAD +"kFU" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_s) +"kGi" = ( +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_f_p) +======= "kFY" = ( /obj/structure/sign/safety/cryo{ pixel_x = 7 @@ -45083,6 +45131,7 @@ icon_state = "plate" }, /area/almayer/shipboard/panic) +>>>>>>> master "kGu" = ( /obj/structure/machinery/cryopod{ layer = 3.1; @@ -47315,12 +47364,24 @@ icon_state = "red" }, /area/almayer/living/offices/flight) +<<<<<<< HEAD +"lsT" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/living/pilotbunks) +======= "lsQ" = ( /obj/structure/machinery/power/reactor, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/engineering/lower/engine_core) +>>>>>>> master "lsV" = ( /obj/structure/largecrate/random/barrel/red, /obj/structure/sign/safety/fire_haz{ @@ -47392,6 +47453,15 @@ icon_state = "test_floor4" }, /area/almayer/living/commandbunks) +"lus" = ( +/obj/structure/machinery/cm_vending/clothing/pilot_officer{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/cryo_cells) "luz" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 @@ -48661,7 +48731,26 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +<<<<<<< HEAD +"lVz" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/pilot_officer{ + density = 0; + pixel_y = 16 + }, +/obj/structure/window{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/cryo_cells) +"lVR" = ( +/obj/structure/stairs{ + icon_state = "ramptop" + }, +======= "lVv" = ( +>>>>>>> master /obj/structure/platform{ dir = 1 }, @@ -57471,6 +57560,15 @@ icon_state = "red" }, /area/almayer/shipboard/brig/lobby) +"peP" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/living/pilotbunks) "pfa" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -58571,6 +58669,27 @@ icon_state = "mono" }, /area/almayer/hallways/stern_hallway) +<<<<<<< HEAD +"pCQ" = ( +/obj/structure/surface/table/almayer, +/obj/item/attachable/lasersight, +/obj/item/reagent_container/food/drinks/cans/souto/vanilla{ + pixel_x = 10; + pixel_y = 11 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/hull/upper/u_m_s) +"pCR" = ( +/obj/structure/sign/safety/cryo{ + pixel_x = -6; + pixel_y = -6 + }, +/turf/closed/wall/almayer, +/area/almayer/living/cryo_cells) +======= +>>>>>>> master "pDh" = ( /obj/structure/machinery/power/monitor{ name = "Core Power Monitoring" @@ -65071,12 +65190,25 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) +<<<<<<< HEAD +"rTe" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/structure/janitorialcart, +/obj/item/tool/mop, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/maint/upper/u_m_p) +======= "rTj" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 }, /turf/open/floor/almayer, /area/almayer/maint/hull/upper/u_f_s) +>>>>>>> master "rTk" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 @@ -66814,15 +66946,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha) -"sCI" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/living/pilotbunks) "sCQ" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -68382,12 +68505,12 @@ }, /area/almayer/maint/hull/lower/l_a_p) "tfl" = ( -/obj/structure/machinery/light{ - dir = 1 - }, /obj/structure/sign/safety/maint{ pixel_x = 32 }, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) "tfw" = ( @@ -72232,6 +72355,28 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +<<<<<<< HEAD +"uCw" = ( +/obj/structure/closet/crate/freezer, +/obj/item/reagent_container/food/snacks/tomatomeat, +/obj/item/reagent_container/food/snacks/tomatomeat, +/obj/item/reagent_container/food/snacks/tomatomeat, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"uCC" = ( +/obj/structure/window{ + dir = 8 + }, +/obj/structure/machinery/cm_vending/sorted/cargo_guns/vehicle_crew{ + density = 0; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/cryo_cells) +======= +>>>>>>> master "uCM" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -73132,8 +73277,8 @@ /area/almayer/shipboard/brig/cic_hallway) "uVD" = ( /obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" + name = "ship-grade camera"; + dir = 8 }, /turf/open/floor/almayer{ dir = 8; @@ -73332,6 +73477,13 @@ icon_state = "test_floor4" }, /area/almayer/living/basketball) +<<<<<<< HEAD +"vab" = ( +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/living/cryo_cells) +======= "vag" = ( /obj/structure/prop/invuln/overhead_pipe{ dir = 4; @@ -73344,6 +73496,7 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_s) +>>>>>>> master "vak" = ( /obj/structure/sign/safety/security{ pixel_x = 15; @@ -75730,6 +75883,21 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) +<<<<<<< HEAD +"vJB" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ + access_modified = 1; + dir = 1; + name = "\improper Auxiliary Combat Support Secondary Preparations"; + req_one_access = "19;27;22" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) +"vJR" = ( +/obj/structure/barricade/handrail, +======= "vJq" = ( /obj/structure/largecrate/random/barrel/white, /turf/open/floor/almayer{ @@ -75748,6 +75916,7 @@ pixel_x = 8; pixel_y = -32 }, +>>>>>>> master /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_a_s) "vJO" = ( @@ -76330,11 +76499,11 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"vTS" = ( -/obj/structure/machinery/light{ - pixel_x = 16 +"vTR" = ( +/obj/structure/sign/safety/cryo{ + pixel_x = 7 }, -/turf/open/floor/plating/plating_catwalk, +/turf/closed/wall/almayer, /area/almayer/living/cryo_cells) "vTT" = ( /obj/structure/disposalpipe/segment{ @@ -76740,6 +76909,12 @@ "vZw" = ( /turf/open/floor/almayer/research/containment/floor2, /area/almayer/medical/containment/cell/cl) +"vZx" = ( +/obj/structure/machinery/light{ + pixel_x = 16 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/cryo_cells) "vZU" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/power/apc/almayer{ @@ -78189,6 +78364,28 @@ icon_state = "plate" }, /area/almayer/medical/lower_medical_medbay) +<<<<<<< HEAD +"wxu" = ( +/obj/structure/sign/safety/water{ + pixel_x = 8; + pixel_y = -32 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/hull/lower/l_m_p) +"wxy" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/maint/hull/upper/p_stern) +"wxE" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) +======= +>>>>>>> master "wxU" = ( /obj/item/ashtray/bronze{ pixel_x = 7; @@ -82443,18 +82640,6 @@ icon_state = "ai_floors" }, /area/almayer/command/airoom) -"ydM" = ( -/obj/structure/window{ - dir = 8 - }, -/obj/structure/machinery/cm_vending/sorted/cargo_guns/vehicle_crew{ - density = 0; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/cryo_cells) "ydO" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -106839,7 +107024,7 @@ mfQ nPx aiX amd -dXY +peP fmB umS yjM @@ -107042,7 +107227,7 @@ eGH qnl aiX apt -sCI +lsT pWN uTN aqy @@ -127644,6 +127829,29 @@ kcl aLG aYO bZK +<<<<<<< HEAD +lZM +art +xss +rLK +xss +xss +uHk +dXb +dXb +dXb +cTX +xss +xss +dXb +ndm +xss +iFY +dXb +xss +xss +lZM +======= mgZ wVU row @@ -127665,6 +127873,7 @@ fRD row row mgZ +>>>>>>> master cbW iEb bIT @@ -128051,7 +128260,7 @@ aLG aZi aLG bbs -cbh +lus xYP bbs gsm @@ -128254,8 +128463,8 @@ aLG aZi aLG bbs -bKD -vTS +lVz +vZx bbs ccQ bCN @@ -128457,7 +128666,7 @@ fvK aZi aLG bbs -ydM +uCC xYP bbs ccQ @@ -128660,10 +128869,10 @@ aLG aZi aLG bbs -dvs +ivX xYP bbs -cdm +bIt bCM rbF qlz @@ -128862,9 +129071,9 @@ kcl beB byI beB -kFY +vTR jmK -bDL +vJB bbs ccQ bCN @@ -128882,7 +129091,7 @@ ccQ tez ccQ bCN -jhb +pCR jiw cbS bHW @@ -129066,11 +129275,11 @@ aLG aZi aLG bBd -aPr +vab bfl bSb -byw -bkU +wxE +igP bAY pur bxm @@ -129079,7 +129288,7 @@ jmK bRa bxm pur -byw +wxE bzI bAY bSb