Commit Graph

15 Commits

Author SHA1 Message Date
Ed
e87994ae40 Localization clean up + temp eng switch (#325)
* Update ContentLocalizationManager.cs

* Update battle_royale_temp.yml

* Update basic-effect-reagent.ftl
2024-07-12 08:34:08 +03:00
Ed
04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream
# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml
2024-06-17 14:20:38 +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
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
26957472ac localize eng name species generation 2024-06-02 15:32:55 +03:00
Ed
9520f63aa1 Merge remote-tracking branch 'space-station-14/master' into 29-04-2024-upstream
# Conflicts:
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
2024-04-29 16:28:04 +03:00
KrasnoshchekovPavel
199e05fb34 fixed formatting of floating point numbers during localization (#27441) 2024-04-28 21:52:35 -07:00
Froffy025
0601075e79 enTranslationHelp (#115)
* enTranslationHelp

* Update tiles.ftl

* Update human-facial-hair.ftl
2024-04-26 23:40:11 +03:00
Ed
4cd8fd6a07 hide all roles, add Adventure role, localization 2024-03-28 23:02:54 +03: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