Skip to content

Commit

Permalink
Merge Upstream 12.02.2025 (#1799)
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/28173

## Changelog
:cl: ParadiseSS13
fix: Многотайловые шлюзы теперь не остаются на месте при перемещении
шаттлов. <!-- Multi-tile airlocks will not be left behind from shuttles
when moving. (www.github.com/ParadiseSS13/Paradise/pull/28336) -->
tweak: Главы отделов больше не могут быть антагонистами раундстартом.
<!-- Removed command from round start antagonist eligibility.
(www.github.com/ParadiseSS13/Paradise/pull/28173) -->
tweak: Телепушка теперь доступна только учёным с целью захвата станции.
<!-- Telegun moved to hijack only item for scientists.
(www.github.com/ParadiseSS13/Paradise/pull/28173) -->
add: Медботы теперь вежливо выражают своё недовольство, если вы
постоянно от них убегаете. <!-- Medbots now politely voice their disdain
for you if you continuously run away from them.
(www.github.com/ParadiseSS13/Paradise/pull/27749) -->
tweak: Медботы теперь быстрее начинают разочаровываться. <!-- Medbots
get frustrated more easily.
(www.github.com/ParadiseSS13/Paradise/pull/27749) -->
tweak: Изменена максимальная яркость у слаймов, имитирующих другие виды,
чтобы избежать чрезмерной нагрузки на глаза. <!-- Tweaked max luminance
on slimes imitating another species, hopefully resulting in less eye
sores. (www.github.com/ParadiseSS13/Paradise/pull/28348) -->
fix: Исправлены тона кожи видовых подтипов. <!-- Fixed skin tones
(www.github.com/ParadiseSS13/Paradise/pull/28348) -->
fix: Исправлено нарушение сохранений персонажей, вызванное подтипами.
<!-- Fixed subtypes causing character saves to break
(www.github.com/ParadiseSS13/Paradise/pull/28348) -->
fix: Исправлены странные сочетания элементов у персонажей разных видов.
<!-- Fixed funky character mash ups with different species.
(www.github.com/ParadiseSS13/Paradise/pull/28348) -->
fix: Исправлено отсутствие правильных аксессуаров для головы у видов с
подтипами при спавне. <!-- Fixed species with subtypes not spawning in
with the proper head accessories.
(www.github.com/ParadiseSS13/Paradise/pull/28348) -->
/:cl:

## Summary by Sourcery

Update Medbots to express frustration and have more varied voice lines.
Move the Telegun to be a hijack-only item for Scientists. Fix multi-tile
airlocks not moving with shuttles. Remove duplicate large plants on
Deltastation. Tweak slime luminance and fix several issues with skin
tones, character saves, and species subtypes.

New Features:
- Medbots now politely voice their disdain if you run away from them
repeatedly.

Bug Fixes:
- Fix multi-tile airlocks not moving with shuttles.
- Remove duplicate large plants on Deltastation.
- Fix skin tones.
- Fix subtypes causing character saves to break.
- Fix strange character combinations with different species.
- Fix species with subtypes not spawning with proper head accessories.

Enhancements:
- Update Medbots to express frustration and have more varied voice
lines.
  • Loading branch information
m-dzianishchyts authored Feb 12, 2025
2 parents f90d654 + 21f8ca1 commit 30db188
Show file tree
Hide file tree
Showing 34 changed files with 1,550 additions and 1,393 deletions.
2 changes: 0 additions & 2 deletions _maps/map_files/stations/deltastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -57343,7 +57343,6 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
"eyG" = (
Expand Down Expand Up @@ -69651,7 +69650,6 @@
/area/station/medical/reception)
"lBJ" = (
/obj/item/kirbyplants/large,
/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
Expand Down
Loading

0 comments on commit 30db188

Please sign in to comment.