Skip to content

Commit

Permalink
Adjust modular space ruins with new loot system + minor tweaks (#1766)
Browse files Browse the repository at this point in the history
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает

Добавляет оффовские спавнеры лута в модульные руины.
Добавляет несколько новых, модульных спавнеров для определённых руин.
Добавляет тиреи на те наши руины, где присутствуют сейфы с лутом, чтобы
это было более очевидно для гейтеров и им не приходилось лезть в код
чтобы найти заветный сейф, который иначе никак не обнаружить.
Слегка передвигает одного из воксов на руине `voxraiders_1` и добавляет
ему стеклянный аирлок, чтобы он не игнорировал лутающегося рядом
гейтера.

<!-- Вкратце опишите изменения, которые вносите. -->
<!-- Опишите **все** изменения, так как противное может сказаться на
рассмотрении этого PR'а! -->
<!-- Если вы исправляете Issue, добавьте "Fixes #xxxx" (где xxxx - номер
Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после
принятия PR'а. -->

## Почему это хорошо для игры

Больше рандома = больше реиграбельности.

Пока без гейтов, но если всё норм, то гейты тоже можно будет зааджастить
позднее, как уже частично произошло со спейсбаттлом.

<!-- Опишите, почему, по вашему, следует добавить эти изменения в игру.
-->

## Тестирование

Поюзал все спавнеры на локалке, без проблем, вроде. Наверное, стоит
юзать в ТМе, пока не замержат #1764

<!-- Как вы тестировали свой PR, если делали это вовсе? -->

## Changelog

:cl:
tweak: Модульные руины обновлены в соответствии с недавним ребалансом
лута космоса с оффов.
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->

## Summary by Sourcery

Update modular space ruins with the new loot system.

New Features:
- Added off-station loot spawners to modular space ruins.
- Added new modular spawners for specific ruins.

Tests:
- Tested all spawners locally.
  • Loading branch information
kyunkyunkyun authored Feb 11, 2025
1 parent e050a6e commit f90d654
Show file tree
Hide file tree
Showing 14 changed files with 204 additions and 99 deletions.
24 changes: 16 additions & 8 deletions _maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -4816,7 +4824,7 @@ TA
wB
wB
wB
SA
LZ
RP
wr
wr
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -1598,7 +1594,7 @@ Ly
Ly
SK
Ly
zg
bi
jM
tO
SK
Expand Down
11 changes: 4 additions & 7 deletions _maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -1605,7 +1602,7 @@
amount = 1
},
/obj/structure/bed/nest,
/obj/effect/mob_spawn/human/corpse/syndicatecommando,
/obj/effect/spawner/random/pool/spaceloot/modsuit_syndie/corpse,
/turf/simulated/floor/plating,
/area/ruin/space/powered/requires_power_space)
"WR" = (
Expand Down
66 changes: 34 additions & 32 deletions _maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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"
Expand All @@ -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" = (
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand All @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -2871,9 +2873,9 @@ qU
qU
Sb
sD
Md
CX
sh
HB
pC
HB
LC
Kb
Expand Down Expand Up @@ -2929,7 +2931,7 @@ nk
VB
bR
sh
sh
CX
pm
vP
lf
Expand Down Expand Up @@ -3036,7 +3038,7 @@ qU
qU
Sb
Oh
HB
pC
HB
HB
GF
Expand Down Expand Up @@ -3091,8 +3093,8 @@ Sb
qU
Sb
Uu
sh
Md
mF
CX
HB
HB
nk
Expand Down Expand Up @@ -3893,7 +3895,7 @@ QD
SH
ir
rZ
BX
hw
CW
VO
QD
Expand Down
Loading

0 comments on commit f90d654

Please sign in to comment.