Skip to content

Commit

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

## Что этот PR делает
Мергес апстрим.

## Changelog

:cl: ParadiseSS13
add: Система спавна лута в технических тоннелях переработана. В пул
добавлено больше разных предметов. Шанс спавна лута может быть уменьшен
или увеличен станционными трейтами.
tweak: Боевой модуль борга теперь имеет мини огнетушитель.
tweak: Перемещение сопротивляющегося персонажа на стуле или в заваренном
шкафу больше не приводит к сбросу прогресса его сопротивления.
tweak: Скорость переворачивания стола мобом теперь зависит от его
размера.
tweak: Напитки клоунов и мимов теперь хилят КПБ клоунов и мимов тоже
соответственно.
tweak: Научная ценность адбукторских инструментов уборщика снижена с 3
до 2, что не позволит получить инженерные инструменты.
tweak: Отражатели теперь должны быть прикручены, чтобы отражать.
tweak: Хп отражателей снижено с 300 до 50.
tweak: Время прикручивания отражателей увеличено с 2 до 5 секунд.
tweak: Вортекс аномалия стала опаснее: увеличенные радиус действия и
разрушительность.
imageadd: Дипломат теперь отображается у персонажа в руках.
fix: Дымовые гранаты больше не создают аномалии с освещением.
fix: Обычные контейнеры с бумагой больше не имеют опции "Letterhead".
fix: Хранилища МОДсьюитов больше не становится окровавленными и не
приводят к вечно окровавленным рукам.
fix: Кухонную технику больше нельзя активировать через всю комнату альт
кликом.
fix: Спреи больше не используются при клике на МОДсьюит.
fix: Покрашенные в стиральной машине вещи больше не невидимы при
ношении.
fix: Загрузка нескольких наборов законов ИИ теперь не приводит к законам
с одинаковыми приоритетами.
/:cl:
  • Loading branch information
Legendaxe authored Aug 29, 2024
2 parents 585ed42 + c1b0fb0 commit 9bc25fb
Show file tree
Hide file tree
Showing 136 changed files with 5,167 additions and 4,695 deletions.
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@
},
/obj/structure/rack,
/obj/item/melee/baton/cattleprod,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/casino.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@
/obj/structure/rack{
dir = 1
},
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/ruin/space/powered/casino/security)
"pB" = (
Expand Down
74 changes: 37 additions & 37 deletions _maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@
/area/ruin/space/deepstorage)
"cU" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
Expand Down Expand Up @@ -1079,7 +1079,7 @@
/area/ruin/space/deepstorage)
"eI" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
Expand Down Expand Up @@ -1211,7 +1211,7 @@
dir = 1
},
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "podfloor"
Expand Down Expand Up @@ -1259,7 +1259,7 @@
dir = 4
},
/obj/machinery/light/small,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
Expand Down Expand Up @@ -1462,7 +1462,7 @@
dir = 4
},
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "whiteredcorner";
dir = 1
Expand Down Expand Up @@ -1495,7 +1495,7 @@
/area/ruin/space/deepstorage)
"hK" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/obj/structure/sign/poster/contraband/power{
pixel_x = -32
},
Expand Down Expand Up @@ -1619,7 +1619,7 @@
/obj/structure/window/reinforced/polarized{
dir = 4
},
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
Expand Down Expand Up @@ -1742,7 +1742,7 @@
/area/ruin/space/deepstorage)
"jq" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/ruin/space/deepstorage)
"jr" = (
Expand Down Expand Up @@ -1946,7 +1946,7 @@
/obj/structure/window/reinforced/polarized{
dir = 4
},
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/cobweb,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -1981,7 +1981,7 @@
"kG" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "podfloor"
Expand Down Expand Up @@ -2093,7 +2093,7 @@
dir = 1
},
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
Expand All @@ -2111,12 +2111,12 @@
dir = 6
},
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"lL" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 1
},
Expand Down Expand Up @@ -2539,7 +2539,7 @@
dir = 4
},
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "darkredcorners";
dir = 4
Expand Down Expand Up @@ -2593,7 +2593,7 @@
/obj/structure/railing/corner,
/obj/structure/rack,
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
Expand Down Expand Up @@ -2757,7 +2757,7 @@
/area/ruin/space/deepstorage)
"qa" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 8
},
Expand Down Expand Up @@ -2860,7 +2860,7 @@
/area/ruin/space/deepstorage)
"qQ" = (
/obj/structure/closet/crate/can,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -3011,15 +3011,15 @@
/area/ruin/space/deepstorage)
"rQ" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
},
/area/ruin/space/deepstorage)
"rS" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "dark"
Expand Down Expand Up @@ -3145,15 +3145,15 @@
/obj/structure/window/reinforced/polarized{
dir = 4
},
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
},
/area/ruin/space/deepstorage)
"sY" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "podfloor"
Expand All @@ -3169,7 +3169,7 @@
/area/ruin/space/unpowered)
"ta" = (
/obj/structure/table/glass,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "whiteredcorner"
},
Expand Down Expand Up @@ -3348,7 +3348,7 @@
/area/ruin/space/deepstorage)
"tH" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 5;
Expand Down Expand Up @@ -3409,7 +3409,7 @@
/area/ruin/space/deepstorage)
"tZ" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
Expand Down Expand Up @@ -4657,7 +4657,7 @@
/area/ruin/space/deepstorage)
"Cl" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 10;
Expand Down Expand Up @@ -4770,7 +4770,7 @@
"CZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "black"
Expand Down Expand Up @@ -5233,7 +5233,7 @@
/area/ruin/space/unpowered)
"GE" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
Expand Down Expand Up @@ -5465,7 +5465,7 @@
/area/ruin/space/deepstorage)
"IJ" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -5957,7 +5957,7 @@
"Mb" = (
/obj/structure/railing,
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"Mf" = (
Expand Down Expand Up @@ -6166,7 +6166,7 @@
/area/ruin/space/deepstorage)
"Ob" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "black"
Expand Down Expand Up @@ -6283,7 +6283,7 @@
/obj/structure/window/reinforced/polarized{
dir = 4
},
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 10;
Expand Down Expand Up @@ -6412,7 +6412,7 @@
/area/ruin/space/deepstorage)
"PU" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/obj/machinery/light/small{
dir = 4
},
Expand Down Expand Up @@ -6596,7 +6596,7 @@
dir = 10
},
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating,
/area/ruin/space/deepstorage)
"Rc" = (
Expand Down Expand Up @@ -7108,7 +7108,7 @@
/area/ruin/space/unpowered)
"UM" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
icon_state = "darkredcorners";
dir = 1
Expand Down Expand Up @@ -7529,7 +7529,7 @@
dir = 1
},
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "vault"
Expand Down Expand Up @@ -7614,7 +7614,7 @@
/area/ruin/space/deepstorage)
"XN" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
Expand Down Expand Up @@ -7905,7 +7905,7 @@
"ZS" = (
/obj/effect/decal/cleanable/cobweb2,
/obj/structure/rack,
/obj/effect/spawner/lootdrop/maintenance,
/obj/effect/spawner/random/maintenance,
/turf/simulated/floor/plating/asteroid/basalt,
/area/ruin/space/deepstorage)
"ZU" = (
Expand Down
Loading

0 comments on commit 9bc25fb

Please sign in to comment.