fish-station/Resources/Prototypes/Entities
VigersRay 5f10d21fa6 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Administration/Commands/PlayTimeCommands.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Events/BreakerFlipRule.cs
#	Content.Shared/Roles/JobPrototype.cs
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
2024-06-04 09:41:27 +03:00
..
Clothing Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-04 09:41:27 +03:00
Debugging add noSpawn: true to tippy (#27538) 2024-05-01 01:07:30 +03:00
Effects Cleans up some entity-related spawnmenu stuff (#28234) 2024-05-27 17:59:10 -04:00
Markers Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-01 09:38:18 +03:00
Mobs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-04 09:41:27 +03:00
Objects Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-04 09:41:27 +03:00
Stations Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
Structures Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-04 09:41:27 +03:00
Tiles change shadowstone desc. (#27900) 2024-05-10 13:44:27 -07:00
Virtual Atmos device performance improvements (#26493) 2024-03-30 15:17:53 +11:00
World Adds minable salt "ore" (#25324) 2024-02-26 16:34:15 -07:00
categories.yml make objectives use entityCategory (#28269) 2024-06-03 09:23:52 -04:00
foldable.yml Resolves FoldableVisualizer is Obsolete (#13913) 2023-02-06 15:53:07 -04:00