Fixes NV

cmss13-devs · Mar 31, 2024 · b01bf6b · b01bf6b
1 parent 897af44
commit b01bf6b
Show file tree

Hide file tree

Showing 6 changed files with 75,596 additions and 7 deletions.
diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
@@ -27,7 +27,7 @@ block( \
 
 #define MAP_ICE_COLONY "Ice Colony" // Highpop only
 #define MAP_LV_624 "LV-624"
-#define MAP_LV_624_REPAIRED "LV-624 Repaired"
+#define MAP_LV_624_REPAIRED "LV-624"
 #define MAP_BIG_RED "Solaris Ridge"
 #define MAP_PRISON_STATION "Fiorina Cellblocks"
 #define MAP_PRISON_STATION_V3 "Fiorina Science Annex"
@@ -42,6 +42,7 @@ block( \
 #define MAP_RUNTIME "USS Runtime"
 #define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only
 #define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
+#define MAP_NEW_VARADERO_REPAIRED "New Varadero"
 #define MAP_CHINOOK "Chinook 91 GSO" //admin level
 #define MAP_DERELICT_ALMAYER "Derelict Almayer"
 

diff --git a/code/modules/cm_marines/equipment/maps.dm b/code/modules/cm_marines/equipment/maps.dm
@@ -165,6 +165,7 @@ GLOBAL_LIST_INIT_TYPED(map_type_list, /obj/item/map, setup_all_maps())
 		MAP_KUTJEVO = new /obj/item/map/kutjevo_map(),
 		MAP_LV522_CHANCES_CLAIM = new /obj/item/map/lv522_map(),
 		MAP_NEW_VARADERO = new /obj/item/map/new_varadero(),
+		MAP_NEW_VARADERO_REPAIRED = new /obj/item/map/new_varadero(),
 		MAP_DERELICT_ALMAYER = new /obj/item/map/almayer(),
 	)
 

diff --git a/map_config/maps.txt b/map_config/maps.txt
@@ -64,6 +64,9 @@ endmap
 map new_varadero
 endmap
 
+map new_varadero_repaired
+endmap
+
 map derelict_almayer
 endmap
 

diff --git a/maps/map_files/LV624_Fixed/LV624_repaired.dmm b/maps/map_files/LV624_Fixed/LV624_repaired.dmm
@@ -4636,6 +4636,9 @@
 /obj/structure/flora/bush/ausbushes/var3/leafybush,
 /turf/open/auto_turf/strata_grass/layer1,
 /area/lv624/ground/caves/central_caves)
+"faY" = (
+/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_east,
+/area/lv624/ground/jungle/south_central_jungle)
 "faZ" = (
 /obj/structure/surface/table,
 /obj/item/tool/kitchen/utensil/knife,
@@ -5838,7 +5841,7 @@
 /area/lv624/lazarus/landing_zones/lz1)
 "gxv" = (
 /obj/structure/surface/table/reinforced/prison,
-/obj/structure/machinery/faxmachine,
+/obj/structure/machinery/faxmachine/corporate/liaison,
 /turf/open/floor{
 	dir = 9;
 	icon_state = "whiteyellow"
@@ -16947,7 +16950,6 @@
 "sPK" = (
 /obj/structure/machinery/door/airlock/almayer/generic{
 	dir = 1;
-	locked = 1;
 	name = "\improper Storage Room"
 	},
 /turf/open/floor{
@@ -36745,8 +36747,8 @@ gOl
 gOl
 gOl
 tOc
-eUI
-mdK
+tOc
+fcJ
 mdK
 aeW
 bZf
@@ -36969,8 +36971,8 @@ fMc
 bFS
 fMc
 lDp
-eUI
-mdK
+faY
+iwh
 mdK
 hOD
 vLL