Skip to content

Commit

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

## Что этот PR делает
Мерж апстрима.
Блум хз когда вмержут, поэтому ждать не вижу смысла.

## Changelog

:cl: ParadiseSS13
add: Добавлено 2 новых pimp coat'а - один в вендоре и один специально
для КМа.
imageadd: Новые спрайты для существующего розового пальто.
tweak: Гусеницы Дион и Ниан при эволюции теряют "майндслейв/рабство" от
зелья разума.
tweak: Вы больше не можете помещать MMI, позитронные или
роботизированные мозги в аугментированный не IPC корпус. Теперь их можно
помещать только в корпус IPC или IRC.
add: Добавлена новая повседневная униформа - Greyman Henley, доступная в
лодауте и вендоре комбинезонов (контрабанда).
tweak: Титановая метла теперь не отражает дальнобойные снаряды.
tweak: Парирование титановой метлы теперь лучше.
fix: Теперь преобразование через Changeling Transform обновляет флавор
текст.
fix: Несколько руин на Лаваленде теперь питаются надлежащим образом.
fix: Исправлено, что вендоры не сообщали, кто кого в них толкнул.
fix: Вещи можно снова перебрасывать через столы.
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->
  • Loading branch information
Legendaxe authored Jul 4, 2024
2 parents bd29dae + e58601b commit a79e970
Show file tree
Hide file tree
Showing 52 changed files with 302 additions and 235 deletions.
28 changes: 14 additions & 14 deletions _maps/map_files/RandomRuins/LavaRuins/lavaland_surface_envy.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"d" = (
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/envy)
"e" = (
/obj/structure/mirror{
broken = 1;
Expand All @@ -23,7 +23,7 @@
/obj/effect/decal/cleanable/blood,
/obj/item/clothing/head/human_head,
/turf/simulated/floor/plating,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/envy)
"f" = (
/obj/structure/mirror{
broken = 1;
Expand All @@ -32,7 +32,7 @@
pixel_x = 28
},
/turf/simulated/floor/plating/burnt,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/envy)
"g" = (
/obj/effect/decal/cleanable/blood/tracks,
/obj/structure/mirror{
Expand All @@ -42,18 +42,18 @@
pixel_x = -28
},
/turf/simulated/floor/plating,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/envy)
"h" = (
/obj/effect/decal/cleanable/blood,
/turf/simulated/floor/plating,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/envy)
"i" = (
/turf/simulated/floor/plating,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/envy)
"j" = (
/obj/effect/decal/cleanable/blood/splatter,
/turf/simulated/floor/plating,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/envy)
"k" = (
/obj/structure/mirror{
broken = 1;
Expand All @@ -63,7 +63,7 @@
},
/obj/item/kitchen/knife/envy,
/turf/simulated/floor/plating,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/envy)
"l" = (
/obj/structure/mirror{
broken = 1;
Expand All @@ -72,7 +72,7 @@
pixel_x = 28
},
/turf/simulated/floor/plating,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/envy)
"m" = (
/obj/structure/mirror{
broken = 1;
Expand All @@ -81,10 +81,10 @@
pixel_x = -28
},
/turf/simulated/floor/plating,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/envy)
"n" = (
/turf/simulated/floor/plating/damaged,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/envy)
"o" = (
/obj/structure/mirror{
broken = 1;
Expand All @@ -93,16 +93,16 @@
pixel_x = -28
},
/turf/simulated/floor/plating/damaged,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/envy)
"p" = (
/obj/machinery/door/airlock/hatch,
/obj/structure/fans/tiny/invisible,
/turf/simulated/floor/plating,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/envy)
"q" = (
/obj/effect/baseturf_helper/lava/mapping_lava,
/turf/simulated/floor/plating,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/envy)
"A" = (
/obj/effect/mapping_helpers/no_lava,
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,34 @@
/area/template_noop)
"b" = (
/turf/simulated/wall/cult,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/fountain_hall)
"c" = (
/obj/structure/healingfountain,
/turf/simulated/floor/engine/cult,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/fountain_hall)
"d" = (
/obj/structure/fluff/divine/conduit,
/turf/simulated/floor/engine/cult,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/fountain_hall)
"e" = (
/obj/structure/sacrificealtar,
/turf/simulated/floor/engine/cult,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/fountain_hall)
"f" = (
/turf/simulated/floor/engine/cult,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/fountain_hall)
"g" = (
/mob/living/simple_animal/butterfly,
/turf/simulated/floor/engine/cult,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/fountain_hall)
"h" = (
/obj/structure/fans/tiny/invisible,
/turf/simulated/floor/engine/cult,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/fountain_hall)
"i" = (
/obj/effect/baseturf_helper/lava/mapping_lava,
/turf/simulated/floor/engine/cult,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/fountain_hall)

(1,1,1) = {"
a
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,41 @@
/area/lavaland/surface/outdoors)
"d" = (
/turf/simulated/wall,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"e" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"f" = (
/obj/structure/table/wood,
/obj/item/storage/box/cups,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"g" = (
/obj/structure/reagent_dispensers/water_cooler/pizzaparty,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"h" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"i" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"j" = (
/obj/item/food/snacks/mushroompizzaslice,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"k" = (
/obj/structure/table/wood,
/obj/effect/spawner/lootdrop/pizzaparty,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"l" = (
/obj/machinery/light{
dir = 4
Expand All @@ -55,32 +55,32 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"m" = (
/obj/item/chair/wood/wings,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"n" = (
/obj/structure/glowshroom,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"o" = (
/obj/item/trash/plate,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"p" = (
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"q" = (
/obj/item/chair/wood/wings,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"r" = (
/obj/structure/chair/wood/wings,
/obj/effect/decal/remains/human,
Expand All @@ -89,19 +89,19 @@
name = "party hat"
},
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"s" = (
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"t" = (
/obj/structure/chair/wood/wings,
/obj/effect/decal/remains/human,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"u" = (
/obj/structure/glowshroom,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"v" = (
/obj/structure/lattice,
/obj/item/chair/wood/wings,
Expand All @@ -111,92 +111,92 @@
/obj/item/kitchen/utensil/fork,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"x" = (
/obj/structure/table/wood,
/obj/effect/spawner/lootdrop/pizzaparty,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"y" = (
/obj/structure/table/wood,
/obj/item/trash/plate,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"z" = (
/obj/structure/table/wood,
/obj/structure/glowshroom,
/obj/item/a_gift,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"A" = (
/obj/structure/table/wood,
/obj/item/trash/plate,
/obj/item/kitchen/utensil/fork,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"B" = (
/obj/effect/baseturf_helper/lava/mapping_lava,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"C" = (
/obj/structure/chair/wood/wings{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"D" = (
/obj/structure/table/wood,
/obj/item/food/snacks/margheritapizzaslice,
/obj/item/trash/plate,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"E" = (
/obj/structure/table/wood,
/obj/item/food/snacks/meatpizzaslice,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"F" = (
/obj/structure/table/wood,
/obj/item/food/snacks/sliceable/birthdaycake,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"G" = (
/obj/structure/table/wood,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"H" = (
/obj/item/chair/wood/wings,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"I" = (
/obj/item/kitchen/utensil/fork,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"J" = (
/obj/structure/glowshroom,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"K" = (
/obj/structure/chair/wood/wings{
dir = 1
},
/obj/effect/decal/remains/human,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"L" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"M" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/a_gift,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"N" = (
/obj/structure/lattice,
/obj/effect/decal/cleanable/dirt,
Expand All @@ -206,17 +206,17 @@
/obj/item/kitchen/knife,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"P" = (
/obj/machinery/light{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)
"Q" = (
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/unpowered/misc_lavaruin)
/area/ruin/powered/pizza_party)

(1,1,1) = {"
a
Expand Down
Loading

0 comments on commit a79e970

Please sign in to comment.