Merge branch 'master' of https://github.com/iWuna/Fallout-13-NewDecade

MalinaGirl · May 6, 2020 · e8d09d7 · e8d09d7
2 parents 012784a + 55d8892
commit e8d09d7
Show file tree

Hide file tree

Showing 14 changed files with 1,835 additions and 1,510 deletions.
diff --git a/_maps/map_files/TexasWasteland/draft.dmm b/_maps/map_files/TexasWasteland/draft.dmm
diff --git a/_maps/map_files/TexasWasteland/oregon_legacy.dmm b/_maps/map_files/TexasWasteland/oregon_legacy.dmm
diff --git a/_maps/map_files/TexasWasteland/texas_wasteland.dmm b/_maps/map_files/TexasWasteland/texas_wasteland.dmm
diff --git a/_maps/map_files/TexasWasteland/z2_legacy.dmm b/_maps/map_files/TexasWasteland/z2_legacy.dmm
diff --git a/icons/fallout/objects/items.dmi b/icons/fallout/objects/items.dmi
diff --git a/icons/fallout/vehicles/car.dmi b/icons/fallout/vehicles/car.dmi
diff --git a/icons/fallout/vehicles/truck.dmi b/icons/fallout/vehicles/truck.dmi
diff --git a/icons/mob/raiderboss.dmi b/icons/mob/raiderboss.dmi
diff --git a/icons/obj/draft_sprites.dmi b/icons/obj/draft_sprites.dmi
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi
diff --git a/icons/obj/machines/washing_machine.dmi b/icons/obj/machines/washing_machine.dmi
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi