Morb0
1b513f0c1a
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/GameTicking/GameTicker.RoundFlow.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
# Content.Server/Zombies/ZombieSystem.Transform.cs
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Textures/Tiles/attributions.yml
2023-08-29 05:58:14 +03:00
Nemanja
cb98613450
fix chem guidebooks not displaying all damages ( #19509 )
2023-08-24 21:14:53 -05:00
Morb0
8c1b56741a
Temporary fluent fix
2023-06-19 21:25:01 +03:00
Morb0
636bea81df
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Entry/EntryPoint.cs
# Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
# Content.Server/Zombies/ZombifyOnDeathSystem.cs
# Resources/Prototypes/Corvax/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
# Resources/Prototypes/Datasets/tips.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Science/Robotics.xml
# Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/headlight.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit-inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/syndicate.rsi/visorlit.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Suits/syndicate.rsi/inhand-right.png
# Resources/Textures/Effects/speech.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/stock_parts.rsi/adv_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/advanced_matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/bluespace_matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/femto_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/nano_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/pico_mani.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/quadratic_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/super_capacitor.png
# Resources/Textures/Objects/Misc/stock_parts.rsi/super_matter_bin.png
# Resources/Textures/Structures/Furniture/chairs.rsi/meta.json
2023-06-19 21:06:28 +03:00
Nemanja
b9fb66f005
Chem guidebook ( #17123 )
...
* im good at atomizing. welcome to half-finished chem guides.
* wagh
* e
* save work
* aa
* woweee UI
* finishing the last of it
* don't actually update the engine :(
---------
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-06-04 15:45:02 -05:00
Morb
c94d3d8c27
Locale fallback ( #913 )
2023-03-23 21:00:36 -07:00
Morbo
cdfcfe6722
Merge remote-tracking branch 'upstream/master' into upstream-sync
2023-01-22 00:07:21 +03:00
Visne
c6d3e4f3bd
Fix warnings and code cleanup/fixes ( #13570 )
2023-01-19 13:56:45 +11:00
Morbo
88d2445740
Merge remote-tracking branch 'upstream/master' into upstream-sync
...
# Conflicts:
# Resources/Prototypes/Maps/origin.yml
2023-01-01 01:21:40 +03:00
metalgearsloth
007b079330
Fix some comp dirty / appearance warnings ( #13193 )
...
* Fix some comp dirty / appearance warnings
* also dis
2022-12-27 17:58:53 +01:00
Morb
6ad4a10b29
Repository cleanup ( #631 )
2022-12-10 12:10:27 -08:00
Morbo
8ffba84896
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-10-21 19:51:57 +03:00
Kara
7ad867fa0f
Slight localization func cleanup ( #11380 )
2022-10-18 19:51:18 -07:00
Arthur
82c0b1c8e7
Merge remote-tracking branch 'upstream/master' into upstream-sync
2022-05-15 16:38:40 +03:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
Morbo
7339c42b23
Merge branch 'space-wizards:master' into master
2021-12-29 06:05:28 +03:00
zlodo
28df88ef21
Content.Shared.Localizations.Units: fix fluent IDs getting appended instead of the localized string, and wrong fluent IDs for some of the pressure units. ( #5919 )
2021-12-28 13:40:07 +01:00
Morbo
9c493fa810
Merge branch 'space-wizards:master' into master
2021-12-25 03:41:38 +03:00
TemporalOroboros
201952e618
Adds temperature to solutions ( #5834 )
2021-12-24 02:22:34 -07:00
Arthur
5cc811cf7d
Change codebase language to ru-RU
2021-12-15 06:54:07 +03:00
E F R
c8cfff6630
Shared/Localizations: Add translatable Units formatting ( #5063 )
2021-11-23 16:38:51 -07:00
Vera Aguilera Puerto
5a5006e4cf
ConstructionGL2 Part 2: Better guided steps and recipes. ( #5103 )
2021-11-02 11:24:32 +01:00
20kdc
44f5f15790
Power-reading multitool ( #5046 )
...
* AMEPartComponent: Switch to ToolSystem.HasQuality because this bugs me.
* Multitool can read power when you examine a cable with the multitool held.
* Multitool power reading: Condense storage information
* power-sensing multitool: Fix ToolSystem ref.
* Power-reading multitools: Fix misuse of GetComponent
2021-10-29 14:42:18 +02:00
moonheart08
9250bd62cb
Admin shuttle call button ( #4859 )
...
* shuttle call ui
* shuttle call ui
* Localize shuttle commands better.
* localization fix
2021-10-13 10:15:28 -07:00
Galactic Chimp
392b820796
Removed old Loc.GetString() use instances ( #4155 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-06-21 02:13:54 +02:00
DrSmugleaf
ff1a2d97ea
Re-organize all projects ( #4166 )
2021-06-09 22:19:39 +02:00
