From 8781a4f3ad7ed62f73ef55eeea231161ffa915a7 Mon Sep 17 00:00:00 2001 From: Zergspower <22140677+Zergspower@users.noreply.github.com> Date: Thu, 24 Oct 2024 10:18:03 -0500 Subject: [PATCH] Space Ruin - Black Market Trader Balance pass (#4499) * Update blackmarket.dmm * Update blackmarket.dmm * weapon spawner * fine * Update mob_spawns.dm --- .../SpaceRuins/nova/blackmarket.dmm | 55 ++++++++++++------- .../modules/mapping/code/mob_spawns.dm | 17 ++++++ 2 files changed, 52 insertions(+), 20 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/nova/blackmarket.dmm b/_maps/RandomRuins/SpaceRuins/nova/blackmarket.dmm index fcfe9ac6d5c..12f01c218fe 100644 --- a/_maps/RandomRuins/SpaceRuins/nova/blackmarket.dmm +++ b/_maps/RandomRuins/SpaceRuins/nova/blackmarket.dmm @@ -44,6 +44,7 @@ "dm" = ( /obj/structure/sink/kitchen/directional/south, /obj/effect/turf_decal/bot_white, +/obj/effect/spawner/random/contraband/prison, /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/nova/blackmarket) "du" = ( @@ -123,6 +124,10 @@ pixel_y = 5 }, /obj/effect/spawner/random/food_or_drink/three_course_meal, +/obj/effect/spawner/random/food_or_drink/refreshing_beverage{ + pixel_x = 8; + pixel_y = 11 + }, /turf/open/floor/iron/smooth_large, /area/ruin/space/has_grav/nova/blackmarket) "hv" = ( @@ -243,14 +248,7 @@ /obj/machinery/light/dim/directional/west, /obj/structure/table, /obj/item/storage/box/nif_ghost_box/ghost_role, -/obj/effect/spawner/random/food_or_drink/refreshing_beverage{ - pixel_x = 8; - pixel_y = 11 - }, -/obj/item/ammo_box/magazine/m9mm{ - pixel_y = 3; - pixel_x = -8 - }, +/obj/effect/spawner/random/weapon/black_market_trader, /turf/open/floor/iron/smooth_large, /area/ruin/space/has_grav/nova/blackmarket) "mQ" = ( @@ -316,6 +314,10 @@ /obj/machinery/light/red/dim/directional/south, /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/nova/blackmarket) +"rF" = ( +/obj/machinery/telecomms/relay/preset/ruskie, +/turf/open/floor/circuit, +/area/ruin/space/has_grav/nova/blackmarket) "sb" = ( /obj/structure/rack, /obj/effect/spawner/random/engineering/material, @@ -665,7 +667,6 @@ "FG" = ( /obj/structure/table, /obj/structure/sign/poster/contraband/random/directional/west, -/obj/effect/spawner/random/contraband/armory, /obj/effect/spawner/random/contraband/prison, /obj/item/modular_computer/laptop/preset/civilian{ pixel_y = 1 @@ -734,6 +735,10 @@ }, /turf/template_noop, /area/template_noop) +"JI" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/turf/open/floor/iron/dark/textured_large, +/area/ruin/space/has_grav/nova/blackmarket) "JU" = ( /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/effect/turf_decal/delivery/red, @@ -862,6 +867,10 @@ /obj/effect/spawner/random/engineering/material_cheap, /turf/open/floor/iron/smooth, /area/ruin/space/has_grav/nova/blackmarket) +"Qd" = ( +/obj/effect/turf_decal/shuttle/exploration/typhon, +/turf/open/floor/iron/dark/textured_large, +/area/ruin/space/has_grav/nova/blackmarket) "Qu" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -872,6 +881,11 @@ dir = 8 }, /area/ruin/space/has_grav/nova/blackmarket) +"QL" = ( +/obj/effect/turf_decal/bot_white, +/obj/machinery/light/small/dim/directional/north, +/turf/open/floor/iron/dark/textured_large, +/area/ruin/space/has_grav/nova/blackmarket) "QV" = ( /obj/structure/sign/warning/docking/directional/south, /turf/open/floor/plating, @@ -942,7 +956,7 @@ /obj/machinery/door/window/survival_pod/left/directional/south, /obj/machinery/light/floor, /obj/effect/turf_decal/bot_white/left, -/obj/effect/spawner/random/engineering/tool_alien, +/obj/effect/spawner/random/engineering/tool_advanced, /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/nova/blackmarket) "UH" = ( @@ -956,8 +970,9 @@ /area/ruin/space/has_grav/nova/blackmarket) "VF" = ( /obj/effect/spawner/random/structure/closet_private, -/obj/item/gun/ballistic/automatic/pistol, /obj/item/modular_computer/pda, +/obj/item/storage/box/nif_ghost_box/ghost_role, +/obj/item/storage/box/rubbershot, /turf/open/floor/iron/smooth_large, /area/ruin/space/has_grav/nova/blackmarket) "VG" = ( @@ -989,7 +1004,7 @@ /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/rack, /obj/effect/turf_decal/bot_white, -/obj/effect/spawner/random/engineering/tool_alien, +/obj/item/storage/medkit/ancient, /turf/open/floor/iron/dark/textured_large, /area/ruin/space/has_grav/nova/blackmarket) "WS" = ( @@ -1383,7 +1398,7 @@ mZ UH eV sb -hd +Zh Zh Zh Zh @@ -1412,7 +1427,7 @@ hO hO hO hd -Zh +Qd Pk MX hd @@ -1447,8 +1462,8 @@ hO hO hO hO -hO hd +JI hd hd hd @@ -1483,9 +1498,9 @@ hO hO hO hO -hO -hO -hO +hd +QL +rF hd hd eZ @@ -1519,8 +1534,8 @@ hO hO hO hO -hO -hO +hd +hd hd hd oT diff --git a/modular_nova/modules/mapping/code/mob_spawns.dm b/modular_nova/modules/mapping/code/mob_spawns.dm index 0aeb547c8c5..1db6b46f0ca 100644 --- a/modular_nova/modules/mapping/code/mob_spawns.dm +++ b/modular_nova/modules/mapping/code/mob_spawns.dm @@ -40,6 +40,23 @@ handlebank(shady) return ..() +/obj/item/gun/energy/laser/carbine/cybersun/black_market_trader + desc = "A laser gun primarily used by syndicate security guards. It fires a rapid spray of low-power plasma beams. This one seems to have had its firing pin replaced." + pin = /obj/item/firing_pin + +/obj/effect/spawner/random/weapon/black_market_trader + name = "black market trader weapon spawner" + icon_state = "pistol" + loot = list( + /obj/item/gun/energy/laser/carbine/cybersun/black_market_trader = 80, + /obj/item/gun/energy/e_gun/old = 50, + /obj/item/gun/ballistic/shotgun/automatic/combat = 50, + /obj/item/gun/ballistic/automatic/pistol/contraband = 30, + /obj/item/gun/ballistic/automatic/sol_rifle/evil = 20, + /obj/item/gun/ballistic/automatic/sol_smg/evil = 20, + /obj/item/gun/ballistic/shotgun/bulldog/unrestricted, + ) + /obj/effect/mob_spawn/ghost_role/human/ds2 name = "DS2 personnel" use_outfit_name = TRUE