Merge Upstream [03.08.2024] #1415
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
* The start * Getting a bit further * Slight ammo casing update * Istype helper and foam blockage * Adds status effect * Foam blockage and status effect fixes * Autolathe ammo + stun * aaaaaaa * Adds uplink item * Actual slowdown * Makes attacking a bit faster again * Ammo increase to 12 * Sirryan review * Adds sprites - almost working * Lots of fixes + mineral doors * Mineral doors don't open with foam
* Makes incorporeal moving mobs immune to tipping * Lewc review
* Fixing * Suggestion
* Update table_frames.dm Signed-off-by: Faron <[email protected]> * Update abduction_gear.dm Signed-off-by: Faron <[email protected]> * Update table_frames.dm Signed-off-by: Faron <[email protected]> * Update abduction_gear.dm Signed-off-by: Faron <[email protected]> * Update abduction_gear.dm Signed-off-by: Faron <[email protected]> * Update table_frames.dm Signed-off-by: Faron <[email protected]> * Update table_frames.dm Signed-off-by: Faron <[email protected]> * Update table_frames.dm Signed-off-by: Faron <[email protected]> --------- Signed-off-by: Faron <[email protected]>
* Updates chem smoke to work visually again * Update code/game/objects/effects/effect_system/effects_chem_smoke.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> * Update effects_chem_smoke.dm --------- Signed-off-by: Qwertytoforty <[email protected]> Co-authored-by: DGamerL <[email protected]>
* fix powercell for modsuits * Update code/modules/mod/mod_core.dm Signed-off-by: DGamerL <[email protected]> * Update code/modules/power/cell.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: DGamerL <[email protected]>
…c on mops, lightreplacers and more (#26255) * Wohooo refactor * Whoops * Adds unequip * Fixes * Update code/game/objects/items/weapons/mop.dm Co-authored-by: Adrer <[email protected]> Signed-off-by: DGamerL <[email protected]> * Update code/game/objects/items/weapons/mop.dm Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: Adrer <[email protected]>
…inded further if you have broken eyes. (#26338) Co-authored-by: Burzah <[email protected]>
* Update deltastation.dmm * Update deltastation.dmm * Fixing some minor typos for cyborg upgrade flavour text Throws in some missing apostrophes, capitalisation, and the letter "s." * Briefcase Full of Cash buff Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr * Reverts double-feature PR * Reverts a broken revert * Reverting again because Ebba told me to * And reverting yet again * Update robot_upgrades.dm * Update deltastation.dmm * Update deltastation.dmm * Update deltastation.dmm * Update deltastation.dmm * Update deltastation.dmm * Update deltastation.dmm * Update deltastation.dmm * Update deltastation.dmm * Update deltastation.dmm * Fixing some minor typos for cyborg upgrade flavour text Throws in some missing apostrophes, capitalisation, and the letter "s." * Briefcase Full of Cash buff Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr * Reverts double-feature PR * Reverts a broken revert * Reverting again because Ebba told me to * And reverting yet again * Update robot_upgrades.dm * Update deltastation.dmm * Update deltastation.dmm * Update deltastation.dmm * Update deltastation.dmm * Update deltastation.dmm * Fixing some minor typos for cyborg upgrade flavour text Throws in some missing apostrophes, capitalisation, and the letter "s." * Briefcase Full of Cash buff Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr * Reverts double-feature PR * Reverts a broken revert * Reverting again because Ebba told me to * And reverting yet again * Update robot_upgrades.dm * Update deltastation.dmm * Fixing some minor typos for cyborg upgrade flavour text Throws in some missing apostrophes, capitalisation, and the letter "s." * Briefcase Full of Cash buff Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr * Reverts double-feature PR * Reverts a broken revert * Reverting again because Ebba told me to * And reverting yet again * Update robot_upgrades.dm * Update deltastation.dmm * Update deltastation.dmm * Update deltastation.dmm --------- Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> Co-authored-by: Burzah <[email protected]>
…es and cannot be culted (#26174) * Makes nymphs and caterpillars immune to being culted after they evolve. Also makes them not give any usuable blood to vampires. * Improves comments and changes the trait name. * Update code/__HELPERS/trait_helpers.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: Spaghetti-bit <[email protected]> --------- Signed-off-by: Spaghetti-bit <[email protected]> Co-authored-by: Contrabang <[email protected]>
github-actions
bot
added
🗺️ Изменение Карты
Legendaxe
approved these changes
Aug 3, 2024
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.
Что этот PR делает
Мерж апстрима
Changelog
🆑 ParadiseSS13
add: Добавлена пусковая установка C-Foam (пена) в Аплинк за 25 ТК.
add: Попадание в шлюз будет блокировать его и требовать устранения препятствия в виде пены
add: Попадание пеной в гуманойдов (в т.ч. alien'ов) будет замедлять их на 10 секунд.
tweak: Эволюционировавшие гусеницы/нимфы больше не дают вампирам полезную кровь.
tweak: Эволюционировавшие гусеницы/нимфы больше не могут быть конвертированы культом, или осколком души.
tweak: Действия/Спеллы в HUD теперь зафиксированы на месте по умолчанию.
tweak: Ивент с туристами теперь учитывает предпочтения при выборе предателей.
fix: Туристы теперь правильно добавляются в манифест.
fix: Наигранное время игроком теперь правильно учитывается при ивенте с туристами.
fix: Вендоматы больше не опрокидываются на Blood/Shadow/Ghost crawling мобов.
fix: Исправление возможности размещения нескольких столов на одном тайле.
fix: Химический дым снова должен выглядеть нормально и производить более 1600+ частиц.
fix: Rigged батарейки в модсьютах теперь должны работать лучше.
fix: Ядра ИИ теперь снова можно закручивать/откручивать.
fix: Исправлена слепота, вызванная повреждением глаз, которая не считала вас слепым.
fix: Исправлено, что повязки не защищали некоторые расы от ослепления.
fix: Эммитеры снова можно заблокировать с помощью ID карты.
/:cl: