forked from ParadiseSS13/Paradise
-
Notifications
You must be signed in to change notification settings - Fork 130
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge upstream 01.03.2024 #1055
Closed
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
* charlie_bit_my_finger * alphabet
* Refactor pill/patch application * I will come back to this
* shock biochip nerfs * kw * describes it
* Add Cranial Hypertrichosis * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> * Early return * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> * Add stage 2 * Apply suggestions from code review Co-authored-by: Luc <[email protected]> * Don't affect bald species * Fix formatting * Revert invalid syntax --------- Co-authored-by: Arthri <[email protected]> Co-authored-by: Henri215 <[email protected]> Co-authored-by: Luc <[email protected]>
* i joined the force to help people * disabler i hardly know her * Update code/modules/projectiles/ammunition/energy_lens.dm Co-authored-by: Henri215 <[email protected]> * oops * Update code/__DEFINES/lighting_defines.dm Co-authored-by: DGamerL <[email protected]> * Update code/modules/projectiles/guns/energy/stun.dm Co-authored-by: DGamerL <[email protected]> * Update code/modules/projectiles/guns/energy/stun.dm Co-authored-by: DGamerL <[email protected]> * Update code/modules/projectiles/guns/energy/stun.dm Co-authored-by: DGamerL <[email protected]> * Update code/modules/projectiles/guns/energy/stun.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/projectiles/guns/energy/stun.dm Co-authored-by: Luc <[email protected]> --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Luc <[email protected]>
* is good for you * DESCRIPTION * fix * Update code/modules/mod/modules/modules_security.dm Co-authored-by: DGamerL <[email protected]> --------- Co-authored-by: DGamerL <[email protected]>
* burnphoto() now checks for get_heat() instead of requiring lighter * fuck * ebba and cinnamon review * de morgan's law strikes yet again * switch doafter timer to use seconds constant * git gui was a mistake and you can't change my mind * Update code/modules/paperwork/photography.dm Co-authored-by: DGamerL <[email protected]> * lewc review * craaaawling iiiin my skiiiiin --------- Co-authored-by: DGamerL <[email protected]>
* Update magic_projectiles.dm * Update magic_projectiles.dm actually changed the description to say to kill people * rewords the transformation message Co-authored-by: Contrabang <[email protected]> * Removes unnecessary centering Co-authored-by: Contrabang <[email protected]> * Removes ALL the center tags --------- Co-authored-by: Contrabang <[email protected]>
* okay lets do this * return to normal
* clarifies, cleans up long-neglected autopsy scanner mechanic * constrain this a bit more * Update code/game/objects/items/devices/autopsy.dm Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Henri215 <[email protected]>
* Adds names and descriptions to most bullets * Update code/modules/projectiles/ammunition/ammo_boxes.dm Co-authored-by: CRUNCH <[email protected]> * Update ammo_boxes.dm Co-authored-by: CRUNCH <[email protected]> * desc updates * word changes * Update ammo_casings.dm Co-authored-by: Henri215 <[email protected]> * Update ammo_casings.dm Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: CRUNCH <[email protected]> Co-authored-by: Henri215 <[email protected]>
…fline after reviving (#23992) * nerf nerf nerf nerf * cooldown time * rechargable headslug * Update code/modules/antagonists/changeling/powers/absorb.dm Co-authored-by: Luc <[email protected]> * Update code/modules/antagonists/changeling/powers/become_headslug.dm Co-authored-by: S34N <[email protected]> --------- Co-authored-by: matttheficus <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: S34N <[email protected]>
* the start * Update code/modules/projectiles/guns/projectile/revolver.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/projectiles/guns/projectile/revolver.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/projectiles/guns/projectile/revolver.dm Co-authored-by: Contrabang <[email protected]> * Update code/modules/projectiles/guns/projectile/revolver.dm Co-authored-by: Contrabang <[email protected]> * pain * ITS STILL A WIP * dones * Apply suggestions from code review Co-authored-by: Ryan <[email protected]> * oh god, this was just a draft, it should be part of the PR * we dont need this anymore either * sirrayan request * Update code/modules/projectiles/guns/projectile/revolver.dm Co-authored-by: Luc <[email protected]> * DGL's review * more of DLG's review * removes bar judo --------- Co-authored-by: Contrabang <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Luc <[email protected]>
* forbid in-DMI icon state name dupes with CI * remove final icon dupes * use shodancoat item_state
* Update welder.dm You can light other people's cigarettes with welders wooo! * Update code/game/objects/items/tools/welder.dm Co-authored-by: Luc <[email protected]> * Update code/game/objects/items/tools/welder.dm Co-authored-by: S34N <[email protected]> * Fix broken expression * Update code/game/objects/items/tools/welder.dm Co-authored-by: DGamerL <[email protected]> --------- Co-authored-by: Luc <[email protected]> Co-authored-by: S34N <[email protected]> Co-authored-by: DGamerL <[email protected]>
* Add DMI/JSON export to local client admins. * switch to log_world, add if paren
github-actions
bot
added
🔉 Звук
Услада для ушей.
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
🎸 Инструменты
Мы выдаем себя за реальное сообщество разработчиков.
labels
Mar 1, 2024
Чё это ты? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
🎸 Инструменты
Мы выдаем себя за реальное сообщество разработчиков.
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
📜 CL валиден
Этот чейнджлог будет успешно опубликован
🔉 Звук
Услада для ушей.
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.
Changelog
🆑
add: Для локалок добавлена возможность быстрого экспорта JSON-файлов персонажей и DMI-файла, содержащего спрайты персонажей
add: Сварка теперь может зажечь незажжённую сигарету в чужом рту
add: Добавлены ящики с Disabler SMG, их можно купить в Карго, в них содержатся 2 Disabler SMG - новый тип двуручного скорострельного дизейблер-оружия
add: Добавлен симптом Cranial Hypertrichosis для advanced microbes, ведет себя аналогично Hairgrownium
add: Добавлен новый модуль для модьсюта - модуль дымовой гранаты, доступен в Uplink и illegal tech
add: Добавлен новый трейт, "Sleight of hand" (ловкость рук) для бармена
tweak: Бармен больше не владеет дзюдо, вместо этого он владеет "Sleight of hand"
tweak: Headslug теперь доступен всем генокрадам по умолчанию, но может быть выполнен только один раз за поглощение
tweak: Способности генокрадов не могут быть использованы в течении 10 секунд после возрождения с помощью стазиса
tweak: Добавлены названия и описания ко многим пулям и ящикам с патронами
tweak: Автоматический отчет коронера, создаваемый при использовании ручки на сканере аутопсии (существует с 2017 года), был улучшен и уточнен
tweak: В письме теперь указывается должность получателя при осмотре
tweak: При ударе кого-либо выключенным батоном теперь вызывается анимация
tweak: Переписывает и уточняет сообщение Плачущего ангела, когда его превращает волшебник, использующий "Flesh to stone" и палочку "Animate"
tweak: Сообщение PM to-... было перемещено из категории Unsorted в категорию Admin PMs
tweak: Фотографии теперь можно сжигать с помощью любого горящего предмета (сварка, зажигалка и т.д.)
tweak: Дым больше не убивает тайлы Блоба
tweak: Автонаведение шоковых имплантатов сильно снижено
tweak: Скорость броска дизармом от шоковых имплантов снижена
tweak: Изолированные перчатки блокируют бросок дизармом от шоковых имплантатов, но не выносливость
tweak: Ксеноморфы больше не тратят дополнительные 2 секунды на принудительное применение таблеток/пластырей, поздравляем, если вы заметили разницу
fix: Ксеноморфы больше не будут отправляться в null в некоторых странных ситуациях
fix: Исправлены патчи с лишней инъекцией и реакцией на применение
fix: Исправлены таблетки, реагирующие на реагенты с гораздо меньшей долей, чем перенесенный объем в большинстве случаев
fix: Исправлены патчи мгновенного применения, не уведомляющие цель
fix: Chemmasters больше не будут получать хит при откручивании
fix: Граб теперь можно усилить, когда нападающий пристегнут
spellcheck: При попытке наложить патчи на КПБ больше не упоминается невозможность их накормить
/:cl: