cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Balloon Alerts (#7877)

Browse Source
This commit is contained in:
Guti
2024-03-15 07:40:14 +01:00
committed by GitHub
parent 691c394394
commit 172e1c7c12
40 changed files with 705 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
code/modules/reagents/reagent_containers/_reagent_containers.dm
View File

@@ -22,7 +22,7 @@
if(!possible_transfer_amounts)
src.verbs -= /obj/item/weapon/reagent_containers/verb/set_APTFT
create_reagents(volume)
if(starts_with)
var/total_so_far = 0
for(var/string in starts_with)
@@ -49,15 +49,18 @@
return 0
if(!target.reagents || !target.reagents.total_volume)
to_chat(user, "<span class='notice'>[target] is empty.</span>")
// to_chat(user, "<span class='notice'>[target] is empty.</span>")
balloon_alert(user, "[target] is empty.") // CHOMPEdit - Changed to balloon alert
return 1
if(reagents && !reagents.get_free_space())
to_chat(user, "<span class='notice'>[src] is full.</span>")
// to_chat(user, "<span class='notice'>[src] is full.</span>")
balloon_alert(user, "[src] is full.") // CHOMPEdit - Changed to balloon alert
return 1
var/trans = target.reagents.trans_to_obj(src, target:amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>You fill [src] with [trans] units of the contents of [target].</span>")
// to_chat(user, "<span class='notice'>You fill [src] with [trans] units of the contents of [target].</span>")
balloon_alert(user, "[trans] units transfered to \the [src]") // CHOMPEdit - Changed to balloon alert
return 1
/obj/item/weapon/reagent_containers/proc/standard_splash_mob(var/mob/user, var/mob/target) // This goes into afterattack
@@ -65,27 +68,33 @@
return
if(!reagents || !reagents.total_volume)
to_chat(user, "<span class='notice'>[src] is empty.</span>")
// to_chat(user, "<span class='notice'>[src] is empty.</span>")
balloon_alert(user, "[src] is empty.") // CHOMPEdit - Changed to balloon alert
return 1
if(target.reagents && !target.reagents.get_free_space())
to_chat(user, "<span class='notice'>[target] is full.</span>")
// to_chat(user, "<span class='notice'>[target] is full.</span>")
balloon_alert(user, "\the [target] is full.") // CHOMPEdit - Changed to balloon alert
return 1
var/contained = reagentlist()
add_attack_logs(user,target,"Splashed with [src.name] containing [contained]")
user.visible_message("<span class='danger'>[target] has been splashed with something by [user]!</span>", "<span class = 'notice'>You splash the solution onto [target].</span>")
// user.visible_message("<span class='danger'>[target] has been splashed with something by [user]!</span>", "<span class = 'notice'>You splash the solution onto [target].</span>")
balloon_alert_visible("[target] has been splashed with something by [user]!", "Splashed the solution onto [target]") // CHOMPEdit - Changed to balloon_alert
reagents.splash(target, reagents.total_volume)
return 1
/obj/item/weapon/reagent_containers/proc/self_feed_message(var/mob/user)
to_chat(user, "<span class='notice'>You eat \the [src]</span>")
// to_chat(user, "<span class='notice'>You eat \the [src]</span>")
balloon_alert(user, "You eat \the [src]") // CHOMPEdit - Changed to balloon alert
/obj/item/weapon/reagent_containers/proc/other_feed_message_start(var/mob/user, var/mob/target)
user.visible_message("<span class='warning'>[user] is trying to feed [target] \the [src]!</span>")
// user.visible_message("<span class='warning'>[user] is trying to feed [target] \the [src]!</span>")
balloon_alert_visible(user, "[user] is trying to feed [target] \the [src]!") // CHOMPEdit - Changed to balloon alert
/obj/item/weapon/reagent_containers/proc/other_feed_message_finish(var/mob/user, var/mob/target)
user.visible_message("<span class='warning'>[user] has fed [target] \the [src]!</span>")
// user.visible_message("<span class='warning'>[user] has fed [target] \the [src]!</span>")
balloon_alert_visible(user, "[user] has fed [target] \the [src]!") // CHOMPEdit - Changed to balloon alert
/obj/item/weapon/reagent_containers/proc/feed_sound(var/mob/user)
return
@@ -95,26 +104,29 @@
return FALSE
if(!reagents || !reagents.total_volume)
to_chat(user, "<span class='notice'>\The [src] is empty.</span>")
// to_chat(user, "<span class='notice'>\The [src] is empty.</span>")
balloon_alert(user, "\The [src] is empty.") // CHOMPEdit - Changed to balloon alert
return TRUE
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(!H.check_has_mouth())
to_chat(user, "Where do you intend to put \the [src]? [user == target ? "You don't" : "\The [H] doesn't"] have a mouth!")
// to_chat(user, "Where do you intend to put \the [src]? [user == target ? "You don't" : "\The [H] doesn't"] have a mouth!")
balloon_alert(user, "[user == target ? "You don't" : "\The [H] doesn't"] have a mouth!")
return FALSE
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
to_chat(user, "<span class='warning'>\The [blocked] is in the way!</span>")
// to_chat(user, "<span class='warning'>\The [blocked] is in the way!</span>")
balloon_alert(user, "\The [blocked] is in the way!") // CHOMPEdit - Changed to balloon alert
return FALSE
user.setClickCooldown(user.get_attack_speed(src)) //puts a limit on how fast people can eat/drink things
if(user == target)
if(user == target)
self_feed_message(user)
reagents.trans_to_mob(user, issmall(user) ? CEILING(amount_per_transfer_from_this/2, 1) : amount_per_transfer_from_this, CHEM_INGEST)
feed_sound(user)
return TRUE
else
other_feed_message_start(user, target)
if(!do_mob(user, target))
@@ -132,13 +144,16 @@
return 0
if(!reagents || !reagents.total_volume)
to_chat(user, "<span class='notice'>[src] is empty.</span>")
// to_chat(user, "<span class='notice'>[src] is empty.</span>")
balloon_alert(usr, "[src] is empty.") // CHOMPEdit - Changed to balloon alert
return 1
if(!target.reagents.get_free_space())
to_chat(user, "<span class='notice'>[target] is full.</span>")
// to_chat(user, "<span class='notice'>[target] is full.</span>")
balloon_alert(usr, "[target] is full.") // CHOMPEdit - Changed to balloon alert
return 1
var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>You transfer [trans] units of the solution to [target].</span>")
// to_chat(user, "<span class='notice'>You transfer [trans] units of the solution to [target].</span>")
balloon_alert(user, "Transfered [trans] units to [target]") // CHOMPEdit - Balloon alerts! They're the future, I tell you.
return 1

22
code/modules/reagents/reagent_containers/borghypo.dm
View File

@@ -70,14 +70,16 @@
return
if(!reagent_volumes[reagent_ids[mode]])
to_chat(user, "<span class='warning'>The injector is empty.</span>")
// to_chat(user, "<span class='warning'>The injector is empty.</span>")
balloon_alert(user, "The injector is empty.") // CHOMPEdit - Changed to balloon alert
return
var/mob/living/carbon/human/H = M
if(istype(H))
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
if(!affected)
to_chat(user, "<span class='danger'>\The [H] is missing that limb!</span>")
// to_chat(user, "<span class='danger'>\The [H] is missing that limb!</span>")
balloon_alert("\The [H] is missing that limb.") // CHOMPEdit - Changed to balloon alert
return
/* since synths have oil/coolant streams now, it only makes sense that you should be able to inject stuff. preserved for posterity.
else if(affected.robotic >= ORGAN_ROBOT)
@@ -86,8 +88,11 @@
*/
if(M.can_inject(user, 1, ignore_thickness = bypass_protection))
to_chat(user, "<span class='notice'>You inject [M] with the injector.</span>")
to_chat(M, "<span class='notice'>You feel a tiny prick!</span>")
// CHOMPEdit - Changed to balloon alert
// to_chat(user, "<span class='notice'>You inject [M] with the injector.</span>")
// to_chat(M, "<span class='notice'>You feel a tiny prick!</span>")
balloon_alert(user, "You inject [M] with the injector.")
balloon_alert(user, "You feel a tiny prick!")
if(M.reagents)
var/t = min(amount_per_transfer_from_this, reagent_volumes[reagent_ids[mode]])
@@ -118,7 +123,8 @@
playsound(src, 'sound/effects/pop.ogg', 50, 0)
mode = t
var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]]
to_chat(usr, "<span class='notice'>Synthesizer is now producing '[R.name]'.</span>")
// to_chat(usr, "<span class='notice'>Synthesizer is now producing '[R.name]'.</span>")
balloon_alert(usr, "Synthesizer producing is now producing '[R.name]'")
/obj/item/weapon/reagent_containers/borghypo/examine(mob/user)
. = ..()
@@ -195,11 +201,13 @@
return
if(!target.reagents.get_free_space())
to_chat(user, "<span class='notice'>[target] is full.</span>")
// to_chat(user, "<span class='notice'>[target] is full.</span>")
balloon_alert(user, "[target] is full.") // CHOMPEdit - Changed to balloon alert
return
var/t = min(amount_per_transfer_from_this, reagent_volumes[reagent_ids[mode]])
target.reagents.add_reagent(reagent_ids[mode], t)
reagent_volumes[reagent_ids[mode]] -= t
to_chat(user, "<span class='notice'>You transfer [t] units of the solution to [target].</span>")
// to_chat(user, "<span class='notice'>You transfer [t] units of the solution to [target].</span>")
balloon_alert(user, "Transfered [t] units to [target].") // CHOMPEdit - Changed to balloon alert
return

33
code/modules/reagents/reagent_containers/glass.dm
View File

@@ -77,10 +77,12 @@
/obj/item/weapon/reagent_containers/glass/attack_self()
..()
if(is_open_container())
to_chat(usr, "<span class = 'notice'>You put the lid on \the [src].</span>")
// to_chat(usr, "<span class = 'notice'>You put the lid on \the [src].</span>")
balloon_alert(usr, "Lid put on \the [src]")
flags ^= OPENCONTAINER
else
to_chat(usr, "<span class = 'notice'>You take the lid off \the [src].</span>")
// to_chat(usr, "<span class = 'notice'>You take the lid off \the [src].</span>")
balloon_alert(usr, "Lid removed off \the [src]") // CHOMPEdit - Changed to ballopn alert
flags |= OPENCONTAINER
update_icon()
@@ -102,7 +104,8 @@
return ..()
/obj/item/weapon/reagent_containers/glass/self_feed_message(var/mob/user)
to_chat(user, "<span class='notice'>You swallow a gulp from \the [src].</span>")
// to_chat(user, "<span class='notice'>You swallow a gulp from \the [src].</span>")
balloon_alert(user, "Swallowed from \the [src]") // CHOMPEdit - Changed to balloon alert
/obj/item/weapon/reagent_containers/glass/afterattack(var/obj/target, var/mob/user, var/proximity)
if(!is_open_container() || !proximity) //Is the container open & are they next to whatever they're clicking?
@@ -118,7 +121,8 @@
if(standard_splash_mob(user,target))
return 1
if(reagents && reagents.total_volume)
to_chat(user, "<span class='notice'>You splash the solution onto [target].</span>") //They are on harm intent, aka wanting to spill it.
// to_chat(user, "<span class='notice'>You splash the solution onto [target].</span>") //They are on harm intent, aka wanting to spill it.
balloon_alert(user, "Splashed the solution onto [target]")
reagents.splash(target, reagents.total_volume)
return 1
..()
@@ -129,17 +133,20 @@
if(length(tmp_label) > 50)
to_chat(user, "<span class='notice'>The label can be at most 50 characters long.</span>")
else if(length(tmp_label) > 10)
to_chat(user, "<span class='notice'>You set the label.</span>")
// to_chat(user, "<span class='notice'>You set the label.</span>")
balloon_alert(user, "Label set.") // CHOMPEdit - Changed to balloon alert
label_text = tmp_label
update_name_label()
else
to_chat(user, "<span class='notice'>You set the label to \"[tmp_label]\".</span>")
// to_chat(user, "<span class='notice'>You set the label to \"[tmp_label]\".</span>")
balloon_alert(user, "Label set to \"[tmp_label]\"") // CHOMPEdit - Changed to balloon alert
label_text = tmp_label
update_name_label()
if(istype(W,/obj/item/weapon/storage/bag))
..()
if(W && W.w_class <= w_class && (flags & OPENCONTAINER) && user.a_intent != I_HELP)
to_chat(user, "<span class='notice'>You dip \the [W] into \the [src].</span>")
// to_chat(user, "<span class='notice'>You dip \the [W] into \the [src].</span>")
balloon_alert(user, "[W] dipped into \the [src].") // CHOMPEdit - Changed to balloon alert
reagents.touch_obj(W, reagents.total_volume)
/obj/item/weapon/reagent_containers/glass/proc/update_name_label()
@@ -300,7 +307,8 @@
qdel(src)
return
else if(D.has_tool_quality(TOOL_WIRECUTTER))
to_chat(user, "<span class='notice'>You cut a big hole in \the [src] with \the [D]. It's kinda useless as a bucket now.</span>")
// to_chat(user, "<span class='notice'>You cut a big hole in \the [src] with \the [D]. It's kinda useless as a bucket now.</span>")
balloon_alert(user, "You cut a big hole in \the [src] with \the [D]. It's kinda useless now.") // CHOMPEdit - Changed to balloon alert
user.put_in_hands(new /obj/item/clothing/head/helmet/bucket)
user.drop_from_inventory(src)
qdel(src)
@@ -310,16 +318,19 @@
if (M.use(1))
var/obj/item/weapon/secbot_assembly/edCLN_assembly/B = new /obj/item/weapon/secbot_assembly/edCLN_assembly
B.loc = get_turf(src)
to_chat(user, "<span class='notice'>You armed the robot frame.</span>")
// to_chat(user, "<span class='notice'>You armed the robot frame.</span>")
balloon_alert(user, "Armed the robot frame.")
if (user.get_inactive_hand()==src)
user.remove_from_mob(src)
user.put_in_inactive_hand(B)
qdel(src)
else
to_chat(user, "<span class='warning'>You need one sheet of metal to arm the robot frame.</span>")
// to_chat(user, "<span class='warning'>You need one sheet of metal to arm the robot frame.</span>")
balloon_alert(user, "One sheet of metal is needed to arm the robot frame.") // CHOMPEdit - Changed to balloon alert
else if(istype(D, /obj/item/weapon/mop) || istype(D, /obj/item/weapon/soap) || istype(D, /obj/item/weapon/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on buckets"
if(reagents.total_volume < 1)
to_chat(user, "<span class='warning'>\The [src] is empty!</span>")
// to_chat(user, "<span class='warning'>\The [src] is empty!</span>")
balloon_alert(user, "\The [src] is empty!") // CHOMPEdit - Changed to balloon alert
else
reagents.trans_to_obj(D, 5)
to_chat(user, "<span class='notice'>You wet \the [D] in \the [src].</span>")

40
code/modules/reagents/reagent_containers/hypospray.dm
View File

@@ -31,7 +31,8 @@
/obj/item/weapon/reagent_containers/hypospray/attack(mob/living/M as mob, mob/user as mob)
if(!reagents.total_volume)
to_chat(user, "<span class='warning'>[src] is empty.</span>")
// to_chat(user, "<span class='warning'>[src] is empty.</span>")
balloon_alert(user, "\The [src] is empty.") // CHOMPEdit - Changed to balloon alert
return
if (!istype(M))
return
@@ -40,7 +41,8 @@
if(istype(H))
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
if(!affected)
to_chat(user, "<span class='danger'>\The [H] is missing that limb!</span>")
// to_chat(user, "<span class='danger'>\The [H] is missing that limb!</span>")
balloon_alert(user, "\The [H] is missing that limb!") // CHOMPEdit - Changed to balloon alert
return
/* since synths have oil/coolant streams now, it only makes sense that you should be able to inject stuff. preserved for posterity.
else if(affected.robotic >= ORGAN_ROBOT)
@@ -50,16 +52,20 @@
//VOREStation Add Start - Adds Prototype Hypo functionality
if(H != user && prototype)
to_chat(user, "<span class='notice'>You begin injecting [H] with \the [src].</span>")
to_chat(H, "<span class='danger'> [user] is trying to inject you with \the [src]!</span>")
// to_chat(user, "<span class='notice'>You begin injecting [H] with \the [src].</span>")
// to_chat(H, "<span class='danger'> [user] is trying to inject you with \the [src]!</span>")
balloon_alert(user, "Injecting [H] with \the [src]") // CHOMPEdit - Changed to balloon alert
balloon_alert(H, "[user] is trying to inject you with \the [src]")
if(!do_after(user, 30, H))
return
//VOREstation Add End
else if(!H.stat && !prototype) //VOREStation Edit
if(H != user)
if(H.a_intent != I_HELP)
to_chat(user, "<span class='notice'>[H] is resisting your attempt to inject them with \the [src].</span>")
to_chat(H, "<span class='danger'> [user] is trying to inject you with \the [src]!</span>")
if(H.a_intent != I_HELP) // CHOMPEdit - Changed to balloon alert
// to_chat(user, "<span class='notice'>[H] is resisting your attempt to inject them with \the [src].</span>")
// to_chat(H, "<span class='danger'> [user] is trying to inject you with \the [src]!</span>")
balloon_alert(user, "[H] resists your attempt to inject them with \the [src].")
balloon_alert(H, "[user] is trying to inject you with \the [src]")
if(!do_after(user, 30, H))
return
@@ -71,9 +77,11 @@
if(!istype(H) || !istype(user))
return FALSE
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN)
to_chat(user, span("notice", "You inject \the [H] with \the [src]."))
to_chat(H, span("warning", "You feel a tiny prick!"))
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) // CHOMPEdit - Changed to balloon alert
// to_chat(user, span("notice", "You inject \the [H] with \the [src]."))
// to_chat(H, span("warning", "You feel a tiny prick!"))
balloon_alert(user, "Injected \the [H] with \the [src]")
balloon_alert(H, "You feel a tiny prick!")
if(hyposound)
playsound(src, hyposound, 25)
@@ -109,7 +117,8 @@
loaded_vial.update_icon()
user.put_in_hands(loaded_vial)
loaded_vial = null
to_chat(user, "<span class='notice'>You remove the vial from the [src].</span>")
// to_chat(user, "<span class='notice'>You remove the vial from the [src].</span>")
balloon_alert(user, "Vial removed from \the [src]")
update_icon()
playsound(src, 'sound/weapons/flipblade.ogg', 50, 1)
return
@@ -127,7 +136,8 @@
/obj/item/weapon/reagent_containers/hypospray/vial/attackby(obj/item/weapon/W, mob/user as mob)
if(istype(W, /obj/item/weapon/reagent_containers/glass/beaker/vial))
if(!loaded_vial)
user.visible_message("<span class='notice'>[user] begins loading [W] into \the [src].</span>","<span class='notice'>You start loading [W] into \the [src].</span>")
// user.visible_message("<span class='notice'>[user] begins loading [W] into \the [src].</span>","<span class='notice'>You start loading [W] into \the [src].</span>")
balloon_alert_visible("[user] begins loading [W] into \the [src].", "Loading [W] into \the [src].") // CHOMPEdit - Changed to balloon alert
if(!do_after(user,30) || loaded_vial || !(W in user))
return 0
if(W.is_open_container())
@@ -138,11 +148,13 @@
loaded_vial = W
reagents.maximum_volume = loaded_vial.reagents.maximum_volume
loaded_vial.reagents.trans_to_holder(reagents,volume)
user.visible_message("<span class='notice'>[user] has loaded [W] into \the [src].</span>","<span class='notice'>You have loaded [W] into \the [src].</span>")
// user.visible_message("<span class='notice'>[user] has loaded [W] into \the [src].</span>","<span class='notice'>You have loaded [W] into \the [src].</span>")
balloon_alert_visible("[user] has loaded [W] into \the [src].", "Loaded [W] into \the [src].") // CHOMPEdit - Changed to balloon alert
update_icon()
playsound(src, 'sound/weapons/empty.ogg', 50, 1)
else
to_chat(user, "<span class='notice'>\The [src] already has a vial.</span>")
// to_chat(user, "<span class='notice'>\The [src] already has a vial.</span>")
balloon_alert("\The [src] already has a vial.") // CHOMPEdit - Changed to balloon alert
else
..()

34
code/modules/reagents/reagent_containers/pill.dm
View File

@@ -31,10 +31,12 @@
return
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
to_chat(user, "<span class='warning'>\The [blocked] is in the way!</span>")
// to_chat(user, "<span class='warning'>\The [blocked] is in the way!</span>")
balloon_alert(user, "\The [blocked] is in the way!") // CHOMPEdit - Changed to balloon alert
return
to_chat(M, "<span class='notice'>You swallow \the [src].</span>")
// to_chat(M, "<span class='notice'>You swallow \the [src].</span>")
balloon_alert(user, "Swallowed \the [src]") // CHOMPEdit - Changed to balloon alert
M.drop_from_inventory(src) //icon update
if(reagents.total_volume)
reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
@@ -45,21 +47,25 @@
var/mob/living/carbon/human/H = M
if(!H.check_has_mouth())
to_chat(user, "Where do you intend to put \the [src]? \The [H] doesn't have a mouth!")
// to_chat(user, "Where do you intend to put \the [src]? \The [H] doesn't have a mouth!")
balloon_alert(user, "\The [H] doesn't have a mouth.") // CHOMPEdit - Changed to balloon alert
return
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
to_chat(user, "<span class='warning'>\The [blocked] is in the way!</span>")
// to_chat(user, "<span class='warning'>\The [blocked] is in the way!</span>")
balloon_alert(user, "\The [blocked] is in the way!") // CHOMPEdit - Changed to balloon alert
return
user.visible_message("<span class='warning'>[user] attempts to force [M] to swallow \the [src].</span>")
// user.visible_message("<span class='warning'>[user] attempts to force [M] to swallow \the [src].</span>")
balloon_alert_visible("[user] attempts to force [M] to swallow \the [src].") // CHOMPEdit - Changed to balloon alert
user.setClickCooldown(user.get_attack_speed(src))
if(!do_mob(user, M))
return
user.drop_from_inventory(src) //icon update
user.visible_message("<span class='warning'>[user] forces [M] to swallow \the [src].</span>")
// user.visible_message("<span class='warning'>[user] forces [M] to swallow \the [src].</span>")
balloon_alert_visible("[user] forces [M] to swallow \the [src].") // CHOMPEdit - Changed to balloon alert
var/contained = reagentlist()
add_attack_logs(user,M,"Fed a pill containing [contained]")
@@ -77,16 +83,18 @@
if(target.is_open_container() && target.reagents)
if(!target.reagents.total_volume)
to_chat(user, "<span class='notice'>[target] is empty. Can't dissolve \the [src].</span>")
// to_chat(user, "<span class='notice'>[target] is empty. Can't dissolve \the [src].</span>")
balloon_alert(user, "[target] is empty.") // CHOMPEdit - Changed to balloon alert
return
to_chat(user, "<span class='notice'>You dissolve \the [src] in [target].</span>")
// to_chat(user, "<span class='notice'>You dissolve \the [src] in [target].</span>")
balloon_alert_visible("[user] puts something in \the [target]", "[target] dissolves in \the [src]", 2) // CHOMPEdit - Changed to balloon alert
add_attack_logs(user,null,"Spiked [target.name] with a pill containing [reagentlist()]")
reagents.trans_to(target, reagents.total_volume)
for(var/mob/O in viewers(2, user))
/* for(var/mob/O in viewers(2, user)) // CHOMPEdit - balloon_alert_visible handles this
O.show_message("<span class='warning'>[user] puts something in \the [target].</span>", 1)
*/
qdel(src)
return
@@ -94,7 +102,8 @@
/obj/item/weapon/reagent_containers/pill/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(is_sharp(W))
var/obj/item/weapon/reagent_containers/powder/J = new /obj/item/weapon/reagent_containers/powder(src.loc)
user.visible_message("<span class='warning'>[user] gently cuts up [src] with [W]!</span>")
// user.visible_message("<span class='warning'>[user] gently cuts up [src] with [W]!</span>")
balloon_alert_visible("[user] gently cuts up [src] with [W]!", "You gently cut up \the [src] with [W]") // CHOMPEdit - Changed to balloon alert
playsound(src.loc, 'sound/effects/chop.ogg', 50, 1)
if(reagents)
@@ -104,7 +113,8 @@
if(istype(W, /obj/item/weapon/card/id))
var/obj/item/weapon/reagent_containers/powder/J = new /obj/item/weapon/reagent_containers/powder(src.loc)
user.visible_message("<span class='warning'>[user] clumsily chops up [src] with [W]!</span>")
// user.visible_message("<span class='warning'>[user] clumsily cuts up [src] with [W]!</span>")
balloon_alert_visible("[user] clumsily cuts up [src] with [W]!", "You clumsily cut up \the [src] with [W]") // CHOMPEdit - Changed to balloon alert
playsound(src.loc, 'sound/effects/chop.ogg', 50, 1)
if(reagents)

18
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -35,7 +35,8 @@
return
if(reagents.total_volume < amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>\The [src] is empty!</span>")
// to_chat(user, "<span class='notice'>\The [src] is empty!</span>")
balloon_alert(user, "\The [src] is empty!") // CHOMPEdit - Changed to balloon alert
return
Spray_at(A, user, proximity)
@@ -75,7 +76,8 @@
return
amount_per_transfer_from_this = next_in_list(amount_per_transfer_from_this, possible_transfer_amounts)
spray_size = next_in_list(spray_size, spray_sizes)
to_chat(user, "<span class='notice'>You adjusted the pressure nozzle. You'll now use [amount_per_transfer_from_this] units per spray.</span>")
// to_chat(user, "<span class='notice'>You adjusted the pressure nozzle. You'll now use [amount_per_transfer_from_this] units per spray.</span>")
balloon_alert(user, "Pressure nozzle adjusted to [amount_per_transfer_from_this] units per spray.") // CHOMPEdit - Changed to balloon alert
/obj/item/weapon/reagent_containers/spray/examine(mob/user)
. = ..()
@@ -91,7 +93,8 @@
if (tgui_alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", list("Yes", "No")) != "Yes")
return
if(isturf(usr.loc))
to_chat(usr, "<span class='notice'>You empty \the [src] onto the floor.</span>")
// to_chat(usr, "<span class='notice'>You empty \the [src] onto the floor.</span>")
balloon_alert(usr, "Empted \the [src] onto the floor.") // CHOMPEdit - Changed to balloon alert
reagents.splash(usr.loc, reagents.total_volume)
//space cleaner
@@ -138,7 +141,8 @@
/obj/item/weapon/reagent_containers/spray/pepper/attack_self(var/mob/user)
safety = !safety
to_chat(usr, "<span class = 'notice'>You switch the safety [safety ? "on" : "off"].</span>")
// to_chat(usr, "<span class = 'notice'>You switch the safety [safety ? "on" : "off"].</span>")
balloon_alert(usr, "Safety [safety ? "on" : "off"].") // CHOMPEdit - Changed to balloon alert
/obj/item/weapon/reagent_containers/spray/pepper/Spray_at(atom/A as mob|obj)
if(safety)
@@ -245,7 +249,8 @@
/obj/item/weapon/reagent_containers/spray/chemsprayer/hosed/AltClick(mob/living/carbon/user)
if(++spray_particles > 3) spray_particles = 1
to_chat(user, "<span class='notice'>You turn the dial on \the [src] to [spray_particles].</span>")
// to_chat(user, "<span class='notice'>You turn the dial on \the [src] to [spray_particles].</span>")
balloon_alert(user, "Dial turned to [spray_particles].")
return
/obj/item/weapon/reagent_containers/spray/chemsprayer/hosed/CtrlClick(var/mob/user)
@@ -264,7 +269,8 @@
var/list/the_targets = list(T, T1, T2)
if(src.reagents.total_volume < 1)
to_chat(usr, "<span class='notice'>\The [src] is empty.</span>")
// to_chat(usr, "<span class='notice'>\The [src] is empty.</span>")
balloon_alert(usr, "\The [src] is empty.")
return
if(!heavy_spray)

8
code/modules/reagents/reagent_containers/syringes.dm
View File

@@ -268,7 +268,7 @@
var/obj/item/organ/external/affecting = H.get_organ(target_zone)
if (!affecting || affecting.is_stump())
to_chat(user, "<span class='danger'>They are missing that limb!</span>")
balloon_alert(user, "They are missing that limb!") // CHOMPEdit - Changed to balloon_alert
return
var/hit_area = affecting.name
@@ -286,13 +286,15 @@
return
user.visible_message("<span class='danger'>[user] stabs [target] in \the [hit_area] with [src.name]!</span>")
// user.visible_message("<span class='danger'>[user] stabs [target] in \the [hit_area] with [src.name]!</span>")
balloon_alert_visible("Stabs [target] in \the [hit_area] with [src.name]!") // CHOMPEdit - Changed to balloon alert
if(affecting.take_damage(3))
H.UpdateDamageIcon()
else
user.visible_message("<span class='danger'>[user] stabs [target] with [src.name]!</span>")
// user.visible_message("<span class='danger'>[user] stabs [target] with [src.name]!</span>")
balloon_alert_visible("Stabs [user] in \the [target] with [src.name]!") // CHOMPEdit - Changed to balloon alert
target.take_organ_damage(3)// 7 is the same as crowbar punch

3
code/modules/reagents/reagent_containers/syringes_vr.dm
View File

@@ -74,7 +74,8 @@
switch(mode)
if(SYRINGE_CAPPED)
mode = SYRINGE_DRAW
to_chat(user,"<span class='notice'>You uncap the syringe.</span>")
// to_chat(user,"<span class='notice'>You uncap the syringe.</span>")
balloon_alert(user, "[src] uncapped") // CHOMPEdit - Changed to balloon_alert
if(SYRINGE_DRAW)
mode = SYRINGE_INJECT
if(SYRINGE_INJECT)