diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 17029920dd3..d386fe07d0b 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -26,7 +26,7 @@ /obj/effect/mine/proc/triggermine(mob/living/victim) if(triggered) return - visible_message("[victim] sets off \icon[src] [src]!") + visible_message("[victim] sets off [bicon(src)] [src]!") var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(3, 1, src) s.start() diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm index 218fe47ed6b..ec6f285acd1 100644 --- a/code/game/objects/items/weapons/powerfist.dm +++ b/code/game/objects/items/weapons/powerfist.dm @@ -26,17 +26,17 @@ to_chat(user, "You'll need to get closer to see any more.") return if(tank) - to_chat(user, "\icon [tank] It has \the [tank] mounted onto it.") + to_chat(user, "[bicon(tank)] It has [tank] mounted onto it.") /obj/item/weapon/melee/powerfist/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/tank)) if(!tank) var/obj/item/weapon/tank/IT = W if(IT.volume <= 3) - to_chat(user, "\The [IT] is too small for \the [src].") + to_chat(user, "[IT] is too small for [src].") return updateTank(W, 0, user) - else if(istype(W, /obj/item/weapon/wrench)) + else if(iswrench(W)) switch(fisto_setting) if(1) fisto_setting = 2 @@ -45,8 +45,8 @@ if(3) fisto_setting = 1 playsound(loc, W.usesound, 50, 1) - to_chat(user, "You tweak \the [src]'s piston valve to [fisto_setting].") - else if(istype(W, /obj/item/weapon/screwdriver)) + to_chat(user, "You tweak [src]'s piston valve to [fisto_setting].") + else if(isscrewdriver(W)) if(tank) updateTank(tank, 1, user) @@ -54,29 +54,29 @@ /obj/item/weapon/melee/powerfist/proc/updateTank(obj/item/weapon/tank/thetank, removing = 0, mob/living/carbon/human/user) if(removing) if(!tank) - to_chat(user, "\The [src] currently has no tank attached to it.") + to_chat(user, "[src] currently has no tank attached to it.") return - to_chat(user, "You detach \the [thetank] from \the [src].") + to_chat(user, "You detach [thetank] from [src].") tank.forceMove(get_turf(user)) user.put_in_hands(tank) tank = null if(!removing) if(tank) - to_chat(user, "\The [src] already has a tank.") + to_chat(user, "[src] already has a tank.") return if(!user.unEquip(thetank)) return - to_chat(user, "You hook \the [thetank] up to \the [src].") + to_chat(user, "You hook [thetank] up to [src].") tank = thetank thetank.forceMove(src) /obj/item/weapon/melee/powerfist/attack(mob/living/target, mob/living/user) if(!tank) - to_chat(user, "\The [src] can't operate without a source of gas!") + to_chat(user, "[src] can't operate without a source of gas!") return if(tank && !tank.air_contents.remove(gasperfist * fisto_setting)) - to_chat(user, "\The [src]'s piston-ram lets out a weak hiss, it needs more gas!") + to_chat(user, "[src]'s piston-ram lets out a weak hiss, it needs more gas!") playsound(loc, 'sound/effects/refill.ogg', 50, 1) return @@ -90,8 +90,8 @@ playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1) var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src))) - spawn(0) - target.throw_at(throw_target, 5 * fisto_setting, 0.2) + + target.throw_at(throw_target, 5 * fisto_setting, 0.2) add_logs(user, target, "power fisted", src) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index fc3baf62556..f0861b2591c 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -377,7 +377,7 @@ found = 1 break if(!found) - to_chat(usr, "\icon[src]The conveyor switch did not detect any linked conveyor belts in range.") + to_chat(usr, "[bicon(src)] The conveyor switch did not detect any linked conveyor belts in range.") return var/obj/machinery/conveyor_switch/NC = new/obj/machinery/conveyor_switch(A, id) transfer_fingerprints_to(NC)