Merge Upstream 30.07.2024 #1399
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
…S13#26141) * Allow access helpers for airlock spawners. * whoops * whitespace * add visual access helper placement indicator
* Idk man * IT WORKS * SO CLOSE TO GREATNESS * IT ALL WORKS AAAAAA * Actually add a random timer * Oopsie * Removes empty proc * Update code/game/gamemodes/traitor/traitor.dm Co-authored-by: SteelSlayer <[email protected]> * Contra requested changes * Adds randomness to random_time * Whoops * Contra + AA Review * Removes TODO * Reverts standard mode * Makes CI not fail * Removes unused proc * FUCK * Fixes a kit bug (Thanks Erik) * Tourte Review * Matt review * Changes text, adds admin logs * Clarifies the log * New and improved version! * Fixes * Revert "Fixes" This reverts commit ea29aa9. * Revert "New and improved version!" This reverts commit ea053f3. * Properly rerolls objectives at handout * Adds trifecta support * Contra and Sirryan review * Forgor this * Fix CI * Final fixes * Update code/game/gamemodes/traitor/traitor.dm Co-authored-by: Ryan <[email protected]> Signed-off-by: DGamerL <[email protected]> * Update code/game/gamemodes/trifecta/trifecta.dm Co-authored-by: Ryan <[email protected]> Signed-off-by: DGamerL <[email protected]> * Steel review * Wow I was silly * Less whitespace * Dumbest bug in a while * No more lavaland player getting autobalanced * Streamlines a proc + another fix * AAAAA FUCK * Update code/game/gamemodes/objective.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: DGamerL <[email protected]> * Update code/game/gamemodes/objective.dm Signed-off-by: DGamerL <[email protected]> * Contra review * Faire review * Forgor to push this * Farie + Contra review * Hal + Contra review * Uses `replaceobjective` now + Fix * Farie review * Farie review * Farie review 2: electric bogaloo * Fix * Update code/game/gamemodes/objective_holder.dm Co-authored-by: Farie82 <[email protected]> Signed-off-by: DGamerL <[email protected]> * Contra review * Update code/game/gamemodes/objective_holder.dm Co-authored-by: Farie82 <[email protected]> Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: SteelSlayer <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Contrabang <[email protected]> Co-authored-by: Farie82 <[email protected]>
* Pulse demon failsaves * We can have 1000 power, as a treat
…gle being a copy of the music instrument description (ParadiseSS13#26283)
…13#26279) * Replica syndicate space suit sprites * Revert "Replica syndicate space suit sprites" This reverts commit 1fb5cf6. * Adds back sprite for plasmaspear --------- Co-authored-by: [email protected] <[email protected]>
… for final review] (ParadiseSS13#25820) * THE WORK, IT GOES AND SO IT GOES * darker yet darker * more changes * Almost done, let's post the pr and have some dev people test it out. * update comment * small change * pushing , then we address changes * Apply suggestions from code review Co-authored-by: 1080pCat <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> * more progress * final bar lines * aditional tweaks * Update telecomns_returns.dmm * Update code/modules/awaymissions/mission_code/ruins/telecomns.dm Co-authored-by: Ryan <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> * Apply suggestions from code review Co-authored-by: Ryan <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> * sirian changes * emp weakness, light changes * no runtimes, shoot borgs * sorry for all the commits just update to master thanks * Update code/modules/awaymissions/mission_code/ruins/telecomns.dm Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> * fixes * fixes pathing. Voices * removes always spawn * Apply suggestions from code review Co-authored-by: Luc <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> * more changes * requested string change * Update code/modules/awaymissions/mission_code/ruins/telecomns.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> * lewcs final changes * Apply suggestions from code review Co-authored-by: Luc <[email protected]> Signed-off-by: Qwertytoforty <[email protected]> --------- Signed-off-by: Qwertytoforty <[email protected]> Co-authored-by: 1080pCat <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: warriorstar-orion <[email protected]> Co-authored-by: Luc <[email protected]>
Signed-off-by: S34N <[email protected]>
…3#25801) * GOD DAMN I WAS COOKING * Makes portal less dumb
Signed-off-by: Faron <[email protected]>
…D) and RPED Afterattack (ParadiseSS13#26257) * Refactor wooo! * Apply suggestions from code review Co-authored-by: Ryan <[email protected]> Signed-off-by: CRUNCH <[email protected]> --------- Signed-off-by: CRUNCH <[email protected]> Co-authored-by: Ryan <[email protected]>
…g over the blob (ParadiseSS13#26275) * ranged guardian blob fix * oop * Update code/game/gamemodes/miniantags/guardian/types/ranged.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: Ryan <[email protected]> --------- Signed-off-by: Ryan <[email protected]> Co-authored-by: DGamerL <[email protected]>
…SS13#26134) * FINALLY, IT WORKS * fix tabs * Contra's suggestion * Spaghetti's review * removes an unnecessary enter * Guarantees the stronger version drops a salvage * Lewc's/DGAMER's review
* tentacle no longer runtimes when shooting point blank * Update code/modules/antagonists/changeling/powers/mutations.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: HMBGERDO <[email protected]> * Update code/modules/antagonists/changeling/powers/mutations.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: HMBGERDO <[email protected]> * Update code/modules/antagonists/changeling/powers/mutations.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: HMBGERDO <[email protected]> * Update code/modules/antagonists/changeling/powers/mutations.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: HMBGERDO <[email protected]> --------- Signed-off-by: HMBGERDO <[email protected]> Co-authored-by: 1080pCat <[email protected]>
* Switch default TGchat theme from dark to light * Rebuild TGUI
* Aaaaa it works * Add updatepaths * Add unsaved files * MATTTTT * Fixes casino * Fix --------- Signed-off-by: DGamerL <[email protected]>
* aaaaaaaaaaaaaa * Update code/game/gamemodes/objective.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: Contrabang <[email protected]>
* Some borgs now block flashes again * Check if it affects silicons * Charlie review
* Update transfer_valve.dm Signed-off-by: Faron <[email protected]> * Update transfer_valve.dm Signed-off-by: Faron <[email protected]> --------- Signed-off-by: Faron <[email protected]>
…lood from species descriptors (ParadiseSS13#26309)
…13#26314) * Initial commit * Additional operator spacing adjustment * Removes an unused var and autodocs another
Signed-off-by: Faron <[email protected]>
* ClothGolemFix * Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm Co-authored-by: S34N <[email protected]> Signed-off-by: Ryan <[email protected]> --------- Signed-off-by: Ryan <[email protected]> Co-authored-by: S34N <[email protected]>
* Nukes 514 support * 1633 * replace CI exclude for proc refs * 1619
…eSS13#25859) * makes syndicate code words more generic and natural sounding * Moves codewords into config * sort config/names/codeword_locations.txt Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: tipoima <[email protected]> * sort config/names/codeword_nouns.txt Co-authored-by: warriorstar-orion <[email protected]> Signed-off-by: tipoima <[email protected]> --------- Signed-off-by: tipoima <[email protected]> Co-authored-by: warriorstar-orion <[email protected]>
github-actions
bot
added
Документация
github-actions
bot
added
Кибериада
Legendaxe
approved these changes
Jul 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
💾 Изменение конфига
Ф-ф-фуриор...?
🎸 Инструменты
Мы выдаем себя за реальное сообщество разработчиков.
Документация
Улучшения и дополнения в документации
🖌️ Спрайты
Вы заработали свою миска-рис и кошко-жена. Партия гордится вами!
🙏 Слияние с восходящим потоком
Боже, храни Короля!
📜 CL валиден
Этот чейнджлог будет успешно опубликован
🔉 Звук
Услада для ушей.
TGUI
Кто-то решил потрогать интерфейсы.
Керберос
Этот ПР изменил что-то на Керберосе (DeltaStation)
Кибериада
Этот ПР изменил что-то на Кибериаде (BoxStation)
Цереброн
Этот ПР изменил что-то на Цереброне (MetaStation)
Документация
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 делает
Заменяет Skill Issue хэдэдэ на мой
Changelog
🆑 ParadiseSS13
add: Трейторы теперь будут получать целы спустя 5-15 минут после начала раунда
add: Новая космическая руина - спутник телекомов
fix: Электродемон теперь должен умирать реже при спавне
fix: Нося защиту от радиации, все вещи под защитой, например, сумки, больше не будут облучаться
fix: МОДы с защитой от радиации, теперь не защищают от радиации, если заряда меньше 1000
fix: Патроны с горохом теперь отбрасывают жертву при попадании
fix: Зарядники снова могут быть улучшены с помощью RPED
fix: Destroyer и борги Гамма ЕРТ теперь блочат флеш
del: Удалены кодовые слова напитков и имён членов экипажей
fix: И куча мелких фиксов
/:cl: