diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm index a1f3f1fd3daa6..915725a4c41c2 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm @@ -417,7 +417,7 @@ /obj/structure/closet/crate/secure/weapon{ req_access = list(3) }, -/obj/item/gun/energy/laser/retro/old, +/obj/effect/spawner/random/pool/spaceloot/laser, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, @@ -588,7 +588,7 @@ dir = 2 }, /obj/structure/closet/crate, -/obj/item/grenade/frag, +/obj/effect/spawner/random/pool/spaceloot/syndicate/common_rare, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/unpowered/unpowered_structures) "zo" = ( @@ -830,7 +830,7 @@ dir = 2 }, /obj/structure/closet/crate, -/obj/item/grenade/frag, +/obj/effect/spawner/random/pool/spaceloot/syndicate/common_rare, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/unpowered/unpowered_structures) "IN" = ( @@ -921,6 +921,15 @@ icon_state = "dark" }, /area/ruin/space/unpowered/unpowered_structures) +"LZ" = ( +/obj/effect/turf_decal/delivery/white, +/obj/effect/turf_decal/delivery, +/obj/structure/closet/crate, +/obj/effect/spawner/random/pool/spaceloot/mining_tool, +/turf/simulated/floor/plasteel/airless{ + icon_state = "dark" + }, +/area/ruin/space/unpowered/unpowered_structures) "Md" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/visible{ @@ -1119,17 +1128,16 @@ /area/ruin/space/unpowered/unpowered_structures) "TF" = ( /obj/structure/closet/syndicate, -/obj/item/ammo_box/magazine/m10mm, -/obj/item/gun/projectile/automatic/pistol, /obj/structure/window/plasmareinforced{ color = "#FF0000"; dir = 4 }, +/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/unpowered/unpowered_structures) "TT" = ( -/obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/status_display/directional/east, +/obj/effect/spawner/random/pool/spaceloot/security/modsuit, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, @@ -1179,8 +1187,8 @@ /area/ruin/space/unpowered/unpowered_structures) "VO" = ( /obj/structure/table, -/obj/item/grenade/plastic/c4, /obj/item/clothing/glasses/sunglasses, +/obj/effect/spawner/random/pool/spaceloot/syndicate/common_rare, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/unpowered/unpowered_structures) "VX" = ( @@ -4816,7 +4824,7 @@ TA wB wB wB -SA +LZ RP wr wr diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm index 89036d547b8a0..5949b9928fa93 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/destroyed_infiltrator.dmm @@ -29,7 +29,7 @@ /turf/template_noop, /area/ruin/space/unpowered/unpowered_structures) "bi" = ( -/obj/item/reagent_containers/hypospray/autoinjector/nanocalcium, +/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, /turf/template_noop, /area/template_noop) "bq" = ( @@ -333,10 +333,6 @@ /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) -"zg" = ( -/obj/item/storage/box/syndidonkpockets, -/turf/template_noop, -/area/template_noop) "zG" = ( /obj/structure/table, /obj/structure/lattice, @@ -452,7 +448,7 @@ /turf/template_noop, /area/template_noop) "IA" = ( -/obj/machinery/suit_storage_unit/syndicate/secure, +/obj/effect/spawner/random/pool/spaceloot/modsuit_syndie/nuclear, /turf/simulated/floor/mineral/plastitanium/red/airless, /area/ruin/space/unpowered/unpowered_structures) "Jr" = ( @@ -1598,7 +1594,7 @@ Ly Ly SK Ly -zg +bi jM tO SK diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm index 518b50d49579e..02426cca62e99 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm @@ -6,10 +6,7 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/storage/toolbox/syndicate{ - pixel_x = -10; - pixel_y = 10 - }, +/obj/effect/spawner/random/pool/spaceloot/syndicate/common_rare, /turf/simulated/floor/pod, /area/ruin/space/powered/requires_power_space) "al" = ( @@ -358,7 +355,7 @@ /obj/effect/turf_decal/stripes/white/line{ dir = 8 }, -/obj/item/toy/sword, +/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "iP" = ( @@ -936,8 +933,8 @@ /obj/machinery/light_construct/directional/west, /obj/item/paper/crumpled, /obj/effect/spawner/random/dirt/often, -/obj/item/storage/secure/briefcase/syndie, /obj/item/trash/spentcasing/bullet, +/obj/effect/spawner/random/pool/spaceloot/syndicate/common, /turf/simulated/floor/mineral/plastitanium, /area/ruin/space/powered/requires_power_space) "yd" = ( diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm index a36cc4ffc61ac..4afffbda86230 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm @@ -18,9 +18,9 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) "aH" = ( -/obj/structure/closet/crate/secure/loot, /obj/effect/decal/cleanable/dirt, /obj/machinery/light_construct/directional/north, +/obj/effect/spawner/random/loot/crate, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered) "aK" = ( @@ -247,7 +247,7 @@ "fO" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/camera_bug, +/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, /turf/simulated/floor/mineral/titanium/blue, /area/ruin/space/powered) "gB" = ( @@ -331,7 +331,7 @@ /area/ruin/space/powered) "ir" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/secure/loot, +/obj/effect/spawner/random/loot/crate, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered) "iG" = ( @@ -529,6 +529,13 @@ /obj/structure/fans/tiny, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) +"mF" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/secure/loot, +/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, +/turf/simulated/floor/mineral/titanium, +/area/ruin/space/powered) "mN" = ( /obj/machinery/button/windowtint/west{ id = "mech_toilet" @@ -545,9 +552,9 @@ /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "nc" = ( -/obj/structure/closet/crate/secure/loot, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small/directional/south, +/obj/effect/spawner/random/loot/crate, /turf/simulated/floor/plating, /area/ruin/space/powered) "ng" = ( @@ -662,6 +669,11 @@ /obj/structure/railing/corner, /turf/template_noop, /area/template_noop) +"pC" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/spawner/random/loot/crate, +/turf/simulated/floor/mineral/titanium, +/area/ruin/space/powered) "pQ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -690,9 +702,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/powered) "qA" = ( -/obj/mecha/combat/durand/old{ - obj_integrity = 120 - }, +/obj/effect/spawner/random/pool/spaceloot/mechtransport_new/mecha, /turf/simulated/floor/mech_bay_recharge_floor, /area/ruin/space/powered) "qB" = ( @@ -809,8 +819,8 @@ /turf/simulated/floor/mineral/titanium/yellow, /area/ruin/space/powered) "sU" = ( -/obj/structure/closet/crate/secure/loot, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/loot/crate, /turf/simulated/floor/plating, /area/ruin/space/powered) "tf" = ( @@ -1228,11 +1238,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) -"BX" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/secure/loot, -/turf/simulated/floor/plating, -/area/ruin/space/powered) "Cl" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/hostile/scavengers/meele/crusher, @@ -1246,8 +1251,8 @@ /area/ruin/space/powered) "Co" = ( /obj/structure/table, -/obj/item/mecha_parts/core, /obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/pool/spaceloot/mechtransport/storage4, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "Cp" = ( @@ -1307,6 +1312,12 @@ }, /turf/simulated/floor/plating, /area/ruin/space/powered) +"CX" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/loot/crate, +/turf/simulated/floor/mineral/titanium, +/area/ruin/space/powered) "CZ" = ( /obj/effect/turf_decal/delivery/hollow, /obj/structure/mecha_wreckage/gygax, @@ -1778,7 +1789,7 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/powered) "KY" = ( -/obj/structure/closet/crate/secure/loot, +/obj/effect/spawner/random/loot/crate, /turf/simulated/floor/plating, /area/ruin/space/powered) "La" = ( @@ -1862,12 +1873,6 @@ /obj/structure/gunrack, /turf/simulated/floor/mineral/plastitanium/red, /area/ruin/space/powered) -"Md" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/secure/loot, -/turf/simulated/floor/mineral/titanium, -/area/ruin/space/powered) "Me" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -30 @@ -2423,14 +2428,11 @@ /obj/structure/closet/crate/secure/weapon{ req_access = list(7) }, -/obj/item/mecha_parts/mecha_equipment/weapon/honker, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang, /obj/item/mecha_modkit/voice/nanotrasen, /obj/item/toy/figure/mech/mauler, /obj/effect/decal/cleanable/dirt, /obj/machinery/light_construct/directional/south, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg, -/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser, +/obj/effect/spawner/random/pool/spaceloot/mechtransport_new/mecha_equipment, /turf/simulated/floor/mineral/titanium, /area/ruin/space/powered) "WK" = ( @@ -2871,9 +2873,9 @@ qU qU Sb sD -Md +CX sh -HB +pC HB LC Kb @@ -2929,7 +2931,7 @@ nk VB bR sh -sh +CX pm vP lf @@ -3036,7 +3038,7 @@ qU qU Sb Oh -HB +pC HB HB GF @@ -3091,8 +3093,8 @@ Sb qU Sb Uu -sh -Md +mF +CX HB HB nk @@ -3893,7 +3895,7 @@ QD SH ir rZ -BX +hw CW VO QD diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/sierra_1_4.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/sierra_1_4.dmm index b5e0832226d0a..4a36aaaafc104 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/sierra_1_4.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/sierra_1_4.dmm @@ -103,6 +103,18 @@ icon_state = "white_large" }, /area/ruin/space/sierra/med) +"aR" = ( +/obj/effect/decal/cleanable/dust, +/obj/item/crowbar, +/obj/item/t_scanner{ + pixel_x = 8; + pixel_y = -8 + }, +/obj/effect/decal/remains/human, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/space/sierra/shelter) "aV" = ( /turf/simulated/floor/plating/airless, /area/ruin/space/sierra/hall) @@ -1415,6 +1427,7 @@ /area/ruin/space/sierra/med) "kB" = ( /obj/structure/rack, +/obj/item/clothing/neck/stethoscope, /turf/simulated/floor/plating, /area/ruin/space/sierra/med) "kI" = ( @@ -5570,6 +5583,14 @@ /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/sierra/med) +"Rv" = ( +/obj/effect/decal/cleanable/dust, +/obj/structure/safe/floor, +/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/ruin/space/sierra/shelter) "Rw" = ( /obj/structure/cable/green{ d1 = 1; @@ -10093,8 +10114,8 @@ KS BT Me FF -kZ -kZ +Rv +aR kZ kZ kZ diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm index 9385aa142bef1..212bd7fcdd4bb 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm @@ -1011,8 +1011,8 @@ dir = 1 }, /obj/structure/safe/floor, -/obj/item/camera_bug, /obj/item/flash, +/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, /turf/simulated/floor/greengrid, /area/ruin/space/spacehotelv1/reception) "ix" = ( @@ -2959,7 +2959,7 @@ /obj/item/clothing/under/dress/victdress/red, /obj/item/clothing/under/dress/victdress, /obj/item/clothing/under/suit/victsuit, -/obj/item/gun/projectile/revolver/doublebarrel/improvised/cane, +/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, /turf/simulated/floor/carpet/cyan, /area/ruin/space/spacehotelv1/guestroom5) "xb" = ( @@ -4309,13 +4309,10 @@ /area/ruin/space/spacehotelv1/bar) "GZ" = ( /obj/structure/table/holotable/wood, -/obj/item/paper/pamphlet/deltainfo{ - name = "Hotel pamphlet"; - info = "
The Twin Nexus Hotel

A place of Sanctuary


Welcome to The Twin-Nexus Hotel, \[insert name here]! The loyal staff strive to their best effort to cater for the best possible experience for all space(wo)men! If you have any questions or comments, please ask one of our on-board staff for more information.
" - }, /obj/effect/turf_decal/siding/wood/neutral{ dir = 4 }, +/obj/item/t_scanner, /turf/simulated/floor/wood/oak, /area/ruin/space/spacehotelv1/reception) "Hb" = ( diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm index af6d9c94129e6..67ba17abbc28d 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm @@ -230,6 +230,7 @@ /area/ruin/space/powered) "R" = ( /obj/structure/closet/crate/can, +/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, /turf/simulated/floor/transparent/glass/reinforced, /area/ruin/space/powered) "T" = ( diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm index cc8e771d706cc..1b997b38931bd 100644 --- a/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm +++ b/_maps/map_files220/RandomRuins/SpaceRuins/voxraiders_1.dmm @@ -138,7 +138,7 @@ /obj/effect/turf_decal/box, /obj/machinery/light_construct/directional/north, /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/secure/loot, +/obj/effect/spawner/random/loot/crate, /turf/simulated/floor/plasteel/airless{ icon_state = "Dark" }, @@ -223,10 +223,10 @@ /turf/simulated/wall/mineral/titanium, /area/ruin/space/unpowered/unpowered_structures) "vp" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/command{ locked = 1 }, -/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel/airless{ icon_state = "Dark" }, @@ -291,6 +291,11 @@ icon_state = "plastitanium" }, /area/ruin/space/powered) +"Cs" = ( +/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, +/obj/structure/closet/crate, +/turf/simulated/floor/mineral/plastitanium/red/nitrogen, +/area/ruin/space/powered) "CI" = ( /obj/structure/chair/comfy/shuttle{ dir = 1 @@ -339,7 +344,7 @@ "Fi" = ( /obj/effect/turf_decal/box, /obj/effect/decal/cleanable/dirt, -/obj/structure/closet/crate/secure/loot, +/obj/effect/spawner/random/loot/crate, /turf/simulated/floor/plasteel/airless{ icon_state = "Dark" }, @@ -377,6 +382,7 @@ /area/ruin/space/unpowered/unpowered_structures) "JI" = ( /obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/vox/ranged_laser/space, /turf/simulated/floor/plasteel/airless{ icon_state = "Dark_Golden_1" }, @@ -424,6 +430,7 @@ /obj/item/shard{ icon_state = "small" }, +/obj/effect/spawner/random/loot/crate, /turf/simulated/floor/plasteel/airless{ icon_state = "dark" }, @@ -452,7 +459,6 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) "QX" = ( -/mob/living/simple_animal/hostile/vox/ranged_laser/space, /obj/effect/decal/cleanable/glass, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered/unpowered_structures) @@ -476,7 +482,7 @@ /area/ruin/space/powered) "SX" = ( /obj/structure/rack, -/obj/item/salvage/loot/pirate, +/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, /turf/simulated/floor/mineral/plastitanium/red/nitrogen{ icon_state = "plastitanium" }, @@ -531,16 +537,17 @@ pixel_y = 9; pixel_x = 8 }, -/obj/item/toy/plushie/voxplushie, -/obj/item/food/cheesepizzaslice{ - pixel_y = -2; - pixel_x = -7 +/obj/item/toy/plushie/voxplushie{ + pixel_x = 8; + pixel_y = -3 }, /obj/item/storage/box/zipties{ pixel_x = -8; pixel_y = 8 }, -/obj/item/grenade/plastic/c4, +/obj/item/food/sliceable/pizza/cheesepizza{ + pixel_x = -4 + }, /turf/simulated/floor/mineral/plastitanium/red/nitrogen{ icon_state = "plastitanium" }, @@ -664,7 +671,7 @@ OC CI il AK -Mq +Fi oL Mq Fi @@ -922,7 +929,7 @@ dQ KN KN dQ -UO +Cs fG Sp ye diff --git a/modular_ss220/balance/_balance.dme b/modular_ss220/balance/_balance.dme index 8c1e00182243b..4c49e870688d0 100644 --- a/modular_ss220/balance/_balance.dme +++ b/modular_ss220/balance/_balance.dme @@ -7,6 +7,7 @@ #include "code/items/storage/surgical_tray.dm" #include "code/items/storage/closets.dm" #include "code/jobs/warden.dm" +#include "code/loot/pools.dm" #include "code/mobs/aliens/larva.dm" #include "code/species/machine.dm" #include "code/species/skrell.dm" diff --git a/modular_ss220/balance/code/loot/pools.dm b/modular_ss220/balance/code/loot/pools.dm new file mode 100644 index 0000000000000..dd91fc55f5c7c --- /dev/null +++ b/modular_ss220/balance/code/loot/pools.dm @@ -0,0 +1,66 @@ +/datum/spawn_pool/spaceloot + available_points = 2200 // tweak available points considering centcomm and away mission + +/obj/effect/spawner/random/pool/spaceloot/mechtransport_new/mecha + point_value = 100 + loot = list(/obj/mecha/combat/durand/old/mechtransport_new) + +/obj/effect/spawner/random/pool/spaceloot/mechtransport_new/mecha_equipment + point_value = 40 + spawn_all_loot = TRUE + loot = list( + /obj/item/mecha_parts/mecha_equipment/weapon/honker, + /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang, + /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg, + /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser, + ) + +/obj/effect/spawner/random/pool/spaceloot/modsuit_syndie/nuclear + point_value = 110 + spawn_loot_chance = 30 + loot = list(/obj/machinery/suit_storage_unit/syndicate) + +/obj/effect/spawner/random/pool/spaceloot/modsuit_syndie/corpse + loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando) + +/obj/effect/spawner/random/pool/spaceloot/syndicate/common_rare + loot = list( + /obj/effect/spawner/random/pool/spaceloot/syndicate/common = 3, + /obj/effect/spawner/random/pool/spaceloot/syndicate/rare = 2, + ) + +/obj/effect/spawner/random/pool/spaceloot/laser + point_value = 30 + spawn_loot_chance = 40 + loot = list( + /obj/item/gun/energy/laser, + /obj/item/gun/energy/laser/retro, + ) + +/obj/effect/spawner/random/pool/spaceloot/mining_tool + point_value = 15 + loot = list( + /obj/item/pickaxe = 50, + /obj/item/pickaxe/safety = 30, + /obj/item/pickaxe/mini = 20, + /obj/item/pickaxe/silver = 10, + /obj/item/pickaxe/gold = 9, + /obj/item/pickaxe/diamond = 7, + /obj/item/pickaxe/drill = 15, + /obj/item/pickaxe/drill/diamonddrill = 5, + /obj/item/pickaxe/drill/jackhammer = 3, + /obj/item/gun/energy/plasmacutter = 5, + /obj/item/gun/energy/plasmacutter/adv = 3, + /obj/item/kinetic_crusher = 3, + /obj/item/gun/energy/kinetic_accelerator = 3, + /obj/item/gun/energy/kinetic_accelerator/pistol = 3, + /obj/item/gun/energy/kinetic_accelerator/experimental, + ) + +/obj/effect/spawner/random/pool/spaceloot/security/modsuit + point_value = 75 + spawn_loot_chance = 45 + loot = list( + /obj/machinery/suit_storage_unit/security/space = 9, + /obj/machinery/suit_storage_unit/security/space/safeguard, + ) diff --git a/modular_ss220/maps220/code/RandomRuins/space/space_ruins.dm b/modular_ss220/maps220/code/RandomRuins/space/space_ruins.dm index 01eeb35f2dd86..4cd9ea88cb4c3 100644 --- a/modular_ss220/maps220/code/RandomRuins/space/space_ruins.dm +++ b/modular_ss220/maps220/code/RandomRuins/space/space_ruins.dm @@ -5,7 +5,6 @@ description = "Пример описания" // Описание руины. Видно только админам. prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" // Путь до карты, обязательно оставлять таким. suffix = "" // .dmm файл руины, вписывать название полностью, пример: suffix = "example.dmm". Саму карту закидывать в путь префикса. - // cost = 5 // Вес руины, чем он больше, тем меньше шанс что она заспавнится allow_duplicates = FALSE // Разрешает/Запрещает дубликаты руины. TRUE - могут быть дубликаты. FALSE - дубликатов не будет. always_place = TRUE // Если вписать эту строчку, руина будет спавнится всегда. Использовать ТОЛЬКО для теста! После удалить. ci_exclude = /datum/map_template/ruin/space/example // Это не использовать. @@ -18,7 +17,6 @@ description = "An abandoned unarmed transport ship, a perfect target for the bandit scum." prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "mechtransport_new.dmm" - // cost = 3 allow_duplicates = FALSE /datum/map_template/ruin/space/destroyed_infiltrator @@ -27,7 +25,6 @@ description = "They're loading BSA! But why? Ah, they're going to sho-..." prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "destroyed_infiltrator.dmm" - // cost = 3 allow_duplicates = FALSE /datum/map_template/ruin/space/transit_bar @@ -36,7 +33,6 @@ description = "One of the trillion bars in this galaxy, this one looks especially homey and comfy." prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "transit_bar.dmm" - // cost = 1 allow_duplicates = FALSE /datum/map_template/ruin/space/infected_ship @@ -45,7 +41,6 @@ description = "A lonely drifting ship showing no signs of life... What kind of black rubber substance is weaving around its shell?" prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "infected_ship.dmm" - // cost = 3 allow_duplicates = FALSE /datum/map_template/ruin/space/convoy_ambush @@ -54,7 +49,6 @@ description = "I've been waiting for this for twuh years!" prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "convoy_ambush.dmm" - // cost = 3 allow_duplicates = FALSE /datum/map_template/ruin/space/whiteship @@ -65,7 +59,6 @@ description = "An old, abandoned NT medical ship. Its computer can navigate to other landmarks within space with ease." allow_duplicates = FALSE always_place = TRUE - // cost = 0 /datum/map_template/ruin/space/whiteship/get_cost() return 0 @@ -76,7 +69,6 @@ description = "A small Vox skipjack near some space scrap. They will definitely not tolerate new rivals." prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "voxraiders_1.dmm" - // cost = 4 allow_duplicates = FALSE /datum/map_template/ruin/space/spacehotel @@ -85,7 +77,6 @@ description = "An interstellar hotel, where the weary spaceman can rest their head and relax, assured that the residental staff will not murder them in their sleep. Probably." prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "spacehotel.dmm" - // cost = 10 allow_duplicates = FALSE /datum/map_template/ruin/space/sierra_1_4 @@ -94,5 +85,4 @@ description = "Wreckage of the Sierra after a terrible incident" prefix = "_maps/map_files220/RandomRuins/SpaceRuins/" suffix = "sierra_1_4.dmm" - // cost = 20 я хуй знает как это тут сделать, так что похуй. allow_duplicates = FALSE diff --git a/modular_ss220/objects/_objects.dme b/modular_ss220/objects/_objects.dme index cb5e10211b8f2..20c9adda13695 100644 --- a/modular_ss220/objects/_objects.dme +++ b/modular_ss220/objects/_objects.dme @@ -45,6 +45,7 @@ #include "code/shuttle.dm" #include "code/smartfridge.dm" #include "code/spellbook.dm" +#include "code/suit_storage_unit.dm" #include "code/tribune.dm" #include "code/key.dm" #include "code/musician.dm" diff --git a/modular_ss220/objects/code/mecha/combat.dm b/modular_ss220/objects/code/mecha/combat.dm index 6c49ced534de8..cc7f9949f4982 100644 --- a/modular_ss220/objects/code/mecha/combat.dm +++ b/modular_ss220/objects/code/mecha/combat.dm @@ -104,6 +104,10 @@ icon = 'modular_ss220/objects/icons/mecha.dmi' icon_state = "darkdurand-broken" +// mechtransport_new space ruin mech +/obj/mecha/combat/durand/old/mechtransport_new + obj_integrity = 120 + #undef ERT_TYPE_AMBER #undef ERT_TYPE_RED #undef ERT_TYPE_GAMMA diff --git a/modular_ss220/objects/code/suit_storage_unit.dm b/modular_ss220/objects/code/suit_storage_unit.dm new file mode 100644 index 0000000000000..03d5059417bb8 --- /dev/null +++ b/modular_ss220/objects/code/suit_storage_unit.dm @@ -0,0 +1,6 @@ +// used in space ruins +/obj/machinery/suit_storage_unit/security/space + mask_type = null + +/obj/machinery/suit_storage_unit/security/space/safeguard + suit_type = /obj/item/mod/control/pre_equipped/safeguard