fix after upstream

ss220club · Oct 4, 2024 · 1094430 · 1094430
1 parent 0f7cdda
commit 1094430
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/modular_bandastation/automapper/code/area_spawn_subsystem.dm b/modular_bandastation/automapper/code/area_spawn_subsystem.dm
@@ -265,7 +265,7 @@ SUBSYSTEM_DEF(area_spawn)
 	var/list/blacklisted_stations = list("Runtime Station", "MultiZ Debug", "Gateway Test")
 
 /datum/area_spawn/proc/try_spawn()
-	if(SSmapping.config.map_name in blacklisted_stations)
+	if(SSmapping.current_map.map_name in blacklisted_stations)
 		return
 
 	// Turfs that are available
@@ -281,7 +281,7 @@ SUBSYSTEM_DEF(area_spawn)
 
 	if(!LAZYLEN(available_turfs))
 		if(!optional)
-			log_mapping("[src.type] could not find any suitable turfs on map [SSmapping.config.map_name]!")
+			log_mapping("[src.type] could not find any suitable turfs on map [SSmapping.current_map.map_name]!")
 			SSarea_spawn.failed_area_spawns += src.type
 		return
 
@@ -349,7 +349,7 @@ SUBSYSTEM_DEF(area_spawn)
  * Spawn the atoms.
  */
 /datum/area_spawn_over/proc/try_spawn()
-    if(SSmapping.config.map_name in blacklisted_stations)
+    if(SSmapping.current_map.map_name in blacklisted_stations)
         return
     for(var/area_type in target_areas)
         try_spawn_area(area_type)

diff --git a/modular_bandastation/automapper/code/automapper_subsystem.dm b/modular_bandastation/automapper/code/automapper_subsystem.dm
@@ -41,7 +41,7 @@ SUBSYSTEM_DEF(automapper)
 
 		// !builtin is a magic code for built in maps, ie CentCom levels.
 		// We'll pretend it's loaded with the station z-level, because they by definition they are loaded before the station z-levels.
-		var/requires_builtin = (required_map == AUTOMAPPER_MAP_BUILTIN) && ((SSmapping.config.map_file in map_names) || SSmapping.config.map_file == map_names)
+		var/requires_builtin = (required_map == AUTOMAPPER_MAP_BUILTIN) && ((SSmapping.current_map.map_file in map_names) || SSmapping.current_map.map_file == map_names)
 
 		if(!requires_builtin && !(required_map in map_names))
 			continue
@@ -73,7 +73,7 @@ SUBSYSTEM_DEF(automapper)
 	if(!islist(map_names))
 		map_names = list(map_names)
 	for(var/datum/map_template/automap_template/iterating_template as anything in preloaded_map_templates)
-		if(iterating_template.affects_builtin_map && ((SSmapping.config.map_file in map_names) || SSmapping.config.map_file == map_names))
+		if(iterating_template.affects_builtin_map && ((SSmapping.current_map.map_file in map_names) || SSmapping.current_map.map_file == map_names))
 			// CentCom already started loading objects, place them in the netherzone
 			for(var/turf/old_turf as anything in iterating_template.get_affected_turfs(iterating_template.load_turf, FALSE))
 				init_contents(old_turf)

diff --git a/modular_bandastation/medical/code/surgery/vocal_cords.dm b/modular_bandastation/medical/code/surgery/vocal_cords.dm
@@ -7,15 +7,15 @@
 		/datum/surgery_step/tune_vocal_cords,
 		/datum/surgery_step/close,
 	)
-	
+
 /datum/surgery_step/tune_vocal_cords
 	name = "настройка голосовых связок (гемостат)"
 	implements = list(
 		TOOL_HEMOSTAT = 100,
 		TOOL_WIRECUTTER = 50,
 		/obj/item/kitchen/fork = 35
 	)
-	preop_sound = 'sound/surgery/hemostat1.ogg'
+	preop_sound = 'sound/items/handling/surgery/hemostat1.ogg'
 	time = 6.4 SECONDS
 
 /datum/surgery_step/tune_vocal_cords/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)

diff --git a/modular_bandastation/objects/code/weapons/ranged/awaymission_gun.dm b/modular_bandastation/objects/code/weapons/ranged/awaymission_gun.dm
@@ -59,7 +59,7 @@
 		return FALSE
 
 	user.balloon_alert(user, "зарядка...")
-	playsound(src, 'sound/effects/sparks3.ogg', 10, 1)
+	playsound(src, 'sound/effects/sparks/sparks3.ogg', 10, 1)
 	do_sparks(1, 1, src)
 
 	if(!do_after(user, 3 SECONDS, target = src))