pacable
8378011bf0
актуализирован свод правил ( #362 )
...
Signed-off-by: pacable <igor.mamaev1@gmail.com>
2024-09-16 11:04:39 +03:00
VigersRay
0441b8b814
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Launcher/LauncherConnecting.cs
# Content.Client/Launcher/LauncherConnectingGui.xaml
# Content.Client/Launcher/LauncherConnectingGui.xaml.cs
# Content.Server/Administration/Managers/BanManager.cs
# Content.Server/Medical/Components/HealthAnalyzerComponent.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
# Content.Server/StationEvents/Events/RandomSentienceRule.cs
# Content.Shared/Interaction/Components/BlockMovementComponent.cs
# Content.Shared/Interaction/SharedInteractionSystem.Blocking.cs
# Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
# Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml
# Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Objectives/objectiveGroups.yml
# Resources/Prototypes/Objectives/stealTargetGroups.yml
# Resources/Prototypes/Roles/Jobs/Security/detective.yml
# Resources/Prototypes/Species/human.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
# Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
# Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
# Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
# Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
# Resources/ServerInfo/Guidebook/Antagonist/Zombies.xml
# Resources/migration.yml
2024-08-22 06:50:04 +03:00
Killerqu00
2c98d0a519
clarify what is an important role in rule 12 ( #30818 )
...
clarify what is an important role
2024-08-18 21:39:45 -06:00
Rinary
05aeb44b14
[RU] Полный перевод ( #236 )
...
* init
* fax translate
* translate
* translate cargo panel
* road map translate
* Fix cargo panel | fix bot craft translate
* fix, steal objectives translate
* do not break my not localized fax!
* fix
* radio guide translate
* Better DefaultRules
* Translate Criminal Records
* Space luw fully translate excluding CrimeList(need to rework)
* Some Guidebook translate
* Перевод глоссария, некоторые термины были переписанны под РУ комьюнити игры, некоторые к сожелению остались прежними
* Fix
* fix, translate
* Обновил структуру SpeakOnUIClosed, пофиксил перевод автоматов
* update and fix
* fully translate
* fix
* not fail but warn
* fix
* fix2
* фикс уже переведённого дерьма от корвахов
* Добавил термин подов в глоссарий
* roles translate fix
* Сикей в глоссарий
* Delete Resources/Locale/ru-RU/_sunrise/info/character-info.ftl
* remove cluster from pool
* new translation
* fully translate borgs
* some fixes
* Mr.Chang moment
* upd
* upd
* upd
* hotfix
* big fix
* fix some hardcode lang
* oh no shitcode language
* some translation
* some actions| admin commands translate start
* some new translation
* fully translate commands | figurines | chat-repo
* upd
* second upd
* upd
* start translating items
* some fixes
* translate wackpack
Из-за игры слов, я не смог нормально интерпритировать это дерьмо, так что пусть будет так, да теряется смысл и смешинка, но извините, я не смог как-то придумать игру слов
* translate
* debug translate
* upd
* Актуализация всего перевода
* fix
* fix
* upd
* some fixes | guns to his folders
* upd
* upd
* upd
* upd
* upd
* upd
* Перевод меток атмоса
* Последние коррективы
* fix
* some hardcode localization fix
* fix
* some fixes
* stats entry fully translate
* upd
* some fixes
* translate server side stats entry
* fix
* fix
* fix2
* fix
* upd
* upd
* fix
* holly shit
* fix
* totaly feed
* upd
* upd
* fix
* upd
* init
* upd
* upd
* access in prototypes
* Sunrise comments on code
* my bad
* я даун
2024-08-14 21:44:32 +03:00
VigersRay
67c8ba2471
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml
# Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Systems/ChatSystem.cs
# Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs
# Content.Server/Light/EntitySystems/PoweredLightSystem.cs
# Content.Server/Medical/HealthAnalyzerSystem.cs
# Content.Server/Medical/SuitSensors/SuitSensorComponent.cs
# Content.Server/StationEvents/Events/MeteorSwarmSystem.cs
# Content.Server/StationEvents/Events/StationEventSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Interaction/SharedInteractionSystem.cs
# Resources/Prototypes/AlertLevels/alert_levels.yml
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
# Resources/Prototypes/Datasets/Names/fortunes.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
# Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
# Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
# Resources/Prototypes/Entities/Objects/Fun/pai.yml
# Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
# Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
# Resources/Prototypes/Recipes/Lathes/clothing.yml
# Resources/Prototypes/game_presets.yml
# Resources/Prototypes/secret_weights.yml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Mask/ert.rsi/meta.json
# Resources/Textures/Clothing/Mask/joy.rsi/meta.json
# Resources/Textures/Clothing/Mask/squadron.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png
# Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png
# Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
# Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png
# Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png
# Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json
# Resources/migration.yml
2024-08-14 19:55:44 +03:00
Chief-Engineer
691e37c0db
Update space law for contraband upate ( #30937 )
...
* update space law
* missed a thing
2024-08-12 04:58:20 -05:00
strO0pwafel
35819e4ba5
more consistent CentComm naming ( #29217 )
...
* first-commit
* second commit
* i think i get git kinda maybe
* all of resources i think
* last easy changes
* oops
* Update Resources/Prototypes/Entities/Clothing/Head/hoods.yml
---------
Co-authored-by: stroopwafel <j.o.luijkx@student.tudelft.nl>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-08-08 20:04:19 +10:00
VigersRay
7e989794b7
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-07-27 00:32:31 +03:00
Errant
eab5030c39
Add vox naming convention to Rules ( #30284 )
...
vox naming conventions
2024-07-26 10:19:12 -05:00
VigersRay
31b256cce8
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Resources/Prototypes/Accents/word_replacements.yml
# Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
# Resources/Prototypes/Entities/Mobs/Species/base.yml
# Resources/Prototypes/Entities/Mobs/Species/moth.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
# Resources/Prototypes/Traits/disabilities.yml
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
# Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json
2024-07-24 20:36:22 +03:00
IProduceWidgets
9bc9b6b696
Amend spacelaw to allow zookeepers to have tranq shotguns. ( #30237 )
...
In loving memory of Harambe May 27, 1999 – May 28, 2016
2024-07-22 04:33:02 -05:00
pacable
91f5b3a1b2
Правила фронтира и ласта ( #196 )
...
* правила фронтира
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
* Правила ласт
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
---------
Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-07-15 01:27:43 +03:00
Rinary
7cb6856998
Фикс ошибок ( #116 )
...
* Some Fixes
* Map Init Fix
* Restart Test Fix
* Some Fixes
* Revert Restart Fixes
* Don't Delete StandardNanotrasenStation
* Revert "Don't Delete StandardNanotrasenStation"
This reverts commit ad2cbff7f65f19c61f3c534d9093e63ef3036402.
2024-06-16 22:26:40 +03:00
VigersRay
85550d3609
фикс правил
2024-06-14 20:32:54 +03:00
VigersRay
195faba150
Merge remote-tracking branch 'refs/remotes/wizards/master'
2024-06-14 20:00:45 +03:00
dffdff2423
05cc7541dd
Rename generic drugs ( #28989 )
...
* Rename generic drugs
Space Drugs and Stimulents cause quite a bit of confusion.
* Ensure everything is updated to the new names.
2024-06-14 12:53:48 -04:00
deBurboun
34ec132325
Сделал более структурированными правила ( #52 )
...
Структурировал правила
Co-authored-by: deBurboun <olehsamrai@gmail.com>
2024-06-09 17:00:21 +03:00
VigersRay
c01034d336
Merge remote-tracking branch 'refs/remotes/wizards/master'
...
# Conflicts:
# Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
2024-06-07 20:16:41 +03:00
VigersRay
0ca9930f8f
переименовал правила
2024-06-07 20:15:04 +03:00
deBurboun
661c2e1093
Переделанные правила ( #41 )
...
Переделал пока что правила санрайза под гайдбук, позже рыбу.
Co-authored-by: deBurboun <olehsamrai@gmail.com>
2024-06-07 20:13:13 +03:00
Chief-Engineer
b3debf449a
rule fixes first pass ( #28701 )
...
update
2024-06-07 09:03:22 -05:00
VigersRay
a2ad2f2131
Временные правила
2024-06-07 11:39:50 +03:00
Verm
08d2918fe7
Fix typo in slime naming conventions ( #28682 )
2024-06-06 20:37:41 -04:00
Moomoobeef
6e98965e6a
fixed "silicones" typo in new rules ( #28671 )
...
fixed all appearances of silicone where it should have been silicon
2024-06-06 15:47:41 -04:00
Thomas
e72ac31d5d
Fix typo in Space Law's restricted gear ( #28668 )
...
This typo was included in the wiki as well.
Reported-by: Bobberson in the Discord
2024-06-06 15:24:13 -04:00
Chief-Engineer
fea2bc9422
Update rules ( #28452 )
2024-06-05 19:59:22 -04:00
