merge upstream #907
Merged
merge upstream #907
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
* Fix MODsuit storage keybinding issue Resolved issue where Shift + B key combination did not put items into MODsuit storage. Updated the quick_equip_item method to handle MODsuits and allow items to be inserted into MODsuit storage using key bindings. Therefore Fixes #23152. * return messages (of errors and confirmation) * Update code/modules/mob/living/carbon/human/human_inventory.dm Co-authored-by: Ryan <[email protected]> --------- Co-authored-by: Pierre-Louis <[email protected]> Co-authored-by: Ryan <[email protected]>
* Add a prompt for cyborgs created with Roborgers/Nanomachines Fixes #23616 : Oversight where cyborgs created with Roborgers/Nanomachines were not prompted to change their name. * Update code/datums/diseases/transformation.dm Co-authored-by: Ryan <[email protected]> --------- Co-authored-by: Pierre-Louis <[email protected]> Co-authored-by: Ryan <[email protected]>
…ng used. (#23570) * more bad extinguisher code * guh * Update code/game/objects/items/weapons/extinguisher.dm Co-authored-by: Burzah <[email protected]> * Update code/game/objects/items/weapons/extinguisher.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/weapons/extinguisher.dm Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Burzah <[email protected]> Co-authored-by: Henri215 <[email protected]>
* roulette * part 2 * radial menu * updated sprite * Apply suggestions from code review * Update code/game/objects/items/roulette.dm
…mplete modsuit forever. (#23598) * Updated makeCluwne method to instantly deactivate modsuit before applying the Cluwne spell Updated the makeCluwne method to instantly deactivate the modsuit control unit before applying the Cluwne spell. This ensures that the target is immediately affected by the spell without them being forever locked in the modsuit. Therefore fixes #22502 * Small fix for deployed (but unactivated) modsuit --------- Co-authored-by: Pierre-Louis <[email protected]>
* rewording * Validhunting bad
* fix * cleanup * revert changes * another cleanup * reagents_holder runtime fix * ci
…pen/close morgue trays (#23531) * Cyborg Morgue * Cyborg TSU
Co-authored-by: S34N <[email protected]>
* fixes * you piece of shit frame, eat shit and die
* Ladder begone! * Whoops * Map and icon * I forgor text * Renamed + typepath
* Adds Bearserk combos * Adds main Bearserk file * Adds Berserker Bear Pelt to uplink items Blacklisted from Nuclear and SST because Nukies always use modsuits, and SST won't be very stealthy if it's rocking the martial arts bear pelt. * Update bearserk.dm Minor tweak * Update uplink_traitor.dm Another minor tweak * Update bear_jaws.dm * Update paw_slam.dm * Update smokey.dm * Update uplink_traitor.dm * Update bear_jaws.dm * More Balance Tweaks * Whoopsies forgot a thing * Improved flavour text for Uplink Please give a warm welcome to a new cult (that only exists in flavour); Children of Ursa Major! * More Changes * Updated flavour text for Bear Jaws * Updated flavour text for Bear Jaws * Added a bit of Smoh'Kie to Smokey * Minor alteration * Minor flavour text tweak Made with love and copious amounts of vodka * I had an even better pun idea * Made cost identical to Carp * Ticked the files * Swapped the weights of Bearserk and Carp * Moved some resistances to a status buff * Fixed inexplicably formed code bugs * More inexplicable code fuckery *scream * Part 1 of Swapping weights of Bearserk and Carp * Second part * Added Suggestion Co-authored-by: Contrabang <[email protected]> * Added Suggestion Co-authored-by: Contrabang <[email protected]> * Added Suggestion Co-authored-by: Contrabang <[email protected]> * Added Suggestion I do agree the IsWeakened is rather redundant Co-authored-by: Contrabang <[email protected]> * Added Suggestion Co-authored-by: Contrabang <[email protected]> * Added Suggestion Co-authored-by: Contrabang <[email protected]> * Added Suggestion Co-authored-by: Contrabang <[email protected]> * Added Suggestion Co-authored-by: Contrabang <[email protected]> * Added Suggestion * Added Suggestion * Added Suggestion * Added Suggestion However, considering the && are causing check fails, this may be reverted * Added Suggestion * Added Suggestion, may be reverted if issues arise * Added Suggestion Co-authored-by: Contrabang <[email protected]> * Added Suggestion Co-authored-by: Contrabang <[email protected]> * Removed Antag Checks on Equipping and Unequipping the Pelt As per Contrabang's suggestion * Added a Suggestion and sound for Bearserker Rage * Added Suggestion I like consistency, so thank you Co-authored-by: Contrabang <[email protected]> * Added placeholder status icon * Added Suggestion Co-authored-by: DGamerL <[email protected]> * Added Suggestion Co-authored-by: DGamerL <[email protected]> * Added Suggestion Co-authored-by: DGamerL <[email protected]> --------- Co-authored-by: Contrabang <[email protected]> Co-authored-by: DGamerL <[email protected]>
* coin * oops * oops 2 * Update code/modules/mining/ores_coins.dm Co-authored-by: Burzah <[email protected]> * dgl review * Update code/modules/mining/ores_coins.dm Co-authored-by: DGamerL <[email protected]> * henri review, also move the mf desc * denth suggestion/review * conflict 👀 * DGL review&oopsie --------- Co-authored-by: Burzah <[email protected]> Co-authored-by: DGamerL <[email protected]>
* captain cig * aactually * Update cerestation.dmm * oops --------- Co-authored-by: S34N <[email protected]>
* Delete Table * File + Sprite * table list * Comment * MAP QUEUE AAAAAAAAAAAAAAA * space ruins and shuttle * Map Update + Fix MAPDIFF is GOD * Revert "table list" This reverts commit ba57c7d. * Revert "Delete Table" This reverts commit fa35ef1. * Added back the tray table * meta merge conflict --------- Co-authored-by: S34N <[email protected]>
* Remap Delta Medbay * this is fucking scary * Update delta.dmm * more new shits * Update delta.dmm * holy shit thats a lot * more shit * ALMOST DONEEEEEEE * its ready * fixs * tweaks * fixs * fixs * fixes and tweaks * god damn pipes people hate offset pipes :( * fix * fix and tweaks * tweaks * tweaks and more things * i am glad nobody saw this mistake * added missing virus food dispenser * fix some issues * more issues * more issues and more tables to chem * little tweaks * yes github, i fixed it * there we go baby, s34n review and updates changes * bruh now it is?
* how could I let this pass i am dumb dumb * Update delta.dmm * fire alarm in the window
* Lmao * Contra review
* Neat * Remove .
Co-authored-by: NanoMap Generation <[email protected]>
* FINALLY * m a t h
Chitinous armor headgear cover both mouth and eyes. Therefore protect from pepper spray. Fixes #23500 Co-authored-by: Pierre-Louis <[email protected]>
* wip * it works yipee * Update code/game/objects/items/weapons/implants/implant_shock.dm Co-authored-by: Henri215 <[email protected]> * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> * Did you know, in terms of making me suffer, full conflicts * Update code/_onclick/click_override.dm Co-authored-by: Ryan <[email protected]> * yes * Update code/game/objects/items/weapons/bio_chips/bio_chip_shock.dm Co-authored-by: DGamerL <[email protected]> --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: DGamerL <[email protected]>
* Reorder * spacing * Spacing * another one
* BALANCE: Buff generator for mecha * Update code/game/mecha/equipment/tools/other_tools.dm Co-authored-by: DGamerL <[email protected]> * Update code/game/mecha/equipment/tools/other_tools.dm Co-authored-by: Ryan <[email protected]> --------- Co-authored-by: DGamerL <[email protected]> Co-authored-by: Ryan <[email protected]>
* Update contractor_kit.dm * Requested changes * Changes requested from Rurik
* fixes external limbs runtiming when no owner at times * =
* Purges improvised and overloaded improvised shotgun ammo * order order tape recorder
* remove duplicate space parallax icons * floors too
…. Refactor lavaland themes to datums (#23611) * feat: add different background planet based on current lavaland theme. Refactor lavaland themes to datums * fix: adjust to linter * fix: replace `istype` with `ispath` in `/datum/lavaland_theme` validation * refactor: apply `Contrabang` review * Update code/modules/lavaland/lavaland_theme.dm Co-authored-by: Contrabang <[email protected]> --------- Co-authored-by: Contrabang <[email protected]>
* this ID must have icon * APC access is engineering
* Fixed russian walls saying they can be sliced. * good idea. Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: S34N <[email protected]>
* i love CI! * WILL... IT... FIX? --------- Co-authored-by: S34N <[email protected]>
Co-authored-by: S34N <[email protected]>
…are the same name (#23610) * Ghost bar character select no longer break for shared names Ghost bar character selector now use an unique ID and not a name as an identifier. Having two characters with the same name no longer break ghost bar selector. Hence Fixes #23608 * small fixs * Update code/modules/ruins/ghost_bar.dm Co-authored-by: warriorstar-orion <[email protected]> * variable name fix --------- Co-authored-by: Pierre-Louis <[email protected]> Co-authored-by: warriorstar-orion <[email protected]>
Co-authored-by: S34N <[email protected]>
* Kirby randomless * Whoops * Whoops x2 * Maps Script & missing plant * Spellcheck * Plant eye fix * Update code/game/objects/structures/flora.dm Co-authored-by: Burzah <[email protected]> * double pipe fix * errant sign removal --------- Co-authored-by: Burzah <[email protected]> Co-authored-by: S34N <[email protected]>
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
🆑
add: Мержим оффов
add: Добавлен бинд(shift+B(eng)) для сумки модсьюта
fix: Исправлена смерть от диабета после шоколадки
add: Добавлена кастомизируемая рулетка(крафтится из 10 досок дерева)
tweak: Борги теперь умеют взаимодействовать с газовыми баллонами и с морговым подносом
fix: Подкоректированы спрайты воксов
add: Добавлено новое боевое исскуство - Ярость космомедведя
add: Добавлена шкура берсеркера в аплинк(подробнее можно почитать тут ParadiseSS13#23050)
tweak: Клоунская монетка теперь подскальзывает
tweak: Урановая монета теперь радиоактивная(давно пора)
tweak: Теперь плазмовая монета может перейти в газовое состояние после взаимодействия с чем-то горячим
tweak: Теперь кольца делаются с помощью кусачек
tweak: Теперь гуманоидные расы имеют более реалистичную температуру тела
tweak: Теперь силовые перчатки(Power Gloves) это биочип который работает даже если носитель в модсьюте
tweak: Теперь система поиска целей для силовых перчаток при клике мимо куклы работает лучше
tweak: Теперь силовые перчатки скалируются от силы сети, а не от ее излишка.
fix: Оливки больше не могут мутировать в яблоки
tweak: Изменения работы генераторов для мехов, урановый и плазмовый генератор потребляют и вырабатывают больше на 5 единиц
tweak: Дельта выработки тесла генератора повышена в три раза
add: В стартовый ящик контрактора добавлен ключ шифрования синдиката и коробка с 5-ью С4
tweak: Контракторский набор хамелиона добавлен в стандартный набор
del: Энергокинжал, заряды Х4 и бинарный ключ шифрования удалены из пула вещей контрактора
tweak: Теперь нельзя перезарядить импульсный пистолет
del: Убраны импровизированные патроны для самодельного дробовика, вместе с их перегруженной версией
tweak: Шприцы с летальной инъекцией больше не помещаются в шприцемет
/:cl: