Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pretty huge yea #1

Closed
wants to merge 468 commits into from
Closed

Pretty huge yea #1

wants to merge 468 commits into from

Conversation

m-dzianishchyts
Copy link
Owner

Что этот PR делает

Test

Почему это хорошо для игры

Test

Тестирование

Test

Changelog

🆑
add: Что-то добавил
del: Что-то удалил
tweak: Поменял что-то по мелочи
fix: Что-то починил
wip: Какие-либо наработки в процессе
soundadd: Добавил новый звук
sounddel: Удалил старый звук
imageadd: Добавил новую картинку
imagedel: Удалил старую картинку
spellcheck: Исправил опечатку
experiment: Добавил эксперементальную функцию
/:cl:

dj-34 and others added 30 commits February 3, 2024 20:35
@dj-34
Fix: TTS no such file or directory (ss220club#972)
79dacf0 
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает
Потенциальный фикс ошибки No such file or directory и работы этих же
голосов (если с ними есть проблемы)


![image](https://github.com/ss220club/Paradise-SS220/assets/20109643/15676c9e-f83b-468c-ad28-1692ef2408cb)

## Почему это хорошо для игры

<!-- Опишите, почему, по вашему, следует добавить эти изменения в игру.
-->

## Изображения изменений
<!-- Если вы не меняли карту или спрайты, можете опустить эту секцию.
Если хотите, можете вставить видео. -->

## Тестирование
<!-- Как вы тестировали свой PR, если делали это вовсе? -->

## Changelog

:cl:
fix: Потенциальный фикс некоторых голосов, а также их кэширования
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->
@DGamerL @Burzah
Refactors composting, allows to compost things again (ParadiseSS13#23883
8ab107c 
)

* Ok this was not so ezpz

* Update code/modules/hydroponics/hydroponics_tray.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/hydroponics/hydroponics_tray.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
@Legendaxe
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise int…
d87f341 
…o ParadiseSS13-master
@Gaxeer @Legendaxe @AyIong
feat: add exploding decompressions (ss220club#970)
30dfa87 
## Что этот PR делает

Добавляем взрывные разгермы от нашего друга @AddRaiser

## Почему это хорошо для игры

Возможно меньше нагрузки на атмос

## Тестирование
Сломал окно граничащее с космосом

## Changelog

:cl:
add: Взрывные разгермы
/:cl:

---------

Co-authored-by: Volodymir Ohorodnytskyi <102746941+Legendaxe@users.noreply.github.com>
Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com>
@Qwertytoforty
Update modules_antag.dm (ParadiseSS13#24054)
90ddc89
@HMBGERDO
Stamina damage no longer bypass some checks (ParadiseSS13#23447)
ecc1099 
* adjusting stamina damage no longer bypass some checks

* no illness changes

* i surrender on this, let it be
@PollardTheDragon
Adds Malfunctioning AI Deploy Turret Ability (ParadiseSS13#23473)
d10e1ad 
* Adds Malf AI turret deployment ability

* Review Changes

* Check the Eye

* Do After Once check

* Turret Invisibility during Deploy, AI Control

* Reset to initial values on deploy

* Better Audio Booleans

* Helper Proc

* Alert Defaults to No

* Overhauled can_place_turret

* Modular Proc, Global to AI, Null Check

* Callback changes

* Autodoc, removed extraneous line

* Removed Extraneous QDEL
@AffectedArc07
[TM prolly] Some init optimisationss (ParadiseSS13#23800)
3ab2a08 
* [TM prolly] Some init optimisationss

* Do this as well

* Sod it some runtime optimisations as well
@m-dzianishchyts
Fix tint control logic (ParadiseSS13#23821)
19730f6 
* Fix: Upgrade tint control logic

* Follow formatting

* Remove redundant 'as'

* Revert "Remove redundant 'as'"

This reverts commit 12bceb4.

* Auto-docs, refactoring
@Qwertytoforty
Adjust supermatter mole crush / changes out cryo anomalies / sm zap p…
a2a8042 
…ower gen. (ParadiseSS13#23843)

* Supermatter generates zap power properly. Introduces mole stability period. Fixes SM darkness

* removes darkness fix
@datlo @Henri215
@Sirryan2002 @S34NW
Refactor and rework the staff of chaos (ParadiseSS13#23472)
97f46ff 
* [WIP] Refactor and rework the staff of chaos

* update lists

* Add trick weapons

* rename damaging effect, more stuff

* add chaos wand

* implement gift spawning, css, disco, wand

* string tweaks, prank toys

* tweaks + bonus soul

* tweak

* add prank revolver

* fix

* tweak

* implement lethal effects + tweaks

* string tweaks

* implement negative effects

* implement remaining effects

* remove leftovers

* non carbon handling

* non-human handling

* wand human check

* clean up

* Balance

* remove test comment

* remove debug chaos items

* add message to dead check

* clean leftovers

* review suggestions

* Update code/modules/projectiles/guns/chaos_bolt.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from review

* oh and that one too

* Update code/modules/projectiles/guns/projectile/revolver.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>

* documentation fix

for some reason chaos_bolt has a bunch of changes not in the git

* add css classes

* recompile css, fix food

* recompile tgui

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* invoke async proc ref

* adress code review

* fix conflict

* rename var

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
@1080pCat @Contrabang @lewcc
Fixes railings mentioning tables on inspect. (ParadiseSS13#23554)
a2ff8ad 
* teehee

* cinnamonsnowball review

* contra review

* Update railings.dm

* Update code/game/objects/structures.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
@Qwertytoforty @Contrabang
Reboots the CNS implant (ParadiseSS13#23813)
e2bdc3b 
* Reboots the CNS implant

* Update code/modules/surgery/organs/augments_internal.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* contra you nerd you forgot a bracket

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* requested changes

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
@Qwertytoforty @DGamerL
stimulants now use stun absorb, flashes no longer makes stun immune p…
5dd3f7f 
…eople drop items (ParadiseSS13#23850)

* stimulants now use stun absorb, flashes no longer makes stun immune people drop items

* whoops need this

* and this

* 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>
@datlo @Henri215
Adds the pondering orb to the wizard den (ParadiseSS13#23861)
17e5823 
* Pondering orb

* fix

* reset map

* map merge fix test

* Update centcomm.dmm

* Revert "Update centcomm.dmm"

This reverts commit 1ff1a91.

* Revert "map merge fix test"

This reverts commit 0b4a71a.

* update map

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* make ghostify more generic

* add proximity check

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
@HMBGERDO
yeah (ParadiseSS13#23925)
602f1d0
@warriorstar-orion
adds request console rotational sprites (ParadiseSS13#23840)
f6cc8df
@Qwertytoforty
Abductors can not be recalled for 10 seconds after beaming down (Para…
a31a1aa 
…diseSS13#23849)
@GDNgit
Adds runechat to the abductor mindlink (ParadiseSS13#23868)
605abfc 
* Adds runechat to the abductor mindlink

* Update code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@AyIong @Burzah
Separate Antags from Game Settings (ParadiseSS13#23929)
25f76da 
* Separate cursed shit

* Update code/modules/client/preference/preferences.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Antag buttons color

* Forgot to delete the attempt at an experiment

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
@BiancaWilkson
Species with oldcrit no longer go unconcious at 0 HP (ParadiseSS13#23877
78f3f9b 
)

* IPC + ABDUCTOR BUFF IN 2024???

* IM SORRY LINTER PLEASE DONT KILL ME
@TheKillfish @Henri215
@S34NW @DGamerL
Adding Improvements to Knuckledusters (ParadiseSS13#23902)
84dff25 
* First tweaks to the dusty bois

* Better code comment

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Managed to finish my checklist of things

* Didn't like the flag name, and finished it's descriptor comment

* Nevermind, flag was not needed

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
@Qwertytoforty
fixes supermatter darkness. Again. (ParadiseSS13#24061)
e9ff39a 
* fixes supermatter darkness. Again.

* =
@Fluffyzack21
QOL changes to NSS kerberos (ParadiseSS13#23439)
60433a7 
* Rechargers

* Table in the kitchen

* Door access fixed in cargo

* Shutters with a button

* borg charger

* funny fix

* Recharger

* unfuck what I fucked

* stupid random shudder

* fun

* doors

* dam doors

* damn doors

* fixed access

* saved a person who fell

* damn I tripped

* Fixed a layer
@warriorstar-orion
remove most top-level vardecls (ParadiseSS13#23946)
ed9842b
@Qwertytoforty @Gaxeer
Ports / reworks roundstart blurbs (ParadiseSS13#23545)
c66f31b 
* [BEGIN_MISSION]

* ai change

* also TCOMMS

* Update location_blurbs.dm

* Apply suggestions from code review

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>

* fixes tabbing

---------

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
@GDNgit
Fixes the gibber rarely not working (ParadiseSS13#24019)
ac48101
@Qwertytoforty
fixes a very hilarious grey autocloner bug (ParadiseSS13#24038)
782290c 
* fixes a very hillarious grey autocloner bug

* actually move it here so languages are kept
@1080pCat @Henri215 @Contrabang
The admin outfit "Debug outfit" gets the breathless DNA string active…
36472fe 
… now. (ParadiseSS13#23945)

* i hate breathing

* Update code/datums/outfits/outfit_debug.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update outfit_debug.dm

* Update code/datums/outfits/outfit_debug.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
@Fluffyzack21 @S34NW
Fixes Quartermaster's office on other stations that doesn't have an A…
9c2775b 
…nnouncement Request console (ParadiseSS13#23444)

* Bam people say stuff

* Fucked messed up the wording

* god damnt missed a few things

* fuck missed a bit more

* bam thing done

* for fuck sacks screw up

* bam

* Update cyberiad.dmm

* fix

* announcers to all the stations

* fuck sacks

* fixed a funny

* funny fix

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Christasmurf and others added 14 commits February 24, 2024 18:21
@Christasmurf
sprite changes (ParadiseSS13#24237)
e52d768
@m-dzianishchyts @Henri215
Fix invisible carp hologram for AI (ParadiseSS13#24264)
c761b48 
* Fix invisible carp hologram for AI

* Update code/modules/mob/living/silicon/ai/ai_mob.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply some formatting

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
@Qwertytoforty
I don't want to talk about it (ParadiseSS13#24286)
4aa06a9
@m-dzianishchyts @DGamerL
Fix non-consumable Ahdomai's Eclipse (ParadiseSS13#24277)
b3bec16 
* Fix non-consumable Ahdomai's Eclipse

* Apply some refactoring

* Better call parent first

* Apply DGamerL suggestions

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
@DGamerL
(Hopefully) Fixes the runtime where a hallucination tries to pick fro…
a44f9ca 
…m an empty list (ParadiseSS13#24276)

* This was an RNG PITA to test

* Also does energy sword
@AyIong
Fixes some issues with TGUI Alerts, and Text Input (ParadiseSS13#24282)
329398b 
* Well... maybe that's not better way

* PDA and all_channels encryptionkey

* Alert fixes

* Bad style
@Qwertytoforty
Alternate fix to 24241. TM PLEASE (ParadiseSS13#24243)
4e905c0 
* Alternate fix to 24241

* no commament

* no free chances

* one more shift

* contras changes

* dgammers changes

* list it
@warriorstar-orion @S34NW
Add directional variants to APC sprites (ParadiseSS13#24155)
df5c7f1 
* Add directional variants to APC sprites.

Provide exhaustive UpdatePaths script for every single APC around.
Run script across all map files.

* add separate directions

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
@SynthTwo
Adds craftable and wearable flower crowns (ParadiseSS13#24248)
9892dd9 
* deja vu! i've just been in this place before

* PLEASE PLEASE WORK. PLEASE PLEASE
@GDNgit @Contrabang
[S] fixes a headslug exploit (ParadiseSS13#24300)
5c2f317 
* fixes headslugs being able to double up on the dead

* Update code/modules/mob/living/simple_animal/hostile/headslug.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
@DGamerL
Removes insulated pipes and some related variables (ParadiseSS13#24156)
d0c4dbf 
* Removes insulated pipes

* Fixes some issues

* This is a better layout

* Removes the datum

* Removes defines

* Sean review
@Legendaxe
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
2384e6f
@Legendaxe
update pipes(merge upsteram)
d403586
@m-dzianishchyts
Fix failing OpenDream check (please)
86bb40a
@m-dzianishchyts
Copy link
Owner Author

ok

@m-dzianishchyts m-dzianishchyts deleted the od-check-fix branch February 27, 2024 21:32
m-dzianishchyts pushed a commit that referenced this pull request Mar 12, 2024
@Furrior @Gaxeer @larentoun
Feat: Text to Speech (#40)
565cec6 
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

Накидал ТТС. Сделано кривовато местами и, фактически, является смесью
нашей версии с парашизы и скайрата.
Закрывает #1

<!-- Вкратце опишите изменения, которые вносите. -->
<!-- Опишите **все** изменения, так как противное может сказаться на
рассмотрении этого PR'а! -->
<!-- Если вы исправляете Issue, добавьте "Fixes ss220club#1234" (где 1234 - номер
Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после
принятия PR'а. -->

НРП ТТС
<!-- Опишите, почему, по вашему, следует добавить эти изменения в игру.
-->

<!-- Если вы не меняли карту или спрайты, можете опустить эту секцию.
Если хотите, можете вставить видео. -->

Побегал на локалке. Вроде, говорит нормально.
<!-- Как вы тестировали свой PR, если делали это вовсе? -->

:cl:
add: Добавлена озвучка фраз

/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->

---------

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
Co-authored-by: larentoun <31931237+larentoun@users.noreply.github.com>
m-dzianishchyts pushed a commit that referenced this pull request Apr 22, 2024
@warriorstar-orion @Henri215
cere: upgrade and expand telepad network (ParadiseSS13#25089)
24aadc9 
* cere: upgrade and expand telepad network

* no parts in cere telepads to avoid taking advantage of high-level parts

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* fix a bunch of pre-merge issues

* whoopsies

* ahhhhhh

* review changes #1

* fix horrid doublewalls in evac

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
m-dzianishchyts pushed a commit that referenced this pull request Aug 12, 2024
@warriorstar-orion
remap: Farragus Cargo. (ParadiseSS13#26042)
20f8fd1 
* remap: Farragus Cargo.

* fix rock edges and struts

* docking ports aren't nearspace

* separate atmos/EVA in starboard south, fix doors, add store trash

* lint fix

* i uh forget

* qm windows, maints improvements

* more maints decorating

* fix electrochromic area

* tiny bit more mining-themed

* sean review #1

* fix windoor access on cargo office

* 1080p review 1

* accidentally uncommited changes from above review

* one last grilled spawner replaced

* misclick

* fix disposals corners and y-junction

* completely forgot to update sec telepads

* as many APCs as possible pulled into maints

* fix conflicted tile

* remove disconnected disposal pipe

* fix disposals redirecting into psych office
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
TGUI Документация Звук Изменение Карты Инструменты Керберос Кибериада Спрайты Требуется изменение конфига Цереброн
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.