Made eating Keeki a bit smarter. #24373
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
Seems kinda weird to punish the eating of a cake cat with uncounterable death |
GDNgit
reviewed
Mar 1, 2024
DGamerL
reviewed
Mar 1, 2024
|
The prions were replaced with teslium per discussion. (Edit: For anyone wondering where the review changes are, Github is having issues syncing commits to PRs right now; visit the branch to see the current state.) |
that's like 90% of this game lol |
Henri215
reviewed
Mar 2, 2024
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
|
Not gonna lie, where does the teslium come from in a cake cat? The punishment should probably be something food related, not just a random "haha shock go brrrt" |
|
It's part of the recipe, 1u of teslium. Amount was increased to ensure it actually triggers. |
Looks like a good change to me to be honest, bug fixes, and I saw that it was prions, which would of been terrible, but it being Teslium makes sense to me, if you consume a food that contains a reagent, you should get some form of it in your system, making the cake an actual useful (ish) food item, while also still letting the reagents that are used to make it still be present, by making it the last bite, makes it much better then every bite. |
Henri215
reviewed
Mar 14, 2024
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
S34NW
approved these changes
Mar 18, 2024
m-dzianishchyts
added a commit
to m-dzianishchyts/Paradise-SS220
that referenced
this pull request
Apr 2, 2024
* oops (ParadiseSS13#24658) * Cyborgs drop their upgrades on the floor when reset or deconstructed (ParadiseSS13#24467) * 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 * yes * Update robot_mob.dm * Update robot_mob.dm * Update code/modules/mob/living/silicon/robot/robot_mob.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Modsuit activation/deactivation is no longer cancelled by user incapacitation (ParadiseSS13#24564) * changes activation do_afters to not check for incapacitation * fix spacing * Fix: Body Scanner layout (ParadiseSS13#24140) * Fix: Body Scanner layout * Rebuild TGUI * Rebuild --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * niche case (ParadiseSS13#24595) * Adjusts Species Lung Temperature Tolerances (ParadiseSS13#24509) * Adjusts Species Temperature Tolerances * Update code/modules/surgery/organs/organ_datums/lung_datum.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Adjusts Unathi and Ashwalker to match ParadiseSS13#23325 --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Adds Meson Sunglasses (ParadiseSS13#24619) * meson sunglasses * species sprites ew * why * Update code/modules/clothing/glasses/glasses.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> * eeh * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Apply suggestions from code review Self commit time (With approval) --------- Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Makes headslug mob_size MOB_SIZE_SMALL (ParadiseSS13#24623) Co-authored-by: adrermail@gmail.com <adrermail@gmail.com> * Capitalized Comfrey. (ParadiseSS13#24642) * Update inflatable.dm (ParadiseSS13#24646) * Fix dynamic lighting in secret clown HQ (ParadiseSS13#24181) * Make clown HQ require power * Added APC to area * Superfluous spacing removed. * There is only one thing worse than a DMM conflict --------- Co-authored-by: adrermail@gmail.com <adrermail@gmail.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * re-maps cables on box station (ParadiseSS13#24260) * cables * even more cable fixes * did this fix the issue * ehh * Fixes all the cables on meta station (ParadiseSS13#24589) * Engineering cables Part 1 * Update MetaStation.dmm * Engineering cables part 1 * set any non-engine SMES cables to red (#8) * cables * did this fix it * fixed a fail * oops --------- Co-authored-by: warriorstar-orion <orion@snowfrost.garden> * oversight perma pipe missing (ParadiseSS13#24607) * goodbye exclaims (ParadiseSS13#24593) * fixes admin shuttles breaking the escape shuttle / not working (ParadiseSS13#24677) * Fix RD-Robotics Surgery window tint button on Cyberiad. (ParadiseSS13#24647) Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Update gun icon on knife removing (ParadiseSS13#24674) * Fix mime/clown picked names not being on their bank account. (ParadiseSS13#24669) * Make pAIs show correctly in diagnostic HUDs (ParadiseSS13#24666) * Retaliate mobs no longer break stuff after revived with a laz injector. (ParadiseSS13#24665) * Remove IPC heel pixel on standard chassis type (ParadiseSS13#24657) * Handle 'Adjacent' for items inside structures (ParadiseSS13#24655) `/obj/item/Adjacent` has a check for handling items inside items, for example if storing an item inside a pill bottle, which is located inside a box. This didn't check for structures, so `Adjacent` on the trashbag inside the janitorialcart structure always returned false. * adds extra check (ParadiseSS13#24648) * Make gravity generator power-dependent again (ParadiseSS13#24601) * Cargo "View Contents" Fix (ParadiseSS13#24562) * contains_special * contains special list additions * keep on testing * moar * test test * get manifest * make sure * indentation mistake * Made eating Keeki a bit smarter. (ParadiseSS13#24373) * Made eating Keeki a bit smarter. * Prions -> Teslium, minor fixes. * Better comment for total_final_bites. * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/friendly/cat.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Fixed clown and mime brain/head naming. (ParadiseSS13#24668) * It just work's. Probably. (ParadiseSS13#24515) Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Multi-tile doors fix (ParadiseSS13#24113) * Multi-tile doors fix * Linter Fix * Comment cleanup * Removing fillers before updating bounds to prevent issues * fix (ParadiseSS13#24679) * okay one last time (ParadiseSS13#24681) * ci: check_grep now exhaustive, vsc run is optional (ParadiseSS13#24545) * Adds recharge stations to the permabrig for IPCs (ParadiseSS13#24605) * add recharge stations to perma * Revert "add recharge stations to perma" This reverts commit ce48320. * add recharge stations to perma, this time with a updated sdmm * 1080pCats fix --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Parrots no longer hold items they don't have. (ParadiseSS13#24682) * Parrots no longer hold items they don't have. * Whoops. * Fix falling into chasm on map load (ParadiseSS13#24673) * Fix flying bayonet/seclight overlay (ParadiseSS13#24676) * Fix flying bayonet overlay * Make it simpler * Cigar/pipe cleanup. (ParadiseSS13#24683) * Refactored how monkeys name their brains. (ParadiseSS13#24678) * Electropack works more consistently, and is more responsive. (ParadiseSS13#24680) * electropack is less silly * dont need this anymore * Update code/game/objects/items/devices/radio/electropack.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Admin controls now update the shuttle timer in units of minutes, not seconds. (ParadiseSS13#24356) * Admins now update the shuttle timer in minutes, not seconds. (As in the units, not how long it takes.) * Apply suggestions from code review Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * More bitflag cleanup (ParadiseSS13#24531) * Convert a few more bitflags that weren't bit-shifting. * Update a few comments around bitflags. * Add some parentheses around bitflag combination defines. * Fix some whitespace consistency issues, mostly with bitflags. * Collar on a chick stay when it grow into a chicken. (ParadiseSS13#24524) * Collar on a chick stay when it grow into a chicken. Collar on a chick stay when it grow into a chicken. Fixes ParadiseSS13#24412 * Update code/modules/mob/living/simple_animal/friendly/farm_animals.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Co-authored-by: Pierre-Louis <hernandezpierrelouis@protonmail.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * Moves weapons sprites out of items.dmi (ParadiseSS13#24634) * Moves weapons sprites out of items.dmi * lets revert this * oversight from energy melee PR * [s] Fixes Mechs being able to walk through walls (ParadiseSS13#24695) * Adds the ismecha check * I am a dummy, thanks contra * Bump to yarn 4.1.1 (automated changes) and fixed settings (ParadiseSS13#24358) * bump to yarn 4.1.0 (automated changes) * fix prettier issues * 4.1.1 * this gets auto-commited on build * [S] Fixes an exploit (ParadiseSS13#24703) * it never had a range........ * slide to the left * guh * Radio resprite (ParadiseSS13#24629) * sprites * fixik * lil animation * fixes syndicate sensory being emp weak (ParadiseSS13#24625) * fixes syndicate sensory being emp weak * Update code/modules/surgery/organs/augments_internal.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * fixes it --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * Security poncho (ParadiseSS13#24614) * all at once * no * ah yes * minor pixel adjustments * moved * Update code/modules/clothing/suits/armor_suits.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * [TGchat] Annihilation Dropdowns & Tweaks (ParadiseSS13#24502) * New TGchat settings section * New Chat Settings Tab & Reorder Tabs * Annihilate dropdowns * Normal Divider * Max Total Messages 10000 -> 2000 * Remove removed things * Rebuild * [s] Adds Contrabang to Commit Access (ParadiseSS13#24707) * updates contributing.md * Empty-Commit * Fix TGUI deconflict hooks, makes them work on windows (ParadiseSS13#24686) * Lets us install tgui merge drivers on windows * test this * gamer mode * debug * do it like this * test * test this * stop it being weirdly relative * more relative fixes * try cat * indentation * update CI stuff to cache * correct this * yarn * yarn consistency * do we even need to do this? (no we don't) * properly cache yarn deps in ci * Why do we even have that step --------- Co-authored-by: github-actions <github-actions@github.com> * Adds the Organ Extractor (ParadiseSS13#24100) * Adds the Syndicate Organ Extractor * ipc moment * fix bug, prevents putting organs in dead bodies to extract * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * renames sprite * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * replace xx yy --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Optable fixes (ParadiseSS13#24101) * Proto Emitter Gun now has its own name and description (ParadiseSS13#24528) * Update laser.dm * Update code/modules/projectiles/guns/energy/laser.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/projectiles/guns/energy/laser.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * blamo (ParadiseSS13#24582) * Re-added the account info paper on creating a new account. (ParadiseSS13#24588) * Re-added the account info paper on creating a new account. * Review suggestions. * Adds CI checks forbidding certain kinds of world loops (ParadiseSS13#24454) * Updates checkgrep to report unnecessary loops * improved message * global lists are better too * much better * Apply suggestions from code review Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * update to modern check_grep format --------- Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Gutlunches will no longer eat brains. (ParadiseSS13#24603) * NO MORE EATING BRAINS * Update code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Increases Paper's Window Size (ParadiseSS13#24541) * its time to PAPERWORK * remove test item * autodoc / henri Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Cowboy hats resprite (ParadiseSS13#24611) * human_mob * items * grey_mob * drask_mob * vox_mob * code, lets fucking hope i didnt forget anything * i forgot stupid fuckign shit * also i love to delete wrong things * Update code/modules/clothing/head/misc_hats.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/client/preference/loadout/loadout_hat.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> * moved to other cowboy hats --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> * Adds Boot Knives (Combat + Mining Boots + Jump Boots) (ParadiseSS13#24530) * stabbing time * examine text * oopsie * spans * add to jumpboots * contra review * henri/gdn reviews * contra + burzah review * span swap Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * chat box red (ParadiseSS13#24663) * NanoMap Auto-Update (Wed Mar 20 01:07:32 UTC 2024) (ParadiseSS13#24350) Co-authored-by: NanoMap Generation <action@github.com> * Bear update, part 2 (ParadiseSS13#24506) * The bear update! * more sprites * more bearprites * diversify * removing comments * description and mapping * duplicate * Update code/modules/mob/living/simple_animal/hostile/bear.dm --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * yeah (ParadiseSS13#24709) * This is the fix (ParadiseSS13#24710) * Added new skirts to suitdispenser (ss220club#1101) <!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то может пойти не так. --> <!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. --> ## Что этот PR делает Добавляет новые юбки в игру и в suitdispenser в частности. <!-- Вкратце опишите изменения, которые вносите. --> <!-- Опишите **все** изменения, так как противное может сказаться на рассмотрении этого PR'а! --> <!-- Если вы исправляете Issue, добавьте "Fixes #xxxx" (где xxxx - номер Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после принятия PR'а. --> ## Почему это хорошо для игры Дамы могут одеваться в грейтайд! А ещё разнообразие лучше отсутствия разнообразия. <!-- Опишите, почему, по вашему, следует добавить эти изменения в игру. --> ## Изображения изменений  <!-- Если вы не меняли карту или спрайты, можете опустить эту секцию. Если хотите, можете вставить видео. --> ## Тестирование Провел модный приговор на локалке. <!-- Как вы тестировали свой PR, если делали это вовсе? --> ## Changelog :cl: add: Добавлены 22 новые юбки разных цветов в suitdispenser. /:cl: <!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы можете написать свой ник справа от первого :cl:, если хотите. Иначе будет использован ваш ник на ГитХабе. --> <!-- Вы можете использовать несколько записей с одинаковым префиксом (Они используются только для иконки в игре) и удалить ненужные. Помните, что чейнджлог должен быть понятен обычным игроком. --> <!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы можете исключить всю секцию. --> --------- Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com> * Restrict !merge_upstream workflow to dev team and PR author (ParadiseSS13#24711) * restrict !merge_upstream to PR author or repo members * proper syntax please * No more black borders on the sides with different size (ParadiseSS13#24151) * New ability icons part 2 (ParadiseSS13#24671) * icons and shit * other icons * mhm * contras order * [S] Fixes an exploit (ParadiseSS13#24721) * fixes an exploit * length * Allow OP to !merge_upstream (ParadiseSS13#24724) Co-authored-by: Arthri <41360489+a@users.noreply.github.com> * Tesla containment area safety * Better grounding rods placement --------- Co-authored-by: cybercapitalism <98280110+cybercapitalism@users.noreply.github.com> Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: LtDiggs <41313156+LtDiggs@users.noreply.github.com> Co-authored-by: Marm <85680653+ItsMarmite@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Adrer <erwin@lombok.demon.nl> Co-authored-by: adrermail@gmail.com <adrermail@gmail.com> Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> Co-authored-by: Zack <winklj000@gmail.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: Zantox <vetle.neumann@protonmail.com> Co-authored-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com> Co-authored-by: RomainzZ <roman.shalin87@gmail.com> Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com> Co-authored-by: PopGamer46 <yt1popgamer@gmail.com> Co-authored-by: Volodymir Ohorodnytskyi <102746941+Legendaxe@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Pierre-Louis <44984704+PIerreLouisH@users.noreply.github.com> Co-authored-by: Pierre-Louis <hernandezpierrelouis@protonmail.com> Co-authored-by: McRamon <31545294+McRamon@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: NanoMap Generation <action@github.com> Co-authored-by: The Real <102225891+TheFckReal@users.noreply.github.com> Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com> Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
m-dzianishchyts
added a commit
to m-dzianishchyts/Paradise-SS220
that referenced
this pull request
Apr 2, 2024
* oops (ParadiseSS13#24658) * Cyborgs drop their upgrades on the floor when reset or deconstructed (ParadiseSS13#24467) * 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 * yes * Update robot_mob.dm * Update robot_mob.dm * Update code/modules/mob/living/silicon/robot/robot_mob.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Modsuit activation/deactivation is no longer cancelled by user incapacitation (ParadiseSS13#24564) * changes activation do_afters to not check for incapacitation * fix spacing * Fix: Body Scanner layout (ParadiseSS13#24140) * Fix: Body Scanner layout * Rebuild TGUI * Rebuild --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * niche case (ParadiseSS13#24595) * Adjusts Species Lung Temperature Tolerances (ParadiseSS13#24509) * Adjusts Species Temperature Tolerances * Update code/modules/surgery/organs/organ_datums/lung_datum.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Adjusts Unathi and Ashwalker to match ParadiseSS13#23325 --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Adds Meson Sunglasses (ParadiseSS13#24619) * meson sunglasses * species sprites ew * why * Update code/modules/clothing/glasses/glasses.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> * eeh * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Apply suggestions from code review Self commit time (With approval) --------- Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Makes headslug mob_size MOB_SIZE_SMALL (ParadiseSS13#24623) Co-authored-by: adrermail@gmail.com <adrermail@gmail.com> * Capitalized Comfrey. (ParadiseSS13#24642) * Update inflatable.dm (ParadiseSS13#24646) * Fix dynamic lighting in secret clown HQ (ParadiseSS13#24181) * Make clown HQ require power * Added APC to area * Superfluous spacing removed. * There is only one thing worse than a DMM conflict --------- Co-authored-by: adrermail@gmail.com <adrermail@gmail.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * re-maps cables on box station (ParadiseSS13#24260) * cables * even more cable fixes * did this fix the issue * ehh * Fixes all the cables on meta station (ParadiseSS13#24589) * Engineering cables Part 1 * Update MetaStation.dmm * Engineering cables part 1 * set any non-engine SMES cables to red (#8) * cables * did this fix it * fixed a fail * oops --------- Co-authored-by: warriorstar-orion <orion@snowfrost.garden> * oversight perma pipe missing (ParadiseSS13#24607) * goodbye exclaims (ParadiseSS13#24593) * fixes admin shuttles breaking the escape shuttle / not working (ParadiseSS13#24677) * Fix RD-Robotics Surgery window tint button on Cyberiad. (ParadiseSS13#24647) Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Update gun icon on knife removing (ParadiseSS13#24674) * Fix mime/clown picked names not being on their bank account. (ParadiseSS13#24669) * Make pAIs show correctly in diagnostic HUDs (ParadiseSS13#24666) * Retaliate mobs no longer break stuff after revived with a laz injector. (ParadiseSS13#24665) * Remove IPC heel pixel on standard chassis type (ParadiseSS13#24657) * Handle 'Adjacent' for items inside structures (ParadiseSS13#24655) `/obj/item/Adjacent` has a check for handling items inside items, for example if storing an item inside a pill bottle, which is located inside a box. This didn't check for structures, so `Adjacent` on the trashbag inside the janitorialcart structure always returned false. * adds extra check (ParadiseSS13#24648) * Make gravity generator power-dependent again (ParadiseSS13#24601) * Cargo "View Contents" Fix (ParadiseSS13#24562) * contains_special * contains special list additions * keep on testing * moar * test test * get manifest * make sure * indentation mistake * Made eating Keeki a bit smarter. (ParadiseSS13#24373) * Made eating Keeki a bit smarter. * Prions -> Teslium, minor fixes. * Better comment for total_final_bites. * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/friendly/cat.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Fixed clown and mime brain/head naming. (ParadiseSS13#24668) * It just work's. Probably. (ParadiseSS13#24515) Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Multi-tile doors fix (ParadiseSS13#24113) * Multi-tile doors fix * Linter Fix * Comment cleanup * Removing fillers before updating bounds to prevent issues * fix (ParadiseSS13#24679) * okay one last time (ParadiseSS13#24681) * ci: check_grep now exhaustive, vsc run is optional (ParadiseSS13#24545) * Adds recharge stations to the permabrig for IPCs (ParadiseSS13#24605) * add recharge stations to perma * Revert "add recharge stations to perma" This reverts commit ce48320. * add recharge stations to perma, this time with a updated sdmm * 1080pCats fix --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Parrots no longer hold items they don't have. (ParadiseSS13#24682) * Parrots no longer hold items they don't have. * Whoops. * Fix falling into chasm on map load (ParadiseSS13#24673) * Fix flying bayonet/seclight overlay (ParadiseSS13#24676) * Fix flying bayonet overlay * Make it simpler * Cigar/pipe cleanup. (ParadiseSS13#24683) * Refactored how monkeys name their brains. (ParadiseSS13#24678) * Electropack works more consistently, and is more responsive. (ParadiseSS13#24680) * electropack is less silly * dont need this anymore * Update code/game/objects/items/devices/radio/electropack.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Admin controls now update the shuttle timer in units of minutes, not seconds. (ParadiseSS13#24356) * Admins now update the shuttle timer in minutes, not seconds. (As in the units, not how long it takes.) * Apply suggestions from code review Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * More bitflag cleanup (ParadiseSS13#24531) * Convert a few more bitflags that weren't bit-shifting. * Update a few comments around bitflags. * Add some parentheses around bitflag combination defines. * Fix some whitespace consistency issues, mostly with bitflags. * Collar on a chick stay when it grow into a chicken. (ParadiseSS13#24524) * Collar on a chick stay when it grow into a chicken. Collar on a chick stay when it grow into a chicken. Fixes ParadiseSS13#24412 * Update code/modules/mob/living/simple_animal/friendly/farm_animals.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Co-authored-by: Pierre-Louis <hernandezpierrelouis@protonmail.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * Moves weapons sprites out of items.dmi (ParadiseSS13#24634) * Moves weapons sprites out of items.dmi * lets revert this * oversight from energy melee PR * [s] Fixes Mechs being able to walk through walls (ParadiseSS13#24695) * Adds the ismecha check * I am a dummy, thanks contra * Bump to yarn 4.1.1 (automated changes) and fixed settings (ParadiseSS13#24358) * bump to yarn 4.1.0 (automated changes) * fix prettier issues * 4.1.1 * this gets auto-commited on build * [S] Fixes an exploit (ParadiseSS13#24703) * it never had a range........ * slide to the left * guh * Radio resprite (ParadiseSS13#24629) * sprites * fixik * lil animation * fixes syndicate sensory being emp weak (ParadiseSS13#24625) * fixes syndicate sensory being emp weak * Update code/modules/surgery/organs/augments_internal.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * fixes it --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * Security poncho (ParadiseSS13#24614) * all at once * no * ah yes * minor pixel adjustments * moved * Update code/modules/clothing/suits/armor_suits.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * [TGchat] Annihilation Dropdowns & Tweaks (ParadiseSS13#24502) * New TGchat settings section * New Chat Settings Tab & Reorder Tabs * Annihilate dropdowns * Normal Divider * Max Total Messages 10000 -> 2000 * Remove removed things * Rebuild * [s] Adds Contrabang to Commit Access (ParadiseSS13#24707) * updates contributing.md * Empty-Commit * Fix TGUI deconflict hooks, makes them work on windows (ParadiseSS13#24686) * Lets us install tgui merge drivers on windows * test this * gamer mode * debug * do it like this * test * test this * stop it being weirdly relative * more relative fixes * try cat * indentation * update CI stuff to cache * correct this * yarn * yarn consistency * do we even need to do this? (no we don't) * properly cache yarn deps in ci * Why do we even have that step --------- Co-authored-by: github-actions <github-actions@github.com> * Adds the Organ Extractor (ParadiseSS13#24100) * Adds the Syndicate Organ Extractor * ipc moment * fix bug, prevents putting organs in dead bodies to extract * Apply suggestions from code review Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * renames sprite * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * replace xx yy --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Optable fixes (ParadiseSS13#24101) * Proto Emitter Gun now has its own name and description (ParadiseSS13#24528) * Update laser.dm * Update code/modules/projectiles/guns/energy/laser.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/projectiles/guns/energy/laser.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * blamo (ParadiseSS13#24582) * Re-added the account info paper on creating a new account. (ParadiseSS13#24588) * Re-added the account info paper on creating a new account. * Review suggestions. * Adds CI checks forbidding certain kinds of world loops (ParadiseSS13#24454) * Updates checkgrep to report unnecessary loops * improved message * global lists are better too * much better * Apply suggestions from code review Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * update to modern check_grep format --------- Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Gutlunches will no longer eat brains. (ParadiseSS13#24603) * NO MORE EATING BRAINS * Update code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Increases Paper's Window Size (ParadiseSS13#24541) * its time to PAPERWORK * remove test item * autodoc / henri Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Cowboy hats resprite (ParadiseSS13#24611) * human_mob * items * grey_mob * drask_mob * vox_mob * code, lets fucking hope i didnt forget anything * i forgot stupid fuckign shit * also i love to delete wrong things * Update code/modules/clothing/head/misc_hats.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/client/preference/loadout/loadout_hat.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> * moved to other cowboy hats --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> * Adds Boot Knives (Combat + Mining Boots + Jump Boots) (ParadiseSS13#24530) * stabbing time * examine text * oopsie * spans * add to jumpboots * contra review * henri/gdn reviews * contra + burzah review * span swap Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * chat box red (ParadiseSS13#24663) * NanoMap Auto-Update (Wed Mar 20 01:07:32 UTC 2024) (ParadiseSS13#24350) Co-authored-by: NanoMap Generation <action@github.com> * Bear update, part 2 (ParadiseSS13#24506) * The bear update! * more sprites * more bearprites * diversify * removing comments * description and mapping * duplicate * Update code/modules/mob/living/simple_animal/hostile/bear.dm --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * yeah (ParadiseSS13#24709) * This is the fix (ParadiseSS13#24710) * Added new skirts to suitdispenser (ss220club#1101) <!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то может пойти не так. --> <!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. --> ## Что этот PR делает Добавляет новые юбки в игру и в suitdispenser в частности. <!-- Вкратце опишите изменения, которые вносите. --> <!-- Опишите **все** изменения, так как противное может сказаться на рассмотрении этого PR'а! --> <!-- Если вы исправляете Issue, добавьте "Fixes #xxxx" (где xxxx - номер Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после принятия PR'а. --> ## Почему это хорошо для игры Дамы могут одеваться в грейтайд! А ещё разнообразие лучше отсутствия разнообразия. <!-- Опишите, почему, по вашему, следует добавить эти изменения в игру. --> ## Изображения изменений  <!-- Если вы не меняли карту или спрайты, можете опустить эту секцию. Если хотите, можете вставить видео. --> ## Тестирование Провел модный приговор на локалке. <!-- Как вы тестировали свой PR, если делали это вовсе? --> ## Changelog :cl: add: Добавлены 22 новые юбки разных цветов в suitdispenser. /:cl: <!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы можете написать свой ник справа от первого :cl:, если хотите. Иначе будет использован ваш ник на ГитХабе. --> <!-- Вы можете использовать несколько записей с одинаковым префиксом (Они используются только для иконки в игре) и удалить ненужные. Помните, что чейнджлог должен быть понятен обычным игроком. --> <!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы можете исключить всю секцию. --> --------- Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com> * Restrict !merge_upstream workflow to dev team and PR author (ParadiseSS13#24711) * restrict !merge_upstream to PR author or repo members * proper syntax please * No more black borders on the sides with different size (ParadiseSS13#24151) * New ability icons part 2 (ParadiseSS13#24671) * icons and shit * other icons * mhm * contras order * [S] Fixes an exploit (ParadiseSS13#24721) * fixes an exploit * length * Allow OP to !merge_upstream (ParadiseSS13#24724) Co-authored-by: Arthri <41360489+a@users.noreply.github.com> * Add space between badges and ckey * Linter yea yea --------- Co-authored-by: cybercapitalism <98280110+cybercapitalism@users.noreply.github.com> Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: LtDiggs <41313156+LtDiggs@users.noreply.github.com> Co-authored-by: Marm <85680653+ItsMarmite@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Adrer <erwin@lombok.demon.nl> Co-authored-by: adrermail@gmail.com <adrermail@gmail.com> Co-authored-by: Charlie Nolan <funnyman3595@gmail.com> Co-authored-by: Zack <winklj000@gmail.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Co-authored-by: Zantox <vetle.neumann@protonmail.com> Co-authored-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com> Co-authored-by: RomainzZ <roman.shalin87@gmail.com> Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com> Co-authored-by: PopGamer46 <yt1popgamer@gmail.com> Co-authored-by: Volodymir Ohorodnytskyi <102746941+Legendaxe@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Pierre-Louis <44984704+PIerreLouisH@users.noreply.github.com> Co-authored-by: Pierre-Louis <hernandezpierrelouis@protonmail.com> Co-authored-by: McRamon <31545294+McRamon@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: NanoMap Generation <action@github.com> Co-authored-by: The Real <102225891+TheFckReal@users.noreply.github.com> Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com> Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
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.
What Does This PR Do
Why It's Good For The Game
Bug fixes are good.
It's bad enough to kill Keeki, but you ate him completely? You monster.
Testing
Changelog
🆑
fix: Eating Keeki on disarm intent actually feeds you.
tweak: Eating a dead Keeki now gives nutrition, but there's only so much.
add: An unpleasant surprise awaits anyone who dares to eat the last bite of Keeki.
/:cl: