Skip to content

Commit

Permalink
minor map fixes, minor survivor preset fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Zenith00000
Zenith00000 committed Jul 4, 2024
1 parent 11ccb6b commit 49e0947
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 26 deletions.
9 changes: 9 additions & 0 deletions code/modules/gear_presets/survivors/lv_759/preset_hybrisa.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
90 changes: 64 additions & 26 deletions maps/map_files/LV759_Hybrisa_Prospera/LV759_Hybrisa_Prospera.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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,
Expand All @@ -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" = (
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -218536,7 +218574,7 @@ cPS
aor
tnl
vtz
wmm
mYD
unn
unn
unn
Expand Down Expand Up @@ -218788,7 +218826,7 @@ ccx
aor
tnl
vtz
blX
fAY
unn
unn
unn
Expand Down Expand Up @@ -219040,7 +219078,7 @@ cPS
aor
tnl
vtz
tyh
tos
unn
unn
unn
Expand Down

0 comments on commit 49e0947

Please sign in to comment.