Merge Upstream [09.07.2024] #1365
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
* Adds epi to nanocalcium * Actually add volume * Now 10u
…iseSS13#26033) * Adds Hyperregenative Medipen to traitor uplink * remove rogue pixel * Update code/datums/uplink_items/uplink_traitor.dm Co-authored-by: Spaghetti-bit <[email protected]> Signed-off-by: tipoima <[email protected]> * Update code/datums/uplink_items/uplink_traitor.dm Co-authored-by: Spaghetti-bit <[email protected]> Signed-off-by: tipoima <[email protected]> * Update code/modules/reagents/reagent_containers/hypospray.dm Co-authored-by: Spaghetti-bit <[email protected]> Signed-off-by: tipoima <[email protected]> * Cuts iron, sanguine, and spaceaccil from the medipen * Update code/datums/uplink_items/uplink_traitor.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: tipoima <[email protected]> * Update code/datums/uplink_items/uplink_traitor.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: tipoima <[email protected]> --------- Signed-off-by: tipoima <[email protected]> Co-authored-by: Spaghetti-bit <[email protected]> Co-authored-by: DGamerL <[email protected]>
* toggleable fullsize strip menu * name. * TGUI rebuild * tgui rebuild * TGUI rebuild * TGUI rebuild * TGUI rebuild * TGUI rebuild * TGUI rebuild
* ddsadsa ddsadsa * Update pet.dm * Update pet.dm * Update code/modules/mob/living/simple_animal/friendly/pet.dm Co-authored-by: Ryan <[email protected]> Signed-off-by: Kyani <[email protected]> * early returns * early returns * Update code/modules/mob/living/simple_animal/friendly/pet.dm Signed-off-by: DGamerL <[email protected]> * Update code/modules/mob/living/simple_animal/friendly/pet.dm Signed-off-by: DGamerL <[email protected]> * Update code/modules/mob/living/simple_animal/friendly/pet.dm Co-authored-by: Matt <[email protected]> Signed-off-by: Charlie <[email protected]> --------- Signed-off-by: Kyani <[email protected]> Signed-off-by: DGamerL <[email protected]> Signed-off-by: Charlie <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Charlie <[email protected]> Co-authored-by: Matt <[email protected]>
Signed-off-by: Faron <[email protected]>
* resprite Signed-off-by: Us3rn4me228 <[email protected]> * fix Signed-off-by: Us3rn4me228 <[email protected]> --------- Signed-off-by: Us3rn4me228 <[email protected]>
* if the item has no damage, it is not autoblocked. * armor check first * Update code/modules/mob/living/carbon/human/human_defense.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]>
* flashbang 1s gone * time defines * Update code/game/objects/items/weapons/grenades/flashbang.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: 1080pCat <[email protected]> * Update code/game/objects/items/weapons/grenades/flashbang.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: 1080pCat <[email protected]> --------- Signed-off-by: 1080pCat <[email protected]> Co-authored-by: Contrabang <[email protected]>
…ting unless pulled manually. (ParadiseSS13#26170)
…diseSS13#26154) * First wave * Second wave * Last wave * Apply suggestions from code review Signed-off-by: DGamerL <[email protected]> * We love signals in this household * Revert "We love signals in this household" This reverts commit 75fe8d4. * Update code/game/machinery/camera/tracking.dm Co-authored-by: Charlie <[email protected]> Signed-off-by: DGamerL <[email protected]> * Update code/game/machinery/camera/tracking.dm Co-authored-by: Charlie <[email protected]> Signed-off-by: DGamerL <[email protected]> --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: Charlie <[email protected]>
* Refactor Cream-Master UI handling. * Playsound TRUE * Lint
* Various rollie fixes * Fixes
…diseSS13#26138) * Update mind.dm * Update code/datums/mind.dm Co-authored-by: Matt <[email protected]> Signed-off-by: CRUNCH <[email protected]> --------- Signed-off-by: CRUNCH <[email protected]> Co-authored-by: Matt <[email protected]>
* We love signals in this household * This isn't needed * Coconut review * Update code/game/objects/items/weapons/melee/energy_melee_weapons.dm Co-authored-by: Ryan <[email protected]> Signed-off-by: DGamerL <[email protected]> * Adds handler --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: Ryan <[email protected]>
* cleanup: Remove all unused accesses. * Whoops, TCOMSAT is used, didn't read script correctly
* Retrofit TG pathfinder with upstream improvements * i know how things work * don't use HAS_TRAIT for things that aren't traits * unique filenames * i'm just a goofy lil moron * use new block syntax * apparently values don't need clamping with new block syntax? * silence invalid JPS dest runtime * fix runtime passing ID instead of access list
…6130) * fixes beaker telekinesis * removed unneeded spacing * commenting * user to usr
* fix treadmill throwat * fixes dropdel runtimes and end_throw() not being called * dgl review
github-actions
bot
added
🗺️ Изменение Карты
* Makes all playsounds use `TRUE` for vary * Same but for `FALSE`
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: Новый предмет предателя: Hyperregenerative medipen, быстро исцеляющий предмет.
imageadd: Изменены спрайты странных объектов (реликвий).
imageadd: Новые спрайты для брони и шлема Судьи Дредда.
tweak: Теперь вы можете изменять размер TGUI strip menu между миниатюрной версией и полноразмерной, размещая слоты там, где они находятся в стандартном HUD.
tweak: Hardened Kaleido Optics Eyes Autoimplanter, они же глаза с прицелом, теперь стоят 10 ТК (было 20 TC).
tweak: Nanocalcium injectors теперь впрыскивают также 10 юнитов эпинефрина.
tweak: На флешки больше нельзя выставить таймер в 1 секунду. Теперь самое минимальное время срабатывание - 1 миллисекунда, далее 3 секунды и 5.
tweak: Фаер алярма теперь проверяется на то, емагнута она, или нет, для предотвращения активаций через дамаг или температуру, кроме случаев ручной активации.
fix: Фултон снова работает.
fix: Исправлены эмоуты, теперь они имеют случайный питч, если не зависят от возраста.
fix: Исправлена проблема, из-за которой руки без перчаток имели неправильный цвет крови.
fix: Мышеловка больше не исчезает из ваших рук, если вы ее активируете.
fix: Машина с мороженым теперь снова может вмещать больше реагентов.
fix: Исправлено отсутствие времени курения у самокруток.
fix: Энергетическое оружие теперь можно затачивать, пока оно активно.
fix: Энергетическое оружие теперь немедленно обновляет свой урон, когда вы его затачиваете.
fix: Кастеты снова меняют свой звук удара.
fix: Доступ "Courtroom" на ID консоли теперь правильно предоставляет доступ к залу суда.
fix: Исправлен процесс передачи телекинезом мензурки в руку при переключении рук.
spellcheck: Исправлено название рецепта Neural Jumpstarter Implants.
/:cl: