Merge Upstream 13.02.2025 #1802
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: ImOnMinimal <101551292+ImOnMinimal@users.noreply.github.com>
* sounds have been stopped * update * name and format update --------- Co-authored-by: Bmon <no@email.com>
* fix slapper drop * Apply code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com> --------- Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* Fix sluggish AI eye movement Fixes ParadiseSS13#28326 With the AI eye refactor, a `Moved()` callback was implicitly added to each call to `set_loc` on a camera eye. As camera eyes are completely invisible and do not directly interact with the game world, this extra processing isn't necessary. Removing it also removed the noted sluggishness. * Re-adds Moved() call to set_loc, adds parameters The Moved() call removed in the previous commit was not actually completely unnecessary, or newly added. Rather, new parameters were added that were not accounted form namely `momentum_change`. This commit re-adds parent proc call to set_loc for camera eyes, and adds the correct parameter values to Moved() in `/atom/movable/proc/set_loc`.
* Initial variable changes * Add defines * oh my god huds * Removes update_items(), it seems useless but this might need reverting later * the hud doesn't work but the inventory itself seems to * Renames a var, gets inventory working properly * Activation/Deactivation support, ore bag fixed * Fixes CL and also this would have been a massive, hilarious bug * Apply suggestions from code review Dr and Lewc reviews Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Drsmail <60036448+Drsmail@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Update code/_onclick/hud/robot_hud.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Fixes a comment * Wait I forgot this worked like this for a reason * Lewc Suggestions Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> * Burza Suggestions Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> --------- Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Drsmail <60036448+Drsmail@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* /tg/ AI controllers, part 1: core implementation. * lewc review * remove unused arg * lewc review 2 * lint fix
Co-authored-by: Bmon <no@email.com>
* Allow decompilation of shrapnel, cardboard tubes, ammo boxes and magazines * Do not allow decompilation of magazines --------- Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
* Can pick paraplegic in character menu, will start floored+wheelchaired * Why won't you show up on scanners * Forgot the description. * Got the scanners to show Paraplegia! * block off some roles from paraplegics * Use stance instead of the floored trait for paraplegic * Prevent paraplegics from using/being hit by legsweeps, change get_num_legs() * Add DNA injectors for paraplegia * change legsweep to use traitcheck, get_num_leg() solution screwed up beartraps * Can pick paraplegic in character menu, will start floored+wheelchaired * Why won't you show up on scanners * Forgot the description. * Got the scanners to show Paraplegia! * block off some roles from paraplegics * Use stance instead of the floored trait for paraplegic * Prevent paraplegics from using/being hit by legsweeps, change get_num_legs() * Add DNA injectors for paraplegia * change legsweep to use traitcheck, get_num_leg() solution screwed up beartraps * whoops. * TGUI. * How did I miss that in testing * Add the point interaction that nuggets get to armless paraplegics * Update code/modules/mob/living/carbon/human/human_organs.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> --------- Signed-off-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com> Co-authored-by: Scribble-Sheep <15377810-AlyxisDrayko@users.noreply.gitlab.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Why did the crusher have a spawn? No idea. Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* reduces juggernaut laser resistance * documentation
* make it all work * unneeded line * weird linter but ok * Update code/modules/mob/mob.dm Signed-off-by: Kapu1178 <75460809+Kapu1178@users.noreply.github.com> * remove span macro * Update code/modules/mob/mob.dm Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com> Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> * unconscious people arent blind i guess --------- Signed-off-by: Kapu1178 <75460809+Kapu1178@users.noreply.github.com> Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com>
* Fix jetpacks * All mobs LONG_GLIDE * Don't disturb the drift loop on Z level changes. * Fix speedbikes
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
* wed * Update cannabis.dm
* No seriously why didn't I? * that should fix that
* Vending machine lock improvements * No dumping stuff in when the vendor is locked! * Fix custom vendor UI height when unlocked.
Документация
m-dzianishchyts
approved these changes
Feb 13, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Документация
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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/27999
Changelog
🆑 ParadiseSS13
fix: Исправлены реагенты spaceman's trumpet.
fix: Прием CQC "удушение" теперь наносит до 2.2 раза больше урона в зависимости от уровня урона выносливости вашей цели.
add: Во вкладке Special Verbs добавлена команда "Stop Sounds". При использовании эта команда прекращает проигрывание всех звуков.
add: Во вкладке Debug добавлена команда "Stop Sounds Global". Эта команда, доступная только администраторам, прекращает проигрывание всех звуков для всех игроков.
fix: Предмет CQC slapper больше не удаляется при выполнении комбинаций вроде 3q3, 3q4 или при сбросе предмета из другой руки.
fix: Исправлено замедленное движение активного ИИ или камеры.
fix: Сумки для руды для киборгов теперь работают корректно.
tweak: Активные слоты у боргов теперь работают немного иначе; потребуется немного привыкать.
tweak: Космические карпы теперь могут сбиваться в стаи.
tweak: Темное зрение у таяр и вульпканинов снова снижено до уровня 3.
tweak: Добавлена черта "толстые пальцы" для боксерских перчаток.
fix: Исправлено смещение по оси Y для измененных в размере мобов.
tweak: Matter Decompiler у инженерных боргов и дронов технического обслуживания теперь позволяют разбирать осколки и пустые картонные коробки.
tweak: Снижена дисперсия выстрелов резиновыми пулями и лазерами.
add: Добавлена новая инвалидность - паралич (paraplegia). Она доступна как стартовое ограничение или может быть получена генетически в результате рандома.
tweak: Конструкты Джаггернаут теперь немного менее устойчивы к лазерам.
add: Теперь окружающие игроки смогут видеть, когда вы что-либо осматриваете, благодаря контекстным сообщениям.
fix: Реактивные ранцы больше не телепортируются.
fix: Скоростные байки больше не телепортируются.
fix: Скоростные байки теперь могут летать в космосе.
tweak: Настроена стартовая экипировка ботаников: она теперь включает полностью укомплектованный пояс ботаника и портативный экстрактор семян.
tweak: Нельзя привязать новое устройство EFTPOS к заблокированному кастомному торговому автомату.
tweak: Нельзя открутить заблокированный кастомный торговый автомат.
add: Можно обойти блокировку кастомного торгового автомата, если устройство EFTPOS находится в вашей руке или кармане.
/:cl:
Summary by Sourcery
Refactor cyborg module selection to allow for more modules. Custom vendors can no longer be locked with a crowbar or wrench while the point of sale device is linked, but not held. Allow contextual messages for examines. Improve atmospherics speed during large plasma fires. Improve cyborg ore satchels.
New Features:
Bug Fixes: