diff --git a/code/datums/skills/civilian.dm b/code/datums/skills/civilian.dm index ff9cadf02913..68c0833a1c42 100644 --- a/code/datums/skills/civilian.dm +++ b/code/datums/skills/civilian.dm @@ -97,6 +97,7 @@ CIVILIAN /datum/skills/civilian/survivor/pmc/medic name = "Survivor PMC Medic" additional_skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, @@ -109,6 +110,7 @@ CIVILIAN /datum/skills/civilian/survivor/pmc/engineer name = "Survivor PMC Engineer" additional_skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, @@ -120,6 +122,23 @@ CIVILIAN SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, ) +/datum/skills/civilian/survivor/pmc/SL + name = "Survivor PMC Team Leader" + additional_skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_VEHICLE = SKILL_VEHICLE_SMALL, + SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, + SKILL_JTAC = SKILL_JTAC_TRAINED, + ) + /datum/skills/civilian/survivor/doctor name = "Survivor Doctor" additional_skills = list( diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm index 4a6e5272ed05..c51717079112 100644 --- a/code/game/objects/effects/landmarks/survivor_spawner.dm +++ b/code/game/objects/effects/landmarks/survivor_spawner.dm @@ -111,20 +111,20 @@ synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ - "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") + "Your primary objective is to survive. You believe a second dropship crashed somewhere to the north, which was carrying additional supplies.") story_text = "You are a PMC from Weyland-Yutani. Your ship was enroute to Solaris Ridge to escort an Assistant Manager. On the way, your ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, your pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconscious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your squadmates lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You need to find out what happened to the colony, see if you can find any of your squadmates, and find a way to contact Weyland-Yutani." roundstart_damage_min = 3 roundstart_damage_max = 10 roundstart_damage_times = 2 - spawn_priority = SPAWN_PRIORITY_HIGH + spawn_priority = SPAWN_PRIORITY_MEDIUM /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic equipment = /datum/equipment_preset/survivor/pmc/medic synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ - "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") + "Your primary objective is to survive. You believe a second dropship crashed somewhere to the north, which was carrying additional supplies.") story_text = "You are a PMC medic from Weyland-Yutani. Your ship was enroute to Solaris Ridge to escort an Assistant Manager. On the way, your ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, your pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconscious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your squadmates lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You need to find out what happened to the colony, see if you can find any of your squadmates, and find a way to contact Weyland-Yutani." roundstart_damage_min = 3 roundstart_damage_max = 10 @@ -137,12 +137,25 @@ synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ - "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") + "Your primary objective is to survive. You believe a second dropship crashed somewhere to the north, which was carrying additional supplies.") story_text = "You are a PMC engineer from Weyland-Yutani. Your ship was enroute to Solaris Ridge to escort an Assistant Manager. On the way, your ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, your pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconscious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your squadmates lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You need to find out what happened to the colony, see if you can find any of your squadmates, and find a way to contact Weyland-Yutani." roundstart_damage_min = 3 roundstart_damage_max = 10 roundstart_damage_times = 2 + spawn_priority = SPAWN_PRIORITY_HIGH + +/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_leader + equipment = /datum/equipment_preset/survivor/pmc/pmc_leader + synth_equipment = /datum/equipment_preset/synth/survivor/pmc + intro_text = list("

You are a survivor of a crash landing!

",\ + "You are NOT aware of the xenomorph threat.",\ + "Your primary objective is to survive. You believe a second dropship crashed somewhere to the north, which was carrying additional supplies.") + story_text = "You are a PMC team leader from Weyland-Yutani. Your ship was enroute to Solaris Ridge to escort an Assistant Manager. On the way, your ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, your pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconscious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your squadmates lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You need to find out what happened to the colony, see if you can find any of your squadmates, and find a way to contact Weyland-Yutani." + roundstart_damage_min = 3 + roundstart_damage_max = 10 + roundstart_damage_times = 2 + spawn_priority = SPAWN_PRIORITY_VERY_HIGH /obj/effect/landmark/survivor_spawner/bigred_crashed_cl @@ -150,7 +163,7 @@ synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ - "Your primary objective is to heal up and survive. If you want to assault the hive - adminhelp.") + "Your primary objective is to survive. You believe a second dropship crashed somewhere to the north, which was carrying additional supplies.") story_text = "You are an Assistant Manager from Weyland-Yutani. You were being escorted onboard a PMC ship to Solaris Ridge. On the way, the ship received a distress signal from the colony about an attack. Worried that it might be a CLF attack, the pilot set full speed for the colony. However, during atmospheric entry the engine failed and you fell unconscious from the G-Forces. You wake up wounded... and see that the ship has crashed onto the colony. Your PMC escorts lie dead beside you, but there's some missing. Perhaps they survived and moved elsewhere? You must get up and find a way to contact Weyland-Yutani." roundstart_damage_min = 3 roundstart_damage_max = 10 diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index 1a61aa39efe8..275c79fe5807 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -841,29 +841,29 @@ GLOBAL_LIST_INIT(rebel_rifles, list( /datum/equipment_preset/proc/add_pmc_survivor_weapon(mob/living/carbon/human/new_human) // Random Weapons a WY PMC may have during a deployment on a colony. They are not equiped with the elite weapons than their space station counterparts but they do bear some of the better weapons the outer rim has to offer. - var/random_weapon = rand(0,6) + var/random_weapon = rand(0,4) switch(random_weapon) if(0) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/mp5(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/mp5(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/corporate/no_lock, WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39(new_human), WEAR_IN_BACK) if(1) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/fp9000(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/fp9000(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/fp9000/pmc(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/fp9000(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/fp9000(new_human), WEAR_IN_BACK) if(2) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/shotgun_ammo, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/combat(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot(new_human), WEAR_IN_BACK) if(3) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23/no_lock/stripped(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/nsg23(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/nsg23(new_human), WEAR_IN_BACK) if(4) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/mar40(new_human), WEAR_WAIST) - if(5) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/merc(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/shotgun_ammo, WEAR_WAIST) - if(6) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/corporate/no_lock(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m41a(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle(new_human), WEAR_IN_BACK) /** * Randomizes the primary weapon a survivor might find at the start of the outbreak in a gun cabinet. diff --git a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm index de117b9a5a56..ecf9e8f3a161 100644 --- a/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm +++ b/code/modules/gear_presets/survivors/solaris/crashlanding-offices_insert_bigred.dm @@ -6,7 +6,7 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND assignment = "Weyland-Yutani PMC" faction = FACTION_SURVIVOR - faction_group = list(FACTION_WY, FACTION_SURVIVOR) + faction_group = FACTION_LIST_SURVIVOR_WY paygrades = list(PAY_SHORT_PMC_OP = JOB_PLAYTIME_TIER_0) idtype = /obj/item/card/id/pmc skills = /datum/skills/civilian/survivor/pmc @@ -30,16 +30,18 @@ /datum/equipment_preset/survivor/pmc/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/hvh, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) add_pmc_survivor_weapon(new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88_near_empty, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) - ..() // /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic /datum/equipment_preset/survivor/pmc/medic @@ -73,6 +75,23 @@ new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/med_small_stack(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_R_HAND) + ..() +// /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_leader + +/datum/equipment_preset/survivor/pmc/pmc_leader + name = "Survivor - PMC Leader" + assignment = JOB_PMC_LEADER + rank = JOB_PMC_LEADER + paygrades = list(PAY_SHORT_PMC_TL = JOB_PLAYTIME_TIER_0) + skills = /datum/skills/civilian/survivor/pmc/SL + +/datum/equipment_preset/survivor/pmc/pmc_leader/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/leader, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/leader, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/leader, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + ..() // /obj/effect/landmark/survivor_spawner/bigred_crashed_cl @@ -85,7 +104,7 @@ assignment = "Colony Supervisor" role_comm_title = "Supervisor" idtype = /obj/item/card/id/silver/clearance_badge/manager - faction_group = list(FACTION_WY, FACTION_SURVIVOR) + faction_group = FACTION_LIST_SURVIVOR_WY access = list( ACCESS_WY_GENERAL, ACCESS_WY_COLONIAL, @@ -120,10 +139,10 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/head/manager(new_human), WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) add_pmc_survivor_weapon(new_human) add_random_cl_survivor_loot(new_human) - ..() // only used on the spawner of all of those above... /datum/equipment_preset/synth/survivor/pmc name = "Survivor - Synthetic - PMC Support Synth" diff --git a/code/modules/projectiles/guns/smgs.dm b/code/modules/projectiles/guns/smgs.dm index 6be0f979c7ad..4cc0100f1b41 100644 --- a/code/modules/projectiles/guns/smgs.dm +++ b/code/modules/projectiles/guns/smgs.dm @@ -136,6 +136,23 @@ scatter_unwielded = SCATTER_AMOUNT_TIER_6 damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_7 +/obj/item/weapon/gun/smg/m39/corporate + desc = "A Weyland-Yutani creation, this M-39 comes equipped in corporate white. Uses 10x20mm caseless ammunition." + icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_obj.dmi' + item_icons = list( + WEAR_L_HAND = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_lefthand.dmi', + WEAR_R_HAND = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_righthand.dmi', + WEAR_BACK = 'icons/obj/items/weapons/guns/guns_by_map/snow/back.dmi', + WEAR_J_STORE = 'icons/obj/items/weapons/guns/guns_by_map/snow/suit_slot.dmi' + ) + flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_WY_RESTRICTED + map_specific_decoration = FALSE + starting_attachment_types = list(/obj/item/attachable/stock/smg/collapsible) + +/obj/item/weapon/gun/smg/m39/corporate/no_lock //for PMC nightmares. + desc = "A Weyland-Yutani creation, this M-39 comes equipped in corporate white. Uses 10x20mm caseless ammunition. This one had its IFF electronics removed." + flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER + /obj/item/weapon/gun/smg/m39/elite/whiteout//attachies + heap mag for whiteout. starting_attachment_types = list(/obj/item/attachable/stock/smg, /obj/item/attachable/suppressor, /obj/item/attachable/angledgrip, /obj/item/attachable/magnetic_harness) current_mag = /obj/item/ammo_magazine/smg/m39/heap diff --git a/maps/Nightmare/maps/BigRed/nightmare.json b/maps/Nightmare/maps/BigRed/nightmare.json index 5c66a5dc94f1..56b017889726 100644 --- a/maps/Nightmare/maps/BigRed/nightmare.json +++ b/maps/Nightmare/maps/BigRed/nightmare.json @@ -1,9 +1,19 @@ [ { "type": "map_sprinkle", "path": "sprinkles/" }, - { "type": "pick", "chance": 0.40, "choices": [ - { "type": "map_insert", "landmark": "crashlanding-offices", "path": "standalone/crashlanding-offices.dmm" }, - { "type": "map_insert", "landmark": "crashlanding-eva", "path": "standalone/crashlanding-eva.dmm" } - ]}, + { + "type": "map_insert", + "landmark": "crashlanding-offices", + "chance": 1.0, + "path": "standalone/crashlanding-offices.dmm", + "when": { "lvevent": "pmccrash" } + }, + { + "type": "map_insert", + "landmark": "crashlanding-eva", + "chance": 1.0, + "path": "standalone/crashlanding-eva.dmm", + "when": { "lvevent": "pmccrash" } + }, { "type": "map_insert", "chance": 0.50, "landmark": "lambda-graveyard", "path": "standalone/lambda-graveyard.dmm" }, { "type": "pick", "chance": 0.50, "choices": [ { "type": "map_insert", "landmark": "lambda-cave-mushroom", "path": "standalone/lambda-cave_mushroom.dmm" }, diff --git a/maps/Nightmare/maps/BigRed/scenario.json b/maps/Nightmare/maps/BigRed/scenario.json index fe51488c7066..c3fad27a6c55 100644 --- a/maps/Nightmare/maps/BigRed/scenario.json +++ b/maps/Nightmare/maps/BigRed/scenario.json @@ -1 +1,10 @@ -[] +[ + { + "type": "pick", "name": "pmccrash", + "choices": [ + { "weight": 10, "type": "def", "values": { "lvevent": "none" } }, + { "weight": 4, "type": "def", "values": { "lvevent": "pmccrash" } } + ] + } +] + diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index ec03a01d7633..4421727523b6 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -16063,7 +16063,7 @@ /turf/open/floor/darkblue2/northeast, /area/bigredv2/caves/eta/research) "bzJ" = ( -/obj/item/weapon/gun/smg/m39, +/obj/item/weapon/gun/smg/m39/corporate/no_lock, /obj/structure/closet/secure_closet/guncabinet/wy, /turf/open/floor/redfull/northwest, /area/bigredv2/caves/eta/research) diff --git a/maps/map_files/BigRed/standalone/crashlanding-eva.dmm b/maps/map_files/BigRed/standalone/crashlanding-eva.dmm index cce52624863f..0a095bad3ca1 100644 --- a/maps/map_files/BigRed/standalone/crashlanding-eva.dmm +++ b/maps/map_files/BigRed/standalone/crashlanding-eva.dmm @@ -4,6 +4,7 @@ /area/bigredv2/caves) "an" = ( /obj/effect/decal/cleanable/dirt, +/obj/item/stack/sandbags_empty/small_stack, /turf/open/mars, /area/bigredv2/caves_north) "at" = ( @@ -17,6 +18,7 @@ /turf/open/mars, /area/bigredv2/caves_north) "aw" = ( +/obj/structure/prop/invuln/fire, /turf/closed/shuttle/ert{ icon_state = "wy20" }, @@ -45,9 +47,8 @@ }, /area/bigredv2/outside/general_offices) "aG" = ( -/turf/closed/shuttle/ert{ - icon_state = "wy21" - }, +/obj/structure/girder/displaced, +/turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) "aH" = ( /turf/closed/shuttle/ert{ @@ -61,9 +62,15 @@ /turf/open/floor, /area/bigredv2/outside/general_offices) "aP" = ( -/turf/closed/shuttle/ert{ - icon_state = "wy18" +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "gib6" }, +/obj/item/ammo_magazine/pistol/vp78{ + current_rounds = 0 + }, +/turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) "aQ" = ( /obj/effect/decal/cleanable/dirt, @@ -71,12 +78,14 @@ /turf/open/mars, /area/bigredv2/caves_north) "aR" = ( -/turf/open/shuttle/dropship/can_surgery/light_grey_top_left, +/obj/item/prop/colony/used_flare, +/turf/open/floor/plating/panelscorched, /area/bigredv2/outside/general_offices) "aS" = ( /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right, /area/bigredv2/outside/general_offices) "aT" = ( +/obj/item/ammo_magazine/smg/fp9000, /turf/open/shuttle/dropship/can_surgery/light_grey_top_right, /area/bigredv2/outside/general_offices) "aV" = ( @@ -147,8 +156,28 @@ icon_state = "wy15" }, /area/bigredv2/outside/general_offices) +"bH" = ( +/obj/item/frame/rack, +/obj/item/storage/box/m94, +/obj/item/storage/box/m94, +/turf/open/floor/plating, +/area/bigredv2/outside/general_offices) "bJ" = ( -/obj/structure/bed/chair/dropship/passenger, +/obj/structure/closet/crate/secure/weyland, +/obj/item/ammo_magazine/rifle/nsg23, +/obj/item/ammo_magazine/rifle/nsg23, +/obj/item/ammo_magazine/rifle/nsg23/extended, +/obj/item/ammo_magazine/rifle/nsg23/extended, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle/nsg23, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle, +/obj/item/ammo_magazine/rifle/nsg23, +/obj/item/ammo_magazine/rifle/nsg23, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) "bM" = ( @@ -170,6 +199,13 @@ /turf/open/shuttle/dropship/can_surgery/light_grey_bottom_left, /area/bigredv2/outside/general_offices) "cd" = ( +/obj/structure/closet/crate/secure/weyland, +/obj/item/weapon/gun/rifle/nsg23/no_lock, +/obj/item/explosive/grenade/high_explosive/pmc, +/obj/item/explosive/grenade/high_explosive/pmc, +/obj/item/weapon/gun/rifle/m41a/corporate/no_lock, +/obj/item/device/motiondetector/hacked/pmc, +/obj/item/defenses/handheld/planted_flag/wy, /turf/open/shuttle/dropship/can_surgery/light_grey_bottom_right, /area/bigredv2/outside/general_offices) "cf" = ( @@ -223,11 +259,13 @@ /area/bigredv2/outside/general_offices) "cA" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Dormitories Tool Storage" + name = "\improper Dormitories Tool Storage"; + welded = 1 }, /turf/open/floor, /area/bigredv2/outside/general_offices) "cC" = ( +/obj/structure/prop/invuln/fire, /turf/closed/shuttle/ert{ icon_state = "leftengine_2"; opacity = 0 @@ -300,8 +338,19 @@ /area/bigredv2/outside/general_offices) "cV" = ( /obj/item/stack/sheet/metal, +/obj/structure/girder/displaced, /turf/open/floor/plating, /area/bigredv2/caves_north) +"cY" = ( +/obj/structure/bed/bedroll, +/obj/effect/landmark/corpsespawner/wygoon, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"de" = ( +/obj/item/stack/sheet/cardboard/small_stack, +/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) "di" = ( /obj/structure/bed/chair{ dir = 8 @@ -321,16 +370,35 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/freezerfloor, /area/bigredv2/outside/general_offices) +"dT" = ( +/obj/structure/barricade/sandbags/wired, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "dX" = ( /obj/item/stack/rods, /turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) +"eb" = ( +/obj/item/ammo_box/rounds/heap/empty, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"ef" = ( +/obj/item/stack/rods, +/obj/item/stack/cable_coil/blue, +/turf/open/floor/plating, +/area/bigredv2/outside/general_offices) +"ex" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/clothing/head/helmet/marine/veteran/pmc, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "eF" = ( /turf/template_noop, /area/template_noop) "eL" = ( /obj/structure/machinery/door/airlock/almayer/generic{ - dir = 2 + dir = 2; + welded = 1 }, /turf/open/shuttle/dropship/can_surgery, /area/bigredv2/outside/general_offices) @@ -358,8 +426,16 @@ /turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) "gp" = ( -/obj/structure/machinery/washing_machine, -/turf/open/floor/freezerfloor, +/obj/item/prop/colony/used_flare, +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"gu" = ( +/obj/structure/surface/rack, +/obj/item/ammo_box/rounds{ + bullet_amount = 145 + }, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) "gP" = ( /turf/open/floor/plating/platingdmg3/west, @@ -376,7 +452,10 @@ /area/bigredv2/outside/general_offices) "id" = ( /obj/structure/surface/rack, -/obj/item/xeno_restraints, +/obj/item/storage/belt/marine, +/obj/item/storage/belt/marine, +/obj/item/storage/belt/marine, +/obj/item/storage/belt/marine, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) "ig" = ( @@ -401,10 +480,37 @@ }, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/general_offices) +"iV" = ( +/obj/item/ammo_magazine/smg/fp9000, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) +"jh" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno, +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/general_offices) +"ji" = ( +/obj/effect/decal/cleanable/blood{ + dir = 4; + icon_state = "gib6" + }, +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "gib6" + }, +/obj/item/weapon/gun/pistol/vp78{ + current_mag = null + }, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/general_offices) "jr" = ( /obj/effect/spawner/random/tool, /turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) +"jM" = ( +/obj/item/xeno_restraints, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "jQ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -447,6 +553,12 @@ }, /turf/open/floor/plating/wood_broken3, /area/bigredv2/outside/general_offices) +"np" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) "nD" = ( /obj/structure/girder, /turf/open/floor/platingdmg1, @@ -466,6 +578,10 @@ }, /turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) +"nZ" = ( +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, +/turf/open/floor/freezerfloor, +/area/bigredv2/outside/general_offices) "og" = ( /obj/item/stack/sheet/plasteel, /turf/open/floor/dark, @@ -474,6 +590,10 @@ /obj/structure/surface/rack, /turf/open/floor, /area/bigredv2/outside/general_offices) +"op" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/general_offices) "oD" = ( /obj/structure/machinery/washing_machine, /turf/open/floor/platingdmg1, @@ -534,6 +654,10 @@ "rK" = ( /turf/open/floor/wall_thermite, /area/bigredv2/outside/hydroponics) +"sa" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor/plating, +/area/bigredv2/outside/general_offices) "sm" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/corpsespawner/colonist, @@ -553,21 +677,33 @@ "tQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/oil, +/obj/structure/barricade/sandbags/wired, /turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) "uj" = ( /turf/open/floor/dark, /area/bigredv2/outside/general_offices) -"uw" = ( -/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, +"um" = ( +/obj/item/ammo_magazine/rifle/nsg23/heap{ + current_rounds = 0 + }, /turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) "vi" = ( /turf/open/floor/plating/wood_broken5, /area/bigredv2/outside/general_offices) +"vw" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "vU" = ( /turf/open/floor/plating/wood_broken6, /area/bigredv2/outside/general_offices) +"wI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "wM" = ( /obj/structure/girder, /turf/open/floor/wall_thermite, @@ -585,6 +721,10 @@ /obj/item/clothing/under/darkred, /turf/open/floor/freezerfloor, /area/bigredv2/outside/general_offices) +"xR" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "xU" = ( /obj/effect/decal/cleanable/blood{ dir = 1; @@ -594,8 +734,18 @@ /area/bigredv2/outside/hydroponics) "xW" = ( /obj/item/stack/rods, +/obj/item/ammo_magazine/rifle/nsg23/heap{ + current_rounds = 0 + }, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/general_offices) +"yw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "yy" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/plastic, @@ -609,6 +759,10 @@ }, /turf/open/floor/dark, /area/bigredv2/outside/general_offices) +"zZ" = ( +/obj/item/reagent_container/food/drinks/flask/weylandyutani, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) "AA" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -617,6 +771,7 @@ /area/bigredv2/outside/general_offices) "AX" = ( /obj/structure/surface/rack, +/obj/item/ammo_magazine/smg/m39, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) "Bb" = ( @@ -664,6 +819,10 @@ /area/bigredv2/outside/ne) "Dg" = ( /obj/item/stack/rods, +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "gib6" + }, /turf/open/floor/plating/panelscorched, /area/bigredv2/outside/general_offices) "Dh" = ( @@ -677,18 +836,22 @@ /turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) "EO" = ( -/turf/closed/shuttle/ert{ - icon_state = "wy20" - }, -/area/bigredv2/outside/general_offices) +/obj/effect/decal/cleanable/dirt, +/obj/item/tool/shovel, +/turf/open/mars, +/area/bigredv2/caves_north) "Fw" = ( -/obj/effect/landmark/corpsespawner/wygoon, +/obj/effect/decal/cleanable/blood/xeno, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) "FF" = ( /obj/structure/bed, /turf/open/floor/plating/wood, /area/bigredv2/outside/general_offices) +"Gl" = ( +/obj/item/prop/colony/used_flare, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/ne) "Gn" = ( /obj/item/stack/sheet/wood, /turf/open/floor/platingdmg1, @@ -698,6 +861,10 @@ /obj/item/stack/sheet/plasteel, /turf/open/floor/dark, /area/bigredv2/outside/general_offices) +"GJ" = ( +/obj/item/prop/alien/hugger, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/general_offices) "GM" = ( /obj/structure/surface/table, /obj/item/clothing/under/brown{ @@ -723,9 +890,8 @@ }, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) -"Hw" = ( -/obj/structure/bed/chair/dropship/passenger, -/obj/effect/landmark/corpsespawner/wygoon, +"Hs" = ( +/obj/item/ammo_box/magazine/nsg23/heap/empty, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/general_offices) "HG" = ( @@ -740,6 +906,9 @@ /area/bigredv2/outside/general_offices) "HS" = ( /obj/structure/surface/table, +/obj/item/ammo_magazine/rifle/nsg23/heap{ + current_rounds = 0 + }, /turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) "Id" = ( @@ -752,6 +921,18 @@ "Ie" = ( /turf/open/floor/plating/wood_broken4, /area/bigredv2/outside/general_offices) +"Ix" = ( +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgib3" + }, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"Iz" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "Jl" = ( /turf/open/floor/platingdmg1, /area/bigredv2/outside/hydroponics) @@ -762,6 +943,14 @@ /obj/structure/bed/bedroll, /turf/open/floor/freezerfloor, /area/bigredv2/outside/general_offices) +"JG" = ( +/obj/structure/barricade/wooden{ + desc = "This barricade is heavily reinforced. Nothing short of blasting it open seems like it'll do the trick, that or melting the breams supporting it..."; + dir = 8; + health = 25000 + }, +/turf/open/floor/plating, +/area/bigredv2/outside/general_offices) "JI" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/gibspawner/human, @@ -771,6 +960,20 @@ /obj/item/stack/sheet/metal, /turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) +"KO" = ( +/obj/structure/closet/crate/secure/weyland, +/obj/item/ammo_magazine/rifle/ap, +/obj/item/ammo_magazine/rifle/ap, +/obj/item/ammo_magazine/rifle/nsg23/ap, +/obj/item/ammo_magazine/rifle/nsg23/ap, +/obj/item/ammo_magazine/rifle/nsg23/ap, +/obj/item/ammo_magazine/rifle/ap, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) +"KS" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) "Lw" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/diamond, @@ -781,6 +984,28 @@ }, /turf/open/floor/dark, /area/bigredv2/outside/general_offices) +"LJ" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/floor/wall_thermite, +/area/bigredv2/outside/general_offices) +"LM" = ( +/obj/effect/decal/cleanable/blood/gibs/xeno/down, +/obj/item/stack/sandbags/small_stack, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"Ma" = ( +/obj/structure/barricade/sandbags/wired, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) +"Mb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_magazine/rifle/nsg23/heap{ + current_rounds = 0 + }, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "Mc" = ( /obj/item/stack/sheet/metal, /turf/open/floor/plating/platingdmg3, @@ -792,6 +1017,22 @@ }, /turf/open/floor/plating/panelscorched, /area/bigredv2/outside/general_offices) +"Ng" = ( +/obj/effect/spawner/gibspawner/human, +/obj/effect/decal/cleanable/blood{ + layer = 3 + }, +/obj/item/weapon/gun/smg/m39/corporate/no_lock{ + current_mag = null + }, +/obj/item/clothing/head/helmet/marine/veteran/pmc/corporate, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) +"NY" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/corpsespawner/wygoon, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "Od" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/panelscorched, @@ -807,6 +1048,10 @@ /obj/structure/machinery/light, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/general_offices) +"Pc" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "Pg" = ( /obj/structure/machinery/suit_storage_unit/carbon_unit, /turf/open/floor/platingdmg1, @@ -817,8 +1062,8 @@ /turf/open/floor/dark, /area/bigredv2/outside/general_offices) "PE" = ( -/obj/structure/machinery/cm_vending/sorted/tech/tool_storage, -/turf/open/floor/platingdmg1, +/obj/structure/machinery/washing_machine, +/turf/open/floor/plating, /area/bigredv2/outside/general_offices) "PI" = ( /turf/open/floor/freezerfloor, @@ -830,10 +1075,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/platingdmg1, /area/bigredv2/outside/general_offices) +"QR" = ( +/obj/item/ammo_magazine/smg/m39/heap{ + current_rounds = 0 + }, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "Rk" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/hydroponics) +"Rl" = ( +/obj/item/stack/sandbags/small_stack, +/turf/open/floor/wall_thermite, +/area/bigredv2/outside/general_offices) "Ro" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood{ @@ -850,6 +1105,13 @@ }, /turf/open/floor/freezerfloor, /area/bigredv2/outside/general_offices) +"Sj" = ( +/obj/item/storage/firstaid/adv/empty, +/obj/item/stack/medical/advanced/bruise_pack/upgraded{ + amount = 2 + }, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/general_offices) "Tz" = ( /obj/structure/surface/rack, /obj/item/stack/sheet/mineral/phoron{ @@ -857,6 +1119,11 @@ }, /turf/open/floor/dark, /area/bigredv2/outside/general_offices) +"TD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/rods, +/turf/open/mars, +/area/bigredv2/caves_north) "TX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood, @@ -876,6 +1143,10 @@ }, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/outside/ne) +"VO" = ( +/obj/item/ammo_magazine/smg/m39, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) "VQ" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/dark, @@ -909,10 +1180,22 @@ /obj/item/stack/rods, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/outside/general_offices) +"Yz" = ( +/obj/item/ammo_magazine/rifle/heap{ + current_rounds = 0 + }, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/general_offices) "YB" = ( /obj/structure/bed, /turf/open/floor/wood, /area/bigredv2/outside/general_offices) +"YE" = ( +/obj/effect/decal/cleanable/blood/xeno{ + icon_state = "xgibleg" + }, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/general_offices) "YL" = ( /obj/structure/machinery/light{ dir = 4 @@ -934,6 +1217,15 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/mars_cave/mars_dirt_5, /area/bigredv2/caves_north) +"YX" = ( +/obj/item/prop/colony/usedbandage{ + dir = 5 + }, +/obj/item/prop/colony/usedbandage{ + dir = 1 + }, +/turf/open/floor/wall_thermite, +/area/bigredv2/outside/general_offices) "ZD" = ( /obj/effect/decal/cleanable/blood{ dir = 1; @@ -1174,13 +1466,13 @@ dR CA GM aB -Dk +Yg PO Yg aB PO bf -bf +sa aB iq FF @@ -1199,13 +1491,13 @@ eF eF eF aB -gp +PI fY Jv -PI +nZ bf nD -uw +Yg BC Yg wM @@ -1231,17 +1523,17 @@ eF eF aB oD -bf +PE bp -Yg -Yg +gp +Dk wM -PE -Yg Yg +qb +um cA Yg -Yg +Pc PN rv vi @@ -1261,15 +1553,15 @@ eF eF eF aB -Yg -OI -bf -PN +QR +GJ +JG +Sj Yg pt -Yg -PO -PO +um +NY +TX aK ge qb @@ -1292,19 +1584,19 @@ eF eF eF aB -Yg -Yg +Ng +QR PN HG Yg -Yg -Yg -PO -Yg +Iz +eb +Mb +dT pt OI dX -Yg +Ix aB aB aB @@ -1323,18 +1615,18 @@ eF ab ab aB -aB -aB -aB -pt +aG +Pc +cY +YX dX pt dX -Yg +Iz tQ oW -PO -OI +wI +jh PO rv vU @@ -1353,9 +1645,9 @@ eF eF aQ cV -EO -aP -bg +dX +bf +ef br bE bM @@ -1385,8 +1677,8 @@ eF aQ cI aG -AX -Ul +bH +jM Hq Hq Hq @@ -1416,16 +1708,16 @@ eF at aw aD -aR +dX bi bt bF bF bF cc -Ul -Ul -Ul +KO +Hs +Ma eL gP Gn @@ -1448,11 +1740,11 @@ aQ ax Bv cm +gu +iV bJ -bJ -bJ -Hw -bJ +zZ +Yz aS bk bk @@ -1462,7 +1754,7 @@ OI Yg Yg YQ -YQ +Gl Od dQ ta @@ -1479,15 +1771,15 @@ au ay aF aT +KS +np bk bk -bk -bk -bk +de cd -Ul +VO qo -Ul +Ma eL Ml Ro @@ -1507,7 +1799,7 @@ eF eF eF aQ -an +TD aG pn Fw @@ -1569,21 +1861,21 @@ eF eF eF XK -an +EO Dg -OI -PO -PO -OI -Yg -pt -Yg -Yg +Ml +Ro +aP +ji Yg -pt +LJ +qb +Ix +um +Rl PO fB -OI +op OI eF eF @@ -1605,16 +1897,16 @@ aB PN PO xW -Yg +ex fB dX kL -Yg -Yg +YE +LM JW -PO -OI -Yg +yw +aR +xR wM eF eF @@ -1634,7 +1926,7 @@ Hj ab aB Pg -Yg +vw Yg fm HS diff --git a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm index 6fd3ae9aad83..13c9e5571713 100644 --- a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm +++ b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm @@ -19,9 +19,8 @@ /turf/open/floor/plating, /area/bigredv2/outside/office_complex) "aC" = ( -/turf/closed/shuttle/ert{ - icon_state = "wy20" - }, +/obj/structure/girder/displaced, +/turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) "aD" = ( /turf/closed/shuttle/ert{ @@ -38,14 +37,14 @@ /turf/open/floor/mech_bay_recharge_floor, /area/bigredv2/outside/office_complex) "aN" = ( -/turf/closed/shuttle/ert{ - icon_state = "wy21" - }, +/obj/structure/girder/displaced, +/obj/item/stack/rods, +/turf/open/floor/plating, /area/bigredv2/outside/office_complex) "aO" = ( -/turf/closed/shuttle/ert{ - icon_state = "wy22" - }, +/obj/item/stack/rods, +/obj/structure/girder/displaced, +/turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) "aQ" = ( /turf/closed/shuttle/ert{ @@ -61,7 +60,8 @@ /obj/structure/bed/chair/dropship/pilot{ dir = 1 }, -/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, +/obj/effect/spawner/gibspawner/human, +/turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) "aX" = ( /turf/closed/shuttle/ert{ @@ -99,16 +99,24 @@ }, /area/bigredv2/outside/office_complex) "bl" = ( -/turf/open/shuttle/dropship/can_surgery/light_grey_top_left, +/obj/effect/landmark/crap_item, +/obj/item/frame/rack, +/turf/open/floor/plating/panelscorched, /area/bigredv2/outside/office_complex) "bm" = ( /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right, /area/bigredv2/outside/office_complex) "bn" = ( -/turf/open/shuttle/dropship/can_surgery/light_grey_middle, +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "gib6" + }, +/turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) "bo" = ( -/turf/open/shuttle/dropship/can_surgery/light_grey_top_right, +/obj/effect/decal/cleanable/dirt, +/obj/item/prop/colony/used_flare, +/turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) "bq" = ( /turf/closed/shuttle/ert{ @@ -133,6 +141,11 @@ icon_state = "wy15" }, /area/bigredv2/outside/office_complex) +"bB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) "bF" = ( /turf/closed/shuttle/ert{ icon_state = "wy12" @@ -202,6 +215,7 @@ }, /area/bigredv2/outside/office_complex) "cL" = ( +/obj/structure/prop/invuln/fire, /turf/closed/shuttle/ert{ icon_state = "leftengine_3"; opacity = 0 @@ -234,6 +248,7 @@ }, /area/bigredv2/outside/office_complex) "cU" = ( +/obj/structure/prop/invuln/fire, /turf/closed/shuttle/ert{ icon_state = "rightengine_2"; opacity = 0 @@ -383,6 +398,19 @@ }, /turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) +"ir" = ( +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "gib6" + }, +/obj/effect/landmark/corpsespawner/wygoon, +/obj/item/weapon/gun/pistol/m4a3/training{ + name = "dented M4A3 service pistol" + }, +/obj/item/limb/leg/r_leg, +/obj/effect/decal/cleanable/blood, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/c) "jl" = ( /turf/open/floor/asteroidwarning, /area/bigredv2/outside/se) @@ -420,6 +448,12 @@ /obj/effect/landmark/crap_item, /turf/open/floor/asteroidwarning/north, /area/bigredv2/outside/c) +"kT" = ( +/obj/structure/prop/invuln/fire, +/turf/closed/shuttle/ert{ + icon_state = "wy17" + }, +/area/bigredv2/outside/office_complex) "lH" = ( /obj/structure/surface/table, /turf/open/floor/dark, @@ -433,6 +467,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/white, /area/bigredv2/outside/office_complex) +"mo" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/office_complex) "mu" = ( /obj/structure/machinery/photocopier, /turf/open/floor/white, @@ -443,6 +481,16 @@ "mP" = ( /turf/open/floor/asteroidwarning/southwest, /area/bigredv2/outside/se) +"mU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/open/floor/wall_thermite, +/area/bigredv2/outside/office_complex) +"nl" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/open/floor/asteroidfloor/north, +/area/bigredv2/outside/se) "nn" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/crap_item, @@ -464,6 +512,12 @@ "of" = ( /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/e) +"oz" = ( +/obj/structure/prop/invuln/fire, +/turf/closed/shuttle/ert{ + icon_state = "wy5" + }, +/area/bigredv2/outside/office_complex) "oE" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/gibspawner/human, @@ -506,10 +560,20 @@ /obj/item/device/radio/headset/distress/pmc/hvh, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) +"qT" = ( +/obj/structure/prop/invuln/fire, +/turf/closed/shuttle/ert{ + icon_state = "wy20" + }, +/area/bigredv2/outside/office_complex) "qY" = ( /obj/structure/girder, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) +"rV" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/office_complex) "si" = ( /obj/item/clothing/head/helmet/marine/veteran/pmc, /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, @@ -518,6 +582,11 @@ /obj/item/storage/firstaid, /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) +"sV" = ( +/obj/item/stack/rods, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) "sX" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tech_supply, @@ -561,15 +630,12 @@ }, /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) -"uL" = ( -/obj/item/weapon/gun/rifle/nsg23/no_lock, -/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, -/area/bigredv2/outside/office_complex) "va" = ( /obj/structure/pipes/standard/simple/hidden/green, /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/bigredv2/outside/c) "ve" = ( +/obj/item/map/big_red_map, /turf/open/shuttle/dropship/can_surgery/light_grey_top, /area/bigredv2/outside/office_complex) "vl" = ( @@ -589,6 +655,7 @@ dir = 8 }, /obj/item/limb/hand/l_hand, +/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_leader, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) "wn" = ( @@ -624,13 +691,23 @@ /area/bigredv2/outside/c) "xx" = ( /obj/structure/surface/rack, -/obj/item/map/big_red_map, +/obj/item/ammo_magazine/shotgun/buckshot, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) +"xL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/rods, +/obj/structure/girder/displaced, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/office_complex) "xU" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/dark, /area/bigredv2/outside/office_complex) +"yC" = ( +/obj/structure/girder/reinforced, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/office_complex) "yI" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 5 @@ -657,7 +734,8 @@ /area/bigredv2/outside/office_complex) "zq" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Office Complex Janitor Room" + name = "\improper Office Complex Janitor Room"; + welded = 1 }, /turf/open/floor/whiteyellowfull/east, /area/bigredv2/outside/office_complex) @@ -758,6 +836,11 @@ "Db" = ( /turf/open/floor/whiteyellowfull/east, /area/bigredv2/outside/office_complex) +"Dl" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/stack/sheet/metal, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/office_complex) "Dn" = ( /obj/structure/surface/table, /obj/item/reagent_container/food/drinks/flask, @@ -786,6 +869,14 @@ "Eq" = ( /turf/open/floor/plating/panelscorched, /area/bigredv2/outside/office_complex) +"Ev" = ( +/obj/item/stack/rods, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/office_complex) +"ER" = ( +/obj/item/frame/rack, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/office_complex) "Fc" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tool, @@ -808,6 +899,13 @@ /obj/item/trash/raisins, /turf/open/floor/dark, /area/bigredv2/outside/office_complex) +"FI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/ammo_magazine/rifle/nsg23{ + current_rounds = 0 + }, +/turf/open/floor/whiteyellowfull/east, +/area/bigredv2/outside/office_complex) "FV" = ( /turf/open/floor/asteroidwarning/north, /area/bigredv2/outside/c) @@ -817,6 +915,10 @@ /obj/item/frame/table, /turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) +"Gf" = ( +/obj/effect/spawner/gibspawner/human, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) "Gr" = ( /turf/open/mars/mars_dirt_11, /area/bigredv2/outside/e) @@ -859,6 +961,7 @@ "HE" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/liquid_fuel, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) "HG" = ( @@ -887,11 +990,21 @@ "Iz" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached1, /area/bigredv2/outside/e) +"IF" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/cleanable/blood/xeno, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/office_complex) "IZ" = ( /obj/effect/decal/cleanable/blood/gibs/down, /obj/structure/pipes/standard/simple/hidden/green, /turf/open/floor/dark, /area/bigredv2/outside/office_complex) +"Jb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/open/floor/platingdmg1, +/area/bigredv2/outside/office_complex) "JH" = ( /obj/effect/spawner/gibspawner/human, /turf/open/floor/platingdmg1, @@ -934,16 +1047,8 @@ /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) "Mb" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 4 - }, -/obj/effect/decal/cleanable/blood, -/obj/item/limb/leg/r_leg, -/obj/item/weapon/gun/pistol/m4a3/training{ - name = "dented M4A3 service pistol" - }, -/obj/effect/landmark/corpsespawner/wygoon, -/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/obj/item/frame/table, +/turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) "Ml" = ( /obj/effect/decal/cleanable/dirt, @@ -963,6 +1068,12 @@ }, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) +"MR" = ( +/obj/structure/prop/invuln/fire, +/turf/closed/shuttle/ert{ + icon_state = "wy16" + }, +/area/bigredv2/outside/office_complex) "Na" = ( /turf/open/floor/asteroidfloor/north, /area/bigredv2/outside/se) @@ -974,6 +1085,11 @@ /obj/item/ammo_magazine/pistol/rubber, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) +"Nv" = ( +/obj/structure/girder/displaced, +/obj/item/stack/cable_coil, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) "NQ" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -984,9 +1100,6 @@ /turf/open/floor/dark, /area/bigredv2/outside/office_complex) "NZ" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 8 - }, /obj/effect/decal/cleanable/blood, /obj/effect/spawner/gibspawner/human, /obj/item/clothing/head/helmet/marine/veteran/pmc, @@ -1000,6 +1113,10 @@ }, /turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) +"Ov" = ( +/obj/item/stack/cable_coil, +/turf/open/floor/plating, +/area/bigredv2/outside/office_complex) "OH" = ( /obj/effect/decal/cleanable/dirt, /obj/item/paper, @@ -1018,9 +1135,8 @@ /turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) "OX" = ( -/obj/structure/surface/rack, /obj/effect/spawner/random/tech_supply, -/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) "Pp" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -1039,6 +1155,10 @@ /obj/effect/landmark/survivor_spawner/bigred_crashed_cl, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) +"PQ" = ( +/obj/effect/spawner/gibspawner/xeno, +/turf/open/floor/wall_thermite, +/area/bigredv2/outside/office_complex) "Qh" = ( /obj/item/stack/rods, /turf/open/floor/asteroidwarning/west, @@ -1053,9 +1173,26 @@ /obj/item/stack/rods, /turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) +"QN" = ( +/obj/effect/decal/cleanable/blood{ + dir = 4; + icon_state = "gib6" + }, +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "gib6" + }, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) "Rd" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/cleanable/blood/xeno, /turf/open/floor/wall_thermite, /area/bigredv2/outside/office_complex) +"RD" = ( +/obj/structure/girder/reinforced, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) "Sf" = ( /obj/structure/surface/rack, /obj/effect/spawner/random/tech_supply, @@ -1067,9 +1204,8 @@ /turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) "Sy" = ( -/obj/structure/surface/rack, /obj/item/xeno_restraints, -/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/turf/open/floor/plating/panelscorched, /area/bigredv2/outside/office_complex) "SD" = ( /obj/effect/decal/cleanable/dirt, @@ -1121,7 +1257,7 @@ /area/bigredv2/outside/office_complex) "Vg" = ( /obj/effect/landmark/objective_landmark/medium, -/turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_left_to_right, +/turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) "Vi" = ( /obj/structure/pipes/standard/simple/hidden/green, @@ -1137,6 +1273,7 @@ "VG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/green, +/obj/effect/decal/cleanable/liquid_fuel, /turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) "Wb" = ( @@ -1171,17 +1308,28 @@ /obj/structure/machinery/autolathe, /turf/open/floor/white, /area/bigredv2/outside/office_complex) +"WJ" = ( +/obj/structure/bed/chair/dropship/passenger{ + dir = 8 + }, +/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer, +/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/area/bigredv2/outside/office_complex) "WU" = ( /obj/structure/machinery/light, /obj/effect/decal/cleanable/dirt, /turf/open/floor/white, /area/bigredv2/outside/office_complex) "WV" = ( -/obj/structure/bed/chair/dropship/passenger{ - dir = 4 +/obj/effect/decal/cleanable/blood{ + dir = 1; + icon_state = "gib6" }, -/obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer, -/turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, +/obj/effect/decal/cleanable/blood{ + dir = 4; + icon_state = "gib6" + }, +/turf/open/floor/plating/platingdmg3, /area/bigredv2/outside/office_complex) "WZ" = ( /obj/item/stack/rods, @@ -1202,6 +1350,11 @@ "XS" = ( /turf/open/asphalt/cement_sunbleached/cement_sunbleached12, /area/bigredv2/outside/c) +"XX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/tool/weldingtool/simple, +/turf/open/floor/whiteyellowfull/east, +/area/bigredv2/outside/office_complex) "Yd" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/redcorner/east, @@ -1213,6 +1366,10 @@ /obj/item/stack/sheet/metal, /turf/open/floor/wall_thermite, /area/bigredv2/outside/office_complex) +"Yy" = ( +/obj/effect/landmark/crap_item, +/turf/open/floor/plating/platingdmg3, +/area/bigredv2/outside/office_complex) "YI" = ( /obj/item/frame/table, /turf/open/floor/dark, @@ -1222,6 +1379,12 @@ /obj/item/trash/hotdog, /turf/open/floor/white, /area/bigredv2/outside/office_complex) +"Zj" = ( +/obj/structure/bed/chair/dropship/passenger{ + dir = 4 + }, +/turf/open/floor/plating/panelscorched, +/area/bigredv2/outside/office_complex) "Zl" = ( /obj/item/frame/table, /turf/open/floor/white, @@ -1461,10 +1624,10 @@ Hq xr FV ap -ap -ap -AF -QD +aC +WA +mo +xL LN oE tG @@ -1488,17 +1651,17 @@ Hq Vy FV SK -SK -ap -aC -bj -bz -bF -bJ -bj +ir +bn +bn +QN bz bF bJ +MR +aC +Tb +Ov bj bz bF @@ -1506,8 +1669,8 @@ cD cL cT dc -Eq -Tb +rV +sV Eq "} (11,1,1) = {" @@ -1517,15 +1680,15 @@ SK SK SK WB -aN +Nv WV -Mb +Tb hl Al KK Nc OX -Al +Tb ws hl hl @@ -1534,7 +1697,7 @@ cM cM cM dg -tG +mU tG "} (12,1,1) = {" @@ -1542,17 +1705,17 @@ XS ap ap ap -aC +qT aT aO -bl +Tb dz bc bc dB bc bc -bc +UB bc Bu dF @@ -1568,14 +1731,14 @@ Is XS ap qk -Eq +Ev aN Sy -KK -bm -wO +bl +UB +Dl ql -oc +WJ oc oc oc @@ -1596,11 +1759,11 @@ va Xm yI aC -aO -Al -Al +Eq +ER +Eq Vg -hl +Zj qw ws hl @@ -1625,8 +1788,8 @@ zl aD Ko aW -uL -bn +UB +UB NZ jx dE @@ -1651,8 +1814,8 @@ ba Hr aE aQ -Al -Al +Tb +UB vw wm wO @@ -1677,12 +1840,12 @@ ka ap MJ Tb -aN -KK +RD +Yy Qr bm hl -hl +ws hl zH ZR @@ -1707,7 +1870,7 @@ ap aE aX aQ -bo +AF bc bc uC @@ -1733,8 +1896,8 @@ of of of Ym -aN -ql +WA +Gf Fi oc Al @@ -1746,11 +1909,11 @@ ql wO oc cF -cN +oz cN cN di -Tk +nl jl "} (20,1,1) = {" @@ -1760,12 +1923,12 @@ ka Au Au qY -aE -bq +aO +kT bA bG bJ -bq +yC bA bG bJ @@ -1777,7 +1940,7 @@ cO cU dd Rd -Tk +nl Na "} (21,1,1) = {" @@ -1801,10 +1964,10 @@ uw AF Cy JH -Cy -UB -Rd -Tk +Jb +Mb +PQ +nl Na "} (22,1,1) = {" @@ -1827,9 +1990,9 @@ Cy ap zv UB -Kp +bB QD -UB +IF WB Tk Na @@ -1855,7 +2018,7 @@ ap vH UB Fp -Kp +bo Cy dk Tk @@ -1879,7 +2042,7 @@ ap Yd ie zq -pu +XX Cy Cz Pv @@ -1908,7 +2071,7 @@ UB Db UB zh -pu +FI OH hU ap