Skip to content

Commit

Permalink
Merge Upstream 23.01.2025 (ss220club#1761)
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/28030

## Changelog
:cl: ParadiseSS13
tweak: Метеоры теперь появляются на краю карты (за пределами зоны
строительства), вместо того чтобы быть настолько близко, что могут
обходить спутники-щиты. <!-- Meteors now appear at the edge of the map
(beyond the buildable range), rather than so close they can bypass
shield satellites. (www.github.com/ParadiseSS13/Paradise/pull/27996) -->
tweak: Емагнутые спутники-щиты теперь умнее и сбивают симулированные
метеоры. <!-- Emagged shield satellites are now clever and shoot down
simulated meteors. (www.github.com/ParadiseSS13/Paradise/pull/27996) -->
fix: Спутники-щиты, находящиеся в ящике, теперь сообщают местоположение
ящика на карте управления, вместо угла карты. <!-- Shield sats inside a
crate now report the crate's position on the control map, rather than
the corner of the map. (www.github.com/ParadiseSS13/Paradise/pull/27996)
-->
tweak: Увеличена длина отображения flavor text при осмотре персонажей.
<!-- Increased the length of flavor text before cutoff when examining
characters. (www.github.com/ParadiseSS13/Paradise/pull/27976) -->
tweak: Повышена стоимость Mantis Blades в меню предателя (Traitor
Uplink). <!-- Raised price of Mantis Blades in the Traitor Uplink
(www.github.com/ParadiseSS13/Paradise/pull/28030) -->
tweak: Снижена сила удара у Mantis Blades Синдиката и Нанотрейзен. <!--
Reduced force on Syndicate and NT Mantis blades
(www.github.com/ParadiseSS13/Paradise/pull/28030) -->
tweak: Удалены Mantis Blades из меню ядерного оперативника (Nuclear
Uplink). <!-- Removed Mantis blades from the Nuclear Uplink
(www.github.com/ParadiseSS13/Paradise/pull/28030) -->
tweak: Предотвращено появление Mantis Blades в Syndicate Surplus Crate.
<!-- Prevented Mantis blades from being included in Surplus crates
(www.github.com/ParadiseSS13/Paradise/pull/28030) -->
tweak: Mantis Blades больше не могут быть выбраны со скидкой. <!--
Prevented Mantis blades from being discount eligible
(www.github.com/ParadiseSS13/Paradise/pull/28030) -->
add: Администраторы теперь могут легко создавать случайных персонажей
для событий из числа экипажа с помощью Create Antagonist. <!-- Admins
can now easily create event characters at random from the crew.
(www.github.com/ParadiseSS13/Paradise/pull/27855) -->
add: Добавлено дополнительное освещение в примерочной базы Синдиката в
космосе. <!-- Additional lights in the Syndicate Space Base Dressing
Room (www.github.com/ParadiseSS13/Paradise/pull/27369) -->
fix: Внешнее освещение на базе Синдиката в космосе теперь подключено к
АПЦ. <!-- Syndicate Space Base exterior lights now have an APC connected
(www.github.com/ParadiseSS13/Paradise/pull/27369) -->
fix: Космическая база Синдиката теперь имеет вариант игрового автомата
Claw Game, который не требует кредитов или аккаунта. <!-- Syndicate
Space Base now has a Syndicate variant of Claw Game which does not
require credits or an account
(www.github.com/ParadiseSS13/Paradise/pull/27369) -->
fix: Зависшие эффекты огня и ветра теперь действительно устранены. <!--
Stuck fire and wind should be gone for real now.
(www.github.com/ParadiseSS13/Paradise/pull/28057) -->
fix: Режим строительства атмосферы (buildmode atmos) больше не будет
иногда некорректно указывать параметры воздуха. <!-- Buildmode atmos
will no longer fail to set air sometimes.
(www.github.com/ParadiseSS13/Paradise/pull/28057) -->
fix: Другие изменения атмосферы, которые ранее иногда могли не работать,
теперь исправлены. <!-- Other air changes were also likely to have been
not working sometimes, and are fixed now.
(www.github.com/ParadiseSS13/Paradise/pull/28057) -->
fix: Спрей больше не открывает два меню одновременно. <!-- Spray can no
longer opens 2 menus (www.github.com/ParadiseSS13/Paradise/pull/27944)
-->
fix: Команда aheal больше не вызывает паузы на сервере. <!-- aheal won't
cause the server to pause
(www.github.com/ParadiseSS13/Paradise/pull/28059) -->
tweak: Увеличена защита от радиации в MODsuit для парамедиков. <!--
Increased radiation protection on paramedic MODsuits.
(www.github.com/ParadiseSS13/Paradise/pull/27824) -->
del: Удалены некоторые старые галлюцинации, подробности можно найти в
PR. <!-- Removed some old hallucinations, check the PR for more details
(www.github.com/ParadiseSS13/Paradise/pull/27984) -->
tweak: Обновлены названия и описания, связанные с блюспейсом. <!--
Updated a bunch of names and descriptions referencing bluespace
(www.github.com/ParadiseSS13/Paradise/pull/27809) -->
tweak: Обновлено множество лоровых описаний брони. <!-- Updated a lot of
armor lore (www.github.com/ParadiseSS13/Paradise/pull/27750) -->
add: Зловещая активность Синдиката ощущается по всему сектору! Теперь
почти все руины в космосе содержат некоторое количество экипировки,
ранее доступной только в депо. Депо больше не гарантируется в каждом
раунде, так что тщательно исследуйте все руины, чтобы найти добычу
Синдиката. <!-- The Syndicate's sinister presence is felt all over the
sector! Nearly all ruins found in space will have some level of gear
previously only found in the depot. The depot is no longer guaranteed
every round, so make sure to explore every ruin to find the Syndicate's
loot. (www.github.com/ParadiseSS13/Paradise/pull/27954) -->
/:cl:

## Summary by Sourcery

Update movement to use movement loops.

New Features:
- Implement movement loops to manage timed movement.
- Add new movement procs to the move_manager datum.
- Add new signals for movement events.

Tests:
- Update tests to account for new movement system.
  • Loading branch information
m-dzianishchyts authored Jan 23, 2025
2 parents 8e96b2a + ef42763 commit 7157a80
Show file tree
Hide file tree
Showing 238 changed files with 3,742 additions and 1,148 deletions.
30 changes: 26 additions & 4 deletions _maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,10 @@
/obj/effect/mapping_helpers/turfs/burn,
/turf/simulated/floor/plating,
/area/ruin/space/abandoned_engi_sat)
"fs" = (
/mob/living/simple_animal/hostile/asteroid/hivelord,
/turf/simulated/floor/wood/airless,
/area/ruin/space/abandoned_engi_sat)
"fA" = (
/turf/simulated/floor/plasteel,
/area/ruin/space/abandoned_engi_sat)
Expand Down Expand Up @@ -364,6 +368,7 @@
name = "torn sign";
pixel_x = -1
},
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plating,
/area/ruin/space/abandoned_engi_sat)
"kT" = (
Expand Down Expand Up @@ -503,6 +508,7 @@
pixel_y = -24;
name = "south bump"
},
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plasteel,
/area/ruin/space/abandoned_engi_sat)
"oL" = (
Expand Down Expand Up @@ -546,6 +552,7 @@
/area/ruin/space/abandoned_engi_sat)
"pX" = (
/obj/structure/closet/secure_closet/engineering_personal/empty,
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/wood/airless,
/area/ruin/space/abandoned_engi_sat)
"qu" = (
Expand Down Expand Up @@ -711,6 +718,7 @@
pixel_y = 32
},
/obj/structure/closet/crate/internals,
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plasteel{
icon_state = "bot";
dir = 1
Expand Down Expand Up @@ -931,6 +939,7 @@
/obj/machinery/light{
dir = 1
},
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plasteel{
icon_state = "vault";
dir = 5
Expand All @@ -950,6 +959,10 @@
name = "floor"
},
/area/ruin/space/abandoned_engi_sat)
"FN" = (
/mob/living/simple_animal/hostile/asteroid/hivelord,
/turf/simulated/floor/carpet/airless,
/area/ruin/space/abandoned_engi_sat)
"FQ" = (
/obj/machinery/door/airlock/engineering{
name = "Construction Area"
Expand Down Expand Up @@ -1259,6 +1272,11 @@
dir = 5
},
/area/ruin/space/abandoned_engi_sat)
"RV" = (
/obj/effect/mapping_helpers/turfs/damage,
/mob/living/simple_animal/hostile/asteroid/hivelord,
/turf/simulated/floor/plasteel,
/area/ruin/space/abandoned_engi_sat)
"Sa" = (
/obj/structure/table,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -1340,6 +1358,10 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/ruin/space/abandoned_engi_sat)
"Ye" = (
/mob/living/simple_animal/hostile/asteroid/hivelord,
/turf/simulated/floor/plasteel,
/area/ruin/space/abandoned_engi_sat)
"Yz" = (
/obj/structure/closet/emcloset,
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -2089,7 +2111,7 @@ Ux
Vx
mQ
DO
DO
fs
DO
DO
bi
Expand Down Expand Up @@ -2159,7 +2181,7 @@ kI
mG
pX
hB
nH
FN
pX
EU
EU
Expand Down Expand Up @@ -2286,9 +2308,9 @@ oL
xp
gL
fA
kd
fA
RV
fA
Ye
fA
eG
iV
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
/obj/item/gun/projectile/automatic/pistol/enforcer,
/obj/item/grenade/flashbang,
/obj/item/storage/firstaid/regular,
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plating/airless,
/area/ruin/space/sec_shuttle)
"F" = (
Expand Down
2 changes: 2 additions & 0 deletions _maps/map_files/RandomRuins/SpaceRuins/abandonedtele.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
/area/ruin/space/abandtele)
"w" = (
/obj/structure/closet,
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plating/airless,
/area/ruin/space/abandtele)
"x" = (
Expand All @@ -106,6 +107,7 @@
/obj/item/weldingtool,
/obj/item/wrench,
/obj/item/circuitboard/teleporter,
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plating/airless,
/area/ruin/space/abandtele)
"z" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/item/gun/energy/floragun,
/obj/effect/spawner/random/pool/spaceloot/zoo,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -376,7 +376,7 @@
/area/ruin/space/unpowered)
"aY" = (
/obj/structure/table/reinforced,
/obj/item/gun/energy/temperature,
/obj/effect/spawner/random/pool/spaceloot/zoo,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down
6 changes: 5 additions & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
"c" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/space/unpowered)
"l" = (
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"V" = (
/turf/template_noop,
/area/template_noop)
Expand Down Expand Up @@ -149,7 +153,7 @@ V
V
V
b
b
l
V
V
V
Expand Down
8 changes: 6 additions & 2 deletions _maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
/obj/structure/spawner/mining/basilisk,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"C" = (
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"R" = (
/obj/structure/spawner/mining/goliath,
/turf/simulated/floor/plating/asteroid/airless,
Expand Down Expand Up @@ -220,7 +224,7 @@ c
d
c
c
c
C
c
c
c
Expand Down Expand Up @@ -337,7 +341,7 @@ c
c
c
c
c
C
c
c
c
Expand Down
6 changes: 5 additions & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/asteroid3.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
"q" = (
/turf/simulated/mineral/random/low_chance,
/area/ruin/space/unpowered)
"r" = (
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"v" = (
/obj/structure/spawner/mining/basilisk,
/turf/simulated/floor/plating/asteroid/airless,
Expand Down Expand Up @@ -175,7 +179,7 @@ q
c
c
c
b
r
c
c
q
Expand Down
6 changes: 5 additions & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/asteroid4.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@
},
/turf/simulated/floor/mineral/titanium/blue,
/area/ruin/space/unpowered)
"p" = (
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plating,
/area/ruin/space/unpowered)
"Q" = (
/turf/simulated/mineral/random/low_chance,
/area/ruin/space/unpowered)
Expand Down Expand Up @@ -354,7 +358,7 @@ a
c
c
b
f
p
f
i
i
Expand Down
6 changes: 5 additions & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/asteroid5.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
/obj/structure/spawner/mining/goliath,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"o" = (
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"A" = (
/turf/simulated/mineral/random/low_chance,
/area/ruin/space/unpowered)
Expand Down Expand Up @@ -606,7 +610,7 @@ d
c
c
b
d
o
d
c
d
Expand Down
21 changes: 17 additions & 4 deletions _maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,13 @@
},
/turf/simulated/floor/plating/airless,
/area/ruin/space/tcommsat)
"cl" = (
/obj/structure/rack,
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plasteel/airless{
icon_state = "dark"
},
/area/ruin/space/tcommsat)
"cM" = (
/obj/effect/decal/cleanable/blood/writing{
dir = 8
Expand Down Expand Up @@ -207,7 +214,7 @@
},
/area/ruin/space/tcommsat)
"lq" = (
/mob/living/simple_animal/hostile/syndicate/ranged/space/autogib,
/obj/effect/spawner/random/pool/spaceloot/modsuit_syndie,
/turf/simulated/floor/plating/airless,
/area/ruin/space/tcommsat)
"my" = (
Expand Down Expand Up @@ -481,6 +488,7 @@
/area/ruin/space/tcommsat)
"Go" = (
/obj/structure/table,
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plating/airless,
/area/ruin/space/tcommsat)
"GG" = (
Expand Down Expand Up @@ -590,6 +598,10 @@
},
/turf/simulated/floor/plating/airless,
/area/ruin/space/tcommsat)
"NC" = (
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plating/airless,
/area/ruin/space/tcommsat)
"NJ" = (
/obj/structure/disposaloutlet{
dir = 4
Expand Down Expand Up @@ -632,6 +644,7 @@
dir = 8
},
/obj/structure/closet/firecloset,
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
/turf/simulated/floor/plasteel,
/area/ruin/space/tcommsat)
"PZ" = (
Expand Down Expand Up @@ -1241,7 +1254,7 @@ Wc
Is
ot
UK
fS
cl
Wr
kx
Jr
Expand Down Expand Up @@ -2082,7 +2095,7 @@ Wc
Wc
Wc
Is
Wc
NC
Wr
kx
Jr
Expand Down Expand Up @@ -2862,7 +2875,7 @@ au
Wc
ot
bc
Wc
NC
Wr
bc
Wc
Expand Down
Loading

0 comments on commit 7157a80

Please sign in to comment.