diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 3b400944959..4b25d6fd02c 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -29,14 +29,15 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \ var/obj/item/weapon/weldingtool/WT = W if(get_amount() < 2) - user << "You need at least two rods to do this." + user << "You need at least two rods to do this." return if(WT.remove_fuel(0,user)) var/obj/item/stack/sheet/metal/new_item = new(usr.loc) new_item.add_to_stacks(usr) - for (var/mob/M in viewers(src)) - M.show_message("[src] is shaped into metal by [user.name] with the weldingtool.", 3, "You hear welding.", 2) + user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \ + "You shaped [src] into metal with the weldingtool.", \ + "You hear welding.") var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_hand()==R) diff --git a/code/game/objects/items/stacks/tiles/plasteel.dm b/code/game/objects/items/stacks/tiles/plasteel.dm index bb8617446fd..6950684b6c9 100644 --- a/code/game/objects/items/stacks/tiles/plasteel.dm +++ b/code/game/objects/items/stacks/tiles/plasteel.dm @@ -31,14 +31,15 @@ var/obj/item/weapon/weldingtool/WT = W if(get_amount() < 4) - user << "You need at least four tiles to do this." + user << "You need at least four tiles to do this." return if(WT.remove_fuel(0,user)) var/obj/item/stack/sheet/metal/new_item = new(usr.loc) new_item.add_to_stacks(usr) - for (var/mob/M in viewers(src)) - M.show_message("[src] is shaped into metal by [user.name] with the weldingtool.", 3, "You hear welding.", 2) + user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \ + "You shaped [src] into metal with the weldingtool.", \ + "You hear welding.") var/obj/item/stack/rods/R = src src = null var/replace = (user.get_inactive_hand()==R) diff --git a/code/game/objects/items/weapons/storage/book.dm b/code/game/objects/items/weapons/storage/book.dm index 59f2a0f6589..6168bb200b8 100644 --- a/code/game/objects/items/weapons/storage/book.dm +++ b/code/game/objects/items/weapons/storage/book.dm @@ -85,13 +85,12 @@ for(var/obj/item/organ/limb/affecting in H.organs) if(affecting.status == ORGAN_ORGANIC) if(message_halt == 0) - for(var/mob/O in viewers(M, null)) - O.show_message(text("[] heals [] with the power of [src.deity_name]!", user, M), 1) - M << "May the power of [src.deity_name] compel you to be healed!" + M.visible_message("[user] heals [M] with the power of [src.deity_name]!") + M << "May the power of [src.deity_name] compel you to be healed!" playsound(src.loc, "punch", 25, 1, -1) message_halt = 1 else - src << "[src.deity_name] refuses to heal this metallic taint!" + user << "[src.deity_name] refuses to heal this metallic taint!" return @@ -101,18 +100,18 @@ if(ishuman(M) && !istype(M:head, /obj/item/clothing/head/helmet)) M.adjustBrainLoss(10) M << "You feel dumber." - for(var/mob/O in viewers(M, null)) - O.show_message(text("[user] beats [M] over the head with [src]!"), 1) + M.visible_message("[user] beats [M] over the head with [src]!", \ + "[user] beats [M] over the head with [src]!") playsound(src.loc, "punch", 25, 1, -1) else if(M.stat == 2) - for(var/mob/O in viewers(M, null)) - O.show_message(text("[user] smacks [M]'s lifeless corpse with [src]."), 1) + M.visible_message("[user] smacks [M]'s lifeless corpse with [src].") playsound(src.loc, "punch", 25, 1, -1) return /obj/item/weapon/storage/book/bible/afterattack(atom/A, mob/user as mob, proximity) - if(!proximity) return + if(!proximity) + return if (istype(A, /turf/simulated/floor)) user << "You hit the floor with the bible." if(user.mind && (user.mind.assigned_role == "Chaplain")) diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index ef759b24073..f8ec5a90b5d 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -51,11 +51,13 @@ updatehealth() return + var/suicide_message = pick("[src] is attempting to bite \his tongue off! It looks like \he's trying to commit suicide.", \ + "[src] is jamming \his thumbs into \his eye sockets! It looks like \he's trying to commit suicide.", \ + "[src] is twisting \his own neck! It looks like \he's trying to commit suicide.", \ + "[src] is holding \his breath! It looks like \he's trying to commit suicide.") + + visible_message("[suicide_message]", "[suicide_message]") - visible_message(pick("[src] is attempting to bite \his tongue off! It looks like \he's trying to commit suicide.", \ - "[src] is jamming \his thumbs into \his eye sockets! It looks like \he's trying to commit suicide.", \ - "[src] is twisting \his own neck! It looks like \he's trying to commit suicide.", \ - "[src] is holding \his breath! It looks like \he's trying to commit suicide.")) adjustOxyLoss(max(175 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -68,7 +70,8 @@ return if(confirm == "Yes") suiciding = 1 - viewers(loc) << "[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live." + visible_message("[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live.", \ + "[src]'s brain is growing dull and lifeless. It looks like it's lost the will to live.") spawn(50) death(0) suiciding = 0 @@ -83,7 +86,8 @@ if(confirm == "Yes") suiciding = 1 //instead of killing them instantly, just put them at -175 health and let 'em gasp for a while - viewers(src) << "[src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide." + visible_message("[src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide.", \ + "[src] is attempting to bite \his tongue. It looks like \he's trying to commit suicide.") adjustOxyLoss(max(175- getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -96,7 +100,8 @@ return if(confirm == "Yes") suiciding = 1 - viewers(src) << "[src] is powering down. It looks like \he's trying to commit suicide." + visible_message("[src] is powering down. It looks like \he's trying to commit suicide.", \ + "[src] is powering down. It looks like \he's trying to commit suicide.") //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -110,7 +115,8 @@ return if(confirm == "Yes") suiciding = 1 - viewers(src) << "[src] is powering down. It looks like \he's trying to commit suicide." + visible_message("[src] is powering down. It looks like \he's trying to commit suicide.", \ + "[src] is powering down. It looks like \he's trying to commit suicide.") //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -122,8 +128,8 @@ var/answer = input("REALLY kill yourself? This action can't be undone.", "Suicide", "No") in list ("Yes", "No") if(answer == "Yes") card.removePersonality() - for (var/mob/M in viewers(loc)) - M.show_message("[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"", 3, "[src] bleeps electronically.", 2) + var/turf/T = get_turf(src.loc) + T.visible_message("[src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"", "[src] bleeps electronically.") death(0) else src << "Aborting suicide attempt." @@ -137,7 +143,9 @@ return if(confirm == "Yes") suiciding = 1 - viewers(src) << "[src] is thrashing wildly! It looks like \he's trying to commit suicide." + visible_message("[src] is thrashing wildly! It looks like \he's trying to commit suicide.", \ + "[src] is thrashing wildly! It looks like \he's trying to commit suicide.", \ + "You hear thrashing") //put em at -175 adjustOxyLoss(max(175 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -152,6 +160,8 @@ return if(confirm == "Yes") suiciding = 1 + visible_message("[src] is growing dull and lifeless. It looks like it's lost the will to live.", \ + "[src] is growing dull and lifeless. It looks like it's lost the will to live.") setOxyLoss(100) adjustBruteLoss(100 - getBruteLoss()) setToxLoss(100) diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm index 874828a6f69..f35c035b9dc 100644 --- a/code/modules/mob/living/silicon/pai/life.dm +++ b/code/modules/mob/living/silicon/pai/life.dm @@ -4,8 +4,7 @@ if(src.cable) if(get_dist(src, src.cable) > 1) var/turf/T = get_turf(src.loc) - for (var/mob/M in viewers(T)) - M.show_message("[src.cable] rapidly retracts back into its spool.", 3, "You hear a click and the sound of wire spooling rapidly.", 2) + T.visible_message("[src.cable] rapidly retracts back into its spool.", "You hear a click and the sound of wire spooling rapidly.") qdel(src.cable) cable = null if(silence_time) diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 68f68f57d4b..000d18b8997 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -58,17 +58,25 @@ //helmet and armor = 100% protection if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) ) if( O.force ) - usr << "[src] is wearing too much armor. You can't cause \him any damage." - for (var/mob/M in viewers(src, null)) - M.show_message("\red \b [user] hits [src] with [O], however [src] is too armored.") + user << "[src] is wearing too much armor. You can't cause \him any damage." + visible_message(" [user] hits [src] with [O], however [src] is too armored.") else - usr << "[src] is wearing too much armor. You can't reach \his skin." - for (var/mob/M in viewers(src, null)) - M.show_message("[user] gently taps [src] with [O].") + user << "[src] is wearing too much armor. You can't reach \his skin." + visible_message("[user] gently taps [src] with [O].") if(health>0 && prob(15)) emote("me", 1, "looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression.") return - ..() + + if(istype(O, /obj/item/weapon/newspaper)) + if(!stat) + user.visible_message("[user] baps [name] on the nose with the rolled up [O]") + spawn(0) + for(var/i in list(1,2,4,8,4,2,1,2)) + dir = i + sleep(1) + else + ..() + /mob/living/simple_animal/corgi/Topic(href, href_list) if(usr.stat) return @@ -426,18 +434,7 @@ return step(AM, t) now_pushing = null -//PC stuff-Sieve -/mob/living/simple_animal/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri - if(istype(O, /obj/item/weapon/newspaper)) - if(!stat) - user.visible_message("[user] baps [name] on the nose with the rolled up [O]") - spawn(0) - for(var/i in list(1,2,4,8,4,2,1,2)) - dir = i - sleep(1) - else - ..() /mob/living/simple_animal/corgi/regenerate_icons() overlays = list()