rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Resources/Maps/Shuttles
History
Vigers Ray cef39bc293 Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	Content.Client/UserInterface/Controls/RadialContainer.cs
#	Content.Server/Lathe/LatheSystem.cs
#	Content.Server/Silicons/Laws/SiliconLawSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Materials/SharedMaterialReclaimerSystem.cs
#	Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs
#	Content.Shared/VendingMachines/SharedVendingMachineSystem.cs
#	Content.Shared/Wieldable/SharedWieldableSystem.cs
#	Resources/Locale/en-US/_strings/station-events/events/radiation-storm.ftl
#	Resources/Locale/en-US/_strings/store/uplink-catalog.ftl
#	Resources/Prototypes/Atmospherics/gases.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Datasets/Names/borg.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/Player/silicon.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
#	Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Construction.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Networking.xml
#	Resources/ServerInfo/Guidebook/Engineering/Power.xml
#	Resources/ServerInfo/Guidebook/Engineering/RTG.xml
#	Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/Security/CriminalRecords.xml
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
#	Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
#	Resources/migration.yml
2025-01-30 11:33:49 +03:00
..
ShuttleEvent Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-12-21 18:51:37 +03:00
arrivals.yml babyproof arrivals shuttle (#33284) 2024-11-23 16:14:13 +01:00
briggle.yml Replaces small fans on most shuttles with directional fans. (#31495) 2024-08-26 16:24:22 -06:00
cargo.yml Reach/Cargo Update (Holopads & Atmos) (#33943) 2024-12-18 16:29:21 -07:00
cargo_core.yml Link Core cargo shuttle atmos devices (#34061) 2024-12-24 23:21:39 -07:00
cargo_elkridge.yml Elkridge Depot (The station formerly known as Cell) (#34085) 2025-01-03 12:32:46 -07:00
cargo_fland.yml Replaces small fans on most shuttles with directional fans. (#31495) 2024-08-26 16:24:22 -06:00
cargo_plasma.yml Plasma Station (#33991) 2025-01-16 00:02:14 -07:00
dart.yml Replaces small fans on most shuttles with directional fans. (#31495) 2024-08-26 16:24:22 -06:00
emergency.yml Fixed AI Actions (#31823) 2024-09-05 22:49:20 +10:00
emergency_accordia.yml Update Evac-Accordia (#30389) 2024-07-26 23:40:39 -06:00
emergency_amber.yml Amber Station and Science Spawner Tweaks (#34187) 2025-01-03 02:31:58 -07:00
emergency_box.yml Fixed AI Actions (#31823) 2024-09-05 22:49:20 +10:00
emergency_cluster.yml Fixed AI Actions (#31823) 2024-09-05 22:49:20 +10:00
emergency_courser.yml Fixed AI Actions (#31823) 2024-09-05 22:49:20 +10:00
emergency_crimson.yml Packed Update (Remove Christmas & New Evac) (#34168) 2025-01-01 16:50:35 -07:00
emergency_delta.yml Fixed AI Actions (#31823) 2024-09-05 22:49:20 +10:00
emergency_elkridge.yml Fix emergency_elkridge being saved as a map (#34496) 2025-01-20 10:59:42 +11:00
emergency_lox.yml Fixed AI Actions (#31823) 2024-09-05 22:49:20 +10:00
emergency_meta.yml Fixed AI Actions (#31823) 2024-09-05 22:49:20 +10:00
emergency_omega.yml Update omega evac (#32748) 2024-10-12 13:03:55 -06:00
emergency_plasma.yml Plasma station patch 1 (#34602) 2025-01-27 00:07:44 -07:00
emergency_raven.yml Fixed AI Actions (#31823) 2024-09-05 22:49:20 +10:00
emergency_rod.yml Fixed AI Actions (#31823) 2024-09-05 22:49:20 +10:00
emergency_wode.yml Fixed AI Actions (#31823) 2024-09-05 22:49:20 +10:00
escape_pod_small.yml escape pod tiny fan (#31601) 2024-08-28 13:51:22 -06:00
infiltrator.yml infiltrator update (#33759) 2024-12-07 01:36:03 -07:00
mining.yml Replaces small fans on most shuttles with directional fans. (#31495) 2024-08-26 16:24:22 -06:00
pirate.yml Replaces small fans on most shuttles with directional fans. (#31495) 2024-08-26 16:24:22 -06:00
shittle.yml Resave event shuttles (#24528) 2024-01-25 17:53:37 +11:00
trading_outpost.yml Reach/Cargo Update (Holopads & Atmos) (#33943) 2024-12-18 16:29:21 -07:00
wizard.yml Replaces small fans on most shuttles with directional fans. (#31495) 2024-08-26 16:24:22 -06:00