From 072fe6fbd1cdd4fbf1c9ef7fb9fedfc8ca889e43 Mon Sep 17 00:00:00 2001 From: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Date: Mon, 17 Mar 2025 11:36:36 +0100 Subject: [PATCH] Removes duplicate examine proc in polaroid code and fixes a missing space in BR examine (#90028) ## About The Pull Request Triggered my OCD, polaroids had a duplicate examine override and battle rifles had a missing space between sentences in examine_more. ## Changelog :cl: spellcheck: Fixes a missing space in battle rifle's examine text /:cl: --- code/modules/photography/camera/camera.dm | 5 +---- code/modules/projectiles/guns/ballistic/automatic.dm | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index a9695fe6a8a..a7d69e3832a 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -55,6 +55,7 @@ /obj/item/camera/examine(mob/user) . = ..() + . += span_notice("It has [pictures_left] photos left.") . += span_notice("Alt-click to change its focusing, allowing you to set how big of an area it will capture.") /obj/item/camera/proc/adjust_zoom(mob/user) @@ -101,10 +102,6 @@ return TRUE //no afterattack ..() -/obj/item/camera/examine(mob/user) - . = ..() - . += "It has [pictures_left] photos left." - //user can be atom or mob /obj/item/camera/proc/can_target(atom/target, mob/user) if(!on || blending || !pictures_left) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 2968e9052f8..ce68b24b3c5 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -403,7 +403,7 @@ . = ..() . += span_notice("Looking down at \the [src], you recall something you read in a promotional pamphlet... ") - . += span_info("The BR-38 possesses an acceleration rail that launches bullets at higher than typical velocity.\ + . += span_info("The BR-38 possesses an acceleration rail that launches bullets at higher than typical velocity. \ This allows even less powerful cartridges to put out significant amounts of stopping power.") . += span_notice("However, you also remember some of the rumors... ")