merge upstream #830
Merged
merge upstream #830
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
Co-authored-by: NanoMap Generation <action@github.com>
* skintones babey * adds a note for anyone adding skintones * shortens the skin menu * conflict fix PLEASE. adjusted shading * Update code/modules/client/preference/link_processing.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * lewcc suggestion * SQL update script --------- Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
* fixes badly tabbed return true on limbs * Update code/modules/surgery/organs/organ_external.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* Fixes mutable_appearance where it causes bugs * Now we will get filters of an obj
Co-authored-by: Adrer <adrermail@gmail.com>
* Ignore advertized items which are undefined * Build and update tgui --------- Co-authored-by: Arthri <41360489+a@users.noreply.github.com> Co-authored-by: tgui <41898282+github-actions[bot]@users.noreply.github.com>
…23354) * fixes the chat message * addresses review * addressing review 2 electric boogaloo
* Lid for a bucket and anchor water tanks * No more anchored water tank
…#23341) * Update organ_external.dm * Update code/modules/surgery/organs/organ_external.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* fixes IPC organs runtiming * lets fix the wire implant too
* sprites * pierre not pete * description update * description 2 electric boogaloo
…d by CI (ParadiseSS13#23247) * moreglobals * comment
* Tweak: Nearby Buckle * Adjacent * It's definitely better Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com> * Small cleanup Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* fixes shotguns not being able to be reskined * Update code/modules/projectiles/guns/projectile/revolver.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * Update code/modules/projectiles/guns/projectile/revolver.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> --------- Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* Remove emote_sound from the codebase * quick cleanups * Update code/datums/emote.dm oops Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * gnarg Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* adds overdose to diphenhydramine * more hallucinations * better hallucination checks * Remove the copypasted effect * you saw nothing * Update code/modules/reagents/chemistry/reagents/medicine.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * Update code/modules/reagents/chemistry/reagents/medicine.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
* find and replace. this causes zero errors. * there was one error * repathing * minor emote repathing as well
* turns radial menus into screen objects * reviews * Update code/_onclick/hud/radial.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
* fixes a table climbing runtime * should be fine * oh yeah this too
* Buffs a few spells * Keeps Lesser Magic Missile the same * Update code/game/gamemodes/wizard/spellbook.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> * no more doorpass * mindswap changes reverted --------- Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
ParadiseSS13#23099) * We all scream for ice-cream * consistantcy * the despacening * Sirryan review. Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> --------- Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
* removes the fluff item from moonbase, modifies loot * Update code/game/objects/items/weapons/storage/lockbox.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/lockbox.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * compiles * Update code/game/objects/items/weapons/storage/lockbox.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * pick my hated * Update code/game/objects/items/weapons/storage/lockbox.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
) * LOREEEEEEEEE * Update code/modules/client/preference/character.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * Update code/modules/client/preference/preferences.dm Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> * Update code/modules/client/preference/preferences.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * EVERY FUCKING BLURBBBBB * Apply suggestions from code review Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * REWORKED THE HUMAN TEXT * Update human_species.dm * skrell lore tweak --------- Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
* ree * aaaaaaa * Update code/modules/antagonists/changeling/powers/mutations.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/antagonists/changeling/powers/mutations.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/antagonists/changeling/powers/mutations.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/antagonists/changeling/powers/mutations.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/antagonists/changeling/powers/mutations.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/antagonists/changeling/powers/mutations.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/antagonists/changeling/powers/mutations.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Cyborg limbs have been mirrored.
* i hate globals i hate globals * more fucking of these * sirryan review
* Soap resprite * other soaps in hands
* everything * dress sprite adjust * grey coat * Update code/modules/clothing/under/jobs/civilian.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * corgi time --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* drip * this is unneeded actually * Update code/game/objects/items/stacks/sheets/sheet_types.dm sure. Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * flips item sprite for now, at least --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
…nts (ParadiseSS13#23365) * Fix flex expansion * Build and update tgui * ci --------- Co-authored-by: Arthri <41360489+a@users.noreply.github.com> Co-authored-by: tgui <41898282+github-actions[bot]@users.noreply.github.com>
* Ezpz * Whoops, it compiles now * Whoops v2 * Changes numbers around * Update code/modules/antagonists/changeling/powers/mutations.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Henri review --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* Nice * Yeah this is better
* Removes old file * Resprites Geiger counter, TG PORT resprites all Geiger counter icons
…o ParadiseSS13-master
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: Мороженое с ТГ
add: Лор расы в настройках персонажа
add: 5 новых оттенков кожи (Latte, Caramel, Bronzed, Almond, Sienna)
tweak: Изменены 2 оттенка кожи (Coffee и Pale)
tweak: Все эмоуты, которые издают звуки теперь высвечиваются в рунчате
tweak: "Dehydrated carp" теперь стоит 4 ТК
tweak: Передозировка дифенгидрамина вызывает довольно неприятные побочные эффекты, включая сильные галлюцинации
tweak: Реорганизация цвета кожи от светлого к темному
tweak: У ведра появилась крышка
tweak: Бафф хедслага генокрада
tweak: Нерф армблейда генокрада
tweak: Новые звуки для генокрада
tweak: Основание кристалла СМ перерисовано в 3/4
tweak: Талисман бессмертия теперь можно поместить в карман
tweak: e20 больше не выпадает в surplus crate
tweak: Бафф акробатических ботинок клоуна
tweak: Изменены спрайты одежды у Хопа
tweak: Улучшено несколько дрянных заклинаний волшебника, уменьшено время паралича у Mindswap
tweak: Если вы схватите кого-либо, это будет показано при осмотре
imageadd: Шмотки ГП были перерисованы
imageadd: Респрайт мимского рюкзака
fix: Самонаводящийся тулбокс теперь наносит урон
fix: Исправлено отсутствие пробивания брони у даблсворда
fix: Дионы теперь могут сбрасывать мертвых нимф, которых они поглотили
fix: Горелка больше не расходует топливо если используется не по назначению
fix: И прочие различные фиксы от оффов (смотрите на Гитхабе)
/:cl: