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

[MIRROR] ports a bunch of grep checks from TG (#10361)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-03-12 03:09:38 -07:00
committed by GitHub
parent 21031b169b
commit 3cfc33bfde
196 changed files with 627 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,13 +83,13 @@
var/contained = reagentlist()
add_attack_logs(user,target,"Splashed with [src.name] containing [contained]")
// user.visible_message(span_danger("[target] has been splashed with something by [user]!"), span_notice("You splash the solution onto [target]."))
balloon_alert_visible("[target] has been splashed with something by [user]!", "Splashed the solution onto [target]") // CHOMPEdit - Changed to balloon_alert
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/reagent_containers/proc/self_feed_message(var/mob/user)
// to_chat(user, span_notice("You eat \the [src]"))
balloon_alert(user, "You eat \the [src]") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "you eat \the [src]") // CHOMPEdit - Changed to balloon alert
/obj/item/reagent_containers/proc/other_feed_message_start(var/mob/user, var/mob/target)
// user.visible_message(span_warning("[user] is trying to feed [target] \the [src]!"))
@@ -108,19 +108,19 @@
if(!reagents || !reagents.total_volume)
// to_chat(user, span_notice("\The [src] is empty."))
balloon_alert(user, "\The [src] is empty.") // CHOMPEdit - Changed to balloon alert
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!")
balloon_alert(user, "[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_warning("\The [blocked] is in the way!"))
balloon_alert(user, "\The [blocked] is in the way!") // CHOMPEdit - Changed to balloon alert
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
@@ -158,5 +158,5 @@
var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
// to_chat(user, span_notice("You transfer [trans] units of the solution to [target]."))
balloon_alert(user, "Transfered [trans] units to [target]") // CHOMPEdit - Balloon alerts! They're the future, I tell you.
balloon_alert(user, "transfered [trans] units to [target]") // CHOMPEdit - Balloon alerts! They're the future, I tell you.
return 1

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

@@ -71,7 +71,7 @@
if(!reagent_volumes[reagent_ids[mode]])
// to_chat(user, span_warning("The injector is empty."))
balloon_alert(user, "The injector is empty.") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "the injector is empty.") // CHOMPEdit - Changed to balloon alert
return
var/mob/living/carbon/human/H = M
@@ -79,7 +79,7 @@
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
if(!affected)
// to_chat(user, span_danger("\The [H] is missing that limb!"))
balloon_alert("\The [H] is missing that limb.") // CHOMPEdit - Changed to balloon alert
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)
@@ -91,8 +91,8 @@
// CHOMPEdit - Changed to balloon alert
// to_chat(user, span_notice("You inject [M] with the injector."))
// to_chat(M, span_notice("You feel a tiny prick!"))
balloon_alert(user, "You inject [M] with the injector.")
balloon_alert(user, "You feel a tiny prick!")
balloon_alert(user, "you inject [M] with the injector.")
balloon_alert(M, "you feel a tiny prick!")
if(M.reagents)
var/t = min(amount_per_transfer_from_this, reagent_volumes[reagent_ids[mode]])
@@ -124,7 +124,7 @@
mode = t
var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]]
// to_chat(usr, span_notice("Synthesizer is now producing '[R.name]'."))
balloon_alert(usr, "Synthesizer is now producing '[R.name]'") // CHOMPAdd
balloon_alert(usr, "synthesizer is now producing '[R.name]'") // CHOMPAdd
/obj/item/reagent_containers/borghypo/examine(mob/user)
. = ..()
@@ -209,5 +209,5 @@
target.reagents.add_reagent(reagent_ids[mode], t)
reagent_volumes[reagent_ids[mode]] -= t
// to_chat(user, span_notice("You transfer [t] units of the solution to [target]."))
balloon_alert(user, "Transfered [t] units to [target].") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "transfered [t] units to [target].") // CHOMPEdit - Changed to balloon alert
return

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

@@ -79,11 +79,11 @@
..()
if(is_open_container())
// to_chat(user, span_notice("You put the lid on \the [src]."))
balloon_alert(user, "Lid put on \the [src]")
balloon_alert(user, "lid put on \the [src]")
flags ^= OPENCONTAINER
else
// to_chat(user, span_notice("You take the lid off \the [src]."))
balloon_alert(user, "Lid removed off \the [src]") // CHOMPEdit - Changed to ballopn alert
balloon_alert(user, "lid removed off \the [src]") // CHOMPEdit - Changed to ballopn alert
flags |= OPENCONTAINER
update_icon()
@@ -107,7 +107,7 @@
/obj/item/reagent_containers/glass/self_feed_message(var/mob/user)
// to_chat(user, span_notice("You swallow a gulp from \the [src]."))
balloon_alert(user, "Swallowed from \the [src]") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "swallowed from \the [src]") // CHOMPEdit - Changed to balloon alert
/obj/item/reagent_containers/glass/proc/attempt_snake_milking(mob/living/user, mob/living/target)
var/reagent
@@ -149,7 +149,7 @@
return 1
if(reagents && reagents.total_volume)
// to_chat(user, span_notice("You splash the solution onto [target].")) //They are on harm intent, aka wanting to spill it.
balloon_alert(user, "Splashed the solution onto [target]")
balloon_alert(user, "splashed the solution onto [target]")
reagents.splash(target, reagents.total_volume)
return 1
..()
@@ -161,12 +161,12 @@
to_chat(user, span_notice("The label can be at most 50 characters long."))
else if(length(tmp_label) > 10)
// to_chat(user, span_notice("You set the label."))
balloon_alert(user, "Label set.") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "label set.") // CHOMPEdit - Changed to balloon alert
label_text = tmp_label
update_name_label()
else
// to_chat(user, span_notice("You set the label to \"[tmp_label]\"."))
balloon_alert(user, "Label set to \"[tmp_label]\"") // CHOMPEdit - Changed to balloon alert
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/storage/bag))
@@ -342,7 +342,7 @@
return
else if(D.has_tool_quality(TOOL_WIRECUTTER))
// to_chat(user, span_notice("You cut a big hole in \the [src] with \the [D]. It's kinda useless as a bucket now."))
balloon_alert(user, "You cut a big hole in \the [src] with \the [D]. It's kinda useless now.") // CHOMPEdit - Changed to balloon alert
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)
@@ -353,18 +353,18 @@
var/obj/item/secbot_assembly/edCLN_assembly/B = new /obj/item/secbot_assembly/edCLN_assembly
B.loc = get_turf(src)
// to_chat(user, span_notice("You armed the robot frame."))
balloon_alert(user, "Armed the robot frame.")
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_warning("You need one sheet of metal to arm the robot frame."))
balloon_alert(user, "One sheet of metal is needed to arm the robot frame.") // CHOMPEdit - Changed to balloon alert
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/mop) || istype(D, /obj/item/soap) || istype(D, /obj/item/reagent_containers/glass/rag)) //VOREStation Edit - "Allows soap and rags to be used on buckets"
if(reagents.total_volume < 1)
// to_chat(user, span_warning("\The [src] is empty!"))
balloon_alert(user, "\The [src] is empty!") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "\the [src] is empty!") // CHOMPEdit - Changed to balloon alert
else
reagents.trans_to_obj(D, 5)
to_chat(user, span_notice("You wet \the [D] in \the [src]."))

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

@@ -32,7 +32,7 @@
/obj/item/reagent_containers/hypospray/attack(mob/living/M as mob, mob/user as mob)
if(!reagents.total_volume)
// to_chat(user, span_warning("[src] is empty."))
balloon_alert(user, "\The [src] is empty.") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "\the [src] is empty.") // CHOMPEdit - Changed to balloon alert
return
if (!istype(M))
return
@@ -42,7 +42,7 @@
var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
if(!affected)
// to_chat(user, span_danger("\The [H] is missing that limb!"))
balloon_alert(user, "\The [H] is missing that limb!") // CHOMPEdit - Changed to balloon alert
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)
@@ -54,7 +54,7 @@
if(H != user && prototype)
// to_chat(user, span_notice("You begin injecting [H] with \the [src]."))
// to_chat(H, span_danger(" [user] is trying to inject you with \the [src]!"))
balloon_alert(user, "Injecting [H] with \the [src]") // CHOMPEdit - Changed to balloon alert
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
@@ -80,8 +80,8 @@
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!")
balloon_alert(user, "injected \the [H] with \the [src]")
balloon_alert(H, "you feel a tiny prick!")
if(hyposound)
playsound(src, hyposound, 25)
@@ -118,7 +118,7 @@
user.put_in_hands(loaded_vial)
loaded_vial = null
// to_chat(user, span_notice("You remove the vial from the [src]."))
balloon_alert(user, "Vial removed from \the [src]")
balloon_alert(user, "vial removed from \the [src]")
update_icon()
playsound(src, 'sound/weapons/flipblade.ogg', 50, 1)
return
@@ -137,7 +137,7 @@
if(istype(W, /obj/item/reagent_containers/glass/beaker/vial))
if(!loaded_vial)
// user.visible_message(span_notice("[user] begins loading [W] into \the [src]."),span_notice("You start loading [W] into \the [src]."))
balloon_alert_visible("[user] begins loading [W] into \the [src].", "Loading [W] into \the [src].") // CHOMPEdit - Changed to balloon alert
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())
@@ -149,12 +149,12 @@
reagents.maximum_volume = loaded_vial.reagents.maximum_volume
loaded_vial.reagents.trans_to_holder(reagents,volume)
// user.visible_message(span_notice("[user] has loaded [W] into \the [src]."),span_notice("You have loaded [W] into \the [src]."))
balloon_alert_visible("[user] has loaded [W] into \the [src].", "Loaded [W] into \the [src].") // CHOMPEdit - Changed to balloon alert
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_notice("\The [src] already has a vial."))
balloon_alert("\The [src] already has a vial.") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "\the [src] already has a vial.") // CHOMPEdit - Changed to balloon alert
else
..()

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

@@ -32,11 +32,11 @@
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
// to_chat(user, span_warning("\The [blocked] is in the way!"))
balloon_alert(user, "\The [blocked] is in the way!") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "\the [blocked] is in the way!") // CHOMPEdit - Changed to balloon alert
return
// to_chat(M, span_notice("You swallow \the [src]."))
balloon_alert(user, "Swallowed \the [src]") // CHOMPEdit - Changed to balloon alert
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)
@@ -48,12 +48,12 @@
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!")
balloon_alert(user, "\The [H] doesn't have a mouth.") // CHOMPEdit - Changed to balloon alert
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_warning("\The [blocked] is in the way!"))
balloon_alert(user, "\The [blocked] is in the way!") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "\the [blocked] is in the way!") // CHOMPEdit - Changed to balloon alert
return
// user.visible_message(span_warning("[user] attempts to force [M] to swallow \the [src]."))

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

@@ -37,7 +37,7 @@
if(reagents.total_volume < amount_per_transfer_from_this)
// to_chat(user, span_notice("\The [src] is empty!"))
balloon_alert(user, "\The [src] is empty!") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "\the [src] is empty!") // CHOMPEdit - Changed to balloon alert
return
Spray_at(A, user, proximity)
@@ -78,7 +78,7 @@
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_notice("You adjusted the pressure nozzle. You'll now use [amount_per_transfer_from_this] units per spray."))
balloon_alert(user, "Pressure nozzle adjusted to [amount_per_transfer_from_this] units per spray.") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "pressure nozzle adjusted to [amount_per_transfer_from_this] units per spray.") // CHOMPEdit - Changed to balloon alert
/obj/item/reagent_containers/spray/examine(mob/user)
. = ..()
@@ -95,7 +95,7 @@
return
if(isturf(usr.loc))
// to_chat(usr, span_notice("You empty \the [src] onto the floor."))
balloon_alert(usr, "Empted \the [src] onto the floor.") // CHOMPEdit - Changed to balloon alert
balloon_alert(usr, "empted \the [src] onto the floor.") // CHOMPEdit - Changed to balloon alert
reagents.splash(usr.loc, reagents.total_volume)
//space cleaner
@@ -144,7 +144,7 @@
/obj/item/reagent_containers/spray/pepper/attack_self(var/mob/user)
safety = !safety
// to_chat(user, span_notice("You switch the safety [safety ? "on" : "off"]."))
balloon_alert(user, "Safety [safety ? "on" : "off"].") // CHOMPEdit - Changed to balloon alert
balloon_alert(user, "safety [safety ? "on" : "off"].") // CHOMPEdit - Changed to balloon alert
/obj/item/reagent_containers/spray/pepper/Spray_at(atom/A as mob|obj, mob/user)
if(safety)
@@ -254,7 +254,7 @@
if(++spray_particles > 3) spray_particles = 1
// to_chat(user, span_notice("You turn the dial on \the [src] to [spray_particles]."))
balloon_alert(user, "Dial turned to [spray_particles].")
balloon_alert(user, "dial turned to [spray_particles].")
return
/obj/item/reagent_containers/spray/chemsprayer/hosed/CtrlClick(var/mob/user)
@@ -274,7 +274,7 @@
if(src.reagents.total_volume < 1)
// to_chat(user, span_notice("\The [src] is empty."))
balloon_alert(user, "\The [src] is empty.")
balloon_alert(user, "\the [src] is empty.")
return
if(!heavy_spray)

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

@@ -282,7 +282,7 @@
var/obj/item/organ/external/affecting = H.get_organ(target_zone)
if (!affecting || affecting.is_stump())
balloon_alert(user, "They are missing that limb!") // CHOMPEdit - Changed to balloon_alert
balloon_alert(user, "they are missing that limb!") // CHOMPEdit - Changed to balloon_alert
return
var/hit_area = affecting.name
@@ -301,14 +301,14 @@
return
// user.visible_message(span_danger("[user] stabs [target] in \the [hit_area] with [src.name]!"))
balloon_alert_visible("Stabs [target] in \the [hit_area] with [src.name]!") // CHOMPEdit - Changed to balloon alert
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_danger("[user] stabs [target] with [src.name]!"))
balloon_alert_visible("Stabs [user] in \the [target] with [src.name]!") // CHOMPEdit - Changed to balloon alert
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