merge upstream 03.10.2024 #1574

Legendaxe · 2024-10-03T17:39:23Z

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

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

Изображения изменений

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

Changelog

🆑 ParadiseSS13
fix: Теперь пена из космочиста(Space Cleaner) может очищать стены и окна.
tweak: Теперь гетто-хирургия использует кусачки, для удаленния(доставания) внутренних органов.
fix: Способность генокрадов "Apex Predator" больше нельзя использовать на самого себя.
fix: Консоль доступов больше не отбирает некоторые доступы после выбора AA(ALL ACCESS).
del: С синди депота удален ГПС маяк.
fix: Вы снова можете емагать людей.
soundadd: Добавлены новые голосовые сообщения для раундстарта.
tweak: Более корректное отображение здоровья у стражей(которые стэнды из Жожо).
tweak: БРПД теперь помещается на пояс.
tweak: Размер бака огнемета увеличен вдвое.
tweak: Теперь принцесса террора гарантировано дает одно яйцо каждые две минуты(Раньше был 25% шанс появления яйца каждые 30 секунд).
fix: Борги снова могут подобрать catwalk(решетка в космосе).
add: Добавлена новая рубашка "Борги(борг + корги)"(Можно выбрать в настройках персонажа или ИЦ выбрать в шкафе с одеждой).
fix: Исправлен экслпойт связанный с СМом.
fix: Еда на полках больше не может заспавнить муравьев.
add: Теперь с помощью капитанской рапиры можно совершить сеппуку.
/:cl:

* Gives all status effects an ID * Actually delete * Update code/datums/status_effects/buffs.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: DGamerL <[email protected]> * Update code/datums/status_effects/buffs.dm Co-authored-by: 1080pCat <[email protected]> Signed-off-by: DGamerL <[email protected]> * We ball * Fix CI and remove stack trace --------- Signed-off-by: DGamerL <[email protected]> Co-authored-by: 1080pCat <[email protected]>

* yea * update lints * lint changes and code fixes * i hate old code * dont make this an error

ParadiseSS13#26645) * blackbox: Add accumulating feedback types for numeric and text values. * correct introduction * i swear to god i can count to 7 * bloody VSC formatting on save * formatting changes and doc additions

…od more reliably (ParadiseSS13#26886)

* No more burnt hermit * Compacted spawn set

…26837)

* Apex predator can no longer target yourself * Update code/modules/antagonists/changeling/powers/apex_predator.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: Chap <[email protected]> * Update code/modules/antagonists/changeling/powers/apex_predator.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: Chap <[email protected]> * Predator senses too * Added a to_chat --------- Signed-off-by: Chap <[email protected]> Co-authored-by: Adrer <[email protected]> Co-authored-by: Contrabang <[email protected]>

* feat: Storage shelves and gun racks. * Apply suggestions from code review Co-authored-by: Luc <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> * review comments * better examine * fix lint * Examine for empty shelves * Apply suggestions from code review Co-authored-by: Luc <[email protected]> Co-authored-by: DGamerL <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> * rest of review comments --------- Signed-off-by: warriorstar-orion <[email protected]> Co-authored-by: Luc <[email protected]> Co-authored-by: DGamerL <[email protected]>

…ccess (ParadiseSS13#26764)

…SS13#26814)

* You can now emag humans again * Update code/modules/surgery/organs/organ_external.dm Signed-off-by: Burzah <[email protected]> --------- Signed-off-by: Burzah <[email protected]> Co-authored-by: Burzah <[email protected]>

* Safe fixing * Update code/game/objects/structures/safe.dm Co-authored-by: Luc <[email protected]> Signed-off-by: kyunkyunkyun <[email protected]> --------- Signed-off-by: kyunkyunkyun <[email protected]> Co-authored-by: Luc <[email protected]>

) * Prevent sleeps in Move from blocking SSinput * Switch to watifor = FALSE * Move SHOULD_NOT_SLEEP * Whoops, that one's a redefine, too.

* Fixes powerfists * Slightly making it better

* new welcome sounds * went with S34NW idea, added NSS and removed crew, made Crebron sound better * added diagoras welcome sound

…es (ParadiseSS13#26818) * Guardian health hud now updates properly * Now with negative numbers! * New signal * remove non-functioning proc * Update code/game/gamemodes/miniantags/guardian/guardian.dm Co-authored-by: Luc <[email protected]> Signed-off-by: Chap <[email protected]> --------- Signed-off-by: Chap <[email protected]> Co-authored-by: Adrer <[email protected]> Co-authored-by: Luc <[email protected]>

…13#26940)

* Makes the BRPD fit in belts * Also military belt

) * Prevents emissive blockers from getting contaminated by radiation * wrong var. oops

* Remove fungus decal from walls * Remove dirt under walls on maps * Clean more dirt * Use new random spawners for fungus frequent * Replace old fungus spawners with new one * Resolve conflict

* removes princess RNG * Add files via upload * Update princess.dm * Delete spider.patch * Update princess.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> * Update code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm Co-authored-by: Luc <[email protected]> Signed-off-by: PopeDaveThe3th <[email protected]> --------- Signed-off-by: PopeDaveThe3th <[email protected]> Co-authored-by: Contrabang <[email protected]> Co-authored-by: Luc <[email protected]>

* fix: make food on shelves ant-proof * Update food_base.dm Co-authored-by: DGamerL <[email protected]> Signed-off-by: warriorstar-orion <[email protected]> --------- Signed-off-by: warriorstar-orion <[email protected]> Co-authored-by: DGamerL <[email protected]>

Simple (almost 1 to 1) copy paste from eswords (because oop sucks).

dj-34 · 2024-10-03T17:40:31Z

нужно будет rack'и переделать

DGamerL and others added 30 commits September 27, 2024 17:01

Updates OD lints (ParadiseSS13#26729)

900271a

* yea * update lints * lint changes and code fixes * i hate old code * dont make this an error

Non fulltile windows don't get blood on them, spacecleaner cleans blo…

594ff57

…od more reliably (ParadiseSS13#26886)

wire cutters (ParadiseSS13#26921)

2d7d4fa

fixes surgery again please fuck (ParadiseSS13#26922)

30c8f94

fax CC to change lawset (ParadiseSS13#26882)

359739b

Fix: No more burnt hermit (ParadiseSS13#26898)

ff76ba2

* No more burnt hermit * Compacted spawn set

Added shadowperson healing case for when inside locker (ParadiseSS13#…

0f58720

…26837)

Makes the ID machine no longer remove extra access when you get all a…

20258e7

…ccess (ParadiseSS13#26764)

Syndie depot loses it's GPS (ParadiseSS13#26883)

a422b25

fix: headphone music notes updating / admin musician outfit (Paradise…

fafb2d6

…SS13#26814)

You can now emag humans again (ParadiseSS13#26857)

c6f9a5e

* You can now emag humans again * Update code/modules/surgery/organs/organ_external.dm Signed-off-by: Burzah <[email protected]> --------- Signed-off-by: Burzah <[email protected]> Co-authored-by: Burzah <[email protected]>

Prevent sleeps in key handling from blocking SSinput (ParadiseSS13#26761

d652943

) * Prevent sleeps in Move from blocking SSinput * Switch to watifor = FALSE * Move SHOULD_NOT_SLEEP * Whoops, that one's a redefine, too.

fixes my math (ParadiseSS13#26933)

29309ef

the codebase has gotten 1% more cringe (ParadiseSS13#26915)

ab39d2d

Update shelves.dm (ParadiseSS13#26938)

04c110c

[s] Makes powerfists a bit more sane (ParadiseSS13#26939)

a4d7950

* Fixes powerfists * Slightly making it better

New sounds for welcoming the crew to the station (ParadiseSS13#26666)

0d79dc6

* new welcome sounds * went with S34NW idea, added NSS and removed crew, made Crebron sound better * added diagoras welcome sound

Commit Acces to Maintainer Initial (ParadiseSS13#26920)

b1be7cc

fix: handle resizing shelf items from non-player movement (ParadiseSS…

6c38283

…13#26940)

Makes the BRPD fit in belts (ParadiseSS13#26911)

603d717

* Makes the BRPD fit in belts * Also military belt

Such a hard thing to code (ParadiseSS13#26912)

2773249

Fixes lighting emissive blockers becoming irradiated (ParadiseSS13#26931

f2efdcf

) * Prevents emissive blockers from getting contaminated by radiation * wrong var. oops

Add decals to walls banned neighbors (ParadiseSS13#26849)

0f5d71b

* Remove fungus decal from walls * Remove dirt under walls on maps * Clean more dirt * Use new random spawners for fungus frequent * Replace old fungus spawners with new one * Resolve conflict

Qwertytoforty and others added 4 commits October 2, 2024 18:20

Ah Ah Ah, you didn't say the magic word (ParadiseSS13#26966)

6ca35f3

Add Seppuku to the Captain Saber (ParadiseSS13#26936)

95888bb

Simple (almost 1 to 1) copy paste from eswords (because oop sucks).

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

e5d1e09

ss220bot added the 📜 CL невалиден Этот чейнджлог не пройдет валидацию перед публикацией. Исправить или удалить, если не требуется label Oct 3, 2024

Legendaxe added 2 commits October 3, 2024 20:51

hev_suit handle_speech fix

41481de

camera linter fix

bffaf24

updatePaths

afb066d

Legendaxe added 2 commits October 3, 2024 22:10

map linter fix

42b7458

replace modular gunracks with upstream gunracks

760ed92

AyIong added the Do Not Merge Не заливать. В ожидании хэда/хоста. Или просто временный тестмерж. label Oct 3, 2024

dj-34 approved these changes Oct 3, 2024

View reviewed changes

Legendaxe merged commit 7e03a8e into ss220club:master Oct 4, 2024
15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge upstream 03.10.2024 #1574

merge upstream 03.10.2024 #1574

Legendaxe commented Oct 3, 2024 •

edited

Loading

dj-34 commented Oct 3, 2024

merge upstream 03.10.2024 #1574

merge upstream 03.10.2024 #1574

Conversation

Legendaxe commented Oct 3, 2024 • edited Loading

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

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

Изображения изменений

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

Changelog

dj-34 commented Oct 3, 2024

Legendaxe commented Oct 3, 2024 •

edited

Loading