Skip to content

Commit

Permalink
Merge Upstream 25.02.2025 (#1822)
Browse files Browse the repository at this point in the history 
This pull request merges upstream/master. Resolve possible conflicts
manually and make sure all the changes are applied correctly.

> [!NOTE]
> Requires Wiki Update:
> www.github.com/ParadiseSS13/Paradise/pull/28255
> www.github.com/ParadiseSS13/Paradise/pull/28444
> www.github.com/ParadiseSS13/Paradise/pull/28443
> www.github.com/ParadiseSS13/Paradise/pull/28287
> www.github.com/ParadiseSS13/Paradise/pull/28254

## Changelog
:cl: ParadiseSS13
fix: Рулсет генокрадов больше не выпадает в режиме Dynamic бесплатно.
<!-- Changeling ruleset can no longer roll by itself
(www.github.com/ParadiseSS13/Paradise/pull/28476) -->
fix: Мертвые карпы теперь ведут себя адекватно и не блокируют снаряды.
<!-- Dead carp act normally and don't block projectiles
(www.github.com/ParadiseSS13/Paradise/pull/28487) -->
fix: Мобы снова начинают истекать кровью при перемещении в тяжелом
раненом состоянии. <!-- Mobs bleed again when dragged heavily injured
(www.github.com/ParadiseSS13/Paradise/pull/28489) -->
fix: Исправлены случайные оверлеи проводки на различных устройствах.
<!-- Fix stray wires on various devices
(www.github.com/ParadiseSS13/Paradise/pull/28494) -->
tweak: Проверка дальности для проекций с голопада теперь более гибкая
для ИИ. <!-- Range check for holopad projections is more flexible for AI
(www.github.com/ParadiseSS13/Paradise/pull/28450) -->
fix: Исправлена проблема с вместимостью химических емкостей протолата,
которая теперь корректно масштабируется в зависимости от бикеров.
Оборудование на станции начинает раунд с вместимостью 200. <!-- Fix
protolate chemical capacity not scaling with beakers. Roundstart
machines now have 200 capacity.
(www.github.com/ParadiseSS13/Paradise/pull/28500) -->
fix: Мегафауну Легион теперь можно разозлить только один раз, что
предотвращает получение двух и более посохов. <!-- Legion megafauna
can't be enraged for more than one time now, which prevents getting 2+
staffs of storms. (www.github.com/ParadiseSS13/Paradise/pull/28509) -->
tweak: Упавшие торговые автоматы теперь гораздо проще поднять. <!--
Vendors are much faster to right.
(www.github.com/ParadiseSS13/Paradise/pull/28475) -->
add: Добавлена возможность для сбойного ИИ устанавливать статус цели.
<!-- Added ability for AI to set a malf target status
(www.github.com/ParadiseSS13/Paradise/pull/28255) -->
imageadd: Добавлены иконки интерфейса для сбойного ИИ и привязанных
боргов. <!-- Added malf hud icons
(www.github.com/ParadiseSS13/Paradise/pull/28255) -->
fix: Стабилизаторы харвестера больше не потребляют больше энергии, чем
должны, при слишком высокой мощности добычи. <!-- BSH stabilizers no
longer draw more power than they should when desired mining power is set
too high (www.github.com/ParadiseSS13/Paradise/pull/28391) -->
tweak: Боеприпасы WT-550 TTX теперь окрашены в зеленый цвет. <!-- WT-550
TTX rounds are now green
(www.github.com/ParadiseSS13/Paradise/pull/28478) -->
fix: Сканеры атмосферы в ПДА больше не вызывают ошибок при сканировании
пустых устройств. <!-- PDA atmos scanners no longer runtime when
scanning empty devices.
(www.github.com/ParadiseSS13/Paradise/pull/28310) -->
fix: Карта таро Луна теперь сначала размещает пол в указанной локации,
прежде чем телепортировать туда объекты. <!-- The Moon will always place
a floor at the intended location first before teleporting them
(www.github.com/ParadiseSS13/Paradise/pull/28411) -->
add: В робототехнику добавлена бутылка с морфином для проведения
операций. <!-- Adds a morphine bottle to robotics surgery.
(www.github.com/ParadiseSS13/Paradise/pull/28433) -->
fix: Теперь в сигары и трубки можно добавлять химические реагенты. <!--
Now it's possible to add chemical reagents to cigars and pipes.
(www.github.com/ParadiseSS13/Paradise/pull/28443) -->
fix: Исправлена ошибка, при которой Pump Up не удалялся после применения
галоперидола. <!-- Fixed the oversight of Pump Up not being purged by
Haloperidol. (www.github.com/ParadiseSS13/Paradise/pull/28444) -->
fix: Исправлена ошибка, из-за которой Pump Up не учитывался среди
стимуляторов, проверяемых нанокальцием. <!-- Fixed the oversight of Pump
Up not being among the stimulants that Nanocalcium checks for.
(www.github.com/ParadiseSS13/Paradise/pull/28444) -->
fix: Проверка прямой видимости BRPD снова работает корректно. <!-- BRPD
Line of Sight check is properly functional again
(www.github.com/ParadiseSS13/Paradise/pull/28249) -->
fix: Устройства захвата борга снова позволяет сбрасывать предметы в
мусорку. <!-- Cyborg gripper can drop stuff into disposals again.
(www.github.com/ParadiseSS13/Paradise/pull/28240) -->
add: Смертельный отряд получил новое уникальное мыло. <!-- Deathsquad
gets new unique quick soap
(www.github.com/ParadiseSS13/Paradise/pull/28287) -->
imageadd: Добавлены новые спрайты для мыла. <!-- New sprites for soaps
(www.github.com/ParadiseSS13/Paradise/pull/28287) -->
imageadd: Добавлены новые спрайты для телепортера Синдиката,
пинпоинтеров и устройства объявления войны. <!-- New sprites for t-ray
scanner, syndicate teleporter, pinpointers and declaration of war device
(www.github.com/ParadiseSS13/Paradise/pull/28302) -->
imageadd: Добавлены новые спрайты для ПДА, устройства окраски ПДА и
картриджей для ПДА. <!-- New sprites for PDAs, PDA painter machine and
PDA cartridges (www.github.com/ParadiseSS13/Paradise/pull/28254) -->
tweak: Удаление всех выключателей света в области теперь включает
освещение. <!-- Removing all lightswitches in an area will turn the
lights back on (www.github.com/ParadiseSS13/Paradise/pull/28497) -->
/:cl:
  • Loading branch information
@m-dzianishchyts
m-dzianishchyts authored Feb 25, 2025
2 parents 980556e + b6a6ccd commit 64d8188
Show file tree
Hide file tree
Showing 93 changed files with 991 additions and 740 deletions.
4 changes: 2 additions & 2 deletions _maps/map_files/generic/Lavaland.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2336,7 +2336,7 @@
"fO" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/spawner/window/plasma/grilled,
/obj/effect/spawner/window/reinforced/plasma/grilled,
/turf/simulated/floor/plating,
/area/mine/outpost/hallway/east)
"fP" = (
Expand Down Expand Up @@ -3537,7 +3537,7 @@
/turf/simulated/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"lf" = (
/obj/effect/spawner/window/plasma/grilled,
/obj/effect/spawner/window/reinforced/plasma/grilled,
/turf/simulated/floor/plating,
/area/mine/outpost/maintenance/south)
"lg" = (
Expand Down
135 changes: 45 additions & 90 deletions _maps/map_files/stations/boxstation.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32899,7 +32899,7 @@
},
/area/station/medical/medbay)
"cny" = (
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/plasma,
/turf/simulated/floor/plating,
/area/station/science/server/coldroom)
"cnA" = (
Expand Down Expand Up @@ -33725,7 +33725,7 @@
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{
dir = 8
},
/obj/effect/spawner/window/reinforced,
/obj/effect/spawner/window/reinforced/plasma,
/turf/simulated/floor/plating,
/area/station/science/server/coldroom)
"crp" = (
Expand Down Expand Up @@ -35399,21 +35399,6 @@
icon_state = "dark"
},
/area/station/public/construction)
"cxB" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
autolink_id = "aisat_vent"
},
/obj/machinery/airlock_controller/air_cycler{
pixel_y = 25;
vent_link_id = "aisat_vent";
ext_door_link_id = "aisat_door_ext";
int_door_link_id = "aisat_door_int";
ext_button_link_id = "aisat_btn_ext";
int_button_link_id = "aisat_btn_int"
},
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior)
"cxD" = (
/obj/machinery/firealarm/directional/west,
/obj/machinery/atmospherics/unary/vent_pump/on{
Expand Down Expand Up @@ -44708,7 +44693,7 @@
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -44789,7 +44774,10 @@
/area/station/public/locker)
"dhz" = (
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior)
"dhB" = (
Expand Down Expand Up @@ -44913,15 +44901,10 @@
/obj/structure/cable{
icon_state = "2-4"
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior)
"dil" = (
Expand Down Expand Up @@ -46396,7 +46379,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -46554,16 +46537,13 @@
/area/station/turret_protected/aisat/interior)
"dob" = (
/obj/machinery/light/small,
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/item/radio/intercom{
name = "south bump";
pixel_y = -28
},
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 9
},
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior)
"doe" = (
Expand Down Expand Up @@ -49676,19 +49656,6 @@
},
/turf/simulated/floor/engine,
/area/station/engineering/control)
"eqt" = (
/obj/machinery/door/airlock/external{
id_tag = "aisat_door_int";
locked = 1;
name = "MiniSat External Access"
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
/obj/effect/mapping_helpers/airlock/access/all/science/minisat,
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior)
"eqN" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8
Expand Down Expand Up @@ -54354,14 +54321,7 @@
/turf/simulated/floor/plasteel,
/area/station/service/janitor)
"gML" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 9
},
/obj/machinery/access_button{
autolink_id = "aisat_btn_int";
pixel_x = -25;
pixel_y = 25
},
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior)
"gMP" = (
Expand Down Expand Up @@ -55654,15 +55614,6 @@
icon_state = "whitepurplecorner"
},
/area/station/science/hallway)
"hul" = (
/obj/structure/lattice,
/obj/machinery/access_button{
autolink_id = "aisat_btn_ext";
pixel_x = 25;
pixel_y = 25
},
/turf/space,
/area/space/nearstation)
"huo" = (
/obj/structure/chair/stool,
/obj/effect/spawner/random/dirt/frequent,
Expand Down Expand Up @@ -60963,6 +60914,12 @@
/obj/effect/spawner/window/reinforced/grilled,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"klZ" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior)
"kmo" = (
/obj/machinery/computer/secure_data,
/obj/item/radio/intercom{
Expand Down Expand Up @@ -68304,12 +68261,6 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"ofR" = (
/obj/structure/cable{
icon_state = "4-8"
},
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior)
"ofW" = (
/obj/machinery/light/small{
dir = 4
Expand Down Expand Up @@ -69182,6 +69133,11 @@
},
/turf/simulated/floor/carpet/grimey,
/area/station/command/office/hop)
"ozp" = (
/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
/obj/effect/mapping_helpers/airlock/access/all/science/minisat,
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior)
"ozC" = (
/turf/simulated/floor/plasteel{
icon_state = "browncorner"
Expand All @@ -69206,6 +69162,7 @@
/obj/structure/table,
/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath/medical,
/obj/item/reagent_containers/glass/bottle/morphine,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
},
Expand Down Expand Up @@ -73206,6 +73163,10 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/engine,
/area/station/engineering/control)
"qyP" = (
/obj/machinery/light/small,
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior)
"qzh" = (
/obj/structure/chair/sofa/right,
/obj/effect/landmark/start/psychiatrist,
Expand Down Expand Up @@ -80056,6 +80017,10 @@
},
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint2)
"uhm" = (
/obj/effect/spawner/airlock/e_to_w/long/square,
/turf/simulated/wall/r_wall,
/area/station/turret_protected/aisat/interior)
"uhq" = (
/obj/structure/cable{
icon_state = "1-2"
Expand Down Expand Up @@ -82140,16 +82105,6 @@
icon_state = "red"
},
/area/station/security/prisonershuttle)
"vtG" = (
/obj/machinery/door/airlock/external{
id_tag = "aisat_door_ext";
locked = 1;
name = "MiniSat External Access"
},
/obj/effect/mapping_helpers/airlock/access/all/engineering/external,
/obj/effect/mapping_helpers/airlock/access/all/science/minisat,
/turf/simulated/floor/plating,
/area/station/turret_protected/aisat/interior)
"vue" = (
/obj/structure/cable{
icon_state = "1-8"
Expand Down Expand Up @@ -123228,10 +123183,10 @@ aaa
aab
aab
gCu
aab
hul
aab
aab
dmB
dnW
dnW
uhm
iUc
dQC
fAw
Expand Down Expand Up @@ -123485,9 +123440,9 @@ aaa
aab
aaa
nOO
dmB
vtG
dmB
wza
dnW
ozp
dpf
iUc
rTy
Expand Down Expand Up @@ -123743,8 +123698,8 @@ aab
aaa
nOO
wza
cxB
ofR
dnW
qyP
dpf
iUc
iUc
Expand Down Expand Up @@ -124000,8 +123955,8 @@ aab
vHd
saB
jmM
eqt
wza
dnW
dnW
dnZ
wtW
doN
Expand Down Expand Up @@ -124771,7 +124726,7 @@ cQp
wza
ocf
dnv
dnW
klZ
diz
dnZ
diD
Expand Down
Loading

0 comments on commit 64d8188

Please sign in to comment.