Skip to content

Commit

Permalink
Merge Upstream 23.10.2024 (#1609)
Browse files Browse the repository at this point in the history
Надо бы Rust ребилднуть

## Changelog

:cl: ParadiseSS13
add: Плазмемы теперь могут надевать шляпу на шлем
add: Портированы юбки с TG
add: Спавнеры мусора теперь создают ещё и разные гильзы
tweak: Mining Vendor получил картинки в интерфейс
tweak: КПБ теперь получают уведомление когда могут воскреснуть
fix: КПБ могут войти в зарядник не имея микро-батарею
fix: Капканы решили что срабатывать на летающих людей не православно, и
теперь снова срабатывают только по ходячим
tweak: Love pen теперь содержит Pax вместо любви и медленно
восстанавливает этот реагент со временем. Короче, юзабельно + весело
теперь (с) Сиротка
tweak: Mole crush СМа теперь генерирует аномалии
fix: PACMAN показывает оставшееся время точно
tweak: Suit Storage Unit теперь может хранить рюкзак
tweak: Ящик РнД с карго, теперь содержит компоненты для создания сервера
РнД и его контроллера
fix: Позитронный мозг больше не будет предлагаться призракам если в нём
уже есть игрок
fix: Секботы больше не будут пиздить труп игнорируя всё вокруг
fix: Секботы в режиме задержания, будут действительно задерживать людей.
Вы больше не можете съебаться от него без сторонней помощи или антистана
tweak: Пушки теперь будут делать *клик* при навешивании фонарика/штыка
fix: Пушки больше не воспроизводят звук отвёртки когда не должны
tweak: Кристальный шар (scrying orb) наносит больше урона при броске,
возвращается в руку и ломает конечности, в которые попадает
fix: Добавлен strong arm в протолат к остальным имплантам
fix: [АДМИН] Если дать кому-то цель на кусочек СМа или ядро с нюки, то
этому кому-то будет выдан набор для выполнения цели
tweak: Закреплённые кнопки МОДа теперь показывает какой модуль активен
tweak: Модуль огнетушителя в продвинутых и атмосовых МОДах теперь может
быть активирован через кнопку быстрого доступа
fix: N23 Rotary Janitation Launcher теперь можно прикрутить к меху
уборщика
fix: Фейковые артефакты теперь выглядят в руках как настоящие
fix: Пластитановые окна теперь более устойчивы к способностям больших
мобов, которые ломали их с одного удара
fix: Новостник теперь распознаёт карту внутри кошелька
tweak: Коробки с патронами для дробовика теперь вмещают 8 пуль вместо 7
imageadd: Коробки с патронами для дробовика получили респрайт
imageadd: Новый спрайт луча БСА
imageadd: Все перчатки подогнаны под новый спрайт киданов (У нас новый
спрайт киданов откачен, временно)
imageadd: Респрайт ПДА by fridhelm1. Так же, магисрака, дефектив и самая
бесполезная роль (НТР), получили свой собственный спрайт для ПДА
/:cl:
  • Loading branch information
Legendaxe authored Oct 24, 2024
2 parents 258b294 + be1264e commit 565640a
Show file tree
Hide file tree
Showing 308 changed files with 10,884 additions and 7,745 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ $RECYCLE.BIN
*.swp

# Rust output.
/milla/target/*
/rust/target/*

# mkdocs output.
site
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
/turf/simulated/floor/plating/airless,
/area/ruin/space/sec_shuttle)
"c" = (
/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops,
/obj/machinery/door/airlock/external{
id_tag = "s_docking_airlock";
name = "Shuttle Hatch";
req_access_txt = "109"
name = "Shuttle Hatch"
},
/turf/simulated/floor/plasteel/airless{
icon_state = "dark"
Expand Down Expand Up @@ -176,10 +176,10 @@
},
/area/ruin/space/sec_shuttle)
"T" = (
/obj/effect/mapping_helpers/airlock/access/all/centcomm/specops,
/obj/machinery/door/airlock/external{
id_tag = "s_docking_airlock";
name = "Shuttle Hatch";
req_access_txt = "109"
name = "Shuttle Hatch"
},
/turf/simulated/floor/plating/airless,
/area/ruin/space/sec_shuttle)
Expand Down
91 changes: 39 additions & 52 deletions _maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,8 @@
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"aR" = (
/obj/machinery/door/airlock/highsecurity{
req_access_txt = "512"
},
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/highsecurity,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -771,9 +770,8 @@
},
/area/ruin/space/deepstorage)
"co" = (
/obj/machinery/door/airlock/hatch{
req_access_txt = "512"
},
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/hatch,
/obj/structure/barricade/wooden/crude{
layer = 4
},
Expand Down Expand Up @@ -1029,9 +1027,8 @@
},
/area/ruin/space/deepstorage)
"eq" = (
/obj/machinery/door/airlock/maintenance_hatch{
req_access_txt = "512"
},
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/maintenance_hatch,
/turf/simulated/floor/plating,
/area/ruin/space/deepstorage)
"es" = (
Expand Down Expand Up @@ -1440,8 +1437,8 @@
/turf/simulated/floor/plating,
/area/ruin/space/deepstorage)
"hp" = (
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/hatch{
req_access_txt = "512";
name = "Guard Wing"
},
/obj/structure/barricade/wooden/crude{
Expand Down Expand Up @@ -1692,8 +1689,8 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/deepstorage)
"jj" = (
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/highsecurity{
req_access_txt = "512";
name = "Guard Store Room"
},
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -1856,9 +1853,9 @@
/area/ruin/space/deepstorage)
"jT" = (
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/vault{
locked = 1;
req_access_txt = "512"
locked = 1
},
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
Expand Down Expand Up @@ -2170,9 +2167,8 @@
/obj/structure/barricade/wooden/crude{
layer = 4
},
/obj/machinery/door/airlock/centcom{
req_access_txt = "512"
},
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/centcom,
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"mf" = (
Expand Down Expand Up @@ -2690,8 +2686,8 @@
/turf/simulated/floor/plating/asteroid/basalt/airless,
/area/ruin/space/unpowered)
"pz" = (
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/command/glass{
req_access_txt = "512";
name = "Floor Administrator's Office"
},
/obj/effect/mapping_helpers/airlock/polarized{
Expand Down Expand Up @@ -2743,9 +2739,8 @@
/obj/structure/barricade/wooden/crude{
layer = 4
},
/obj/machinery/door/airlock/hatch{
req_access_txt = "512"
},
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/hatch,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "podfloor"
Expand Down Expand Up @@ -2975,9 +2970,8 @@
/area/ruin/space/deepstorage)
"rK" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/door/airlock/hatch{
req_access_txt = "512"
},
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/hatch,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "podfloor"
Expand Down Expand Up @@ -3777,9 +3771,8 @@
/turf/simulated/wall/indestructible/riveted,
/area/ruin/space/deepstorage)
"wH" = (
/obj/machinery/door/airlock/hatch{
req_access_txt = "512"
},
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/hatch,
/obj/machinery/door/poddoor/shutters/preopen{
dir = 2;
id_tag = "DS_Quartermaster"
Expand Down Expand Up @@ -3859,8 +3852,8 @@
},
/area/ruin/space/deepstorage)
"xC" = (
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/highsecurity{
req_access_txt = "512";
name = "Interrogation Room"
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -4111,9 +4104,9 @@
/turf/simulated/floor/mineral/titanium,
/area/ruin/space/deepstorage)
"zh" = (
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/highsecurity{
name = "Incinerator";
req_access_txt = "512"
name = "Incinerator"
},
/turf/simulated/floor/plasteel{
icon_state = "cult"
Expand Down Expand Up @@ -4172,9 +4165,9 @@
/turf/simulated/floor/plating,
/area/ruin/space/deepstorage)
"zy" = (
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/vault{
locked = 1;
req_access_txt = "512"
locked = 1
},
/obj/structure/fans/tiny,
/turf/simulated/floor/catwalk,
Expand All @@ -4195,9 +4188,8 @@
/obj/structure/barricade/wooden/crude{
layer = 4
},
/obj/machinery/door/airlock/hatch{
req_access_txt = "512"
},
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/hatch,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -4324,9 +4316,9 @@
/area/ruin/space/deepstorage)
"As" = (
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/vault{
name = "Auxiliary Power Room";
req_access_txt = "512"
name = "Auxiliary Power Room"
},
/obj/machinery/door/poddoor/multi_tile/impassable{
id_tag = "DS_Engineering"
Expand Down Expand Up @@ -4359,8 +4351,8 @@
},
/area/ruin/space/deepstorage)
"AA" = (
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/highsecurity{
req_access_txt = "512";
name = "Evidence Storage"
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -5373,9 +5365,8 @@
},
/area/ruin/space/deepstorage)
"Hx" = (
/obj/machinery/door/airlock/hatch{
req_access_txt = "512"
},
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/hatch,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -6902,9 +6893,8 @@
},
/area/ruin/space/deepstorage)
"To" = (
/obj/machinery/door/airlock/centcom{
req_access_txt = "512"
},
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/centcom,
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"Tq" = (
Expand All @@ -6930,9 +6920,8 @@
},
/area/ruin/space/deepstorage)
"TK" = (
/obj/machinery/door/airlock/highsecurity{
req_access_txt = "512"
},
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/highsecurity,
/obj/machinery/door/poddoor/multi_tile/impassable{
id_tag = "DS_Storage"
},
Expand Down Expand Up @@ -7008,9 +6997,8 @@
/obj/structure/barricade/wooden/crude{
layer = 4
},
/obj/machinery/door/airlock/highsecurity{
req_access_txt = "512"
},
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/highsecurity,
/obj/machinery/door/poddoor/multi_tile/impassable{
id_tag = "DS_Storage"
},
Expand Down Expand Up @@ -7925,9 +7913,8 @@
/turf/simulated/floor/engine/airless,
/area/ruin/space/unpowered)
"ZW" = (
/obj/machinery/door/airlock/hatch{
req_access_txt = "512"
},
/obj/effect/mapping_helpers/airlock/access/all/ruins/deepstorage,
/obj/machinery/door/airlock/hatch,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "podfloor"
Expand Down
16 changes: 8 additions & 8 deletions _maps/map_files/RandomRuins/SpaceRuins/listeningpost.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
/turf/simulated/floor/plating/airless,
/area/ruin/space/syndicate_listening_station/asteroid)
"kE" = (
/obj/effect/mapping_helpers/airlock/access/all/syndicate,
/obj/machinery/door/airlock/external{
id_tag = "sst_away";
req_access_txt = "150"
id_tag = "sst_away"
},
/obj/structure/cable{
d1 = 4;
Expand Down Expand Up @@ -242,9 +242,9 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/syndicate_listening_station)
"zb" = (
/obj/effect/mapping_helpers/airlock/access/all/syndicate,
/obj/machinery/door/airlock/external{
id_tag = "sst_away";
req_access_txt = "150"
id_tag = "sst_away"
},
/obj/structure/fans/tiny,
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -472,9 +472,9 @@
/turf/simulated/floor/mineral/silver,
/area/ruin/space/syndicate_listening_station)
"Ow" = (
/obj/effect/mapping_helpers/airlock/access/all/syndicate,
/obj/machinery/door/airlock/external{
id_tag = "sst_away";
req_access_txt = "150"
id_tag = "sst_away"
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -513,9 +513,9 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/syndicate_listening_station)
"TS" = (
/obj/effect/mapping_helpers/airlock/access/all/syndicate,
/obj/machinery/door/airlock/external{
id_tag = "sst_away";
req_access_txt = "150"
id_tag = "sst_away"
},
/obj/structure/cable{
d1 = 4;
Expand Down
Loading

0 comments on commit 565640a

Please sign in to comment.