Merge branch 'master' into Carrying_system

DeltaV-Station · Oct 22, 2023 · 10e250e · 10e250e
2 parents bed1112 + 96f2029
commit 10e250e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/Resources/Prototypes/Tiles/tile_migrations.yml b/Resources/Prototypes/Tiles/tile_migrations.yml
@@ -56,3 +56,8 @@
 - type: tileAlias
   id: FloorRGlassAlt
   target: FloorRGlass
+
+# Delta V Explanation: Nyano had an alt version of asphalt
+- type: tileAlias
+  id: FloorPlanetAsphalt
+  target: FloorAsphalt
diff --git a/Resources/migration.yml b/Resources/migration.yml
@@ -74,7 +74,7 @@ SpeedLoaderPistolHighVelocity: SpeedLoaderPistol
 #MountainRockMining: AsteroidRockMining #DeltaV
 
 # 2023-08-08
-WindowTintedDirectional: WindowFrostedDirectional
+WindowTintedDirectional: WindowFrostedDirectional # DeltaV
 
 # 2023-08-10
 SyringeSpaceacillin: null
@@ -148,3 +148,20 @@ WeaponShotgunEnforcerNonLethal: WeaponShotgunEnforcerRubber
 
 # 2023-10-06 (Merge related migrations)
 FoodMealTaco: FoodMealSoftTaco
+FoodTinBeansOpen: FoodTinBeans
+FoodBreadMoldy: FoodBreadMoldySlice
+FoodMeatPatty: FoodMeatMeatball
+ClothingHeadHoodMystic: ClothingHeadHoodMysta
+
+#Delta V temporary changes. Remove When items are added.
+
+MetempsychoticMachine: CloningPod
+MetempsychoticMachineCircuitboard: CloningPodMachineCircuitboard
+ComputerShipyard: ComputerBroken
+ShipyardComputerCircuitboard: null
+SpawnMobGolemCult: null
+ShogiBoard: CheckerBoard
+
+#Delta V Optional: Remove "#" for specific maps.
+#AsteroidRock: AsteroidAltRock
+#AsteroidRockMining: AsteroidAltRockMining