From 49e0947f2fefde9089c04f9f5c75dc050804a963 Mon Sep 17 00:00:00 2001 From: Zenith <109559450+Zenith00000@users.noreply.github.com> Date: Thu, 4 Jul 2024 21:02:39 +0100 Subject: [PATCH] minor map fixes, minor survivor preset fixes. --- .../survivors/lv_759/preset_hybrisa.dm | 9 ++ .../LV759_Hybrisa_Prospera.dmm | 90 +++++++++++++------ 2 files changed, 73 insertions(+), 26 deletions(-) diff --git a/code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm b/code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm index 8f27927ad5a6..4e845127aa2a 100644 --- a/code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm +++ b/code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm @@ -784,6 +784,7 @@ var/choice = rand(1,45) switch(choice) if(1 to 10) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/fur_lined_trench_coat/alt, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/wy_exec_suit_uniform, WEAR_BODY) @@ -793,6 +794,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clipboard(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/spacecash/c1000(new_human), WEAR_IN_BACK) if(10 to 20) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/fur_lined_trench_coat, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/wy_exec_suit_uniform/jacket, WEAR_BODY) @@ -802,6 +804,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clipboard(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/spacecash/c1000(new_human), WEAR_IN_BACK) if(20 to 30) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/wy_exec_suit_uniform/brown, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/black, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/fur_lined_trench_coat/alt, WEAR_JACKET) @@ -811,6 +814,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clipboard, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/spacecash/c1000, WEAR_IN_BACK) if(30 to 40) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/wy_exec_suit_uniform/brown/jacket, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/CMB/hybrisa/fur_lined_trench_coat/alt, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable, WEAR_BACK) @@ -819,6 +823,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clipboard, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/spacecash/c1000, WEAR_IN_BACK) if(40 to 45) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/holster, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/mod88, WEAR_IN_ACCESSORY) @@ -855,6 +860,7 @@ var/choice = rand(1,30) switch(choice) if(1 to 10) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/wy_cap, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/hybrisa, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET) @@ -872,6 +878,7 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90(new_human), WEAR_IN_BACK) if(11 to 29) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/hybrisa, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) @@ -888,6 +895,7 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/p90(new_human), WEAR_IN_BACK) if(30) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/corporate/hybrisa/lead, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc/corporate/hybrisa/lead, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light/corporate/lead, WEAR_JACKET) @@ -922,6 +930,7 @@ /datum/equipment_preset/survivor/hybrisa/wey_po/load_gear(mob/living/carbon/human/new_human) var/random_gear = rand(1,4) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hybrisa/wy_po_cap, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hybrisa/wy_Pilot, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/hybrisa/wy_pilot, WEAR_BODY) diff --git a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm index 5df9f7ce3f13..f39e32267724 100644 --- a/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm +++ b/maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm @@ -15862,7 +15862,9 @@ "cqH" = ( /turf/closed/shuttle/dropship2/WY/StarGlider{ icon_state = "zwing3"; - opacity = 0 + opacity = 0; + desc = "The WY-LWI Horizon Runner HR-150, a collaborative creation of Lunnar-Welsun Industries and Weyland-Yutani. This small dropship is designed for short-range commercial transport."; + name = "\improper WY-LWI Horizon Runner HR-150" }, /area/lv759/indoors/spaceport/horizon_runner) "cqL" = ( @@ -31868,6 +31870,9 @@ /obj/structure/surface/table/almayer, /obj/structure/window/reinforced, /obj/item/ammo_magazine/smg/p90, +/obj/item/ammo_magazine/smg/p90, +/obj/item/ammo_magazine/smg/p90, +/obj/item/ammo_magazine/smg/p90, /turf/open/floor/plating/plating_catwalk/prison, /area/lv759/indoors/wy_research_complex/securityarmory) "eGI" = ( @@ -35614,6 +35619,8 @@ /obj/item/ammo_magazine/smg/p90, /obj/item/ammo_magazine/smg/p90, /obj/item/weapon/gun/smg/p90, +/obj/item/ammo_magazine/smg/p90, +/obj/item/ammo_magazine/smg/p90, /turf/open/floor/strata{ dir = 4; icon_state = "red4" @@ -36097,7 +36104,7 @@ dir = 1 }, /turf/open/auto_turf/hybrisa_auto_turf/layer2, -/area/lv759/indoors/caves/north_east_caves) +/area/lv759/outdoors/colony_streets/north_east_street_LZ) "fnL" = ( /obj/effect/hybrisa/decal/dirt, /turf/open/floor/interior/wood, @@ -37904,6 +37911,10 @@ /obj/structure/largecrate/random/barrel/brown, /turf/open/auto_turf/hybrisa_auto_turf/layer2, /area/lv759/outdoors/caveplateau) +"fAY" = ( +/obj/structure/prop/hybrisa/boulders/wide_boulderdark/wide_boulder1, +/turf/open/auto_turf/hybrisa_auto_turf/layer2, +/area/lv759/outdoors/colony_streets/north_east_street_LZ) "fBb" = ( /obj/structure/prop/invuln/minecart_tracks{ dir = 8; @@ -46249,13 +46260,14 @@ /area/lv759/oob) "gOS" = ( /obj/item/storage/belt/marine, -/obj/item/ammo_magazine/rifle/m41aMK1, -/obj/item/ammo_magazine/rifle/m41aMK1, -/obj/item/ammo_magazine/rifle/m41aMK1, /obj/item/weapon/gun/rifle/m41a/corporate, /obj/structure/closet/secure_closet/guncabinet{ locked = 0 }, +/obj/item/ammo_magazine/rifle/ap, +/obj/item/ammo_magazine/rifle/ap, +/obj/item/ammo_magazine/rifle/ap, +/obj/item/ammo_magazine/rifle/ap, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -50902,7 +50914,9 @@ "hyA" = ( /turf/closed/shuttle/dropship2/WY/StarGlider{ icon_state = "zwing8"; - opacity = 0 + opacity = 0; + desc = "The WY-LWI Horizon Runner HR-150, a collaborative creation of Lunnar-Welsun Industries and Weyland-Yutani. This small dropship is designed for short-range commercial transport."; + name = "\improper WY-LWI Horizon Runner HR-150" }, /area/lv759/indoors/spaceport/horizon_runner) "hyD" = ( @@ -51526,6 +51540,10 @@ /obj/structure/barricade/sandbags{ dir = 8 }, +/obj/effect/hybrisa/decal/road/roadmiddle{ + dir = 8; + pixel_x = 16 + }, /turf/open/hybrisa/street/asphalt, /area/lv759/outdoors/colony_streets/north_street) "hCr" = ( @@ -55680,11 +55698,11 @@ dir = 1; layer = 2 }, -/obj/item/ammo_magazine/rifle/m41aMK1, -/obj/item/weapon/gun/rifle/m41a/corporate, /obj/structure/sign/safety/firingrange{ pixel_y = 32 }, +/obj/item/ammo_magazine/rifle/ap, +/obj/item/weapon/gun/rifle/m41a/corporate, /turf/open/floor/corsat{ icon_state = "officetiles" }, @@ -64320,9 +64338,6 @@ /turf/open/floor/plating, /area/lv759/indoors/mining_outpost/vehicledeployment) "jwH" = ( -/obj/item/bodybag/tarp, -/obj/item/bodybag/tarp, -/obj/item/bodybag/tarp, /obj/effect/hybrisa/decal/dirt, /obj/item/prop/helmetgarb/gunoil, /obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, @@ -64332,6 +64347,7 @@ /obj/structure/prop/hybrisa/misc/buildinggreebliessmall/smallvent3{ pixel_y = 28 }, +/obj/effect/landmark/item_pool_spawner/survivor_ammo/buckshot, /turf/open/floor/hybrisa/tile/tilebeige, /area/lv759/indoors/jacks_surplus) "jwI" = ( @@ -79651,6 +79667,10 @@ /obj/item/ammo_magazine/smg/p90, /obj/item/ammo_magazine/smg/p90, /obj/item/weapon/gun/smg/p90, +/obj/item/ammo_magazine/smg/p90, +/obj/item/ammo_magazine/smg/p90, +/obj/item/ammo_magazine/smg/p90, +/obj/item/ammo_magazine/smg/p90, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -83744,7 +83764,9 @@ "mnv" = ( /turf/closed/shuttle/dropship2/WY/StarGlider{ icon_state = "zwing7"; - opacity = 0 + opacity = 0; + desc = "The WY-LWI Horizon Runner HR-150, a collaborative creation of Lunnar-Welsun Industries and Weyland-Yutani. This small dropship is designed for short-range commercial transport."; + name = "\improper WY-LWI Horizon Runner HR-150" }, /area/lv759/indoors/spaceport/horizon_runner) "mnw" = ( @@ -89728,7 +89750,9 @@ "nhW" = ( /turf/closed/shuttle/dropship2/WY/StarGlider{ icon_state = "zwing6"; - opacity = 0 + opacity = 0; + desc = "The WY-LWI Horizon Runner HR-150, a collaborative creation of Lunnar-Welsun Industries and Weyland-Yutani. This small dropship is designed for short-range commercial transport."; + name = "\improper WY-LWI Horizon Runner HR-150" }, /area/lv759/indoors/spaceport/horizon_runner) "nhZ" = ( @@ -92706,7 +92730,7 @@ dir = 8 }, /turf/open/auto_turf/hybrisa_auto_turf/layer2, -/area/lv759/indoors/caves/north_east_caves) +/area/lv759/outdoors/colony_streets/north_east_street_LZ) "nGN" = ( /obj/effect/hybrisa/decal/dirt, /obj/item/trash/cigbutt{ @@ -98023,7 +98047,9 @@ "otP" = ( /turf/closed/shuttle/dropship2/WY/StarGlider{ icon_state = "zwing2"; - opacity = 0 + opacity = 0; + desc = "The WY-LWI Horizon Runner HR-150, a collaborative creation of Lunnar-Welsun Industries and Weyland-Yutani. This small dropship is designed for short-range commercial transport."; + name = "\improper WY-LWI Horizon Runner HR-150" }, /area/lv759/indoors/spaceport/horizon_runner) "otQ" = ( @@ -113464,6 +113490,7 @@ /obj/structure/machinery/light/small{ dir = 8 }, +/obj/effect/hybrisa/decal/dirt, /turf/open/floor/hybrisa/tile/tilebeige, /area/lv759/indoors/jacks_surplus) "qIK" = ( @@ -122328,11 +122355,12 @@ locked = 0 }, /obj/item/storage/belt/marine, -/obj/item/ammo_magazine/rifle/m41aMK1, -/obj/item/ammo_magazine/rifle/m41aMK1, -/obj/item/ammo_magazine/rifle/m41aMK1, /obj/item/weapon/gun/rifle/m41a/corporate, /obj/structure/machinery/light/double/blue, +/obj/item/ammo_magazine/rifle/ap, +/obj/item/ammo_magazine/rifle/ap, +/obj/item/ammo_magazine/rifle/ap, +/obj/item/ammo_magazine/rifle/ap, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -130161,7 +130189,9 @@ "tcR" = ( /turf/closed/shuttle/dropship2/WY/StarGlider{ icon_state = "zwing4"; - opacity = 0 + opacity = 0; + desc = "The WY-LWI Horizon Runner HR-150, a collaborative creation of Lunnar-Welsun Industries and Weyland-Yutani. This small dropship is designed for short-range commercial transport."; + name = "\improper WY-LWI Horizon Runner HR-150" }, /area/lv759/indoors/spaceport/horizon_runner) "tcV" = ( @@ -131887,6 +131917,9 @@ /obj/structure/prop/hybrisa/xenobiology/small/cracked1, /turf/open/floor/bluegrid, /area/lv759/indoors/wy_research_complex/mainlabs) +"tos" = ( +/turf/open/auto_turf/hybrisa_auto_turf/layer2, +/area/lv759/outdoors/colony_streets/north_east_street_LZ) "tou" = ( /obj/structure/closet/phonebox{ light_color = "#00AAFF"; @@ -145898,7 +145931,7 @@ dir = 1 }, /turf/open/auto_turf/hybrisa_auto_turf/layer1, -/area/lv759/indoors/caves/north_east_caves) +/area/lv759/outdoors/colony_streets/north_east_street_LZ) "vtC" = ( /obj/structure/surface/table/reinforced/prison{ color = "#6b675e" @@ -153589,6 +153622,10 @@ /obj/item/ammo_magazine/smg/p90, /obj/item/ammo_magazine/smg/p90, /obj/item/weapon/gun/smg/p90, +/obj/item/ammo_magazine/smg/p90, +/obj/item/ammo_magazine/smg/p90, +/obj/item/ammo_magazine/smg/p90, +/obj/item/ammo_magazine/smg/p90, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -161089,14 +161126,15 @@ /area/lv759/indoors/wy_research_complex/weaponresearchlab) "xDD" = ( /obj/item/storage/belt/marine, -/obj/item/ammo_magazine/rifle/m41aMK1, -/obj/item/ammo_magazine/rifle/m41aMK1, -/obj/item/ammo_magazine/rifle/m41aMK1, /obj/item/weapon/gun/rifle/m41a/corporate, /obj/structure/machinery/light/double/blue, /obj/structure/closet/secure_closet/guncabinet{ locked = 0 }, +/obj/item/ammo_magazine/rifle/ap, +/obj/item/ammo_magazine/rifle/ap, +/obj/item/ammo_magazine/rifle/ap, +/obj/item/ammo_magazine/rifle/ap, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -218536,7 +218574,7 @@ cPS aor tnl vtz -wmm +mYD unn unn unn @@ -218788,7 +218826,7 @@ ccx aor tnl vtz -blX +fAY unn unn unn @@ -219040,7 +219078,7 @@ cPS aor tnl vtz -tyh +tos unn unn unn