Merge branch 'master' into translate

ss220club · Sep 19, 2024 · 9c4d053 · 9c4d053
2 parents f8e888b + c22cf67
commit 9c4d053
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/modular_ss220/balance/code/items/projectiles.dm b/modular_ss220/balance/code/items/projectiles.dm
@@ -2,16 +2,17 @@
 	///If TRUE, hit mobs even if they're on the floor and not our target
 	var/hit_prone_targets = FALSE
 
-/obj/item/projectile/set_angle(new_angle)
+/atom/handle_ricochet(obj/item/projectile/ricocheting_projectile)
 	. = ..()
-	hit_prone_targets = TRUE
+	if(.)
+		// here is confirmed ricochet - force projectile to hit targets
+		ricocheting_projectile.hit_prone_targets = TRUE
 
 /obj/item/ammo_casing/ready_proj(atom/target, mob/living/user, quiet, zone_override, atom/firer_source_atom)
 	. = ..()
 	if(!BB)
 		return
-	if(user.a_intent != INTENT_HELP)
-		BB.hit_prone_targets = TRUE
+	BB.hit_prone_targets = user.a_intent != INTENT_HELP
 
 /mob/living/carbon/human/projectile_hit_check(obj/item/projectile/P)
 	if(stat == CONSCIOUS)

diff --git a/modular_ss220/maps220/code/walls.dm b/modular_ss220/maps220/code/walls.dm
@@ -26,7 +26,7 @@
 	icon_state = "plastinum_wall-0"
 	base_icon_state = "plastinum_wall"
 	explosion_block = 3
-	flags_2 = RICOCHET_SHINY | RICOCHET_HARD
+	flags_ricochet = RICOCHET_SHINY | RICOCHET_HARD
 	sheet_type = /obj/item/stack/sheet/mineral/titanium
 	smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
 	smoothing_groups = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE)