Vigers Ray
ed0a30bb64
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Weapons/Ranged/Systems/GunSystem.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Entry/EntryPoint.cs
# Content.Server/Ghost/GhostSystem.cs
# Content.Server/IoC/ServerContentIoC.cs
# Content.Server/Shuttles/Systems/ArrivalsSystem.cs
# Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
# Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
# Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Battery.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.Cartridges.cs
# Content.Server/Weapons/Ranged/Systems/GunSystem.cs
# Content.Shared/Damage/Systems/DamageableSystem.cs
# Content.Shared/Follower/FollowerSystem.cs
# Resources/Locale/en-US/_strings/actions/actions/dna-scrambler.ftl
# Resources/Locale/en-US/_strings/administration/commands/change-cvar-command.ftl
# Resources/Locale/en-US/discord/vote-notifications.ftl
# Resources/Prototypes/Catalog/Fills/Crates/armory.yml
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Voice/speech_emotes.yml
2025-02-19 13:16:37 +03:00
Kyle Tyo
1d360956a7
made requested changes.
2025-02-17 01:58:40 -05:00
Kyle Tyo
0fbacd7dcb
Update ContentLocalizationManager.cs
2025-02-16 23:06:28 -05:00
Kyle Tyo
f6fda97b72
I'm gonna do something drastic I swear.
2025-02-16 15:40:30 -05:00
Kyle Tyo
5ecb623e45
Update ContentLocalizationManager.cs
2025-02-16 15:35:44 -05:00
Vigers Ray
3355febe9b
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/StatusIcon/StatusIconSystem.cs
# Content.Server/Implants/ImplantedSystem.cs
# Resources/Audio/Effects/attributions.yml
# Resources/Locale/en-US/markings/ears.ftl
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Catalog/uplink_catalog.yml
# Resources/Prototypes/Entities/Mobs/Player/observer.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/LootTables/suspicion_loot_table.yml
# Resources/Prototypes/Research/arsenal.yml
# Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
# Resources/manifest.yml
# Resources/migration.yml
# RobustToolbox
2025-02-09 22:17:22 +03:00
pathetic meowmeow
524a2182b0
Round up playtime minutes ( #34961 )
2025-02-08 07:12:58 +01:00
Vigers Ray
389ed704e1
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Entry/EntryPoint.cs
# Content.Client/IoC/ClientContentIoC.cs
# Content.Server/Administration/Managers/BanManager.cs
# Content.Server/Chat/Managers/ChatSanitizationManager.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Traitor/Uplink/UplinkSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Content.Shared/Localizations/ContentLocalizationManager.cs
# Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs
# Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs
# Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs
# Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
# Resources/Audio/Ambience/Antag/attributions.yml
# Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
# Resources/Locale/en-US/_strings/advertisements/other/firebot.ftl
# Resources/Locale/en-US/_strings/shuttles/commands.ftl
# Resources/Prototypes/Datasets/Names/last.yml
# Resources/Prototypes/Entities/Mobs/Player/silicon.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Roles/Jobs/Science/borg.yml
# Resources/Prototypes/Shuttles/shuttle_incoming_event.yml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/Textures/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/meta.json
# Resources/Textures/Interface/Actions/actions_borg.rsi/meta.json
# Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json
# RobustToolbox
2024-10-30 13:26:32 +03:00
Stalen
24f79c3ecc
Fix playtime formatting ( #32974 )
2024-10-28 19:00:00 +01:00
VigersRay
24c8d682f9
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-06-16 01:36:33 +03:00
icekot8
a2affe3d00
add 👷 JobCondition system for reagents ( #29023 )
...
* hell 💀
* you're right
i'm dumb
* use the beautiful protoid and or in localization 🥩
* 🙏
2024-06-15 17:36:25 -04:00
Vigers Ray
5775d4cdef
Merge sunrise build ( #2 )
...
* commit
2024-05-31 02:16:18 +03:00
KrasnoshchekovPavel
199e05fb34
fixed formatting of floating point numbers during localization ( #27441 )
2024-04-28 21:52:35 -07:00
Nemanja
766192f4b5
Use nav beacon locations for announcements ( #26437 )
...
* use nav beacon locations for announcements
* :thumbs_up:
2024-03-28 16:53:18 +11:00
Nemanja
cb98613450
fix chem guidebooks not displaying all damages ( #19509 )
2023-08-24 21:14:53 -05: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
Visne
c6d3e4f3bd
Fix warnings and code cleanup/fixes ( #13570 )
2023-01-19 13:56:45 +11: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
Kara
7ad867fa0f
Slight localization func cleanup ( #11380 )
2022-10-18 19:51:18 -07:00
