Commit Graph

94 Commits

Author SHA1 Message Date
Remuchi
3515e87f74 [Feat] Тонкие спрайты снова в строю (#102)
* Revert "Hair Overhaul (#19298)"

This reverts commit 9491f322de.

# Conflicts:
#	Resources/Textures/Mobs/Customization/human_hair.rsi/a.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/afro.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/afro2.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/bigafro.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/cornrows2.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/emofringe.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/keanu.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/long.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/long2.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/long3.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/meta.json
#	Resources/Textures/Mobs/Customization/human_hair.rsi/modern.png
#	Resources/Textures/Mobs/Customization/human_hair.rsi/quiff.png

* add: возврат системы тонкоспрайтов

* fix: небольшие фиксы после реверта причесок

* add: старые текстуры для slim бодитайпа

* fix: фикс причесок после апстрима
2024-02-24 10:06:32 +00:00
Martell
af15fe7cd3 - fix: Исправлена ошибка, из-за которой борги не могли зачитывать законы в рацию (#48) 2024-02-14 16:52:15 +00:00
Aviu00
22db173b81 Merge branch 'final-version' into upupup 2024-02-05 10:24:33 +03:00
Krunklehorn
ed0f2aa221 Client customization late-join spawner priority for arrivals/cryostorage (#24586)
* Initial commit, requires server restart to take effect

* Exposes callbacks directly instead, takes effect immediately

* Cleaned up control flow, swapped cvar for client customization

* Switched to int, dictionary of callbacks, migration

* Update Content.Shared/Preferences/SpawnPriorityPreference.cs

* krunkle stan

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-02-01 21:12:09 +11:00
rhailrake
7872502bf8 - add: new lobby and ui tweaks. (#7)
* base

* arrow pointer for buttons

* some progress for text buttons, need cleaning

* fixed observe button, remove fraction

* just for now

* ui tweaks

* more ui tweaks

* feat: ченджлог в лобби

---------

Co-authored-by: Remuchi <RemuchiOfficial@gmail.com>
2024-01-31 12:54:38 +00:00
Remuchi
21dbccfec9 перенос файлов клиента из папки White в _White 2024-01-28 17:59:43 +07:00
Aviu00
d3cd3c430a Upstream upstream 2024-01-27 09:34:07 +03:00
Kot
4f307a49be Fix issue where round could reset all job priorities to high (#24340)
* Update job priorities when job requirements are getting updated

* Sort jobs by weight and then by the name

* Sort departments too
2024-01-20 17:03:10 -05:00
Aviu00
3cf07dd8a4 Я ебал NetEntity 2024-01-19 13:14:12 +03:00
KettlebellOfCreation
17c8c7070d felinid for admin (#187) 2024-01-19 12:11:02 +03:00
Valtos
204aab28dd Фикс панели выбора персонажей 2024-01-19 12:03:52 +03:00
RavMorgan
c1439eb6fc Всякое (#66)
Co-authored-by: Mona Hmiza <>
2024-01-17 10:46:32 +03:00
EnefFlow
59b5f24842 Play button base 2024-01-14 06:41:33 +03:00
rhailrake
68e52f60c9 [feat] Custom name for clown, mime and borgs 2024-01-14 06:30:49 +03:00
rhailrake
0deda77a06 [feat] New Interface (#10) 2024-01-13 09:47:38 +03:00
Mona Hmiza
8d5feb03e3 Мда 2024-01-13 09:14:47 +03:00
RavMorgan
26c6290be0 Felishit (#37)
* Мне слишком мало платят

* ЖРИ МЫШЕЙ

* Лок рас

* Але оп

* Блять

---------

Co-authored-by: Mona Hmiza <>
2024-01-13 09:14:47 +03:00
rhailrake
663cae3181 [feat] Donate extra slots 2024-01-11 08:06:15 +03:00
rhailrake
ea4f7595a2 [feat] TTS
# Conflicts:
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
#	Content.Server/Database/ServerDbBase.cs
#	Content.Server/Entry/EntryPoint.cs
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
2024-01-10 23:56:07 +07:00
rhailrake
4e85539ec6 [feat] donate
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Entry/EntryPoint.cs
#	Content.Server/GameTicking/GameTicker.Player.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/Markings/MarkingPrototype.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
2024-01-10 20:52:59 +07:00
lzk
abf6b9243f Lil profile editor rearrange (#23305) 2024-01-03 18:41:53 +11:00
metalgearsloth
5b8f3c48c4 Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth
9b1b3e03ed Content audio (#20862) 2023-10-29 14:58:23 +11:00
Repo
e0f3bf0a06 User accessible playtime (#21242)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-10-28 12:01:11 +00:00
deltanedas
4fbebb6917 Roundstart antag role restrictions revival (#20108)
Co-authored-by: Ray <vigersray@gmail.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-20 17:54:53 +10:00
Morb
835bde4c6e Sex restriction for markings (#19894)
* Add sex restriction to markings

* Apply to existing systems
2023-09-19 16:56:10 -04:00
Pieter-Jan Briers
08b6f0748a Clear cached preferences when disconnecting on client (#19921) 2023-09-14 22:49:32 -08:00
Morb
80543c322d Rotating character preview & lobby preview change (#19741) 2023-09-12 21:57:38 -04:00
metalgearsloth
99b77bc2d3 Remove lights compref (#19531) 2023-09-11 19:18:06 +10:00
metalgearsloth
b77265314b Make role timer tooltips pretty (#19605)
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
2023-09-11 15:44:21 +10:00
metalgearsloth
88dfc59038 Remove custom tooltip timings (#19604) 2023-09-11 13:53:35 +10:00
Morb
cb5a2636e1 Localize character editor show button (#19634) 2023-08-30 09:39:01 +10:00
Morb
627a282e1a Improve flavor UI (#19600)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-08-28 20:01:45 +10:00
Visne
11a57be230 Remove usages of obsolete SpriteView.Sprite.set() (#19500) 2023-08-25 11:16:46 +10:00
metalgearsloth
1856d6aaa5 Add clothing toggle to character editor (#18903) 2023-08-08 23:26:33 -07:00
PrPleGoo
7c088ac1de Job icons are stored on ID cards (#18233) 2023-07-29 18:25:27 +10:00
Pieter-Jan Briers
67dbe5f581 Fix atmos techs being so powerful as to break the very fabric of the universe. (#18301) 2023-07-26 10:02:40 +10:00
metalgearsloth
68480af109 Update content vectors to numerics (#17759) 2023-07-08 14:08:32 +10:00
metalgearsloth
76b42ff868 Remove funky IoC resolve (#16848) 2023-05-27 14:42:17 +10:00
metalgearsloth
be14380520 Role ban UI updates (#16736) 2023-05-27 14:22:22 +10:00
metalgearsloth
ae01618874 Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566) 2023-04-20 20:16:01 +10:00
metalgearsloth
acf79a8209 Revert "Replace ResourcePath with ResPath (#15308)" (#15551) 2023-04-20 11:43:54 +10:00
Ygg01
71f358a027 Replace ResourcePath with ResPath (#15308) 2023-04-19 23:39:17 +10:00
csqrb
b3a327988f Fix slime hair translucent (#14478)
* fix

* move
2023-03-11 13:04:58 -08:00
csqrb
8b3d7728d7 Marking default coloring (#13039)
* Marking coloring WIP

* EnsureDefault now supports coloring!

* Now markings have coloring when they get added

* Many things

* yml files

* cleanup

* Some requested changes

* Nullable type and WIP caching

* Time to resolve that thing with deprecated hair fields

* Latest reviews + im still trying to use these hair markings

* FirstOrDefault thing and Tattoo docs

* IDK

* It's now works a bit more properly in preferences GUI

* THEY SYNCING! However preferences GUI still broken and doesn't work properly

* Markings now updating when changing in GUI. However they still don't work properly with bald humanoids

* Forgor...

* Default hair-colored markings will not color to hair if there is no hair

* Fixed default colors for customizable markings

* Fixed bug in prefs GUI that set current hair to null

* Now markings that must match skin color because of limb (e.x. Slimes) - will match skin color

* final tweaks: if hair uses skin color then markings will use skin color as hair color (slimes)

* fix

* fixed dirty. no more funni invis bug

* Mirrors and client profile loading

* default colors soon TM

* review + better coloring

* Hardcode is gone

* diona markings

* oh my god

* fixed CategoryColoring

* cool fallback, clean up and some other tweaks

* code style

* more style

* a
2023-03-04 18:59:07 -08:00
James Simonson
bf5de5472b Improve jobs screen UX (#13657) 2023-01-26 18:32:15 -04:00
Leon Friedrich
48bcd30ef9 Makes humanoid appearance component networked. (#13009)
Fixes https://github.com/space-wizards/space-station-14/issues/12248
2023-01-24 11:38:19 +11:00
Visne
c6d3e4f3bd Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00
Pieter-Jan Briers
a323671984 Changes for prototype load parallelization (#13066)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-12-20 14:25:34 -08:00
nikthechampiongr
3d86baa92e Confirmation button (#12671)
Closes https://github.com/space-wizards/space-station-14/issues/12579
2022-12-06 15:14:48 -08:00