juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,830 Commits 57 Branches 0 Tags
d6a0ce95a1510452d92cda2e4a18c3e01d6da372
Commit Graph

65 Commits

Author SHA1 Message Date
Ed
7328f3449c Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/EntityTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Procedural/DungeonSystem.Rooms.cs
#	Content.Server/Procedural/RoomFillComponent.cs
#	Content.Server/Procedural/RoomFillSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/migration.yml
 2025-02-16 11:58:47 +03:00
Zachary Higgs
8b46538e3f Move CloneAppearance to Shared (#35017) 
* Move CloneAppearance

- Move CloneAppearance from HumanoidAppearanceSystem
to SharedHumanoidAppearanceSystem

* CR - Fix the sins of the past
 2025-02-10 04:13:27 +01:00
Ed
d67f7619c4 Edgefication (#590) 
* bloat

* bloat 2

* bloat 3

* final bloat

* Update icon.ico

* Create integration_test_run.bat

* Arggh

* Disable some tests

* revert roomfill clearexisting changes
 2024-11-18 14:40:52 +03:00
Ed
ca656b3c10 Merge remote-tracking branch 'upstream/master' into ed-29-08-2024 
# Conflicts:
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Resources/Prototypes/Maps/reach.yml
 2024-08-29 14:32:09 +03:00
Rouge2t7
7e60431754 Long human ears (#30490) 
Long human ears colour fix. Shortcut removed.
 2024-08-21 17:44:43 -06:00
Ed
bf93349b73 Female bodies support (#350) 
* port female parts

* boobs support!

* tiefling boobs confirmed

* Update female_shirt.png

* Update female_shirt.png
 2024-07-24 09:11:31 +03:00
Ed
70df945fe1 Elf species (#205) 
* add elves names

* fix

* fix dwarf clothing preview

* elf!

* add marking locales

* fuck ss14 species

* Update SpeciesPrototype.cs
 2024-06-03 23:50:05 +03:00
Ed
6a5fae3403 Merge remote-tracking branch 'space-station-14/master' into ed-02-06-2024-upstream 2024-06-02 11:01:34 +03:00
Verm
a9a65b7e0d Randomizes more humanoid appearances (#27997) 2024-06-01 00:51:07 -04:00
Tornado Tech
0aa0abb949 New tiefling hue (#155) 
* Добавлен отдельный тип цвета кожи для тифлингов

* Немного чистки

* Автоматом поправил, будет мешать при мердже
 2024-05-18 17:46:19 +03:00
Ed
dda8ea2b09 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream 
# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml
 2024-05-13 18:32:59 +03:00
metalgearsloth
332f54a3ae Lobby refactor + species loadouts support (#27576) 
* Vox stuff

* Species loadouts and lobby refactor

The control flow for lobby is all over the shop so I pulled it all up from the individual controls so now they handle the bare minimum required and LobbyUIController handles the rest.

* a

* Bulk changes

* a

* weh

* Character import / export

* finalise

* woops this stuff too

* Also datafield exporting

* comments

* Review
 2024-05-12 09:18:21 +10:00
Ed
6174713383 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-27-04-2024-displacement-upstream 
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
 2024-04-27 10:45:35 +03:00
Errant
257b04d277 Vox sprite rework (#26985) 
weh
 2024-04-27 16:04:51 +10:00
Ed
057556b605 Merge remote-tracking branch 'space-station-14/master' into ed-26-04-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/Station/EvacShuttleTest.cs
 2024-04-26 00:33:04 +03:00
Nemanja
161fd6c83c Mega Antag Refactor (#25786) 
* Mega Antag Refactor

* last minute delta save

* more workshopping

* more shit

* ok tested this for once

* okkkkk sure

* generic delays for starting rules

* well darn

* nukies partially

* ouagh

* ballin' faded and smonkin wed

* obliterated the diff

* Spread my arms and soak up congratulations

* I've got plenty of love, but nothing to show for it

* but there’s too much sunlight
Shining on my laptop monitor, so I
Can’t see anything with any amount of clarity

* ok this junk

* OOK!

* fubar

* most of sloth's review

* oh boy

* eek

* hell yea!

* ASDFJASDJFvsakcvjkzjnhhhyh
 2024-04-25 11:31:45 +10:00
Ed
a899122d1b Merge remote-tracking branch 'space-station-14/master' into 21-04-2024-cleaning-up 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Recipes/Lathes/electronics.yml
#	Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png
#	Resources/Textures/Interface/Nano/item_status_middle.svg.96dpi.png
#	Resources/Textures/Interface/Nano/item_status_right.svg.96dpi.png
 2024-04-21 20:54:50 +03:00
Ed
c156d09081 add comment 2024-04-21 15:46:46 +03:00
Ed
b2226cbe16 localized tiefling name 2024-04-21 15:25:22 +03:00
SlamBamActionman
7aa4beede6 Fix lizard snouts disappearing when wearing masks (#25716) 
* fixes it

* Snout fix

* Partway commit

* Partway commit

* Update masks and helmets to use the new system
 2024-04-19 15:39:47 +10:00
Errant
7120e8736a Cleanup in HumanoidCharacterAppearance (#26974) 
* namespace

* Tidy up the code for selecting random humanoid color
 2024-04-18 13:27:11 +10:00
metalgearsloth
12766fe6e3 Loadouts redux (#25715) 
* Loadouts redux

* Loadout window mockup

* More workout

* rent

* validation

* Developments

* bcs

* More cleanup

* Rebuild working

* Fix model and loading

* obsession

* efcore

* We got a stew goin

* Cleanup

* Optional + SeniorEngineering fix

* Fixes

* Update science.yml

* add

add

* Automatic naming

* Update nukeops

* Coming together

* Right now

* stargate

* rejig the UI

* weh

* Loadouts tweaks

* Merge conflicts + ordering fix

* yerba mate

* chocolat

* More updates

* Add multi-selection support

* test

h

* fikss

* a

* add tech assistant and hazard suit

* huh

* Latest changes

* add medical loadouts

* and science

* finish security loadouts

* cargo

* service done

* added wildcards

* add command

* Move restrictions

* Finalising

* Fix existing work

* Localise next batch

* clothing fix

* Fix storage names

* review

* the scooping room

* Test fixes

* Xamlify

* Xamlify this too

* Update Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/Jobs/Security/detective.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* Update Resources/Prototypes/Loadouts/loadout_groups.yml

Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>

* ben

* Margins

---------

Co-authored-by: Firewatch <54725557+musicmanvr@users.noreply.github.com>
Co-authored-by: Mr. 27 <koolthunder019@gmail.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
 2024-04-16 22:57:43 +10:00
deltanedas
2f5c639a15 predict humanoid identity examine (#26769) 
* predict humanoid identity examine

* actually server doesnt need proto anymore

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-04-08 11:16:21 -04:00
Tayrtahn
4a83c36585 Code cleanup: Dirty(Comp) (#26238) 
* Replaced uses of Dirty(Component) with Dirty(Uid, Component)
Modified some systems (notably pulling-related) to use uids.

* Missed a few

* Revert changes to pulling

* No
 2024-03-19 23:27:02 -04:00
Errant
84a07315dd Species info in Guidebook and at chargen (#25844) 
* guidebook pages defined

* species info button in character profile editor

* if current species has no guidebook page then open the parent page

* skrek

* destroying evidence of secret vox plot

* icon size adjustment, no icon if guidebook page for species does not exist

* finished pages

* additional info

* weh
 2024-03-10 20:01:32 -07:00
Errant
5a9ab3b315 Vox names, species prototype cleanup, some cosmetic changes (#24994) 
* voxnames

* New generator parameters, names are more readable

* bunch of missing vox stuff

* more names

* sad
 2024-02-14 14:08:45 +11:00
ike709
6cbe4a8fb6 Ports colored chat names (#24478) 
* Ports colored chat names

* Update name color on every message

---------

Co-authored-by: ike709 <ike709@github.com>
 2024-01-25 01:39:00 -07:00
deathride58
43d1be51fb Limits the minimum base skin color brightness for species with Hue coloration (#23605) 
adds a minimum skin tone for hue skin colors
 2024-01-06 20:40:29 +11:00
Leon Friedrich
b6bd82caa6 Use ECS prototype-reload events (#22613) 
* Use ECS prototype-reload events

* better constructors

* Maybe this fixes tests?
 2023-12-23 01:13:45 +11:00
Leon Friedrich
907b873145 Fix various errors/exceptions (#22841) 
* Fix entity storage localization

* Fix HumanoidAppearanceComponent resolve

* Fix null reference exceptions

* Fix duplicate key error

* Fix artifact error spam

* actually maybe this is what its meant to do

* Fix entities playing sounds on deletion
 2023-12-22 00:26:08 -07:00
DrSmugleaf
2d58d19b07 Make all prototype types partial (#21374) 2023-11-01 19:56:23 -07:00
DrSmugleaf
2f11a749f6 Remove cloneData parameter from AutoNetworkedField (#20596) 2023-09-30 15:14:16 +10:00
DrSmugleaf
d2578370a7 Fix not networking markings (#20588) 2023-09-28 17:44:47 -07:00
DrSmugleaf
a44fa86b68 Update trivial components to use auto comp states (#20539) 2023-09-28 16:20:29 -07: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
Nemanja
fdbadbe579 closet skeleton event (#19802) 2023-09-19 15:05:17 +10:00
metalgearsloth
5a0fc68be2 Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
DrSmugleaf
a88e747a0b Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Nemanja
3f2ea17bb7 fix species skin colors (#19417) 2023-08-21 19:05:24 -07:00
Vordenburg
7582474f1a Lint more const string prototypes (#18922) 2023-08-13 20:26:59 -04:00
metalgearsloth
ead47c541d Fix humanoid appearances for placement manager (#18291) 2023-08-05 14:25:47 +10:00
metalgearsloth
90110183be Fix a bunch of logger warnings (#17691) 2023-06-27 23:56:52 +10:00
Moony
e92a8fedab Refactor stations to properly use entity prototypes. (stationsv3) (#16570) 
* Update StationSpawningSystem.cs

Web-edit to allow feeding in an existing entity.

* Update StationSpawningSystem.cs

value type moment

* Update StationSpawningSystem.cs

* Oh goddamnit this is a refactor now.

* awawawa

* aaaaaaaaaaa

* ee

* forgot records.

* no records? no records.

* What's in a name?

* Sloth forcing me to do the refactor properly smh.

* e

* optional evac in test.

* tests pls work

* awa

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
 2023-05-19 15:45:09 -05:00
Leon Friedrich
db8a48ba33 Fix SpawnAndDirtyAllEntities test (#15771) 2023-04-25 19:27:57 +10:00
Flipp Syder
c29968372e Adds validation bool for setting humanoid skin color (#15360) 2023-04-23 19:16:59 +10:00
Flipp Syder
c02824a85c Skin color validation (#15140) 2023-04-05 17:41:11 -06:00
Leon Friedrich
f0cf4e7a22 Add missing DataDefinition constructors (#14603) 2023-03-12 16:37:24 -07: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
Leon Friedrich
e8838af395 Fix humanoid appearance error (#13721) 2023-01-26 18:04:58 -04:00