Merge pull request #4371 from NebulaSS13/staging

Updating dev from staging
NebulaSS13 · Aug 17, 2024 · 37a6ebf · 37a6ebf
2 parents 92adf6f + 84f1f0b
commit 37a6ebf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
@@ -307,7 +307,7 @@
 // TODO: generalize to matter list and parts_type.
 /obj/structure/window/create_dismantled_products(turf/T)
 	SHOULD_CALL_PARENT(FALSE)
-	. = material.create_object(loc, is_fulltile() ? 4 : 2)
+	. = material.create_object(loc, 1)
 	if(reinf_material)
 		for(var/obj/item/stack/material/S in .)
 			S.reinf_material = reinf_material

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -770,7 +770,7 @@
 /decl/interaction_handler/gun/toggle_safety
 	name = "Toggle Safety"
 
-/decl/interaction_handler/toggle_safety/invoked(atom/target, mob/user, obj/item/prop)
+/decl/interaction_handler/gun/toggle_safety/invoked(atom/target, mob/user, obj/item/prop)
 	var/obj/item/gun/gun = target
 	gun.toggle_safety(user)
 

diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
@@ -287,10 +287,11 @@
 	return ..()
 
 /obj/item/gun/projectile/attack_hand(mob/user)
-	if(manual_unload && unload_ammo(user, allow_dump = FALSE))
-		return TRUE
-	if(try_remove_silencer(user))
-		return TRUE
+	if(src in user.get_inactive_held_items())
+		if(manual_unload && unload_ammo(user, allow_dump = FALSE))
+			return TRUE
+		if(try_remove_silencer(user))
+			return TRUE
 	return ..()
 
 /obj/item/gun/projectile/afterattack(atom/A, mob/living/user)