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

Sprite: Dresser and Cabinet #531

Closed
wants to merge 487 commits into from
Closed

Sprite: Dresser and Cabinet #531

wants to merge 487 commits into from

Conversation

AyIong
Copy link
Collaborator

@AyIong AyIong commented Oct 21, 2023 •
edited
Loading

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

Заменяет спрайт у шкафа и шуфлядки.

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

Чуть меньше кринжовых срайтов?

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

image

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

No.

Changelog

🆑
imageadd: Шуфлядка теперь красивая, а не из 2013
imageadd: Старые шкайфы сожрали термиты, НТ закупило новые.
/:cl:

meow20 and others added 30 commits October 2, 2023 22:43
@meow20 @lewcc @Furrior
Fixes runtime when clicking an empty coat hanger with empty hand. (Pa…
b0019ff 
…radiseSS13#22577)

* prevents runtime if the hanger is clicked when its empty

* changes recommended on code chat

* Update code/game/objects/structures/coathanger.dm

Co-authored-by: Luc <[email protected]>

---------

Co-authored-by: Luc <[email protected]>
@Contrabang @Furrior
fuck (ParadiseSS13#22574)
a43a731
@1080pCat @Furrior
Ghosts are now able to see N2O with the analyze air verb. (ParadiseSS…
48d0b2c 
…13#22552)

* Update observer_base.dm

* Burzah review

* missed a  couple

* Update observer_base.dm

* Update observer_base.dm

* Update observer_base.dm

* Update observer_base.dm
@Oyu07 @DGamerL @Furrior
Small typo/grammar edits (Ready) (ParadiseSS13#22521)
5fd1bff 
* Thanks Grammarly

* re added ,

* TGUI merge conflict

* BUNDLE WEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE

* Review commit. thanks

Co-authored-by: DGamerL <[email protected]>

* BUNDLEEEEEEEE

* Bundle

---------

Co-authored-by: DGamerL <[email protected]>
@Contrabang @Furrior
Fixes some minor stuff with the debug outfit (ParadiseSS13#22510)
56a55ae 
* argh

* yea

* gatto
@warriorstar-orion @Furrior
fix hardcoded para URLs, add wiki link formatter (ParadiseSS13#22504)
9aa82d1 
* fix hardcoded para URLs, introduce wiki link helper

* add tiny doc
@warriorstar-orion @Furrior
add crayon message customizer; port TG alphanumeric crayon decals (Pa…
b5a89d5 
…radiseSS13#22499)

* guh

* add crayon message customizer; port TG alphanumeric crayon decals

* docs
@Bjamcham @Furrior
This seems bad (ParadiseSS13#22631)
5f2f7a9
@Henri215 @Furrior
Fixes the motorcycle overlay (ParadiseSS13#22628)
734b8b0
@lewcc @Furrior
Kills Check Pulse (ParadiseSS13#22501)
98cf1f2 
* unchecks verbs

* removes method
@GDNgit @Furrior
fixes some turfs being active on a space ruin roundstart (ParadiseSS1…
fe89009 
…3#22549)
@DGamerL @Furrior
Fixes mail crates sometimes spawning inside the Supply shuttle engines (
c2cae2b 
ParadiseSS13#22567)

* Thanks Mira for giving me this proc

* GDN review
@lewcc @Furrior
marks cap guns as harmless (ParadiseSS13#22572)
0545e21
@Henri215 @Furrior
Some fake virus tweaks (ParadiseSS13#22591)
e5f5549 
* Some fake virus tweaks

* renaming some vars
@DGamerL @Henri215 @Furrior
Splits up item_inhands.dmi (ParadiseSS13#22584)
05f0ef5 
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Fixes jackhammer and glass shard

* Fixes toy Chainsaw

* Update code/game/objects/items/toys.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/game/objects/items/weapons/weaponry.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm

Co-authored-by: Henri215 <[email protected]>

* Fixes edagger hopefully

* Henri review

* Oops

* First this gone, and now the pain

* Should all be fixed now

---------

Co-authored-by: Henri215 <[email protected]>
@Contrabang @Furrior
adofiwefwoeiunf (ParadiseSS13#22593)
146cffe
@DGamerL @Contrabang @Furrior
Adds a progressbar to heating up reagent containers. (ParadiseSS13#22594
fc2f554 
)

* HOTHOTHOTHOT

* Update code/_onclick/item_attack.dm

Co-authored-by: Contrabang <[email protected]>

* Removes unused brackets

* Now I fix it again

* Remove unused brackets 2.0

---------

Co-authored-by: Contrabang <[email protected]>
@meow20 @Furrior
Syndicate bots no longer show up on security bot control PDA menu (Pa…
87f7e17 
…radiseSS13#22602)

* technically first commit

* nt ed's now show up and linter check should pass.
@Henri215 @lewcc @Furrior
Nt recruiter First DLC (emag and other tweaks) (ParadiseSS13#22427)
2d90501 
* New NT Recruiter update

* Adding emag effect for the arcade + other tweaks

* tickets for reward too

* ops

* Medal prize!

* adding sounds when losing!

* increasing minimum bad max age

* added small interaction cooldown

* adjusting time

* tgui rebuild

* ah shit, here we go again

* tgui rebuild

* lets fix this

* Apply suggestions from code review

Co-authored-by: Luc <[email protected]>

* tgui rebuild

* tgui rebuild

---------

Co-authored-by: Luc <[email protected]>
@HMBGERDO @Contrabang @Furrior
Parallax in Darkness (ParadiseSS13#22136)
d997bb0 
* you can now see parallax in darkness

* moved parallax_darkness to toggles2

* uh oh

* one more thing

* total value

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

Co-authored-by: Contrabang <[email protected]>

---------

Co-authored-by: Contrabang <[email protected]>
@Sadhorizon @DGamerL @Furrior
Adds a new fauna to lavaland: an abandoned minebot! (ParadiseSS13#22173)
6e09a43 
* added the file

* works pretty nicely

* forgot these comments

* doubled their spawn chance

* minebot passthrough stuff

* more fluff

* no longer will go to lava tiles

* answered most reviews

* DGL's solution

* makes loot more efficient, minor tweaks
big thanks to DGamer with this one!

* DGL's review

* Update code/modules/mob/living/simple_animal/hostile/mining/abandoned_minebot.dm

Co-authored-by: DGamerL <[email protected]>

* Merge remote-tracking branch 'upstream/master' into outpost_remap_copy

* oops, a lil fuckup

* removes an unneeded var

* removed the landmark iconstate

---------

Co-authored-by: DGamerL <[email protected]>
@OctusGit @Henri215 @Furrior
Removes Pet Hospital, Adds Althland Corporation Refinery Ruins (Parad…
5cf078e 
…iseSS13#22287)

* byebyepet

* typo fix

* more typo fixes

* fixes

* another fix

* delete hospital shit

* ok seriously work now you fuc-

* improvements

* changes tempature

* heat proof lattice

* hi qwerty

* test

* ok lmao

* lattice moment

* oopsie!

* ok fuck you

* map update

* yes

* Revert "yes"

This reverts commit 9892a11.

* Update lavaland_surface_althland_facility.dmm

* Update code/game/objects/items/stacks/rods.dm

Co-authored-by: Henri215 <[email protected]>

* henri review

* adds lore

* fix

* fix

* more fix

---------

Co-authored-by: Henri215 <[email protected]>
@Qwertytoforty @Furrior
changes qdel method on bridge spawners (ParadiseSS13#22355)
b8e223b 
* changes qdel method on bridge spanwers

* Update bridges.dm
@DGamerL @Contrabang @Furrior
Refactors the surplus crate (ParadiseSS13#22367)
70ba65a 
* WOOOO

* We do this now

* This too

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Contrabang <[email protected]>

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Contrabang <[email protected]>

* Hmmmm not quite there

* One push

* Aight we ball

* Whoops I gotta run

* WE ARE SO BACK

* Forgor

* Now with even more Cl passing!

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Contrabang <[email protected]>

* Apply suggestions from code review

Co-authored-by: Contrabang <[email protected]>

* Contra review

* Moving it to crates.dm

* Lewc Review

* Forgot about this

* Fixes contractors

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Contrabang <[email protected]>

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Contrabang <[email protected]>

* Update code/game/objects/structures/crates_lockers/crates.dm

Co-authored-by: Contrabang <[email protected]>

* Uh oh they are giving out too much

* Fixed TC refund

* Whoops

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Contrabang <[email protected]>

* Lewc review

---------

Co-authored-by: Contrabang <[email protected]>
@SchrodingersWolf @Furrior
Slightly nerfs and fixes slaughter demon healing (ParadiseSS13#22384)
c3b9f00 
* /mob/living/simple_animal/demon/slaughter

* Tuning down skill level to 'I'm too young to die'

* We call this a DIFFICULTY TWEAK

* Bloodcrawl and HP tweak gone, inverted logic fixed

* Forgot some stuff - Now added

* Procrastination is a slow and insidious killer
@Contrabang @Furrior
Refactors objectives, expands team functionality, and custom teams (P…
eb1ba87 
…aradiseSS13#22374)

* step 1

* renaming 1

* how could I forget this

* renaming 2

* renaming 3

* add matching proc, even if unused can remove later

* rename team obj to match

* oops

* okay more stuff

* okay more stuff

* fix this stuff

* okay more stuff

* needs_target = FALSE

* OKAY MORE STUFF

* OOPS AGAIN.

* self-review

* more round_end stuff

* stuff 119

* yeah fix that too

* EVEN MORE CHANGES

* grammar

* fix

* s34n review

* fixes custom teams with no antags not showing objs

* makes objectives work properly with teams

* a
@Adrer @Furrior
Requires_tcomms now actually works when tcomms are down (ParadiseSS13…
674e161 
…#22402)

Co-authored-by: Adrer <[email protected]>
@OctusGit @Furrior
Updates Sprite on Vox Breath Mask (ParadiseSS13#22422)
50a0585 
* updates mask

* fixes qwerty's concern

* recolor/better shade

* less phallus looking

* cleans a dupe

* new mask resprite thanks to McRamon
@lewcc @Furrior
Modsuit flashlights are now properly extinguished (ParadiseSS13#22557)
a570e56 
* pREVE

* No more force
@Furrior
Fix/Tweak: Now admin logout messages are more important than mentor o…
9580c1e 
…nes (ParadiseSS13#22560)

* Dunno

* oops
Furrior and others added 2 commits October 22, 2023 02:46
@Furrior
Prayge5 (#530)
f873ac9
@Legendaxe @dj-34 @Furrior
add: Italian moustache (#525)
8c24b08 
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает
Добавлянто итальяно уситто

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

Ноу комменто

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

![image](https://github.com/ss220club/Paradise-SS220/assets/102746941/95cc0c2f-8024-43fd-af46-8265ae4b40c5)


## Тестирование
Веритто на словито.

## Changelog

:cl:
add: Мамма-мия, девелоперито Дон-Джейо и Ащиа Лежендария портировали
итальянно уситто
/:cl:

---------

Co-authored-by: dj-34 <[email protected]>
Co-authored-by: Furior <[email protected]>
@github-actions github-actions bot added the 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! label Oct 21, 2023
@dj-34
Copy link
Collaborator

dj-34 commented Oct 21, 2023

не надо рэк спрайт возвращать, я хочу доделать ему сложенную версию, чтоб все красивенько было

@dj-34
Copy link
Collaborator

dj-34 commented Oct 21, 2023

у нас все рэки в тгшных красках, да и практически всё уже

@AyIong
Copy link
Collaborator Author

AyIong commented Oct 21, 2023

у нас все рэки в тгшных красках, да и практически всё уже

Эх... а мне понравился оффовский рэк

@AyIong AyIong marked this pull request as draft October 21, 2023 22:50
@AyIong AyIong changed the title -Rack sprite +Dresser sprite Sprite: Dresser Oct 21, 2023
@dj-34
Copy link
Collaborator

dj-34 commented Oct 21, 2023

image
а если менять дрессер, то тогда надо заменять и спрайт шкафа, ибо они идут вместе

@dj-34
Copy link
Collaborator

dj-34 commented Oct 21, 2023

image
да так то и вся мебель хорошо смотрится и так kekw

@AyIong
Copy link
Collaborator Author

AyIong commented Oct 21, 2023

image да так то и вся мебель хорошо смотрится и так kekw

Мне дрессер вообще не нравится, могу его в старые цвета покрасить

@dj-34
Copy link
Collaborator

dj-34 commented Oct 21, 2023

image да так то и вся мебель хорошо смотрится и так kekw

Мне дрессер вообще не нравится, могу его в старые цвета покрасить

го

@AyIong AyIong changed the title Sprite: Dresser Sprite: Dresser and Cabinet Oct 21, 2023
@AyIong AyIong marked this pull request as ready for review October 21, 2023 23:59
@github-actions github-actions bot added the Merge Conflict Ну блять... label Oct 22, 2023
@github-actions github-actions bot added :neckbeard: Документация Улучшения и дополнения в документации 💾 Изменение конфига Ф-ф-фуриор...? 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один. 🔉 Звук Услада для ушей. 🎸 Инструменты Мы выдаем себя за реальное сообщество разработчиков. Кибериада Этот ПР изменил что-то на Кибериаде (BoxStation) Керберос Этот ПР изменил что-то на Керберосе (DeltaStation) TGUI Кто-то решил потрогать интерфейсы. 💿 SQL Надо править БД. labels Oct 22, 2023
@AyIong
Copy link
Collaborator Author

AyIong commented Oct 22, 2023

#547

@AyIong AyIong closed this Oct 22, 2023
@AyIong AyIong deleted the rack-sprite branch November 6, 2023 16:04
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
💿 SQL Надо править БД. 💾 Изменение конфига Ф-ф-фуриор...? 🎸 Инструменты Мы выдаем себя за реальное сообщество разработчиков. Merge Conflict Ну блять... :neckbeard: Документация Улучшения и дополнения в документации 🖌️ Спрайты Вы заработали свою миска-рис и кошко-жена. Партия гордится вами! 🔉 Звук Услада для ушей. TGUI Кто-то решил потрогать интерфейсы. 🗺️ Изменение Карты В этом ПРе затронут файл не станционной карты. Может и не один. Керберос Этот ПР изменил что-то на Керберосе (DeltaStation) Кибериада Этот ПР изменил что-то на Кибериаде (BoxStation)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.