Merge Upstream 17.08.2024 [IDB IGNORE] #1436
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
* Makes dry mops insert properly into the janicart * Oops
* Revert "Feature Freeze announcement" This reverts commit ec7a0bf. * Update README.md Signed-off-by: S34N <[email protected]> * Update CODE_OF_CONDUCT.md Signed-off-by: S34N <[email protected]> * Update PULL_REQUEST_TEMPLATE.md Signed-off-by: S34N <[email protected]> * Update PULL_REQUEST_TEMPLATE.md Signed-off-by: S34N <[email protected]> * Update CODE_OF_CONDUCT.md Signed-off-by: S34N <[email protected]> * Update PULL_REQUEST_TEMPLATE.md Signed-off-by: S34N <[email protected]> * Update CODE_OF_CONDUCT.md Signed-off-by: S34N <[email protected]> * Update CODE_OF_CONDUCT.md Signed-off-by: S34N <[email protected]> * Update CODE_OF_CONDUCT.md Signed-off-by: S34N <[email protected]> * Update PULL_REQUEST_TEMPLATE.md Signed-off-by: S34N <[email protected]> * Apply suggestions from code review Signed-off-by: S34N <[email protected]> * farie --------- Signed-off-by: S34N <[email protected]>
…13#26409) * fixes null runtime * the ASCII code for " " is 32, or in 0x0020 in hexadecimal * Update code/modules/mob/living/carbon/carbon_procs.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: chuga-git <[email protected]> --------- Signed-off-by: chuga-git <[email protected]> Co-authored-by: DGamerL <[email protected]>
* Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.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 cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Missing cable * Moves a single fungus. * Secret baseball gear * Maints Decor and Spacing The Airless Area * Removes stray thermomachine. Adds science desk disposals. * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Returns as many APCs as possible to maint. * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Escape Pod Decorative Bay * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm
* byondstorage tweaks * await
* Securiblade, Sheaths * Snakesfang and Cleaver * Crates and Armory * Origin Tech Fix * Chargers can now accept securiblades * Clan Cleaver is now Breach Cleaver * Armor Checking * Comment and description fixes * State comment * More Comments * Contains list fix Co-authored-by: 1080pCat <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Breacher sword hates doors * Tab indentation * Breacher Armor Buff - Status Effect while wielding * Breach Cleaver Sounds - courtesy of Stoniest * Snakesfang Codersprites * Define Fix * Breach Cleaver - Icon Codersprites * Breach Cleaver Codersprites * Gave help-intent attack on cleaver an animation * Reduced sound intensity of wielded harm * Moved variables below inherits * Buff spacing, guard clause * Improved examine * Guard clauses the secsword powercell * Sword mode defines * Added undefs * Spacing * Securiblade loreful examine_more * Examine_More for all swords * Grammar Co-authored-by: Luc <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Moved defines, added auto-docs, grammar * Fixed secsword recharging * Secsword burn function fix * Cleaver Armor Buff Fix * Fix to buff * Securiblade burn fix, stamina charge reduction fix * Breach Cleaver - Wielding sprite consistency, fixed sheath orientation when unsheathed * Fixes securiblade EMP oversight * Snakesfang can parry now * Spelling * Removed define indents * Early returns * A whole lot of fixes. Qdels the cell on delete. * stun_delay proc doc * Update code/datums/uplink_items/uplink_general.dm Signed-off-by: DGamerL <[email protected]> * Merged IF statements, relocated inits * Armor change * Remove null in cell variable * Ifs to Switch * Revert "Armor change" This reverts commit 6b61e33. * Better Ifs to Switch * Removes roundstart armory blade, increases crate cost to 550 * Removed extraneous loc check, removed extraneous link cell proc * Added null check to secsword/emp_act * Added clear_cell proc to replace duplicate icon updates and cell nulls * No vars in proc argument * Properly nulls cell. Fixes cell sabotage for sword * JustTheCleaver * Forgot about the recharger * Logic Change - Combined two Ifs Co-authored-by: DGamerL <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Removed extraneous permit var Co-authored-by: DGamerL <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Early returns on object attacks * Fixed missing cleaver sheath * Fixed comment format Co-authored-by: 1080pCat <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * Removed extraneous line Co-authored-by: DGamerL <[email protected]> Signed-off-by: PollardTheDragon <[email protected]> * cleaving_armor_boost variable standardization * Added intent and effects to attack logs * Added notice to description span for antags * Made the armor buff into a var * Replaced get_dir(src, get_step away(H, src) with user.src * Fixed stat check * AP Changes --------- Signed-off-by: PollardTheDragon <[email protected]> Signed-off-by: DGamerL <[email protected]> Co-authored-by: 1080pCat <[email protected]> Co-authored-by: S34N <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: DGamerL <[email protected]>
* Clean up grenades * Update clusterbuster.dm * Update grenade.dm * Update flashbang.dm * Update grenade.dm * Update frag.dm * Update code/game/objects/items/weapons/grenades/frag.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: CRUNCH <[email protected]> * Update code/game/objects/items/weapons/grenades/ghettobomb.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: CRUNCH <[email protected]> * update * Update code/game/objects/items/weapons/grenades/frag.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: CRUNCH <[email protected]> * update * update * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> Signed-off-by: CRUNCH <[email protected]> * Update grenade.dm * Update code/game/objects/items/weapons/grenades/frag.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: CRUNCH <[email protected]> * Apply suggestions from code review Co-authored-by: Burzah <[email protected]> Signed-off-by: CRUNCH <[email protected]> * extra var --------- Signed-off-by: CRUNCH <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Contrabang <[email protected]> Co-authored-by: Burzah <[email protected]>
* Initial commit * Change after review
Co-authored-by: Arthri <[email protected]>
Co-authored-by: NanoMap Generation <[email protected]>
* Fixes scrollbar and background image styles for 516 * Background
* refactor: remove maint loot spawn varedits. * Update script with PR number
…eans up Vents and Scrubber pipes. Improves Wallbump Placement. (ParadiseSS13#26067) * Update boxstation.dmm * Update boxstation.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 boxstation.dmm * Update boxstation.dmm * 4 way manifold --------- Co-authored-by: Burzah <[email protected]>
Co-authored-by: NanoMap Generation <[email protected]>
…adiseSS13#26446) * Proto pulse slugs cannot immediately destroy reinforced walls * uses ex_act defines
* Initial commit * Back to JS (Skill Issue & lazyness) * Update UI please * No need that * Uhhh... documentation?
* Fix stack merge & return lost code * What is `S` and `O`? * Comment * Update code/game/objects/items/stacks/stack_recipe.dm Signed-off-by: Burzah <[email protected]> --------- Signed-off-by: Burzah <[email protected]> Co-authored-by: Burzah <[email protected]>
* Add admin-spawn-only syndicate scanner. * Add cooldown and sound on hit. * Vars cooldown time. * Update code/game/objects/items/devices/traitordevices.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: Charlie Nolan <[email protected]> * Update code/game/objects/items/devices/traitordevices.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: Charlie Nolan <[email protected]> * Code quality. * Apply suggestions from code review Co-authored-by: DGamerL <[email protected]> Signed-off-by: Charlie Nolan <[email protected]> --------- Signed-off-by: Charlie Nolan <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: DGamerL <[email protected]>
… on APCs (ParadiseSS13#26445) * Makes Static Power Safer & Fixes Negative Power Issues * updates documentation & syntax * updates disposal power changes * Revert "updates disposal power changes" This reverts commit b233aec.
…mind (ParadiseSS13#26473) * sanity checks observers without minds being trait checked * Update code/game/gamemodes/cult/runes.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: chuga-git <[email protected]> * Update code/game/gamemodes/cult/runes.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: chuga-git <[email protected]> --------- Signed-off-by: chuga-git <[email protected]> Co-authored-by: Contrabang <[email protected]>
* ddsadsa ddsadsa * adds a new MILLA atmos type * Build MILLA * oopsie * comments * Update code/__DEFINES/atmospherics_defines.dm Co-authored-by: Charlie Nolan <[email protected]> Signed-off-by: Kyani <[email protected]> * adds commenting * merged and redid commenting * Build MILLA --------- Signed-off-by: Kyani <[email protected]> Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com> Co-authored-by: Charlie Nolan <[email protected]>
…lements. (ParadiseSS13#25619) * refactor: elementize simplemob homeostasis * undef these bad boys * ugh * Fix up comments Co-authored-by: Luc <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> * update element var name * Update code/modules/mob/living/simple_animal/simple_animal.dm Signed-off-by: Burzah <[email protected]> --------- Signed-off-by: warriorstar-orion <[email protected]> Signed-off-by: Burzah <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: Burzah <[email protected]>
…seSS13#25430) * Fix not being able to get mech pilot out manually * Update mecha.dm * Update mecha.dm * Update mecha.dm * Update mecha.dm * Update code/game/mecha/mecha.dm Co-authored-by: Burzah <[email protected]> Signed-off-by: Сиротка <[email protected]> --------- Signed-off-by: Сиротка <[email protected]> Co-authored-by: Burzah <[email protected]>
* Fix Desk Bell Bugs Fixes a bug where a desk bell with a receiving signaler and another receiving signaler ended up in an infinite loop. Fixes door bells not unregistering (code) signal handlers for removed (item) signalers * remove superfluous comment Co-authored-by: Luc <[email protected]> Signed-off-by: Kenionatus <[email protected]> * Update code/modules/paperwork/desk_bell.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Burzah <[email protected]> --------- Signed-off-by: Kenionatus <[email protected]> Signed-off-by: Burzah <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: DGamerL <[email protected]>
* bloody blood * ehhhh * here too * bloodwrite fix * a * review changes * max blood amount to argument * Update code/game/atoms.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: HMBGERDO <[email protected]> * Update code/modules/mob/living/carbon/human/human_defense.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: HMBGERDO <[email protected]> * tab --------- Signed-off-by: HMBGERDO <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Burzah <[email protected]>
Co-authored-by: NanoMap Generation <[email protected]>
…dates explanation text (ParadiseSS13#26501)
…huggers. (ParadiseSS13#26513) * Removes the blindness from Facehuggers and ties it to `update_tint()`. `update_tint()` now properly removes and adds blindness. * Removes unneeded overlay.
* Fixes StackCraft for 516 * Rebuild
github-actions
bot
added
Документация
AyIong
changed the title
Legendaxe
approved these changes
Aug 17, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
💾 Изменение конфига
Ф-ф-фуриор...?
🎸 Инструменты
Мы выдаем себя за реальное сообщество разработчиков.
Документация
Улучшения и дополнения в документации
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
🙏 Слияние с восходящим потоком
Боже, храни Короля!
📜 CL валиден
Этот чейнджлог будет успешно опубликован
🔉 Звук
Услада для ушей.
TGUI
Кто-то решил потрогать интерфейсы.
🗺️ Изменение Карты
В этом ПРе затронут файл не станционной карты. Может и не один.
Документация
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.
Надо пересобрать MILLA
Был удалён модуль Stack Craft, так как залито на оффы
Changelog
🆑 ParadiseSS13
add: Добавлен Breach Cleaver. Огромный тесак доступный в аплинке Унатха
add: Восстановлена возможность построить Disk Compartmentalizer
add: Добавлены 3 экстренных ящика с приборами для освещения
fix: Cloak of the prophet теперь работает
fix: Прото-пульс слаги больше не уничтожают реинфорс стены с 50% шансом, вместо этого просто наносят им урон. Пульсовки дедов не затронуты
fix: Электродемон теперь имеют предохранитель, ограничивающий их способность прыгать по проводам
fix: Больше нельзя раскрутить гранаты, если на ней не выставлен таймер
fix: Мокрую швабру сново можно поставить в JaniCart
fix: АПЦ больше не отображает негативный заряд или неправильное значение потребления мастер канала
fix: Тайндердом иерофанта больше не горячий
fix: Больше нельзя заставить настольный звонок, с помощью сигналлера, бесконечно издавать звон
fix: Окровавленные от операции руки, больше не будут пачкать инструменты и прочие предметы
fix: Если вы решите написать что-то кровью, ваши руки больше не будут кровавые навсегда
fix: Цель генокрада на побег под чужой личиной, больше не ломается если цель ушла в крио
/:cl: