Skip to content

Commit

Permalink
Merge Upstream 01.02.2025 (#1776)
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.

## Changelog
:cl: ParadiseSS13
fix: Показ листа бумаги больше не вызывает мгновенного открытия
всплывающего окна, из-за чего игра теряла фокус. Теперь цель получает
ссылку, по которой может кликнуть, чтобы прочитать содержимое бумаги.
<!-- Aiming eyes with a piece of paper will no longer instantly open up
a pop up browser that would cause the game to become unfocused. Gives
the target a link in which they can click to read the paper.
(www.github.com/ParadiseSS13/Paradise/pull/28195) -->
fix: Исправлена бесконечная длительность событий СМ. <!-- Fixed infinite
duration SM events. (www.github.com/ParadiseSS13/Paradise/pull/28199)
-->
fix: Исправлены не анонсируемые события СМ. <!-- Fixed unannounced SM
events. (www.github.com/ParadiseSS13/Paradise/pull/28199) -->
fix: Манипуляторы боргов снова могут размещать световые панели. <!--
Grippers can place light tiles again.
(www.github.com/ParadiseSS13/Paradise/pull/28139) -->
fix: Манипуляторы боргов снова могут устанавливать батареи в зарядные
устройства и АПЦ. <!-- Grippers can place cells into chargers and APCs
again. (www.github.com/ParadiseSS13/Paradise/pull/28139) -->
fix: Манипуляторы боргов больше не ударяют машины при вставке
удерживаемых предметов. <!-- Grippers no longer bap machines when
inserting held items into them.
(www.github.com/ParadiseSS13/Paradise/pull/28139) -->
fix: Манипуляторы боргов больше не гладят животных дважды за одну атаку.
<!-- Grippers no longer pet animals 2 times with one attack.
(www.github.com/ParadiseSS13/Paradise/pull/28139) -->
fix: Остановлено повреждение коллекторов при вставке в них баллонов.
<!-- Stops collectors from being hit by tanks inserted into them
(www.github.com/ParadiseSS13/Paradise/pull/28187) -->
fix: Порталы от предметов, таких как ручные телепортеры, больше не
дрейфуют в космосе. <!-- Portals from items such as hand teleporters
will no longer drift in space.
(www.github.com/ParadiseSS13/Paradise/pull/28097) -->
imageadd: Комнатные растения на станции теперь больше по размеру и
выглядят менее инопланетными. <!-- Station potted plants are now bigger
and less alien on average.
(www.github.com/ParadiseSS13/Paradise/pull/28046) -->
tweak: Теперь нельзя прятаться за маленькими растениями, но их стало
проще поднимать. <!-- You can no longer hide behind small plants, but
you can pick them up more easily.
(www.github.com/ParadiseSS13/Paradise/pull/28046) -->
fix: Исправлен бесконечный цикл кода при смене вида на руках с жезлом
Асклепия. <!-- Fixed code loop when you change your species with rod of
asclepius in hand (www.github.com/ParadiseSS13/Paradise/pull/28036) -->
fix: Исправлено ошибка, из-за которой митоколид не восстанавливал органы
при его наливании на них. <!-- Fixed mitocholide not restoring organs
when splashed on them (www.github.com/ParadiseSS13/Paradise/pull/28010)
-->
tweak: Установлено ограничение для gas_coefficient СМа, чтобы избежать
радиационных проблем. <!-- Places a limit on gas_coefficient to limit
rad issues (www.github.com/ParadiseSS13/Paradise/pull/27921) -->
add: Добавлена новая галлюцинация. <!-- Sniper hallucination
(www.github.com/ParadiseSS13/Paradise/pull/27579) -->
fix: Исправлен лишний пиксель на спрайте грудного импланта вокса
wardtakahashi. <!-- Fixed a stray pixel on the wardtakahashi vox augment
chest sprite (www.github.com/ParadiseSS13/Paradise/pull/28197) -->
fix: Галлюцинации ксеноморфов больше не сохраняются слишком долго. <!--
Xeno Hallucination no longer lingers
(www.github.com/ParadiseSS13/Paradise/pull/28201) -->
fix: Исправлена проблема, из-за которой тела оставались в вертикальном
положении после снятия с крюка. <!-- Fixed standing corpse when
unbuckling it from a meat spike
(www.github.com/ParadiseSS13/Paradise/pull/28037) -->
tweak: Стоимость трейторов в режиме Dynamic увеличена с 5 до 7. <!--
Increased the cost of traitors when drawing from the budget.
(www.github.com/ParadiseSS13/Paradise/pull/28132) -->
/:cl:

## Summary by Sourcery

Update potted plants to come in small, medium, and large sizes. Allow
hiding behind large potted plants.

New Features:
- Added a sniper hallucination.

Bug Fixes:
- Fixed a code loop that occurred when changing species with the Rod of
Asclepius in hand.
- Fixed mitocholide not restoring organs when splashed on them.
- Fixed a bug where aiming eyes with a piece of paper instantly opened a
pop-up browser, causing the game to lose focus. Now provides a clickable
link to read the paper.
- Fixed infinite duration and unannounced events with the SM.
- Fixed grippers hitting machines when inserting items, petting animals
twice with one attack, and damaging collectors when inserting tanks.
- Fixed Kerberos' cell flashers not working.
- Fixed portals from items like hand teleporters drifting in space.
- Fixed a stray pixel on the vox augment chest sprite.
- Fixed xeno hallucinations lingering for too long.
- Fixed standing corpses when unbuckling them from a meat spike.

Enhancements:
- Place a limit on gas_coefficient to mitigate radiation issues.

Tests:
- Improved test assertions for chatlogs.
  • Loading branch information
m-dzianishchyts authored Feb 1, 2025
2 parents 3f6538d + 3bdc01d commit 63fafa2
Show file tree
Hide file tree
Showing 75 changed files with 1,775 additions and 1,550 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
cp target/i686-pc-windows-gnu/release/rustlibs.dll ../rustlibs.dll
# Build the para-specific version
RUSTFLAGS='-C target-cpu=raptorlake' cargo build --release --target=i686-pc-windows-gnu
RUSTFLAGS='-C target-cpu=znver5' cargo build --release --target=i686-pc-windows-gnu
cp target/i686-pc-windows-gnu/release/rustlibs.dll ../rustlibs_prod.dll
git commit -a -m "Build Rust library" --allow-empty
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/SpaceRuins/casino.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
/turf/simulated/floor/mineral/plastitanium,
/area/ruin/space/powered/casino/security)
"fT" = (
/obj/item/kirbyplants/plant1,
/obj/item/kirbyplants/medium/medium2,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/powered/casino/arrivals)
"fV" = (
Expand Down Expand Up @@ -432,7 +432,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/powered/casino/maints)
"kC" = (
/obj/item/kirbyplants/plant10,
/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/mineral/silver,
/area/ruin/space/powered/casino/hall)
"kH" = (
Expand Down
32 changes: 16 additions & 16 deletions _maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -831,7 +831,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/deepstorage)
"cP" = (
/obj/item/kirbyplants/plant27,
/obj/item/kirbyplants/large/plant10,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
Expand All @@ -845,7 +845,7 @@
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"cT" = (
/obj/item/kirbyplants/plant21,
/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -889,7 +889,7 @@
/area/ruin/space/deepstorage)
"dg" = (
/obj/effect/decal/cleanable/cobweb,
/obj/item/kirbyplants/plant21,
/obj/item/kirbyplants/large/plant4,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 9;
Expand Down Expand Up @@ -1294,7 +1294,7 @@
/area/ruin/space/deepstorage)
"gC" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/kirbyplants/plant18,
/obj/item/kirbyplants/large/plant8,
/turf/simulated/floor/plasteel{
icon_state = "black"
},
Expand Down Expand Up @@ -1371,7 +1371,7 @@
},
/area/ruin/space/deepstorage)
"hg" = (
/obj/item/kirbyplants/plant27,
/obj/item/kirbyplants/large/plant10,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -2402,7 +2402,7 @@
},
/area/ruin/space/deepstorage)
"nM" = (
/obj/item/kirbyplants/plant22,
/obj/item/kirbyplants/medium/medium6,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -2875,7 +2875,7 @@
/turf/simulated/floor/engine/airless,
/area/ruin/space/unpowered)
"re" = (
/obj/item/kirbyplants/plant18,
/obj/item/kirbyplants/large/plant8,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 5;
Expand Down Expand Up @@ -3364,7 +3364,7 @@
/obj/machinery/light/small{
dir = 8
},
/obj/item/kirbyplants/plant22,
/obj/item/kirbyplants/medium/medium6,
/obj/structure/sign/biohazard{
pixel_x = -32
},
Expand Down Expand Up @@ -4508,7 +4508,7 @@
/area/ruin/space/deepstorage)
"BF" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/kirbyplants/plant22,
/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "white"
Expand Down Expand Up @@ -5328,7 +5328,7 @@
},
/area/ruin/space/deepstorage)
"Ha" = (
/obj/item/kirbyplants/plant27,
/obj/item/kirbyplants/large/plant10,
/obj/machinery/light/small{
dir = 8
},
Expand Down Expand Up @@ -5913,7 +5913,7 @@
/turf/simulated/floor/engine,
/area/ruin/space/deepstorage)
"LT" = (
/obj/item/kirbyplants/plant22,
/obj/item/kirbyplants/medium/medium6,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "dark"
Expand Down Expand Up @@ -6300,7 +6300,7 @@
},
/area/ruin/space/deepstorage)
"Pq" = (
/obj/item/kirbyplants/plant29,
/obj/item/kirbyplants/large/plant11,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -6721,7 +6721,7 @@
},
/area/ruin/space/deepstorage)
"Sc" = (
/obj/item/kirbyplants/plant18,
/obj/item/kirbyplants/large/plant8,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -7348,7 +7348,7 @@
},
/area/ruin/space/deepstorage)
"Ww" = (
/obj/item/kirbyplants/plant27,
/obj/item/kirbyplants/large/plant10,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "vault"
Expand Down Expand Up @@ -7485,7 +7485,7 @@
},
/area/ruin/space/deepstorage)
"Xj" = (
/obj/item/kirbyplants/plant10,
/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -7545,7 +7545,7 @@
/area/ruin/space/deepstorage)
"Xy" = (
/obj/structure/table/glass,
/obj/item/kirbyplants/plant15{
/obj/item/kirbyplants/small/small4{
pixel_y = 13
},
/turf/simulated/floor/plasteel{
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"sd" = (
/obj/item/kirbyplants/dead,
/obj/item/kirbyplants/large/dead,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"vg" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/dj.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -907,7 +907,7 @@
},
/area/ruin/space/djstation)
"yr" = (
/obj/item/kirbyplants,
/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet{
name = "north bump";
pixel_y = 30
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@
/turf/simulated/floor/redgrid,
/area/ruin/space/mech_transport)
"ZI" = (
/obj/item/kirbyplants,
/obj/item/kirbyplants/large,
/turf/simulated/floor/mineral/plastitanium/red/airless,
/area/ruin/space/mech_transport)
"ZK" = (
Expand Down
Loading

0 comments on commit 63fafa2

Please sign in to comment.