[TESTMERGE] Disables projectile logs (#6229) [testmerge][ab818cb]

ss220-space · Dec 5, 2024 · be796be · be796be
1 parent 676fe7b
commit be796be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -169,7 +169,7 @@
 	return TRUE
 
 /obj/item/gun/proc/shoot_with_empty_chamber(mob/living/user)
-	to_chat(user, span_danger("*click*"))
+	//to_chat(user, span_danger("*click*")) [TESTMERGE: LOGS REMOVED]
 	playsound(user, 'sound/weapons/empty.ogg', 100, 1)
 
 /obj/item/gun/proc/shoot_live_shot(mob/living/user, atom/target, pointblank = FALSE, message = TRUE)
@@ -188,14 +188,14 @@
 		playsound(user, fire_sound, 50, TRUE)
 		if(message)
 			if(pointblank)
-				user.visible_message("<span class='danger'>[user] fires [src] point blank at [target]!</span>", "<span class='danger'>You fire [src] point blank at [target]!</span>", "<span class='italics'>You hear \a [fire_sound_text]!</span>")
+				//user.visible_message("<span class='danger'>[user] fires [src] point blank at [target]!</span>", "<span class='danger'>You fire [src] point blank at [target]!</span>", "<span class='italics'>You hear \a [fire_sound_text]!</span>") [TESTMERGE: LOGS REMOVED]
 				if(pb_knockback > 0 && isliving(target))
 					var/mob/living/living_target = target
 					if(!(living_target.move_resist > MOVE_FORCE_NORMAL)) //no knockbacking prince of terror or somethin
 						var/atom/throw_target = get_edge_target_turf(living_target, user.dir)
 						living_target.throw_at(throw_target, pb_knockback, 2)
 			else
-				user.visible_message("<span class='danger'>[user] fires [src]!</span>", "<span class='danger'>You fire [src]!</span>", "You hear \a [fire_sound_text]!")
+				//user.visible_message("<span class='danger'>[user] fires [src]!</span>", "<span class='danger'>You fire [src]!</span>", "You hear \a [fire_sound_text]!") [TESTMERGE: LOGS REMOVED]
 	if(chambered.muzzle_flash_effect)
 		var/obj/effect/temp_visual/target_angled/muzzle_flash/effect = new chambered.muzzle_flash_effect(get_turf(src), target, muzzle_flash_time)
 		effect.alpha = min(255, muzzle_strength * 255)
@@ -226,14 +226,14 @@
 	if(flag)
 		if(user.zone_selected == "mouth")
 			if(target == user && HAS_TRAIT(user, TRAIT_BADASS))
-				user.visible_message("<span class='danger'>[user] blows smoke off of [src]'s barrel. What a badass.</span>")
+				//user.visible_message("<span class='danger'>[user] blows smoke off of [src]'s barrel. What a badass.</span>") [TESTMERGE: LOGS REMOVED]
 			else
 				handle_suicide(user, target, params)
 			return
 
 	//Exclude lasertag guns from the CLUMSY check.
 	if(clumsy_check && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(40))
-		to_chat(user, "<span class='userdanger'>You shoot yourself in the foot with \the [src]!</span>")
+		//to_chat(user, "<span class='userdanger'>You shoot yourself in the foot with \the [src]!</span>") [TESTMERGE: LOGS REMOVED]
 		var/shot_leg = pick(BODY_ZONE_PRECISE_L_FOOT, BODY_ZONE_PRECISE_R_FOOT)
 		process_fire(user, user, 0, params, zone_override = shot_leg)
 		user.drop_from_active_hand()

diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
@@ -211,13 +211,13 @@
 
 		if(suppressed)
 			playsound(loc, hitsound, 5, 1, -1)
-			to_chat(L, "<span class='userdanger'>You're shot by \a [src][organ_hit_text]!</span>")
+			// [TESTMERGE: LOGS REMOVED] to_chat(L, "<span class='userdanger'>You're shot by \a [src][organ_hit_text]!</span>")
 		else
 			if(hitsound)
 				var/volume = vol_by_damage()
 				playsound(loc, hitsound, volume, 1, -1)
-			L.visible_message("<span class='danger'>[L] is hit by \a [src][organ_hit_text]!</span>", \
-								"<span class='userdanger'>[L] is hit by \a [src][organ_hit_text]!</span>")	//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
+			//[TESTMERGE: LOGS REMOVED] L.visible_message("<span class='danger'>[L] is hit by \a [src][organ_hit_text]!</span>",
+			//					"<span class='userdanger'>[L] is hit by \a [src][organ_hit_text]!</span>")	//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
 
 		if(L.mind && firer?.mind?.objectives)
 			for(var/datum/objective/pain_hunter/objective in firer.mind.get_all_objectives())
@@ -385,7 +385,7 @@
 					reagent_note += ", "
 			fire_log_text += " | Reagents: [reagent_note]"
 
-		add_attack_logs(firer, original, "Fired at. [fire_log_text]")
+		//add_attack_logs(firer, original, "Fired at. [fire_log_text]") [Nope, no logs today. // TESTMERGE //]
 
 	if(!current || loc == current)
 		current = locate(clamp(x + xo, 1, world.maxx), clamp(y + yo, 1, world.maxy), z)