From 40ab91a060a6d282a5d40e6005d7f6fc6fdd2fdb Mon Sep 17 00:00:00 2001 From: paprka Date: Tue, 14 Oct 2014 04:58:42 -0700 Subject: [PATCH 1/2] removes a few spammable visible messages --- code/game/objects/items/weapons/cigs_lighters.dm | 12 ++++-------- code/game/objects/items/weapons/melee/misc.dm | 8 ++------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index a848cb4dc3f..e53911df341 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -465,14 +465,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM hitsound = 'sound/items/welder.ogg' attack_verb = list("burnt", "singed") if(istype(src, /obj/item/weapon/lighter/zippo) ) - user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.") + user << "You light the [src] in one smooth motion." else if(prob(75)) - user.visible_message("After a few attempts, [user] manages to light [src].") + user << "After a few attempts, you manage to light [src].") else - user << "You burn yourself while lighting the lighter." + user << "You burn yourself while lighting the lighter!" user.adjustFireLoss(5) - user.visible_message("After a few attempts, [user] manages to light [src], they however burn their finger in the process.") user.AddLuminosity(1) processing_objects.Add(src) @@ -483,10 +482,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM hitsound = "swing_hit" force = 0 attack_verb = null //human_defense.dm takes care of it - if(istype(src, /obj/item/weapon/lighter/zippo) ) - user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing. Wow.") - else - user.visible_message("[user] quietly shuts off [src].") + usr << "You shut off the [src]." user.AddLuminosity(-1) processing_objects.Remove(src) diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 62bc85bb52e..332ca0e93a7 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -83,18 +83,14 @@ /obj/item/weapon/melee/telebaton/attack_self(mob/user as mob) on = !on if(on) - user.visible_message("With a flick of their wrist, [user] extends their telescopic baton.",\ - "You extend the baton.",\ - "You hear an ominous click.") + user << "You extend the baton." icon_state = "telebaton_1" item_state = "nullrod" w_class = 4 //doesnt fit in backpack when its on for balance force = 10 //seclite damage attack_verb = list("smacked", "struck", "cracked", "beaten") else - user.visible_message("[user] collapses their telescopic baton.",\ - "You collapse the baton.",\ - "You hear a click.") + user << "You collapse the baton." icon_state = "telebaton_0" item_state = "telebaton_0" //no sprite in other words slot_flags = SLOT_BELT From 54b575523a61bbf781aeca4f434b3a1b4bd3a517 Mon Sep 17 00:00:00 2001 From: paprka Date: Wed, 15 Oct 2014 16:32:51 -0700 Subject: [PATCH 2/2] removes zippo changes --- code/game/objects/items/weapons/cigs_lighters.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index e53911df341..a848cb4dc3f 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -465,13 +465,14 @@ CIGARETTE PACKETS ARE IN FANCY.DM hitsound = 'sound/items/welder.ogg' attack_verb = list("burnt", "singed") if(istype(src, /obj/item/weapon/lighter/zippo) ) - user << "You light the [src] in one smooth motion." + user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.") else if(prob(75)) - user << "After a few attempts, you manage to light [src].") + user.visible_message("After a few attempts, [user] manages to light [src].") else - user << "You burn yourself while lighting the lighter!" + user << "You burn yourself while lighting the lighter." user.adjustFireLoss(5) + user.visible_message("After a few attempts, [user] manages to light [src], they however burn their finger in the process.") user.AddLuminosity(1) processing_objects.Add(src) @@ -482,7 +483,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM hitsound = "swing_hit" force = 0 attack_verb = null //human_defense.dm takes care of it - usr << "You shut off the [src]." + if(istype(src, /obj/item/weapon/lighter/zippo) ) + user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing. Wow.") + else + user.visible_message("[user] quietly shuts off [src].") user.AddLuminosity(-1) processing_objects.Remove(src)