diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 5b41ba88b7..81603a9440 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -684,7 +684,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. usr.client.pixel_x = -viewoffset usr.client.pixel_y = 0 - usr.visible_message("[usr] peers through the [devicename].") + usr.visible_message("[usr] peers through the [zoomdevicename ? "[zoomdevicename] of the [src.name]" : "[src.name]"].") /* if(istype(usr,/mob/living/carbon/human/)) @@ -704,6 +704,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. usr.client.pixel_y = 0 if(!cannotzoom) - usr.visible_message("[usr] lowers the [devicename].") + usr.visible_message("[zoomdevicename ? "[usr] looks up from the [zoomdevicename] of the [src.name]" : "[usr] lowers the [src.name]"].") return \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index cfb5e2cf3d..44941eb532 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -225,7 +225,7 @@ obj/item/weapon/gun/energy/staff/focus charge_cost = 250 fire_delay = 35 w_class = 4.0 - zoomdevicename = "sniper scope" + zoomdevicename = "scope" /obj/item/weapon/gun/energy/sniperrifle/verb/scope() set category = "Object" diff --git a/html/changelog.html b/html/changelog.html index fecd3052c1..a091338d90 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,18 @@ should be listed in the changelog upon commit though. Thanks. --> +