removes haunted house event map from main repo (#2307)

Co-authored-by: Stan_Albatross <[email protected]>
cmss13-devs · Jan 13, 2023 · 19773ea · 19773ea
1 parent e54c879
commit 19773ea
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 67,057 deletions.
diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
@@ -37,7 +37,6 @@ block( \
 #define MAP_CORSAT "CORSAT" // Highpop only
 #define MAP_KUTJEVO "Kutjevo Refinery"
 #define MAP_ICE_COLONY_V3 "Shivas Snowball" //Ice Rework, low pop enabled.
-#define MAP_HAUNTED_HOUSE_V2 "Haunted House V2"
 #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

diff --git a/code/game/area/Sulaco.dm b/code/game/area/Sulaco.dm
@@ -29,10 +29,6 @@
 	ambience_exterior = AMBIENCE_LV624
 	icon_state = "shuttle"
 
-/area/shuttle/drop1/Haunted
-	name = "\improper Dropship Alamo"
-	icon_state = "shuttle"
-
 /area/shuttle/drop1/prison
 	name = "\improper Dropship Alamo"
 	ambience_exterior = AMBIENCE_PRISON
@@ -84,10 +80,6 @@
 	ambience_exterior = AMBIENCE_LV624
 	icon_state = "shuttle2"
 
-/area/shuttle/drop2/Haunted
-	name = "\improper Dropship Normandy"
-	icon_state = "shuttle2"
-
 /area/shuttle/drop2/prison
 	name = "\improper Dropship Normandy"
 	ambience_exterior = AMBIENCE_PRISON

diff --git a/code/modules/decorators/weapon_map_decorator.dm b/code/modules/decorators/weapon_map_decorator.dm
@@ -49,7 +49,7 @@
 	r_icon = 'icons/obj/items/weapons/guns/guns_by_map/jungle/guns_righthand.dmi'
 	b_icon = 'icons/obj/items/weapons/guns/guns_by_map/jungle/back.dmi'
 	j_icon = 'icons/obj/items/weapons/guns/guns_by_map/jungle/suit_slot.dmi'
-	map_array = list(MAP_LV_624, MAP_HAUNTED_HOUSE_V2, MAP_RUNTIME,MAP_NEW_VARADERO)
+	map_array = list(MAP_LV_624, MAP_RUNTIME,MAP_NEW_VARADERO)
 
 /datum/decorator/weapon_map_decorator/snow
 	c_icon = 'icons/obj/items/weapons/guns/guns_by_map/snow/guns_obj.dmi'

diff --git a/code/modules/mob/new_player/sprite_accessories/undershirt.dm b/code/modules/mob/new_player/sprite_accessories/undershirt.dm
@@ -35,7 +35,7 @@ GLOBAL_LIST_INIT_TYPED(undershirt_f, /datum/sprite_accessory/undershirt, setup_u
 		switch(SSmapping.configs[GROUND_MAP].map_name) // maploader TODO: json
 			if(MAP_PRISON_STATION, MAP_PRISON_STATION_V3, MAP_LV522_CHANCES_CLAIM)
 				selected_icon_state = "c_" + selected_icon_state
-			if(MAP_LV_624, MAP_HAUNTED_HOUSE_V2, MAP_RUNTIME, MAP_NEW_VARADERO)
+			if(MAP_LV_624, MAP_RUNTIME, MAP_NEW_VARADERO)
 				selected_icon_state = "j_" + selected_icon_state
 			if(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO)
 				selected_icon_state = "d_" + selected_icon_state

diff --git a/code/modules/mob/new_player/sprite_accessories/underwear.dm b/code/modules/mob/new_player/sprite_accessories/underwear.dm
@@ -35,7 +35,7 @@ GLOBAL_LIST_INIT_TYPED(underwear_f, /datum/sprite_accessory/underwear, setup_und
 		switch(SSmapping.configs[GROUND_MAP].map_name) // maploader TODO: json
 			if(MAP_PRISON_STATION, MAP_PRISON_STATION_V3, MAP_LV522_CHANCES_CLAIM)
 				selected_icon_state = "c_" + selected_icon_state
-			if(MAP_LV_624, MAP_HAUNTED_HOUSE_V2, MAP_RUNTIME, MAP_NEW_VARADERO)
+			if(MAP_LV_624, MAP_RUNTIME, MAP_NEW_VARADERO)
 				selected_icon_state = "j_" + selected_icon_state
 			if(MAP_WHISKEY_OUTPOST, MAP_DESERT_DAM, MAP_BIG_RED, MAP_KUTJEVO)
 				selected_icon_state = "d_" + selected_icon_state

diff --git a/map_config/maps.txt b/map_config/maps.txt
@@ -63,7 +63,3 @@ endmap
 
 map whiskey_outpost_v2
 endmap
-
-map haunted_house_v2
-	voteweight 0
-endmap
diff --git a/maps/Nightmare/maps/Haunted_House_V2/nightmare.json b/maps/Nightmare/maps/Haunted_House_V2/nightmare.json
diff --git a/maps/Nightmare/maps/Haunted_House_V2/scenario.json b/maps/Nightmare/maps/Haunted_House_V2/scenario.json
diff --git a/maps/haunted_house_v2.json b/maps/haunted_house_v2.json