Skip to content

Commit

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

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

## Changelog

:cl:
add: Мержим оффов.
fix: Гравген теперь не может быть уничтожен ИИ с помощью Machine
Overload/Override.
fix: Исправлена проблема со спрайтом Qani-Laaca Sensory Computer.
fix: Голопроектор детектива теперь помещается на пояс СБ.
fix: АВД снова может попасть в карго.
fix: В Нанобанке теперь можно ввести пин-код больше 10000.
tweak: Отрубать конечности теперь проще, если цель мертва.
tweak: Недостающие доступы 'Cargo Bay' and 'Supply Shuttle' были
добавлены в консоль идентификации.
tweak: Моды Синдиката теперь полностью защищают от радиации.
imageadd: Спрайты терминала гостевых пропусков и Nano-Mob Hunter GO!
были перерисованы.
tweak: Инженерные борги теперь должны пополнять запасы металла и стекла
в печи. Можно это быстро сделать, кликнув по печи с активным устройством
захвата.
tweak: Листья окопника и алое теперь называются компрессами, имеют новое
описание и спрайты.
soundadd: Компресс с алое издает звук при броске или использовании.
tweak: Иконки в TGUI были обновлены.
fix: Передвижение персонажа стало плавнее.
fix: Ассистенты теперь не могут случайно получить магический комбинезон
раундстартом.
fix: Исправлен баг с исчезновением тела при случайном его помещении
фултоном в телепорт.
cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->
  • Loading branch information
Legendaxe authored Mar 16, 2024
2 parents 87c611c + 544eb5d commit 223bc9d
Show file tree
Hide file tree
Showing 100 changed files with 5,618 additions and 4,967 deletions.
1,164 changes: 479 additions & 685 deletions _maps/map_files/Delta/delta.dmm

Large diffs are not rendered by default.

1,734 changes: 908 additions & 826 deletions _maps/map_files/MetaStation/MetaStation.dmm

Large diffs are not rendered by default.

211 changes: 78 additions & 133 deletions _maps/map_files/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,22 @@
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"aJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/stack/ore{
pixel_y = -9;
pixel_x = -6
},
/obj/effect/landmark/burnturf,
/obj/structure/disposalpipe/segment/corner{
dir = 1
},
/turf/simulated/floor{
temperature = 500;
oxygen = 8;
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"aM" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -145,9 +161,8 @@
/area/ruin/unpowered/althland_processing)
"dh" = (
/obj/effect/mapping_helpers/no_lava,
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
/obj/structure/disposalpipe/segment/corner{
dir = 1
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
Expand Down Expand Up @@ -293,23 +308,12 @@
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"gC" = (
/obj/effect/decal/cleanable/dirt,
"gw" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery/white/partial,
/obj/machinery/light_construct/small{
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
/obj/effect/decal/cleanable/glass,
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
},
/obj/machinery/mineral/processing_unit_console{
pixel_y = -2;
pixel_x = -29
},
/turf/simulated/floor/plasteel{
temperature = 500;
oxygen = 8;
Expand Down Expand Up @@ -515,10 +519,9 @@
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"ms" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
"mv" = (
/obj/structure/disposalpipe/segment/corner{
dir = 1
},
/turf/simulated/floor{
temperature = 500;
Expand Down Expand Up @@ -784,6 +787,16 @@
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"tH" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
/turf/simulated/floor{
temperature = 500;
oxygen = 8;
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"tS" = (
/obj/effect/mapping_helpers/no_lava,
/obj/effect/mapping_helpers/no_lava,
Expand Down Expand Up @@ -958,23 +971,6 @@
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"zq" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/stack/ore{
pixel_y = -9;
pixel_x = -6
},
/obj/effect/landmark/burnturf,
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/simulated/floor{
temperature = 500;
oxygen = 8;
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"zv" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -1259,6 +1255,20 @@
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"Es" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/item/stack/ore/plasma,
/obj/structure/disposalpipe/segment/corner{
dir = 2
},
/obj/effect/landmark/burnturf,
/turf/simulated/floor{
temperature = 500;
oxygen = 8;
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"Fa" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand All @@ -1284,6 +1294,28 @@
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"FW" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery/white/partial,
/obj/machinery/light_construct/small{
dir = 8
},
/obj/effect/decal/cleanable/glass,
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
/obj/machinery/mineral/processing_unit_console{
pixel_y = -2;
pixel_x = -29
},
/turf/simulated/floor/plasteel{
temperature = 500;
oxygen = 8;
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"FX" = (
/obj/structure/disposalpipe/broken{
dir = 4
Expand Down Expand Up @@ -1332,17 +1364,6 @@
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"Gz" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor{
temperature = 500;
oxygen = 8;
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"GF" = (
/obj/effect/mapping_helpers/no_lava,
/obj/effect/decal/cleanable/glass,
Expand All @@ -1359,27 +1380,11 @@
/area/ruin/unpowered/althland_processing)
"Hj" = (
/obj/effect/mapping_helpers/no_lava,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
/obj/structure/disposalpipe/segment/corner{
dir = 2
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"Hp" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/item/stack/ore/plasma,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/obj/effect/landmark/burnturf,
/turf/simulated/floor{
temperature = 500;
oxygen = 8;
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"Hs" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/baseturf_helper/lava/mapping_lava,
Expand Down Expand Up @@ -1588,6 +1593,17 @@
nitrogen = 14
},
/area/lavaland/surface/outdoors)
"Mu" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
temperature = 500;
oxygen = 8;
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"Mw" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -1623,18 +1639,6 @@
nitrogen = 14
},
/area/lavaland/surface/outdoors)
"Nu" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
temperature = 500;
oxygen = 8;
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"Og" = (
/obj/structure/girder,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -1826,19 +1830,6 @@
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"UU" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/floor/plasteel{
temperature = 500;
oxygen = 8;
nitrogen = 14
},
/area/ruin/unpowered/althland_processing)
"Vj" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -2088,9 +2079,8 @@
"ZB" = (
/obj/effect/mapping_helpers/no_lava,
/obj/effect/mapping_helpers/no_lava,
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
/obj/structure/disposalpipe/segment/corner{
dir = 2
},
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
Expand Down Expand Up @@ -2350,7 +2340,7 @@ ZB
hc
Pn
fv
zq
aJ
ui
ab
ab
Expand Down Expand Up @@ -2421,8 +2411,8 @@ ab
af
ui
Ec
gC
UU
FW
gw
ui
ab
ab
Expand Down Expand Up @@ -2509,7 +2499,7 @@ bT
af
TX
rw
ms
mv
ui
bT
ab
Expand Down Expand Up @@ -2581,7 +2571,7 @@ ui
vf
Yt
uC
Gz
tH
ui
bT
bT
Expand Down Expand Up @@ -2781,7 +2771,7 @@ cb
ab
Au
WQ
Hp
Es
fd
ui
ab
Expand Down Expand Up @@ -3004,7 +2994,7 @@ ui
Dp
fY
hY
Nu
Mu
ui
af
af
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -301,9 +301,8 @@
/turf/simulated/floor/plasteel/freezer,
/area/ruin/powered/seedvault)
"DZ" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
/turf/simulated/floor/plasteel/freezer,
/area/ruin/powered/seedvault)
Expand Down Expand Up @@ -380,9 +379,8 @@
/turf/simulated/floor/plasteel/freezer,
/area/ruin/powered/seedvault)
"OL" = (
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
/obj/structure/disposalpipe/segment/corner{
dir = 1
},
/turf/simulated/floor/plasteel/freezer,
/area/ruin/powered/seedvault)
Expand Down
15 changes: 6 additions & 9 deletions _maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,8 @@
},
/area/ruin/space/abandoned_engi_sat)
"cK" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
/obj/effect/spawner/random_spawners/wall_rusted_probably,
/turf/simulated/wall,
Expand Down Expand Up @@ -243,9 +242,8 @@
/turf/simulated/floor/carpet/airless,
/area/ruin/space/abandoned_engi_sat)
"hE" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
/turf/template_noop,
/area/template_noop)
Expand Down Expand Up @@ -927,9 +925,8 @@
},
/area/ruin/space/abandoned_engi_sat)
"De" = (
/obj/structure/disposalpipe/segment{
dir = 4;
icon_state = "pipe-c"
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall/r_wall,
Expand Down
Loading

0 comments on commit 223bc9d

Please sign in to comment.