Skip to content

Commit

Permalink
Migrate lootdrop spawners to random spawners (#1543)
Browse files Browse the repository at this point in the history
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает
Рефакторит спавнеры лута под новый тип `/obj/effect/spawner/random` в
рамках избавления от легаси `/obj/effect/spawner/lootdrop`.
Фиксит лут у симпл воксов, который я случайно сломал во время мержа
апстрима.

## Почему это хорошо для игры
Баги плохо, новые технологии - хорошо.

## Тестирование
Поспавнил всякого, вроде спавнится, воксы дропают лут.

## Changelog

:cl: Maxiemar
tweak: Спавнеры лута мусора переведены на новую логику. Лут почти тот
же.
fix: Из симпл воксов снова корректно выпадает лут.
/:cl:
  • Loading branch information
m-dzianishchyts authored Sep 23, 2024
1 parent 99a1c42 commit a01a8c7
Show file tree
Hide file tree
Showing 16 changed files with 400 additions and 373 deletions.
6 changes: 3 additions & 3 deletions _maps/map_files220/RandomRuins/LavaRuins/cheesus_temple.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
/turf/simulated/floor/wood/fancy/oak,
/area/ruin/powered/cheesus)
"cr" = (
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/random/trash,
/turf/simulated/floor/wood/fancy/oak,
/area/ruin/powered/cheesus)
"cV" = (
Expand Down Expand Up @@ -87,7 +87,7 @@
/area/ruin/powered/cheesus)
"fK" = (
/obj/structure/table/wood/fancy/orange,
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/random/trash,
/turf/simulated/floor/wood/fancy/oak,
/area/ruin/powered/cheesus)
"gh" = (
Expand Down Expand Up @@ -199,7 +199,7 @@
/obj/effect/turf_decal/siding/yellow{
dir = 5
},
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/random/trash,
/obj/effect/landmark/damageturf,
/turf/simulated/floor/wood/fancy/oak,
/area/ruin/powered/cheesus)
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files220/RandomRuins/LavaRuins/scp_facility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/powered/scpfacility)
"wa" = (
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/random/trash,
/turf/simulated/floor/plasteel/lavaland_air{
icon_state = "cmo"
},
Expand Down
20 changes: 10 additions & 10 deletions _maps/map_files220/RandomZLevels/beach.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -652,8 +652,8 @@
pixel_x = 3
},
/obj/structure/closet/crate/can,
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/random/trash,
/obj/effect/spawner/random/trash,
/turf/simulated/floor/plasteel/white{
icon_state = "white_large"
},
Expand Down Expand Up @@ -3594,11 +3594,11 @@
"Vp" = (
/obj/machinery/light/directional/north,
/obj/structure/closet/crate/can,
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/random/trash,
/obj/effect/spawner/random/trash,
/obj/effect/spawner/random/trash,
/obj/effect/spawner/random/trash,
/obj/effect/spawner/random/trash,
/turf/simulated/floor/plasteel{
icon_state = "dark_diagonal"
},
Expand Down Expand Up @@ -3998,9 +3998,9 @@
"ZV" = (
/obj/item/trash/candy,
/obj/structure/closet/crate/secure/bin,
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/random/trash,
/obj/effect/spawner/random/trash,
/obj/effect/spawner/random/trash,
/turf/simulated/floor/carpet/arcade,
/area/awaymission/beach)
"ZZ" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files220/RandomZLevels/caves.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@
/area/awaymission/caves)
"dp" = (
/obj/structure/closet/crate,
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/random/trash,
/obj/machinery/light_construct/small/west,
/turf/simulated/floor/plasteel/lavaland_air{
icon_state = "dark"
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files220/RandomZLevels/gate_lizard.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7685,7 +7685,7 @@
"jVr" = (
/obj/structure/closet/crate,
/obj/effect/spawner/random_spawners/dirt_maybe,
/obj/effect/spawner/lootdrop/trash,
/obj/effect/spawner/random/trash,
/turf/simulated/floor/plasteel,
/area/awaymission/jungle_planet/inside)
"jVL" = (
Expand Down
Loading

0 comments on commit a01a8c7

Please sign in to comment.