zonespess

cmss13-devs · Aug 25, 2023 · 69f2ff9 · 69f2ff9
1 parent 7c2bfa8
commit 69f2ff9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -1334,11 +1334,10 @@ and you're good to go.
 
 	//The following relating to bursts was borrowed from Fire code.
 	var/check_for_attachment_fire = FALSE
-	if(active_attachable)
-		if(active_attachable.flags_attach_features & ATTACH_PROJECTILE)
-			check_for_attachment_fire = TRUE
-		else
-			active_attachable.activate_attachment(src, null, TRUE)//No way.
+	if(active_attachable?.flags_attach_features & ATTACH_PROJECTILE)
+		check_for_attachment_fire = TRUE
+	else
+		active_attachable.activate_attachment(src, null, TRUE)//No way.
 
 
 	var/bullets_to_fire = 1
@@ -1506,7 +1505,7 @@ not all weapons use normal magazines etc. load_into_chamber() itself is designed
 		if(active_attachable)
 			if(active_attachable.flags_attach_features & ATTACH_PROJECTILE)
 				if(!(active_attachable.flags_attach_features & ATTACH_WIELD_OVERRIDE) && !(flags_item & WIELDED))
-					to_chat(user, SPAN_WARNING("You must wield [src] to fire \the [active_attachable]!"))
+					to_chat(user, SPAN_WARNING("You must wield [src] to fire [active_attachable]!"))
 					return
 		if((flags_gun_features & GUN_WIELDED_FIRING_ONLY) && !(flags_item & WIELDED) && !active_attachable) //If we're not holding the weapon with both hands when we should.
 			to_chat(user, SPAN_WARNING("You need a more secure grip to fire this weapon!"))

diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm
@@ -2261,7 +2261,7 @@ Defined in conflicts.dm of the #defines folder.
 	var/obj/item/weapon/gun/attached_gun = loc
 
 	if(!(attached_gun.flags_item & WIELDED))
-		to_chat(user, SPAN_WARNING("You must wield [attached_gun] to fire \the [src]!"))
+		to_chat(user, SPAN_WARNING("You must wield [attached_gun] to fire [src]!"))
 		return
 
 	if(current_rounds > round_usage_per_tile && ..())
@@ -2408,7 +2408,7 @@ Defined in conflicts.dm of the #defines folder.
 	if(!internal_extinguisher)
 		return
 	if(!(gun.flags_item & WIELDED))
-		to_chat(user, SPAN_WARNING("You must wield [gun] to fire \the [src]!"))
+		to_chat(user, SPAN_WARNING("You must wield [gun] to fire [src]!"))
 		return
 	if(..())
 		return internal_extinguisher.afterattack(target, user)
@@ -2470,7 +2470,7 @@ Defined in conflicts.dm of the #defines folder.
 		return
 
 	if((gun.flags_gun_features & GUN_WIELDED_FIRING_ONLY) && !(gun.flags_item & WIELDED))
-		to_chat(user, SPAN_WARNING("You must wield [gun] to fire \the [src]!"))
+		to_chat(user, SPAN_WARNING("You must wield [gun] to fire [src]!"))
 		return
 
 	if(gun.flags_gun_features & GUN_TRIGGER_SAFETY)