rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Prototypes/Datasets
History
Vigers Ray 77d4af8975 Merge remote-tracking branch 'space-wizards/master' 
# Conflicts:
#	Content.Server/Atmos/EntitySystems/FlammableSystem.cs
#	Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Components/GasArtifactComponent.cs
#	Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Components/ArtifactGasTriggerComponent.cs
#	Content.Shared/Damage/Systems/StaminaSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Locale/en-US/_strings/chat/ui/chat-window.ftl
#	Resources/Locale/en-US/_strings/damage/damage-popup-component.ftl
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/XenoArch/Effects/normal_effects.yml
#	Resources/Textures/Objects/Specific/Medical/hypospray.rsi/hypo.png
#	Resources/Textures/Objects/Specific/Medical/hypospray.rsi/meta.json
#	Resources/migration.yml
2025-04-15 04:03:44 +03:00
..
Names Merge remote-tracking branch 'space-wizards/master' 2025-04-07 13:28:57 +03:00
adjectives.yml Localize traitor codeverbs datasets (#35737) 2025-03-09 22:20:05 -04:00
corporations.yml Localize traitor codeverbs datasets (#35737) 2025-03-09 22:20:05 -04:00
criminal_records.yml Localize criminal records reason placeholder dataset (#35810) 2025-03-16 19:43:37 -04:00
damage_force_say.yml Added Pain Numbness Trait (#34538) 2025-01-27 11:34:20 +01:00
deliveries.yml Convert spam letters to a LocalizedDataset (#36393) 2025-04-14 19:38:21 +02:00
figurines.yml A Bunch of New Figurine Voicelines (#36039) 2025-03-25 21:14:34 +01:00
ion_storm.yml Remove "SHUTTLES" from the allergy list in ion_storm.yml (#36317) 2025-04-05 11:00:19 +02:00
news.yml Localize news dataset (#35774) 2025-03-11 22:44:19 -07:00
rat_king_commands.yml Merge remote-tracking branch 'space-wizards/master' 2025-03-25 11:30:01 +03:00
spooky_speakers.yml Let ghosts sometimes make certain devices say creepy things (#34368) 2025-01-11 03:48:13 +01:00
story_generation.yml Convert story generation to use LocalizedDatasets (#28402) 2024-05-30 14:49:12 +03:00
tips.yml Add implant names to implanters (#36555) 2025-04-14 18:50:42 +02:00
verbs.yml Localize traitor codeverbs datasets (#35737) 2025-03-09 22:20:05 -04:00