merge upstream 13.04.2024 #1175
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
* add negative station trait: messy station * remains can't be cleaned * Apply suggestions from code review Co-authored-by: Luc <[email protected]> * messy and hangover? you get more mess * pull down max mess size a bit * remove floor tiles properly * autodoc remaining_tiles * actually gonna reduce this further --------- Co-authored-by: Luc <[email protected]>
* Added beaker support to RPEDs. * Apply suggestions from code review Co-authored-by: Henri215 <[email protected]> * Comment fix. * Apply suggestions from code review Co-authored-by: 1080pCat <[email protected]> * Prevented filled beakers from going in the bRPED. --------- Co-authored-by: Henri215 <[email protected]> Co-authored-by: 1080pCat <[email protected]>
…es. (#24699) * Made storage nesting better, improved consistency between storage types. * Out, er, space. * Null safety is good. * Apply suggestions from code review Co-authored-by: Burzah <[email protected]> --------- Co-authored-by: Burzah <[email protected]>
* Decimal proof code * Adds else to the switch statement
Co-authored-by: FunnyMan3595 (Charlie Nolan) <[email protected]>
* Baseturf helpers fix * Better way
* That's a lot of files * More changes * Removes mention * Thanks to Funny for helping with the text
Bumps [tar](https://github.com/isaacs/node-tar) from 6.2.0 to 6.2.1. - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](isaacs/node-tar@v6.2.0...v6.2.1) --- updated-dependencies: - dependency-name: tar dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Increase CC Security * henri review * button replaced and improved * requested changes * Secures CC armory (typo-free edition) * final code edit, map review
* Create directional helpers for air alarms. * rename script, need alarm_area always * I love automated changes
* Bound ahelp/mhelp replies more tightly to their ticket. * Hardened PMs further against missing data. * Support expanding Discord notifications for ahelp/mhelp. Functionality changes: * Informs the user when their ticket is reopened. * Informs other mentors/admins when tickets are converted. * Discord messages now get a "Ticket 3, " or similar prefix. Not useful by itself, but will be with the following PR. Code changes: * When you create a ticket, you get the ticket object back. * checkForTicket now allows you to fetch a ticket by number, and falls back to searching for open tickets if the ticket isn't found. * Corrected and simplified the logic for adding PMs to tickets. * Responses are now added through the ticket system, not the tickets directly. * Make the ahelp/mhelp relay cover more than the initial message. --------- Co-authored-by: FunnyMan3595 (Charlie Nolan) <[email protected]>
* testing code * tweaks * more adjustments * more code adjustments * sponge bob abs * there be light * there be light 2 elighic boogaloo * booky * 0 to -1 * false * action icon * effect * lets seeeee * pixel adjustment * dfsdg * asrfsdg * icon is back * forgot to delete this * test * some sad stuff * i am sad * updated damage * fixed? * Update code/datums/spells/wizard_spells.dm Co-authored-by: DGamerL <[email protected]> * Update code/datums/spells/wizard_spells.dm Co-authored-by: DGamerL <[email protected]> * Update code/datums/spells/wizard_spells.dm Co-authored-by: DGamerL <[email protected]> * Update code/datums/spells/wizard_spells.dm Co-authored-by: DGamerL <[email protected]> * Update code/datums/spells/wizard_spells.dm Co-authored-by: DGamerL <[email protected]> * Update code/datums/spells/wizard_spells.dm Co-authored-by: DGamerL <[email protected]> * look at how cool this is * Update code/datums/spells/wizard_spells.dm Co-authored-by: DGamerL <[email protected]> * Update code/datums/spells/wizard_spells.dm Co-authored-by: DGamerL <[email protected]> * Update code/datums/spells/wizard_spells.dm Co-authored-by: DGamerL <[email protected]> * back to 100 * minrange * max is better than min * refactor by dgl * Update code/datums/spells/wizard_spells.dm Co-authored-by: Henri215 <[email protected]> * Update code/datums/spells/wizard_spells.dm Co-authored-by: Henri215 <[email protected]> * Update code/datums/spells/wizard_spells.dm Co-authored-by: Henri215 <[email protected]> * Update code/datums/spells/wizard_spells.dm Co-authored-by: DGamerL <[email protected]> * Update code/game/objects/effects/temporary_visuals/misc_visuals.dm Co-authored-by: Henri215 <[email protected]> * fuck you --------- Co-authored-by: DGamerL <[email protected]> Co-authored-by: Henri215 <[email protected]>
* Almost done * Adds pricings * Lowers price to 2 * Update code/game/gamemodes/miniantags/abduction/machinery/console.dm Co-authored-by: Burzah <[email protected]> * Update code/game/gamemodes/miniantags/abduction/machinery/console.dm Co-authored-by: Burzah <[email protected]> * Unequip issue fix * Fixes it not working * Extra spacing * Update code/modules/surgery/organs/organ_extractor.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/surgery/organs/organ_extractor.dm Co-authored-by: Henri215 <[email protected]> * Adds Sprites --------- Co-authored-by: Burzah <[email protected]> Co-authored-by: Henri215 <[email protected]>
* improves robobrain spawning * Update code/modules/mob/living/brain/robotic_brain.dm Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Henri215 <[email protected]>
…h new annoucments! (#24892) * added clearer biohazard annoucments, and changed annoucment text to match the new voice annocuments * Update code/modules/events/spider_terror.dm fix misspelling Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Henri215 <[email protected]>
* Thermomachines no longer work backwards. * Return to sender.
* fix wizmag toe peeking * add vox magboots icons * forgot about elite magboots
* added cult summoning annoucment * Minor capitalization fix, Synth review Co-authored-by: synthtee <[email protected]> * making the CI test and actual cult annocument are the same --------- Co-authored-by: synthtee <[email protected]>
* Consistently box mhelp/ahelp messages, change mhelp sound. * Apply suggestions from code review Co-authored-by: Burzah <[email protected]> * Apply suggestions from code review Co-authored-by: Burzah <[email protected]> --------- Co-authored-by: Burzah <[email protected]>
#25016) * Does the thing * Bleh * BLEH!
… of lettuce. (#24870) * 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 * Cabbage purge, lettuce supremacy * Update code/modules/food_and_drinks/recipes/recipes_microwave.dm Co-authored-by: 1080pCat <[email protected]> * updated a comment * Cabbage Restoration * Lettuce sprite * Egg wrap * readd lettuce sprite post-conflict --------- Co-authored-by: 1080pCat <[email protected]> Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
* I love code quality * Update code/modules/projectiles/guns/projectile/shotgun.dm Co-authored-by: Henri215 <[email protected]> --------- Co-authored-by: Henri215 <[email protected]>
Co-authored-by: FunnyMan3595 (Charlie Nolan) <[email protected]>
* Removes a duplicate definition * Henri review
* isspace define * istype to isspacearea * paranthesis * fixes * I HATE VSCDEV ON MMOBILE
* yes this is really how it works * dies of death * undo
) * Radios with a range of 0 no longer broadcast to the entire tile. * Switched to get_atom_on_turf, and renamed its loc to be more readable. * Add type to speaker_coverage. * Better type safety. * Whoops, missed one. * Removed comment complaining about |= Turns out, this is faster than merging the two lists at the start. --------- Co-authored-by: FunnyMan3595 (Charlie Nolan) <[email protected]>
* Oh god, oh fuck, WHY DIDN'T I USE isnull()??? * More correct checks * That's all * That's all x2 * Flavor fix
* alphabetizes bamboo seeds in vendor * makes caltrop component properly check for outer suit flags * removes bamboo stool from wood recipes and adds it to bamboo recipes (i am very dumb)
* The definition of insanity is.. * suggestions --------- Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
* Make Scan Mind offer the prompt to the correct person. * Update code/game/dna/mutations/mutation_powers.dm Co-authored-by: Burzah <[email protected]> --------- Co-authored-by: Burzah <[email protected]>
* Evil Janitor Cyborg * Evil Medical Cyborg * Little less cyanide * Evil Service Borg * Combat Cyborg Firmware Upgrade cost adjustment * Minor code fixes * Updated Energy Type * Spacing Changes * Evil Mining Borg pt1 * Sonic Jackhammer Force, Functions as Combat and Utility mining module * Moved guitar * Moved KA * Naming, Inheritance changes * Fix landmine stack icon * Landmine Repath, RSG Magazine Length and KA Overheat changes * Service Borg Shotgun - Lasershot, Ammo Cap Nerf, No more slug * REALLY got rid of compact slugs * RSG - 2u Toxin, 20 Brute heavy syringes * Syringe Gun Fire Rate * Changed syringe creation, moved syringe cannon off syringe gun * Purged syndie hypo, new emag hypo pierces armor/suits
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
🆑 ParadiseSS13
fix: Пофикшено пару редких ситуаций в которых генераторы защитного поля не работали
fix: Пофикшен баг когда не показывалась статистика за раунд после гринтекста
add: Новый станционный трейт. "Грязнуля" - прошлая смена забыла убрать после себя
add: RPED теперь может подбирать и заменять пустые бикеры
tweak: Теперь можно альткликать в контейнер в контейнере в контейнере
fix: Пофикшен баг когда клонерка случайным образом останавливала работу
add: Добавлен новый скил мага "Взрыв трупа"(отсылка на дьябло). Спелл с низким кд который позволяет взорвать труп застанив всех вокруг и нанеся им урон(Не задевает того кто использовал спелл)
add: Абдукторам добавлен инструмент "Извлекатель органов" за 2 токена
soundadd: Добавлен новый анонс для призыва культа
tweak: Теперь при биоугрозах прямо говорят про тип происшествия вместо кода
fix: Термомашины больше не могут работать наоборот, греть когда охлаждают или охлаждать пока нагревают
imageadd: Добавлен спрайт магбутсов для воксов
tweak: Кролики теперь могут лазать по вентам
tweak: Теперь вампирский глейр полностью станит людей которые находятся в одном тайле с вампиром
add: Добавлена капуста
tweak: Теперь многим бургерам нужна капуста для приготовления
fix; Исправлен баг когда перчатки карманника не были тихими при воровании не из карманов
fix: Исправлен баг когда перчатки карманника не подбирали сразу в руки вещь сворованнуюю не из карманов
fix: Ловушка пунджи больше не проходит через иммунитет к "пронзанию", например через хардсьюты
fix: Теперь стулья из бамбука действительно можно крафтить
add: Емугнутым мед боргам добавлен "пронзающий" гипоспрей и шприцемет
add: Добавлен шприц с цианидом для загрузки в шприцемет
add: Емагнутым боргам уборщикам добавлена боевая метла и "раздатчик мин"
add: Емагнутым сервис боргам добавлена укрепленная сталью гитара и боргский дробовик
add: Емагнутым шахтерским боргам добавлен Sonic jackhammer и апгрейд давленния
/:cl: