Skip to content

Commit

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

## Что этот PR делает
Мерж апстрима. 
- Потребуется ребилднуть TGUI у
#1573

## Changelog

:cl: ParadiseSS13
add: Священнику добавлено кадило. Находится в его шкафчике.
add: Добавлен мех "Nkarrdem" - специализированный мех для уборщика.
add: БСХ: Добавлено наложение пользовательского интерфейса,
срабатывающее при враждебном вмешательстве.
tweak: Гравген, консоль оповещения атмоса, консоль управления атмосом,
монитор камер инженерии, консоль оповещения станции теперь определяют
соответствующие области и устройства в зависимости от области, на
которой они размещены, вместо хардкод проверки того, что вещи находятся
на станции.
tweak: Пересмотр стартового снаряжения для шахтеров и исследователей.
Пересмотр наполнения их вендоров. Подробная информация
[здесь](ParadiseSS13#26525).
tweak: Assault belt теперь может вмещать вещи СБ. Security belt теперь
можно хранить рацию, а security webbing и judo belt стали немного
вместительнее.
tweak: Стиль сообщений в окошках examine, admin/mentor pm/ticket и
прочие немного обновили свой дизайн.
tweak: БСХ: Заменена система уровней на прямой ввод энергии.
fix: БСХ: Исправлена ошибка, из-за которой на высоких уровнях мощности
спавнилось недостаточное количество дополнительных порталов.
fix: Атмосферные тревоги теперь правильно отображаются на своих консолях
атмоса.
fix: Аномалии СМ больше не генерируются внутри структур.
fix: Фрукты Банго теперь можно мутировать из какао.
fix: Магботы теперь работают как и задумано - будучи надетыми.
fix: Исправлены невидимые мобы советов.
fix: Исправление ошибок, связанных с тем, что машинерия не
регистрировались в новой зоне powernet.
fix: Исправлено единоразовое (вместо постоянного) проигрывание анимации
левитации при отсутствии гравитации.
fix: Малф ИИ больше не присваивается Синди-организация. Без геймплейных
изменений.
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->
  • Loading branch information
@Legendaxe
Legendaxe authored Oct 13, 2024
2 parents 95c0580 + d857015 commit d7d9e5a
Show file tree
Hide file tree
Showing 118 changed files with 2,188 additions and 2,159 deletions.
9 changes: 6 additions & 3 deletions _maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2666,6 +2666,7 @@
/area/ruin/space/deepstorage)
"pk" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/salvage/ruin/soviet,
/obj/structure/rack,
/obj/item/stack/spacecash/c500,
/obj/effect/spawner/lootdrop/bluespace_tap/cultural,
Expand Down Expand Up @@ -3533,7 +3534,7 @@
},
/area/ruin/space/deepstorage)
"vo" = (
/obj/item/salvage/ruin/russian,
/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -3940,6 +3941,8 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/deepstorage)
"ye" = (
/obj/structure/table/reinforced,
/obj/item/salvage/ruin/soviet,
/obj/structure/rack,
/obj/item/grenade/confetti,
/obj/item/grenade/confetti,
Expand Down Expand Up @@ -4815,7 +4818,7 @@
/obj/structure/railing{
dir = 8
},
/obj/item/salvage/ruin/russian,
/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -6188,7 +6191,7 @@
/area/ruin/space/unpowered)
"Og" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/salvage/ruin/russian,
/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plasteel,
/area/ruin/space/deepstorage)
"Oh" = (
Expand Down
14 changes: 7 additions & 7 deletions _maps/map_files/RandomRuins/SpaceRuins/dj.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,11 +310,11 @@
"aQ" = (
/obj/structure/rack,
/obj/item/clothing/suit/space/syndicate/orange{
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Security Suit"
},
/obj/item/clothing/head/helmet/space/syndicate/orange{
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Security Helmet"
},
/obj/item/clothing/mask/breath,
Expand Down Expand Up @@ -367,7 +367,7 @@
pixel_y = 28
},
/obj/machinery/economy/vending/cigarette/free{
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -512,7 +512,7 @@
/area/ruin/space/djstation)
"bp" = (
/obj/structure/chair/office/light,
/mob/living/simple_animal/hostile/russian/ranged/mosin,
/mob/living/simple_animal/hostile/soviet/ranged/mosin,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/djstation)
"bq" = (
Expand Down Expand Up @@ -583,7 +583,7 @@
pixel_y = 17
},
/obj/item/phone{
desc = "An old Russian phone. The dial tone is still humming.";
desc = "An old Soviet phone. The dial tone is still humming.";
name = "spin-dial phone";
pixel_x = 1;
pixel_y = 1
Expand Down Expand Up @@ -797,11 +797,11 @@
/area/ruin/space/djstation)
"yr" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/salvage/ruin/russian,
/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plating,
/area/ruin/space/djstation)
"Zp" = (
/obj/item/salvage/ruin/russian,
/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plating,
/area/ruin/space/djstation)

Expand Down
56 changes: 28 additions & 28 deletions _maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
"aL" = (
/obj/structure/table/reinforced,
/obj/item/phone{
desc = "An old Russian phone. The dial tone is still humming.";
desc = "An old Soviet phone. The dial tone is still humming.";
name = "spin-dial phone"
},
/turf/simulated/floor/plasteel{
Expand All @@ -272,7 +272,7 @@
/obj/structure/chair/comfy/red{
dir = 1
},
/mob/living/simple_animal/hostile/russian/ranged/mosin,
/mob/living/simple_animal/hostile/soviet/ranged/mosin,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/bridge)
"aN" = (
Expand Down Expand Up @@ -317,7 +317,7 @@
/area/ruin/space/derelict/bridge)
"aS" = (
/obj/machinery/economy/vending/cigarette/free{
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
},
/turf/simulated/floor/plasteel{
dir = 9;
Expand Down Expand Up @@ -351,11 +351,11 @@
"aX" = (
/obj/structure/closet/cabinet,
/obj/item/clothing/suit/space/syndicate/blue{
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Command Suit"
},
/obj/item/clothing/head/helmet/space/syndicate/blue{
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Command Helmet"
},
/turf/simulated/floor/wood,
Expand Down Expand Up @@ -725,7 +725,7 @@
/area/ruin/space/derelict/arrival)
"bU" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/salvage/ruin/russian,
/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
Expand Down Expand Up @@ -880,7 +880,7 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"cp" = (
/obj/item/salvage/ruin/russian,
/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
Expand Down Expand Up @@ -953,11 +953,11 @@
"cz" = (
/obj/structure/rack,
/obj/item/clothing/suit/space/syndicate/orange{
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Security Suit"
},
/obj/item/clothing/head/helmet/space/syndicate/orange{
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Security Helmet"
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -1410,7 +1410,7 @@
/obj/item/pen,
/obj/structure/window/reinforced,
/obj/machinery/newscaster{
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station.";
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station.";
layer = 3.3;
name = "custom placement";
pixel_x = 27
Expand Down Expand Up @@ -1831,7 +1831,7 @@
/area/ruin/space/derelict/crew_quarters)
"eH" = (
/obj/machinery/newscaster{
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station.";
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station.";
layer = 3.3;
name = "custom placement";
pixel_x = 30
Expand Down Expand Up @@ -2269,7 +2269,7 @@
desc = "This guy seemed to have died in terrible way! Half his remains are dust.";
name = "Human remains"
},
/mob/living/simple_animal/hostile/russian/ranged/mosin,
/mob/living/simple_animal/hostile/soviet/ranged/mosin,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/arrival)
"fF" = (
Expand Down Expand Up @@ -2380,7 +2380,7 @@
name = "suspicious button"
},
/obj/machinery/economy/vending/cigarette/free{
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
},
/obj/effect/landmark/damageturf,
/turf/simulated/floor/wood,
Expand Down Expand Up @@ -3028,7 +3028,7 @@
/area/ruin/space/derelict/hallway/primary)
"hC" = (
/obj/structure/chair/stool,
/mob/living/simple_animal/hostile/russian,
/mob/living/simple_animal/hostile/soviet,
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/hallway/primary)
"hD" = (
Expand Down Expand Up @@ -3102,7 +3102,7 @@
"hM" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/economy/vending/cigarette/free{
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
},
/turf/simulated/floor/plasteel{
dir = 5;
Expand Down Expand Up @@ -3278,11 +3278,11 @@
"ik" = (
/obj/structure/rack,
/obj/item/clothing/head/helmet/space/syndicate/black/engie{
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Engineering Helmet"
},
/obj/item/clothing/suit/space/syndicate/black/engie{
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to Space Russia!";
desc = "This spacesuit is emblazoned with the emblem of the USSP. Glory to the Union!";
name = "Cosmonaut Engineering Suit"
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -3635,7 +3635,7 @@
/area/ruin/space/derelict/arrival)
"jj" = (
/obj/item/paper/djstation{
info = "Fuck. Fuckfuckfuck. I knew this mission was a mistake, that idiot Thomas got himself killed by some angry Russian security bot in the armoury, and the Lt. ran into the annex like a moron and got himself trapped. Now I'm just sitting on my god damn hands because this shuttle won't bloody move. Stupid USSP piece of shit docking arm must be jammed and I don't have the kit to go out and fix it.<br><br>Who the hell attacks a space station without EVA gear anyways? It's not like you can just bloody well waltz out into space with a hot coffee and shrug it off.";
info = "Fuck. Fuckfuckfuck. I knew this mission was a mistake, that idiot Thomas got himself killed by some angry commie security bot in the armoury, and the Lt. ran into the annex like a moron and got himself trapped. Now I'm just sitting on my god damn hands because this shuttle won't bloody move. Stupid USSP piece of shit docking arm must be jammed and I don't have the kit to go out and fix it.<br><br>Who the hell attacks a space station without EVA gear anyways? It's not like you can just bloody well waltz out into space with a hot coffee and shrug it off.";
name = "unknown report"
},
/turf/simulated/floor/mineral/plastitanium/red,
Expand Down Expand Up @@ -4291,7 +4291,7 @@
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/russian,
/mob/living/simple_animal/hostile/soviet,
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"kF" = (
Expand Down Expand Up @@ -4629,7 +4629,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/arrival)
"lw" = (
/obj/structure/statue/russian_mulebot,
/obj/structure/statue/soviet_mulebot,
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/arrival)
"lx" = (
Expand Down Expand Up @@ -4995,7 +4995,7 @@
"mx" = (
/obj/structure/closet/crate/can,
/obj/item/clothing/under/costume/mankini{
desc = "No honest Russian would wear this abomination";
desc = "No honest comrade would wear this abomination";
name = "lucky underwear"
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -5174,7 +5174,7 @@
/area/space/nearstation)
"mY" = (
/obj/machinery/economy/vending/cigarette/free{
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
},
/turf/simulated/floor/plasteel{
icon_state = "bar"
Expand Down Expand Up @@ -5967,7 +5967,7 @@
desc = "An issue of The Griffon. Was Nanotrasen supplying this station at some point?"
},
/obj/machinery/newscaster{
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station.";
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station.";
layer = 3.3;
name = "custom placement";
pixel_x = 27
Expand Down Expand Up @@ -6402,7 +6402,7 @@
/area/ruin/space/derelict/arrival)
"ql" = (
/obj/machinery/economy/vending/cigarette/free{
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Russian cigarette!","Cigarettes! Now with 100% less capitalism.")
slogan_list = list("Just remember! No capitalist.","Best enjoyed with Vodka!.","Smoke!","Nine out of ten USSP scientists agree, smoking reduces stress!","There's no cigarette like a Soviet cigarette!","Cigarettes! Now with 100% less capitalism.")
},
/turf/simulated/floor/plasteel{
icon_state = "redfull"
Expand Down Expand Up @@ -6498,7 +6498,7 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/newscaster{
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Russian station.";
desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. Strange that it's on a Union station.";
layer = 3.3;
name = "custom placement";
pixel_x = 27
Expand Down Expand Up @@ -6942,7 +6942,7 @@
/obj/structure/statue/diamond/captain{
anchored = 1;
desc = "A statue in honour of those who rose against the tyranny of the Trans-Solar Federation in 2443.";
icon_state = "russian";
icon_state = "soviet";
layer = 4;
name = "Cygni Commemorative Statue";
pixel_y = 16
Expand Down Expand Up @@ -7400,7 +7400,7 @@
/area/ruin/space/derelict/solar_control)
"sv" = (
/obj/item/gps/ruin{
gpstag = "Russian Distress Signal"
gpstag = "Soviet Distress Signal"
},
/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal,
/area/ruin/space/derelict/arrival)
Expand Down Expand Up @@ -7469,7 +7469,7 @@
/obj/structure/chair/wood{
dir = 4
},
/mob/living/simple_animal/hostile/russian,
/mob/living/simple_animal/hostile/soviet,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/derelict/crew_quarters)
"Ye" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
/turf/template_noop,
/area/template_noop)
"R" = (
/obj/item/salvage/ruin/russian,
/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plating/airless,
/area/ruin/space/derelict/teleporter)
"U" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files220/RandomRuins/SpaceRuins/convoy_ambush.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@
},
/area/ruin/space/unpowered/unpowered_structures)
"FP" = (
/obj/item/salvage/ruin/russian,
/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/mineral/plastitanium/red,
/area/ruin/space/unpowered/unpowered_structures)
"FZ" = (
Expand Down
6 changes: 3 additions & 3 deletions _maps/map_files220/RandomZLevels/beach.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@
/area/awaymission/beach)
"mP" = (
/obj/effect/decal/cleanable/cobweb2,
/obj/item/salvage/ruin/russian,
/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plating,
/area/awaymission/beach)
"mQ" = (
Expand Down Expand Up @@ -1888,7 +1888,7 @@
/turf/simulated/floor/beach/away/sand_alternative,
/area/awaymission/beach)
"zw" = (
/obj/item/salvage/ruin/russian,
/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/beach/away/sand_alternative,
/area/awaymission/beach)
"zF" = (
Expand Down Expand Up @@ -2619,7 +2619,7 @@
/area/awaymission/beach)
"Iz" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/salvage/ruin/russian,
/obj/item/salvage/ruin/soviet,
/turf/simulated/floor/plating,
/area/awaymission/beach)
"IA" = (
Expand Down
Loading

0 comments on commit d7d9e5a

Please sign in to comment.