Merge Upstream 23.12.2024 #78
Closed
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
![ss220-test-bot[bot]](https://avatars.githubusercontent.com/u/39908528?s=60&v=4){kind=small}
* fixes a few typos on emeraldstation's camera list * removed an accidentally placed camera * fixed one more typo
* refactor: Movement cross/uncross implementation. * wrong var name * fix unit tests dropping PDAs into nowhere * Add documentation. * remove unused constants * say which procs are off limits * fix simpleanimal z change runtime * helps not to leave merge conflicts * kill me * fix typecast * fix projectile/table collision * treadmills don't cause MC to crash anymore * connect_loc is appropriate here * fix windoors and teleporters * fix bonfires and clarify docs * fix proximity sensors Tested with sensors in crates, sensors in modsuits Tested new proximity component with firing projectiles at singularity Tested new proximity component with portable flashes Tested new proximity component with facehuggers * lint * fix: polarized access helper false positives * Revert "fix: polarized access helper false positives" This reverts commit 9814f98. * hopefully the right change for mindflayer steam * Changes following cameras * fix glass table collision * appears to fix doorspam * fix ore bags not picking up ore * fix signatures of /Exited * remove debug log * remove duplicate signal registrar * fix emptying bags into locations * I don't trust these nested Move calls * use connect_loc for upgraded resonator fields * use moveToNullspace * fix spiderweb crossing * fix pass checking for windows from a tile off * fix bluespace closet/transparency issues * fix mechs not interacting with doors and probably other things * fix debug * fix telepete * add some docs * stop trying to shoehorn prox monitor into cards * I should make sure things build * kill override signal warning * undef signal * not many prox monitors survive going off like this * small fixes to storage * make moving wormholes respect signals * use correct signals for pulse demon * fix pulse heart too * fix smoke signals * may have fucked singulo projectile swerve * fix singulo projectile arcing * remove duplicate define * just look at it * hopefully last cleanups of incorrect signal usage * fix squeaking * may god have mercy on my soul * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: warriorstar-orion <orion@snowfrost.garden> * lewc review * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: warriorstar-orion <orion@snowfrost.garden> * burza review * fix bad args for grenade assemblies * Update code/__DEFINES/is_helpers.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: warriorstar-orion <orion@snowfrost.garden> --------- Signed-off-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: DGamerL <daan.lyklema@gmail.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* unit->game tests, /tg/ assertions and allocations * whoopsies * fix lint
…ds. (ParadiseSS13#27694) * Fixes for inserting/removing storage items/swapping items between hands. * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: warriorstar-orion <orion@snowfrost.garden> * Fix doc comments * kill old comment --------- Signed-off-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
…ween han…" (ParadiseSS13#27706) This reverts commit 012e1f1.
* fix turrets * (not)new type of a turret
* Create interaction test harness. * retrofit tests, add janicart attack chain tests * extract puppeteer to separate file * move puppeteer creation to constructor
* Plushie PR TODO- Fix borgs becoming mind Add to smite list Add diona plush effect * Fixed Issues Added alien plush Added loadout Yeah * Apply suggestions from code review Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com> * WIP Will finish later * Fixed the various issues Should be working now! Changed the bread smite to a 'generic item' smite and then made it a specifcally breaded smite. * Minor typo fixing And stuff * WIP Conversion Converting all the attacks into more sleek attacks, will need to finish. * Fixes galore Yippie! * Russian revolver wasn't working now you can self-shoot again! Horay! * You can no longer eat spraycans IPC clowns everywhere devistated * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com> * A tinsy bit of touching up :) --------- Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
* Fix for anti drop being able to equip some items * Forgot to save file) * Clean up * Remove config changes * Update code/modules/mob/inventory_procs.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com> --------- Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Документация
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/27384
Changelog
🆑 ParadiseSS13
fix: Исправлено несколько опечаток в списке камер Emerald Station.
add: Добавлена черта TRAIT_UNKNOWN. Эта черта скрывает имя персонажа, его отображение на SecHUD, голос и предотвращает его обследование.
fix: Предметы больше не будут загораться при их перемещении между руками, вставке или извлечении из сумок/коробок/ремней и т. д. над лавой.
fix: Предметы больше не будут падать в пропасти при их перемещении между руками, вставке или извлечении из сумок/коробок/ремней и т. д. над пропастями.
tweak: Изменение размера области обзора в настройках теперь автоматически обновляет размер области обзора.
fix: Окно настроек предпочтений слегка увеличено.
add: Добавлена футболка с принтом "Великая волна" — доступна в разделе выбора нижнего белья в редакторе персонажа.
tweak: Изменено содержимое бумажника — теперь он может вмещать конфетные деньги и шоколадные монеты.
fix: Турели на мясоперерабатывающих руинах больше не роняют энергооружия при разборке.
add: Добавлены новые плюшевые игрушки для всех видов.
add: Добавлено новое заклинание, превращающее людей в плюшевых игрушек.
add: Добавлены новые плюшевые игрушки в лодаут.
fix: Звук "пуха" больше не использует выбор веса при попадании.
tweak: Плюшевые игрушки всегда разрушаются, если внутри них взрывается граната — включая светошумовые, химические гранаты и т. д.
tweak: Плюшевые игрушки Вокс и Ниан теперь активируют гранаты внутри них, даже если они произносят "слово для объятий".
fix: Исправлены ошибки выполнения для плюшевых игрушек скреллов.
fix: Теперь карты и ремни нельзя экипировать при активном импланте защиты от выброса.
/:cl: