From c6bc0b7fb21cc98ec7e7c9fd944e0f38099a2bda Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 19 Jun 2022 03:27:54 +0200 Subject: [PATCH] [MIRROR] Balloonify welders and extinguishers (and more later) [MDB IGNORE] (#14395) * Balloonify welders and extinguishers (and more later) (#67818) * Balloonify welders and extinguishers (and more later) Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com> --- code/game/objects/items/airlock_painter.dm | 6 +++--- code/game/objects/items/devices/geiger_counter.dm | 2 +- .../objects/items/devices/scanners/health_analyzer.dm | 4 ++-- .../objects/items/devices/scanners/sequence_scanner.dm | 6 ++---- code/game/objects/items/extinguisher.dm | 6 +++--- code/game/objects/items/holosign_creator.dm | 8 +++----- code/game/objects/items/inducer.dm | 6 +++--- code/game/objects/items/tools/weldingtool.dm | 4 +--- 8 files changed, 18 insertions(+), 24 deletions(-) diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index 98fc5dfb208..8c942d8d07d 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -56,10 +56,10 @@ //because you're expecting user input. /obj/item/airlock_painter/proc/can_use(mob/user) if(!ink) - to_chat(user, span_warning("There is no toner cartridge installed in [src]!")) + balloon_alert(user, "no cartridge!") return FALSE else if(ink.charges < 1) - to_chat(user, span_warning("[src] is out of ink!")) + balloon_alert(user, "out of ink!") return FALSE else return TRUE @@ -211,7 +211,7 @@ /obj/item/airlock_painter/decal/afterattack(atom/target, mob/user, proximity) . = ..() if(!proximity) - to_chat(user, span_notice("You need to get closer!")) + balloon_alert(user, "get closer!") return if(isfloorturf(target) && use_paint(user)) diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index 8d1d05f4dd6..76a7e2b8393 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -65,7 +65,7 @@ qdel(GetComponent(/datum/component/geiger_sound)) update_appearance(UPDATE_ICON) - to_chat(user, span_notice("[icon2html(src, user)] You switch [scanning ? "on" : "off"] [src].")) + balloon_alert(user, "switch [scanning ? "on" : "off"]") /obj/item/geiger_counter/afterattack(atom/target, mob/living/user, params) . = ..() diff --git a/code/game/objects/items/devices/scanners/health_analyzer.dm b/code/game/objects/items/devices/scanners/health_analyzer.dm index a76544ec80b..26e6c99c211 100644 --- a/code/game/objects/items/devices/scanners/health_analyzer.dm +++ b/code/game/objects/items/devices/scanners/health_analyzer.dm @@ -80,8 +80,8 @@ to_chat(user, "[M]'s biological structure is too complex for the health analyzer.") return - user.visible_message(span_notice("[user] analyzes [M]'s vitals."), \ - span_notice("You analyze [M]'s vitals.")) + user.visible_message(span_notice("[user] analyzes [M]'s vitals.")) + balloon_alert(user, "analyzing vitals") switch (scanmode) if (SCANMODE_HEALTH) diff --git a/code/game/objects/items/devices/scanners/sequence_scanner.dm b/code/game/objects/items/devices/scanners/sequence_scanner.dm index f74c82c0faf..3251245f864 100644 --- a/code/game/objects/items/devices/scanners/sequence_scanner.dm +++ b/code/game/objects/items/devices/scanners/sequence_scanner.dm @@ -25,10 +25,8 @@ add_fingerprint(user) //no scanning if its a husk or DNA-less Species if (!HAS_TRAIT(target, TRAIT_GENELESS) && !HAS_TRAIT(target, TRAIT_BADDNA)) - user.visible_message( - span_notice("[user] analyzes [target]'s genetic sequence."), - span_notice("You analyze [target]'s genetic sequence.") - ) + user.visible_message(span_notice("[user] analyzes [target]'s genetic sequence.")) + balloon_alert(user, "sequence analyzed") gene_scan(target, user) else user.visible_message(span_notice("[user] fails to analyze [target]'s genetic sequence."), span_warning("[target] has no readable genetic sequence!")) diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index f2dd8facd86..61b97ff65bf 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -113,7 +113,7 @@ /obj/item/extinguisher/attack_self(mob/user) safety = !safety src.icon_state = "[sprite_name][!safety]" - to_chat(user, "The safety is [safety ? "on" : "off"].") + balloon_alert(user, "safety [safety ? "on" : "off"]") return /obj/item/extinguisher/attack(mob/M, mob/living/user) @@ -139,7 +139,7 @@ /obj/item/extinguisher/proc/AttemptRefill(atom/target, mob/user) if(istype(target, tanktype) && target.Adjacent(user)) if(reagents.total_volume == reagents.maximum_volume) - to_chat(user, span_warning("\The [src] is already full!")) + balloon_alert(user, "already full!") return TRUE var/obj/structure/reagent_dispensers/W = target //will it work? var/transferred = W.reagents.trans_to(src, max_water, transfered_by = user) @@ -169,7 +169,7 @@ if (src.reagents.total_volume < 1) - to_chat(usr, span_warning("\The [src] is empty!")) + balloon_alert(user, "it's empty!") return if (world.time < src.last_use + 12) diff --git a/code/game/objects/items/holosign_creator.dm b/code/game/objects/items/holosign_creator.dm index 0c1ca9de478..92f4c7f2346 100644 --- a/code/game/objects/items/holosign_creator.dm +++ b/code/game/objects/items/holosign_creator.dm @@ -41,7 +41,6 @@ var/turf/target_turf = get_turf(target) var/obj/structure/holosign/target_holosign = locate(holosign_type) in target_turf if(target_holosign) - to_chat(user, span_notice("You use [src] to deactivate [target_holosign].")) qdel(target_holosign) return if(target_turf.is_blocked_turf(TRUE)) //can't put holograms on a tile that has dense stuff @@ -50,7 +49,7 @@ to_chat(user, span_notice("[src] is busy creating a hologram.")) return if(LAZYLEN(signs) >= max_signs) - to_chat(user, span_notice("[src] is projecting at max capacity!")) + balloon_alert(user, "max capacity!") return playsound(loc, 'sound/machines/click.ogg', 20, TRUE) if(creation_time) @@ -64,7 +63,6 @@ if(target_turf.is_blocked_turf(TRUE)) //don't try to sneak dense stuff on our tile during the wait. return target_holosign = new holosign_type(get_turf(target), src) - to_chat(user, span_notice("You create \a [target_holosign] with [src].")) /obj/item/holosign_creator/attack(mob/living/carbon/human/M, mob/user) return @@ -73,7 +71,7 @@ if(LAZYLEN(signs)) for(var/H in signs) qdel(H) - to_chat(user, span_notice("You clear all active holograms.")) + balloon_alert(user, "holograms cleared") /obj/item/holosign_creator/Destroy() . = ..() @@ -151,4 +149,4 @@ return for(var/sign in signs) qdel(sign) - to_chat(user, span_notice("You clear all active holograms.")) + balloon_alert(user, "holograms cleared") diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm index 8423ba4bf84..ca16a4d25b2 100644 --- a/code/game/objects/items/inducer.dm +++ b/code/game/objects/items/inducer.dm @@ -51,11 +51,11 @@ return TRUE if(!cell) - to_chat(user, span_warning("[src] doesn't have a power cell installed!")) + balloon_alert(user, "no cell installed!") return TRUE if(!cell.charge) - to_chat(user, span_warning("[src]'s battery is dead!")) + balloon_alert(user, "no charge!") return TRUE return FALSE @@ -116,7 +116,7 @@ if(C) var/done_any = FALSE if(C.charge >= C.maxcharge) - to_chat(user, span_notice("[A] is fully charged!")) + balloon_alert(user, "it's fully charged!") recharging = FALSE return TRUE user.visible_message(span_notice("[user] starts recharging [A] with [src]."), span_notice("You start recharging [A] with [src].")) diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index b37fc5594b1..2eb35b7259d 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -238,7 +238,6 @@ set_welding(!welding) if(welding) if(get_fuel() >= 1) - to_chat(user, span_notice("You switch [src] on.")) playsound(loc, activation_sound, 50, TRUE) force = 15 damtype = BURN @@ -246,10 +245,9 @@ update_appearance() START_PROCESSING(SSobj, src) else - to_chat(user, span_warning("You need more fuel!")) + balloon_alert(user, "no fuel!") switched_off(user) else - to_chat(user, span_notice("You switch [src] off.")) playsound(loc, deactivation_sound, 50, TRUE) switched_off(user)