From 543146b448800878b04175d39c9a84e5ab46f03a Mon Sep 17 00:00:00 2001 From: LC4492 <122557086+LC4492@users.noreply.github.com> Date: Wed, 31 Jan 2024 22:49:54 -0300 Subject: [PATCH 1/4] F.C.D.1 --- .../vendor_types/crew/pilot_officer.dm | 169 +++-- .../objects/effects/landmarks/landmarks.dm | 9 + code/modules/gear_presets/uscm_ship.dm | 2 - maps/map_files/USS_Almayer/USS_Almayer.dmm | 658 +++++++++++------- 4 files changed, 516 insertions(+), 322 deletions(-) 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 0b6a3b4b1ed..d7132581e75 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 64e110d3024..e5e227ad306 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -5483,6 +5483,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" = ( @@ -5786,6 +5787,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" = ( @@ -8082,6 +8084,15 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) +"aFQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "silvercorner" + }, +/area/almayer/living/cryo_cells) "aFV" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -9830,11 +9841,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) @@ -12437,6 +12443,9 @@ /area/almayer/squads/alpha) "bdw" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, /turf/open/floor/almayer{ dir = 9; icon_state = "red" @@ -12758,6 +12767,9 @@ /turf/open/floor/almayer, /area/almayer/living/chapel) "bfl" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, /turf/open/floor/almayer{ dir = 5; icon_state = "silver" @@ -13649,18 +13661,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; @@ -14328,6 +14328,14 @@ icon_state = "mono" }, /area/almayer/squads/req) +"boH" = ( +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/late_join, +/obj/effect/landmark/start/senior, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/cryo_cells) "boL" = ( /turf/open/floor/almayer, /area/almayer/living/starboard_garden) @@ -15506,6 +15514,7 @@ /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) "bxm" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ dir = 4; icon_state = "silver" @@ -15692,11 +15701,12 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "byw" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ icon_state = "SW-out" }, /turf/open/floor/almayer{ - dir = 4; + dir = 5; icon_state = "silver" }, /area/almayer/living/cryo_cells) @@ -15785,8 +15795,7 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ dir = 4; icon_state = "silver" @@ -15990,11 +15999,13 @@ }, /area/almayer/hallways/starboard_hallway) "bAY" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ - icon_state = "NW-out" + icon_state = "NW-out"; + pixel_y = 1 }, /turf/open/floor/almayer{ - dir = 4; + dir = 6; icon_state = "silver" }, /area/almayer/living/cryo_cells) @@ -16458,17 +16469,6 @@ /obj/structure/largecrate/random/case/double, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"bDL" = ( -/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) "bDO" = ( /turf/open/floor/almayer{ icon_state = "tcomms" @@ -16575,10 +16575,8 @@ /area/almayer/squads/req) "bEa" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SW-out" + icon_state = "W" }, -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, /turf/open/floor/almayer{ dir = 6; icon_state = "silver" @@ -17901,18 +17899,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; @@ -17940,6 +17926,9 @@ /obj/structure/bed/chair{ dir = 8 }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) "bKX" = ( @@ -18787,10 +18776,6 @@ }, /area/almayer/squads/req) "bOT" = ( -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, /obj/structure/machinery/light{ dir = 1 }, @@ -18798,6 +18783,14 @@ dir = 1 }, /obj/structure/machinery/cm_vending/gear/sea, +/obj/structure/sign/safety/ammunition{ + pixel_x = -17; + pixel_y = 7 + }, +/obj/structure/sign/safety/hazard{ + pixel_x = -17; + pixel_y = -8 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -18990,17 +18983,17 @@ }, /area/almayer/shipboard/weapon_room) "bPL" = ( +/obj/structure/machinery/cryopod, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera" + }, /obj/structure/machinery/firealarm{ dir = 8; pixel_x = -24 }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" +/turf/open/floor/almayer{ + icon_state = "cargo" }, -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, -/turf/open/floor/almayer, /area/almayer/living/cryo_cells) "bPM" = ( /turf/open/floor/almayer{ @@ -19142,6 +19135,9 @@ /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, /obj/item/tool/pen, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) "bQZ" = ( @@ -19157,6 +19153,9 @@ /obj/structure/machinery/light{ dir = 4 }, +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) "bRe" = ( @@ -19306,11 +19305,12 @@ }, /area/almayer/living/cryo_cells) "bSb" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" }, +/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ - dir = 4; + dir = 5; icon_state = "silver" }, /area/almayer/living/cryo_cells) @@ -20663,15 +20663,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 @@ -21010,14 +21001,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, @@ -24179,9 +24162,6 @@ /area/almayer/hallways/aft_hallway) "cLl" = ( /obj/structure/surface/table/almayer, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /obj/item/storage/fancy/cigar, /obj/item/tool/lighter/zippo, /turf/open/floor/wood/ship, @@ -25156,6 +25136,15 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) +"dei" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silvercorner" + }, +/area/almayer/living/cryo_cells) "deq" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -25416,6 +25405,18 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) +"djT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "dka" = ( /obj/structure/machinery/optable, /turf/open/floor/almayer{ @@ -25592,6 +25593,14 @@ icon_state = "silverfull" }, /area/almayer/command/computerlab) +"dnq" = ( +/obj/structure/machinery/status_display{ + pixel_x = -32 + }, +/obj/effect/landmark/late_join, +/obj/effect/landmark/ert_spawns/distress_cryo, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/cryo_cells) "dnC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -25972,15 +25981,6 @@ icon_state = "silvercorner" }, /area/almayer/command/cichallway) -"dvs" = ( -/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) "dvD" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -26826,13 +26826,8 @@ }, /area/almayer/engineering/lower/engine_core) "dLt" = ( -/obj/structure/sign/safety/hazard{ - pixel_x = -17; - pixel_y = -8 - }, -/obj/structure/sign/safety/ammunition{ - pixel_x = -17; - pixel_y = 7 +/obj/structure/machinery/power/apc/almayer{ + dir = 8 }, /turf/open/floor/almayer{ icon_state = "plating_striped" @@ -27436,15 +27431,6 @@ }, /turf/open/floor/wood/ship, /area/almayer/living/basketball) -"dXY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "blue" - }, -/area/almayer/living/pilotbunks) "dYc" = ( /obj/structure/prop/invuln/overhead_pipe{ pixel_x = 12 @@ -30835,6 +30821,9 @@ /obj/structure/bed/chair/comfy{ dir = 8 }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, /turf/open/floor/almayer{ icon_state = "bluecorner" }, @@ -32284,6 +32273,13 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_p) +"fQg" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, +/area/almayer/living/cryo_cells) "fQl" = ( /obj/structure/largecrate/supply/supplies/flares, /turf/open/floor/almayer{ @@ -32524,6 +32520,16 @@ icon_state = "dark_sterile" }, /area/almayer/medical/chemistry) +"fVN" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "fWg" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -34224,6 +34230,14 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) +"gFH" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/cryo_cells) "gFP" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/stern_point_defense) @@ -35033,6 +35047,15 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) +"gUU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "gUV" = ( /turf/open/floor/almayer{ icon_state = "redcorner" @@ -35081,6 +35104,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) +"gWd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "gWu" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -36116,10 +36149,10 @@ /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ access_modified = 1; name = "\improper Flight Crew Quarters"; - req_one_access_txt = "19;22" + req_one_access = "19;27;22" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -38447,6 +38480,9 @@ phone_id = "Senior Enlisted Advisor's Office"; pixel_x = -3 }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) "iks" = ( @@ -39481,12 +39517,12 @@ /obj/structure/bed/chair/office/light{ dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/power/apc/almayer{ - dir = 8 - }, /obj/structure/sign/safety/maint{ - pixel_x = -17 + pixel_x = -20; + pixel_y = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) @@ -39511,7 +39547,7 @@ "iFY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/sign/safety/cryo{ - pixel_x = 36 + pixel_x = 33 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -40843,6 +40879,10 @@ /area/almayer/squads/req) "jeQ" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 1; + name = "ship-grade camera" + }, /turf/open/floor/almayer{ dir = 6; icon_state = "red" @@ -41005,13 +41045,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; @@ -41089,7 +41122,8 @@ }, /area/almayer/shipboard/brig/lobby) "jiw" = ( -/obj/structure/machinery/firealarm{ +/obj/structure/sign/safety/cryo{ + pixel_x = 8; pixel_y = 28 }, /turf/open/floor/almayer{ @@ -41564,6 +41598,18 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/p_stern) +"jrF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "jrI" = ( /obj/structure/filingcabinet{ density = 0; @@ -44995,12 +45041,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/lower/l_f_s) -"kFY" = ( -/obj/structure/sign/safety/cryo{ - pixel_x = 7 - }, -/turf/closed/wall/almayer, -/area/almayer/living/cryo_cells) "kGi" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/plating_catwalk, @@ -45573,6 +45613,12 @@ icon_state = "blue" }, /area/almayer/living/basketball) +"kPF" = ( +/obj/structure/pipes/vents/scrubber{ + dir = 1 + }, +/turf/open/floor/wood/ship, +/area/almayer/shipboard/sea_office) "kPG" = ( /turf/open/floor/almayer{ dir = 4; @@ -45801,11 +45847,11 @@ /area/almayer/hallways/hangar) "kUh" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ +/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ access_modified = 1; - dir = 1; name = "\improper Flight Crew Quarters"; - req_one_access_txt = "19;22" + req_one_access = "19;27;22"; + dir = 2 }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -49012,6 +49058,15 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"mhD" = ( +/obj/structure/sign/safety/cryo{ + pixel_x = 8; + pixel_y = -28 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/starboard_hallway) "mhG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -52537,6 +52592,15 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) +"nrS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "nsc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -55336,6 +55400,18 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop/hangar) +"orY" = ( +/obj/structure/sign/safety/maint{ + pixel_x = -17 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, +/area/almayer/living/cryo_cells) "osc" = ( /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, /obj/structure/machinery/light{ @@ -55616,7 +55692,7 @@ access_modified = 1; req_access = null; req_one_access = null; - req_one_access_txt = "19;29" + req_access_txt = "19;29" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -55666,6 +55742,16 @@ "oxy" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_s) +"oxQ" = ( +/obj/structure/machinery/status_display{ + pixel_x = -32 + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "oxU" = ( /obj/structure/machinery/photocopier, /turf/open/floor/almayer, @@ -56722,6 +56808,14 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) +"oSa" = ( +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/late_join, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/cryo_cells) "oSq" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -57396,6 +57490,15 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) +"pfU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/vents/pump{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/living/cryo_cells) "pgw" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -58027,6 +58130,10 @@ /obj/structure/machinery/status_display{ pixel_x = -32 }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out" + }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ dir = 4; icon_state = "silver" @@ -59399,7 +59506,9 @@ }, /area/almayer/maint/hull/upper/u_a_s) "pWN" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, /turf/open/floor/almayer{ icon_state = "blue" }, @@ -59439,6 +59548,13 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) +"pYh" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/sign/safety/cryo{ + pixel_x = 33 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/maint/lower/cryo_cells) "pYi" = ( /obj/structure/machinery/light{ dir = 4 @@ -60156,11 +60272,13 @@ /area/almayer/maint/hull/upper/u_a_s) "qlz" = ( /obj/structure/window/framed/almayer, -/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "SEA Office Shutters"; name = "\improper Privacy Shutters" }, +/obj/structure/machinery/door/firedoor/border_only/almayer{ + dir = 1 + }, /turf/open/floor/plating, /area/almayer/shipboard/sea_office) "qlI" = ( @@ -60998,6 +61116,14 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/p_bow) +"qzN" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/port_hallway) "qAs" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -63055,6 +63181,15 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) +"rki" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "rkz" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, @@ -65026,13 +65161,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/port_emb) -"rSR" = ( -/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) "rTe" = ( /obj/structure/machinery/light{ dir = 1 @@ -66838,15 +66966,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{ @@ -66918,6 +67037,12 @@ icon_state = "blue" }, /area/almayer/squads/delta) +"sDP" = ( +/obj/structure/machinery/firealarm{ + pixel_y = 28 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/port_hallway) "sDV" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -68188,6 +68313,16 @@ icon_state = "orange" }, /area/almayer/engineering/lower/engine_core) +"tdx" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "silvercorner" + }, +/area/almayer/living/cryo_cells) "tdy" = ( /obj/structure/bed/sofa/south/grey/right, /obj/structure/sign/safety/restrictedarea{ @@ -68279,9 +68414,13 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_m_s) "tez" = ( -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, -/turf/open/floor/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 4; + icon_state = "silvercorner" + }, /area/almayer/living/cryo_cells) "teE" = ( /obj/structure/machinery/light{ @@ -68324,9 +68463,6 @@ }, /area/almayer/shipboard/brig/lobby) "tfl" = ( -/obj/structure/machinery/light{ - dir = 1 - }, /obj/structure/sign/safety/maint{ pixel_x = 32 }, @@ -68731,6 +68867,19 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) +"tmd" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_y = 1 + }, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer{ + dir = 6; + icon_state = "silver" + }, +/area/almayer/living/cryo_cells) "tmg" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/hypospray, @@ -70094,6 +70243,16 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) +"tJY" = ( +/obj/structure/machinery/cryopod, +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/cryo_cells) "tKf" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/light{ @@ -71264,6 +71423,15 @@ icon_state = "plate" }, /area/almayer/maint/upper/u_m_s) +"ujy" = ( +/obj/structure/machinery/cryopod/right, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/cryo_cells) "ujz" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -73185,9 +73353,8 @@ }, /area/almayer/shipboard/brig/cic_hallway) "uVD" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +/obj/structure/machinery/light{ + dir = 4 }, /turf/open/floor/almayer{ dir = 8; @@ -76009,9 +76176,6 @@ /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) "vRa" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, /obj/structure/machinery/light, /obj/structure/surface/table/almayer, /obj/structure/sign/safety/rewire{ @@ -76024,6 +76188,11 @@ /obj/structure/machinery/faxmachine/uscm{ department = "SEA" }, +/obj/structure/machinery/firealarm{ + dir = 1; + pixel_y = -28; + pixel_x = -2 + }, /turf/open/floor/strata{ desc = "This metal floor has been painted to look like one made of wood. Unfortunately, wood and high pressure internal atmosphere don't mix well. Wood is a major fire hazard don't'cha know."; icon = 'icons/turf/floors/floors.dmi'; @@ -76187,12 +76356,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"vTS" = ( -/obj/structure/machinery/light{ - pixel_x = 16 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/cryo_cells) "vTT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -78604,6 +78767,13 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) +"wKK" = ( +/obj/structure/machinery/cryopod/right, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/cryo_cells) "wKP" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -80001,6 +80171,12 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/squads/bravo) +"xlq" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "silvercorner" + }, +/area/almayer/living/cryo_cells) "xlC" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -81674,9 +81850,6 @@ }, /area/almayer/maint/hull/upper/u_a_p) "xQg" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, /turf/open/floor/almayer{ dir = 8; icon_state = "bluecorner" @@ -81812,15 +81985,16 @@ }, /area/almayer/hallways/repair_bay) "xSM" = ( -/obj/structure/machinery/light{ - dir = 8 - }, /obj/structure/sign/safety/maint{ pixel_x = -17 }, -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, -/turf/open/floor/plating/plating_catwalk, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "silvercorner" + }, /area/almayer/living/cryo_cells) "xSW" = ( /turf/open/floor/almayer{ @@ -82470,18 +82644,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 @@ -82761,8 +82923,8 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "yjM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +/obj/structure/pipes/vents/pump{ + dir = 8 }, /turf/open/floor/almayer{ dir = 4; @@ -106719,7 +106881,7 @@ mLz iFn alw amh -dGr +lvA rtY fJy xQg @@ -106922,7 +107084,7 @@ mfQ nPx aiX amd -dXY +dGr fmB umS yjM @@ -107125,7 +107287,7 @@ eGH qnl aiX apt -sCI +lvA pWN uTN aqy @@ -127728,10 +127890,10 @@ aLG aYO bZK lZM -rSR xss -rLK xss +rLK +pYh xss uHk dXb @@ -127932,8 +128094,8 @@ aYT bzY cvx cvx -bKJ cvx +bKJ cvx cvx cvx @@ -128133,13 +128295,13 @@ aQL aLG aZi aLG -bbs -cbh -xYP -bbs -gsm +bbr bCM -rbF +dnq +aFQ +orY +oSa +tJY cJE bOT dLt @@ -128148,7 +128310,7 @@ iFD vRa vub bPL -bCM +oSa xSM tez gsm @@ -128336,13 +128498,13 @@ aQL aLG aZi aLG -bbs -bKD -vTS -bbs -ccQ +bbr bCN rbF +rki +dei +ccQ +bCN qlz xYf skn @@ -128350,10 +128512,10 @@ bQX ijQ cLl qlz -tez bCN ccQ -tez +tdx +gUU ccQ bCN bbr @@ -128539,24 +128701,24 @@ aQL fvK aZi aLG -bbs -ydM -xYP -bbs -ccQ +bbr cdn rbF +gWd +pfU +ccQ +boH qlz gYe skn -bTx +kPF bKQ tXM qlz -tez bpV ccQ -tez +fVN +nrS ccQ cdn bbr @@ -128742,13 +128904,13 @@ kcl aLG aZi aLG -bbs -dvs -xYP -bbs -cdm +bbr bCM rbF +jrF +tez +ccQ +bCM qlz fOz skn @@ -128756,10 +128918,10 @@ bTx bTx dFF qlz -tez bCM ccQ -tez +aFQ +djT ccQ bCM bbr @@ -128944,14 +129106,14 @@ bES kcl beB byI -beB -kFY -jmK -bDL +mhD bbs +ujy +rbF +jrF +gUU ccQ bCN -rbF vub odN odN @@ -128959,13 +129121,13 @@ gcN odN odN vub -tez bCN ccQ -tez +rki +djT ccQ -bCN -jhb +wKK +bbs jiw cbS bHW @@ -129149,20 +129311,20 @@ aLG aZi aLG bBd -aPr +bFp bfl -bSb +tmd byw -bkU -bAY -pur +bzI +bzI +oxQ bxm -bPM -jmK -bRa +fQg +gFH +xlq bxm pur -byw +bzI bzI bAY bSb @@ -129778,7 +129940,7 @@ lJu bEd bFs bbs -buH +sDP iEb bIT fzq @@ -131177,7 +131339,7 @@ cHl bTb beB aYT -beB +bzY bbs cdp cdp @@ -131199,7 +131361,7 @@ fJO fJO fJO bbs -bJz +qzN rrV bJz xSw @@ -131581,7 +131743,7 @@ ksp rou ksp aQL -aLG +pGM aZl tzf mRS From 3564803a1c7b62f24d577b74e739dc87dea9be46 Mon Sep 17 00:00:00 2001 From: LC4492 <122557086+LC4492@users.noreply.github.com> Date: Thu, 1 Feb 2024 12:06:28 -0300 Subject: [PATCH 2/4] F.Y.N.1 --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 29 +++++++--------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 12b74263bc1..fa305e549e4 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -12417,9 +12417,6 @@ /area/almayer/squads/alpha) "bdw" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, /turf/open/floor/almayer{ dir = 9; icon_state = "red" @@ -40912,10 +40909,6 @@ /area/almayer/squads/req) "jeQ" = ( /obj/structure/machinery/cm_vending/sorted/cargo_guns/squad_prep, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 1; - name = "ship-grade camera" - }, /turf/open/floor/almayer{ dir = 6; icon_state = "red" @@ -61139,14 +61132,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/lower/p_bow) -"qzN" = ( -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/port_hallway) "qAs" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 1 @@ -68499,6 +68484,9 @@ /obj/structure/sign/safety/maint{ pixel_x = 32 }, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) "tfw" = ( @@ -73383,8 +73371,9 @@ }, /area/almayer/shipboard/brig/cic_hallway) "uVD" = ( -/obj/structure/machinery/light{ - dir = 4 +/obj/structure/machinery/camera/autoname/almayer{ + name = "ship-grade camera"; + dir = 8 }, /turf/open/floor/almayer{ dir = 8; @@ -131357,7 +131346,7 @@ cHl bTb beB aYT -bzY +beB bbs cdp cdp @@ -131379,7 +131368,7 @@ fJO fJO fJO bbs -qzN +bJz rrV bJz xSw @@ -131761,7 +131750,7 @@ ksp rou ksp aQL -pGM +aLG aZl tzf mRS From eacdf28ad5f37cc5d1f89db4598ed579206ff04f Mon Sep 17 00:00:00 2001 From: LC4492 <122557086+LC4492@users.noreply.github.com> Date: Thu, 1 Feb 2024 12:14:02 -0300 Subject: [PATCH 3/4] F.Y.N.2 --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index fa305e549e4..d284b93d9a0 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -36179,10 +36179,10 @@ /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ access_modified = 1; name = "\improper Flight Crew Quarters"; - req_one_access = "19;27;22" + req_one_access_txt = "19;22" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -45853,11 +45853,11 @@ /area/almayer/hallways/hangar) "kUh" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, -/obj/structure/machinery/door/airlock/multi_tile/almayer/almayer{ +/obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ access_modified = 1; + dir = 1; name = "\improper Flight Crew Quarters"; - req_one_access = "19;27;22"; - dir = 2 + req_one_access_txt = "19;22" }, /turf/open/floor/almayer{ icon_state = "test_floor4" From 1be581a04629ca01cef14ac60f4e31dbb0b46b30 Mon Sep 17 00:00:00 2001 From: LC4492 <122557086+LC4492@users.noreply.github.com> Date: Fri, 2 Feb 2024 16:37:21 -0300 Subject: [PATCH 4/4] F.Y.N.3 --- maps/map_files/USS_Almayer/USS_Almayer.dmm | 635 ++++++++------------- 1 file changed, 243 insertions(+), 392 deletions(-) diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index d284b93d9a0..24a1d8ca1d0 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -4320,6 +4320,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{ @@ -8068,15 +8075,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/north1) -"aFQ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "silvercorner" - }, -/area/almayer/living/cryo_cells) "aFV" = ( /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 1 @@ -12738,9 +12736,6 @@ /turf/open/floor/almayer, /area/almayer/living/chapel) "bfl" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, /turf/open/floor/almayer{ dir = 5; icon_state = "silver" @@ -14299,14 +14294,6 @@ icon_state = "mono" }, /area/almayer/squads/req) -"boH" = ( -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, -/obj/effect/landmark/start/senior, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/cryo_cells) "boL" = ( /turf/open/floor/almayer, /area/almayer/living/starboard_garden) @@ -15485,7 +15472,6 @@ /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) "bxm" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ dir = 4; icon_state = "silver" @@ -15671,16 +15657,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"byw" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "byC" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 4; @@ -15766,7 +15742,8 @@ /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/late_join, /turf/open/floor/almayer{ dir = 4; icon_state = "silver" @@ -15970,13 +15947,11 @@ }, /area/almayer/hallways/starboard_hallway) "bAY" = ( -/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 + icon_state = "NW-out" }, /turf/open/floor/almayer{ - dir = 6; + dir = 4; icon_state = "silver" }, /area/almayer/living/cryo_cells) @@ -16546,8 +16521,10 @@ /area/almayer/squads/req) "bEa" = ( /obj/effect/decal/warning_stripes{ - icon_state = "W" + icon_state = "SW-out" }, +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/late_join, /turf/open/floor/almayer{ dir = 6; icon_state = "silver" @@ -17477,6 +17454,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{ @@ -17897,9 +17882,6 @@ /obj/structure/bed/chair{ dir = 8 }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 4 - }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) "bKX" = ( @@ -18747,6 +18729,10 @@ }, /area/almayer/squads/req) "bOT" = ( +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /obj/structure/machinery/light{ dir = 1 }, @@ -18754,14 +18740,6 @@ dir = 1 }, /obj/structure/machinery/cm_vending/gear/sea, -/obj/structure/sign/safety/ammunition{ - pixel_x = -17; - pixel_y = 7 - }, -/obj/structure/sign/safety/hazard{ - pixel_x = -17; - pixel_y = -8 - }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -18954,17 +18932,17 @@ }, /area/almayer/shipboard/weapon_room) "bPL" = ( -/obj/structure/machinery/cryopod, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera" - }, /obj/structure/machinery/firealarm{ dir = 8; pixel_x = -24 }, -/turf/open/floor/almayer{ - icon_state = "cargo" +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" }, +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/late_join, +/turf/open/floor/almayer, /area/almayer/living/cryo_cells) "bPM" = ( /turf/open/floor/almayer{ @@ -19106,9 +19084,6 @@ /obj/structure/surface/table/almayer, /obj/item/paper_bin/uscm, /obj/item/tool/pen, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) "bQZ" = ( @@ -19124,9 +19099,6 @@ /obj/structure/machinery/light{ dir = 4 }, -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) "bRe" = ( @@ -19276,12 +19248,11 @@ }, /area/almayer/living/cryo_cells) "bSb" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" +/obj/structure/pipes/vents/pump{ + dir = 4 }, -/obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/almayer{ - dir = 5; + dir = 4; icon_state = "silver" }, /area/almayer/living/cryo_cells) @@ -24141,6 +24112,9 @@ /area/almayer/hallways/aft_hallway) "cLl" = ( /obj/structure/surface/table/almayer, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, /obj/item/storage/fancy/cigar, /obj/item/tool/lighter/zippo, /turf/open/floor/wood/ship, @@ -25166,15 +25140,6 @@ icon_state = "red" }, /area/almayer/lifeboat_pumps/south2) -"dei" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silvercorner" - }, -/area/almayer/living/cryo_cells) "deq" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -25435,18 +25400,6 @@ icon_state = "plate" }, /area/almayer/shipboard/starboard_point_defense) -"djT" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "dka" = ( /obj/structure/machinery/optable, /turf/open/floor/almayer{ @@ -25623,14 +25576,6 @@ icon_state = "silverfull" }, /area/almayer/command/computerlab) -"dnq" = ( -/obj/structure/machinery/status_display{ - pixel_x = -32 - }, -/obj/effect/landmark/late_join, -/obj/effect/landmark/ert_spawns/distress_cryo, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/cryo_cells) "dnC" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 6 @@ -26856,8 +26801,13 @@ }, /area/almayer/engineering/lower/engine_core) "dLt" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 8 +/obj/structure/sign/safety/hazard{ + pixel_x = -17; + pixel_y = -8 + }, +/obj/structure/sign/safety/ammunition{ + pixel_x = -17; + pixel_y = 7 }, /turf/open/floor/almayer{ icon_state = "plating_striped" @@ -30851,9 +30801,6 @@ /obj/structure/bed/chair/comfy{ dir = 8 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, /turf/open/floor/almayer{ icon_state = "bluecorner" }, @@ -32303,13 +32250,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/u_a_p) -"fQg" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silvercorner" - }, -/area/almayer/living/cryo_cells) "fQl" = ( /obj/structure/largecrate/supply/supplies/flares, /turf/open/floor/almayer{ @@ -32550,16 +32490,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/chemistry) -"fVN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/living/cryo_cells) "fWg" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -34260,14 +34190,6 @@ icon_state = "mono" }, /area/almayer/lifeboat_pumps/south1) -"gFH" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/cryo_cells) "gFP" = ( /turf/closed/wall/almayer/outer, /area/almayer/shipboard/stern_point_defense) @@ -35077,15 +34999,6 @@ icon_state = "red" }, /area/almayer/hallways/upper/port) -"gUU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 1; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "gUV" = ( /turf/open/floor/almayer{ icon_state = "redcorner" @@ -35134,16 +35047,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south1) -"gWd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/turf/open/floor/almayer, -/area/almayer/living/cryo_cells) "gWu" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -38364,6 +38267,18 @@ 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" @@ -38505,9 +38420,6 @@ phone_id = "Senior Enlisted Advisor's Office"; pixel_x = -3 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) "iks" = ( @@ -39109,6 +39021,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 @@ -39542,12 +39463,12 @@ /obj/structure/bed/chair/office/light{ dir = 4 }, -/obj/structure/sign/safety/maint{ - pixel_x = -20; - pixel_y = 2 +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/power/apc/almayer{ + dir = 8 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/obj/structure/sign/safety/maint{ + pixel_x = -17 }, /turf/open/floor/wood/ship, /area/almayer/shipboard/sea_office) @@ -39572,7 +39493,7 @@ "iFY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/sign/safety/cryo{ - pixel_x = 33 + pixel_x = 36 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -41148,8 +41069,7 @@ }, /area/almayer/shipboard/brig/lobby) "jiw" = ( -/obj/structure/sign/safety/cryo{ - pixel_x = 8; +/obj/structure/machinery/firealarm{ pixel_y = 28 }, /turf/open/floor/almayer{ @@ -41624,18 +41544,6 @@ icon_state = "plate" }, /area/almayer/maint/hull/upper/p_stern) -"jrF" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "jrI" = ( /obj/structure/filingcabinet{ density = 0; @@ -45619,12 +45527,6 @@ icon_state = "blue" }, /area/almayer/living/basketball) -"kPF" = ( -/obj/structure/pipes/vents/scrubber{ - dir = 1 - }, -/turf/open/floor/wood/ship, -/area/almayer/shipboard/sea_office) "kPG" = ( /turf/open/floor/almayer{ dir = 4; @@ -47203,6 +47105,15 @@ icon_state = "red" }, /area/almayer/living/offices/flight) +"lsT" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "blue" + }, +/area/almayer/living/pilotbunks) "lsV" = ( /obj/structure/largecrate/random/barrel/red, /obj/structure/sign/safety/fire_haz{ @@ -47282,6 +47193,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 @@ -48568,6 +48488,18 @@ /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/lifeboat_pumps/south2) +"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" @@ -49063,15 +48995,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"mhD" = ( -/obj/structure/sign/safety/cryo{ - pixel_x = 8; - pixel_y = -28 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "mhG" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -52597,15 +52520,6 @@ icon_state = "orange" }, /area/almayer/engineering/upper_engineering/starboard) -"nrS" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/almayer, -/area/almayer/living/cryo_cells) "nsc" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -55405,18 +55319,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop/hangar) -"orY" = ( -/obj/structure/sign/safety/maint{ - pixel_x = -17 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silvercorner" - }, -/area/almayer/living/cryo_cells) "osc" = ( /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep, /obj/structure/machinery/light{ @@ -55697,7 +55599,7 @@ access_modified = 1; req_access = null; req_one_access = null; - req_access_txt = "19;29" + req_one_access_txt = "19;29" }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -55747,16 +55649,6 @@ "oxy" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/hull/upper/u_a_s) -"oxQ" = ( -/obj/structure/machinery/status_display{ - pixel_x = -32 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "oxU" = ( /obj/structure/machinery/photocopier, /turf/open/floor/almayer, @@ -56813,14 +56705,6 @@ icon_state = "plate" }, /area/almayer/engineering/lower/workshop) -"oSa" = ( -/obj/effect/landmark/ert_spawns/distress_cryo, -/obj/effect/landmark/late_join, -/obj/structure/machinery/light{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/cryo_cells) "oSq" = ( /obj/item/device/radio/intercom{ freerange = 1; @@ -57426,6 +57310,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 @@ -57490,15 +57383,6 @@ icon_state = "test_floor4" }, /area/almayer/command/airoom) -"pfU" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/living/cryo_cells) "pgw" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -58130,10 +58014,6 @@ /obj/structure/machinery/status_display{ pixel_x = -32 }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out" - }, -/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ dir = 4; icon_state = "silver" @@ -58528,6 +58408,13 @@ 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) "pDh" = ( /obj/structure/machinery/power/monitor{ name = "Core Power Monitoring" @@ -59522,9 +59409,7 @@ }, /area/almayer/maint/hull/upper/u_a_s) "pWN" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "blue" }, @@ -59564,13 +59449,6 @@ /obj/effect/landmark/late_join/charlie, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/charlie) -"pYh" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/sign/safety/cryo{ - pixel_x = 33 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/maint/lower/cryo_cells) "pYi" = ( /obj/structure/machinery/light{ dir = 4 @@ -60288,13 +60166,11 @@ /area/almayer/maint/hull/upper/u_a_s) "qlz" = ( /obj/structure/window/framed/almayer, +/obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/door/poddoor/shutters/almayer{ id = "SEA Office Shutters"; name = "\improper Privacy Shutters" }, -/obj/structure/machinery/door/firedoor/border_only/almayer{ - dir = 1 - }, /turf/open/floor/plating, /area/almayer/shipboard/sea_office) "qlI" = ( @@ -63189,15 +63065,6 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) -"rki" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "rkz" = ( /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, @@ -67055,12 +66922,6 @@ icon_state = "blue" }, /area/almayer/squads/delta) -"sDP" = ( -/obj/structure/machinery/firealarm{ - pixel_y = 28 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/port_hallway) "sDV" = ( /obj/structure/machinery/firealarm{ pixel_y = -28 @@ -68331,16 +68192,6 @@ icon_state = "orange" }, /area/almayer/engineering/lower/engine_core) -"tdx" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 8; - icon_state = "silvercorner" - }, -/area/almayer/living/cryo_cells) "tdy" = ( /obj/structure/bed/sofa/south/grey/right, /obj/structure/sign/safety/restrictedarea{ @@ -68432,13 +68283,9 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/maint/upper/u_m_s) "tez" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 4; - icon_state = "silvercorner" - }, +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/late_join, +/turf/open/floor/almayer, /area/almayer/living/cryo_cells) "teE" = ( /obj/structure/machinery/light{ @@ -68888,19 +68735,6 @@ icon_state = "dark_sterile" }, /area/almayer/medical/lower_medical_lobby) -"tmd" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_y = 1 - }, -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer{ - dir = 6; - icon_state = "silver" - }, -/area/almayer/living/cryo_cells) "tmg" = ( /obj/structure/surface/table/almayer, /obj/item/reagent_container/hypospray, @@ -70269,16 +70103,6 @@ icon_state = "green" }, /area/almayer/living/grunt_rnr) -"tJY" = ( -/obj/structure/machinery/cryopod, -/obj/structure/machinery/camera/autoname/almayer{ - name = "ship-grade camera"; - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/cryo_cells) "tKf" = ( /obj/structure/machinery/door/firedoor/border_only/almayer, /obj/structure/machinery/light{ @@ -71449,15 +71273,6 @@ icon_state = "plate" }, /area/almayer/maint/upper/u_m_s) -"ujy" = ( -/obj/structure/machinery/cryopod/right, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/cryo_cells) "ujz" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -72499,6 +72314,18 @@ /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) "uCM" = ( /obj/structure/disposalpipe/segment, /obj/structure/pipes/standard/simple/hidden/supply, @@ -73578,6 +73405,11 @@ icon_state = "test_floor4" }, /area/almayer/living/basketball) +"vab" = ( +/turf/open/floor/almayer{ + icon_state = "silverfull" + }, +/area/almayer/living/cryo_cells) "vak" = ( /obj/structure/sign/safety/security{ pixel_x = 15; @@ -75820,6 +75652,17 @@ icon_state = "red" }, /area/almayer/shipboard/navigation) +"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, /turf/open/floor/plating/plating_catwalk, @@ -76181,6 +76024,9 @@ /turf/open/floor/wood/ship, /area/almayer/command/corporateliaison) "vRa" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, /obj/structure/machinery/light, /obj/structure/surface/table/almayer, /obj/structure/sign/safety/rewire{ @@ -76193,11 +76039,6 @@ /obj/structure/machinery/faxmachine/uscm{ department = "SEA" }, -/obj/structure/machinery/firealarm{ - dir = 1; - pixel_y = -28; - pixel_x = -2 - }, /turf/open/floor/strata{ desc = "This metal floor has been painted to look like one made of wood. Unfortunately, wood and high pressure internal atmosphere don't mix well. Wood is a major fire hazard don't'cha know."; icon = 'icons/turf/floors/floors.dmi'; @@ -76361,6 +76202,12 @@ icon_state = "plate" }, /area/almayer/engineering/upper_engineering) +"vTR" = ( +/obj/structure/sign/safety/cryo{ + pixel_x = 7 + }, +/turf/closed/wall/almayer, +/area/almayer/living/cryo_cells) "vTT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -76758,6 +76605,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{ @@ -78191,6 +78044,15 @@ "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) "wxU" = ( /obj/item/ashtray/bronze{ pixel_x = 7; @@ -78773,13 +78635,6 @@ }, /turf/open/floor/almayer, /area/almayer/shipboard/brig/cells) -"wKK" = ( -/obj/structure/machinery/cryopod/right, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/living/cryo_cells) "wKP" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -80185,12 +80040,6 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/squads/bravo) -"xlq" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "silvercorner" - }, -/area/almayer/living/cryo_cells) "xlC" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -81864,6 +81713,9 @@ }, /area/almayer/maint/hull/upper/u_a_p) "xQg" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, /turf/open/floor/almayer{ dir = 8; icon_state = "bluecorner" @@ -81992,16 +81844,15 @@ }, /area/almayer/hallways/repair_bay) "xSM" = ( +/obj/structure/machinery/light{ + dir = 8 + }, /obj/structure/sign/safety/maint{ pixel_x = -17 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "silvercorner" - }, +/obj/effect/landmark/ert_spawns/distress_cryo, +/obj/effect/landmark/late_join, +/turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) "xSW" = ( /turf/open/floor/almayer{ @@ -82930,8 +82781,8 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/shipboard/brig/lobby) "yjM" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, /turf/open/floor/almayer{ dir = 4; @@ -106888,7 +106739,7 @@ mLz iFn alw amh -lvA +dGr rtY fJy xQg @@ -107091,7 +106942,7 @@ mfQ nPx aiX amd -dGr +peP fmB umS yjM @@ -107294,7 +107145,7 @@ eGH qnl aiX apt -lvA +lsT pWN uTN aqy @@ -127897,10 +127748,10 @@ aLG aYO bZK lZM -xss +art xss rLK -pYh +xss xss uHk dXb @@ -128101,11 +127952,11 @@ aYT bzY cvx cvx -cvx bKJ cvx cvx cvx +cvx vub vub vub @@ -128302,13 +128153,13 @@ aQL aLG aZi aLG -bbr +bbs +lus +xYP +bbs +gsm bCM -dnq -aFQ -orY -oSa -tJY +rbF cJE bOT dLt @@ -128317,7 +128168,7 @@ iFD vRa vub bPL -oSa +bCM xSM tez gsm @@ -128505,13 +128356,13 @@ aQL aLG aZi aLG -bbr -bCN -rbF -rki -dei +bbs +lVz +vZx +bbs ccQ bCN +rbF qlz xYf skn @@ -128519,10 +128370,10 @@ bQX ijQ cLl qlz +tez bCN ccQ -tdx -gUU +tez ccQ bCN bbr @@ -128708,24 +128559,24 @@ aQL fvK aZi aLG -bbr +bbs +uCC +xYP +bbs +ccQ cdn rbF -gWd -pfU -ccQ -boH qlz gYe skn -kPF +bTx bKQ tXM qlz +tez bpV ccQ -fVN -nrS +tez ccQ cdn bbr @@ -128911,13 +128762,13 @@ kcl aLG aZi aLG -bbr +bbs +ivX +xYP +bbs +bIt bCM rbF -jrF -tez -ccQ -bCM qlz fOz skn @@ -128925,10 +128776,10 @@ bTx bTx dFF qlz +tez bCM ccQ -aFQ -djT +tez ccQ bCM bbr @@ -129113,14 +128964,14 @@ bES kcl beB byI -mhD +beB +vTR +jmK +vJB bbs -ujy -rbF -jrF -gUU ccQ bCN +rbF vub odN odN @@ -129128,13 +128979,13 @@ gcN odN odN vub +tez bCN ccQ -rki -djT +tez ccQ -wKK -bbs +bCN +pCR jiw cbS bHW @@ -129318,20 +129169,20 @@ aLG aZi aLG bBd -bFp +vab bfl -tmd -byw -bzI -bzI -oxQ +bSb +wxE +igP +bAY +pur bxm -fQg -gFH -xlq +bPM +jmK +bRa bxm pur -bzI +wxE bzI bAY bSb @@ -129947,7 +129798,7 @@ lJu bEd bFs bbs -sDP +buH iEb bIT fzq