merge upstream #868
Merged
merge upstream #868
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
* woohoo * sirryan review * accept incoming and stuff * fuck
* wham bam * read this * Update code/modules/mob/new_player/new_player.dm Co-authored-by: Luc <[email protected]> --------- Co-authored-by: Luc <[email protected]>
* Ports baby watcher from TG* * ah. I see. Alphabetical. Should have seen that coming. * here comes the better mapped boi 🎵 * removes recursive_loc_check, uses get. also removes the debug always place WHOOPS * fixes arguments, need to update and edit map * adds bombable turfs * Apply suggestions from code review Co-authored-by: Contrabang <[email protected]> * changes * /// * R-R-R-RUN IT BACK * Update code/modules/awaymissions/mob_spawn.dm Co-authored-by: Contrabang <[email protected]> * oops spacing * part 1/2 * Update code/modules/awaymissions/mission_code/ruins/watcher_grave.dm Co-authored-by: Contrabang <[email protected]> * 2 / 2 * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Contrabang <[email protected]> Co-authored-by: Henri215 <[email protected]>
* clean up and update of mind and objectives * making it work. * identity theft * requested changes * updating some target && target to target?. * requested changes * adds update_explaination_text to objective/steal
* Burn it all * Update code/game/objects/items/flag.dm Co-authored-by: DGamerL <[email protected]> * Update code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm Co-authored-by: DGamerL <[email protected]> * Update code/modules/food_and_drinks/food/foods/baked_goods.dm Co-authored-by: DGamerL <[email protected]> * Update code/modules/mob/language.dm Co-authored-by: Burzah <[email protected]> --------- Co-authored-by: DGamerL <[email protected]> Co-authored-by: Burzah <[email protected]>
…ords whispered when succumbing (#23441) * Allows for final words when succumbing * slightly rework input * oops * moment * better logic * prevent the dead from speaking * Update code/modules/mob/living/living.dm Co-authored-by: Ryan <[email protected]> --------- Co-authored-by: Ryan <[email protected]>
* no timer when buckle ontop of chair, no random hits when buckling * revert revert, right
* code improvement * oops * bad comment gone
#23519) Ensure that changeling internals are retained after transformation to prevent them from being disabled, especially on Lavaland. Co-authored-by: Pierre-Louis <[email protected]>
* Fix patch no longer printing units in default name * Pills/patches show transfer the contained amount * Hide pill/patch transfer rates * Revert "Hide pill/patch transfer rates" This reverts commit ad0edcf and f27ffe6 --------- Co-authored-by: Arthri <[email protected]>
* Fix patches not preserving chem temperature * Remove some leftover same-as-parent property assignments from pills * Fix pills/patches showing their nonexistent transfer rate * Revert "Fix patches not preserving chem temperature" This reverts commit 8905280.
* antag greeting * here too
github-actions
bot
added
💾 Изменение конфига
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
🆑
tweak: Мерж оффов
add: Добавлена новая руина для лаваленда "Гнездо наблюдателей(watcher)"
add: Добавлен рандомный "предсмертный хрип"
tweak: Цена за байк в аркаде снижена до 7000 билетиков
fix: Починили Электрогитару
/:cl: