Skip to content

Commit 30db188

Browse files
Merge Upstream 12.02.2025 (#1799)
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.
2 parents f90d654 + 21f8ca1 commit 30db188

34 files changed

+1550
-1393
lines changed

_maps/map_files/stations/deltastation.dmm

-2
Original file line numberDiff line numberDiff line change
@@ -57343,7 +57343,6 @@
5734357343
/obj/effect/turf_decal/stripes/line{
5734457344
dir = 4
5734557345
},
57346-
/obj/item/kirbyplants/large,
5734757346
/turf/simulated/floor/plasteel,
5734857347
/area/station/engineering/control)
5734957348
"eyG" = (
@@ -69651,7 +69650,6 @@
6965169650
/area/station/medical/reception)
6965269651
"lBJ" = (
6965369652
/obj/item/kirbyplants/large,
69654-
/obj/item/kirbyplants/large,
6965569653
/turf/simulated/floor/plasteel{
6965669654
dir = 8;
6965769655
icon_state = "vault"

0 commit comments

Comments
 (0)