hotfix2 (#8357)

discordia-space · Nov 10, 2023 · 79a177b · 79a177b
1 parent 56f7c88
commit 79a177b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/code/modules/mechs/equipment/combat.dm b/code/modules/mechs/equipment/combat.dm
@@ -846,7 +846,7 @@
 
 /obj/item/mech_equipment/shield_generator/proc/updateVisualBluff(targetDir)
 	visual_bluff.dir = targetDir
-	if(visual_bluff.dir == NORTH)
+	if(targetDir == NORTH)
 		visual_bluff.layer = MECH_UNDER_LAYER
 	else
 		visual_bluff.layer = MECH_ABOVE_LAYER
@@ -927,7 +927,7 @@
 	playsound(get_turf(src), 'sound/weapons/shield/shieldblock.ogg', 50, 8)
 	return damages
 
-/obj/item/mech_equipment/shield_generator/updateVisualBluff(targetDir)
+/obj/item/mech_equipment/shield_generator/ballistic/updateVisualBluff(targetDir)
 	visual_bluff.dir = targetDir
 	switch(get_hardpoint())
 		if(HARDPOINT_RIGHT_HAND)

diff --git a/code/modules/mechs/mech.dm b/code/modules/mechs/mech.dm
@@ -216,11 +216,9 @@
 	. = ..()
 	if(.)
 		update_pilots()
-		var/obj/item/mech_equipment/shield_generator/gen = getShield()
-		// runtimes for ballistic
-		if(gen && gen.visual_bluff)
-			gen.updateVisualBluff(dir)
-
+		for(var/obj/item/mech_equipment/shield_generator/gen in contents)
+			if(gen && gen.visual_bluff)
+				gen.updateVisualBluff(dir)
 
 /mob/living/exosuit/proc/return_temperature()
 	return bodytemperature

diff --git a/icons/mechs/mech_weapon_overlays.dmi b/icons/mechs/mech_weapon_overlays.dmi