Morb0
82b4572421
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Content.Shared/Chat/SharedChatSystem.cs
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2023-06-28 16:02:06 +03:00
metalgearsloth
90110183be
Fix a bunch of logger warnings ( #17691 )
2023-06-27 23:56:52 +10:00
Morb
6ad4a10b29
Repository cleanup ( #631 )
2022-12-10 12:10:27 -08:00
Morbo
d7d2dd96c0
Merge remote-tracking branch 'upstream/master' into upstream-sync2
...
# Conflicts:
# Content.Client/PDA/PDAMenu.xaml
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Shared/Humanoid/NamingSystem.cs
# Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
2022-11-09 03:02:01 +03:00
Nemanja
fd9bedae9a
New Species: Diona ( #11497 )
...
* new species: Diona
* more diona stuff
* dey breathing now
* test fixe
* fix a merge
* now actually fix the merge
* foobar
* oversight
* ok now the rest of em
2022-11-08 14:26:59 -06:00
Morbo
04fdbe539e
Use gender distinguish for last names
2022-10-16 02:06:09 +03:00
Rane
c70e423ff6
Let species prototypes define valid sexes (Sex Refactor) ( #11520 )
2022-10-15 14:45:47 -07:00
