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

Deprecate the stream operator

Browse Source
This commit is contained in:
Arokha Sieyes
2020-02-12 17:26:44 -05:00
committed by Leshana
parent c8a8987610
commit 47ccc655db
762 changed files with 4492 additions and 4464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
View File

@@ -184,17 +184,17 @@
if(istype(O, /obj/item/weapon/paper))
var/obj/item/weapon/paper/paperaffected = O
paperaffected.clearpaper()
usr << "The solution dissolves the ink on the paper."
to_chat(usr, "The solution dissolves the ink on the paper.")
return
if(istype(O, /obj/item/weapon/book))
if(volume < 5)
return
if(istype(O, /obj/item/weapon/book/tome))
usr << "<span class='notice'>The solution does nothing. Whatever this is, it isn't normal ink.</span>"
to_chat(usr, "<span class='notice'>The solution does nothing. Whatever this is, it isn't normal ink.</span>")
return
var/obj/item/weapon/book/affectedbook = O
affectedbook.dat = null
usr << "<span class='notice'>The solution dissolves the ink on the book.</span>"
to_chat(usr, "<span class='notice'>The solution dissolves the ink on the book.</span>")
return
/datum/reagent/fluorine
@@ -352,11 +352,11 @@
var/mob/living/carbon/human/H = M
if(H.head)
if(H.head.unacidable)
H << "<span class='danger'>Your [H.head] protects you from the acid.</span>"
to_chat(H, "<span class='danger'>Your [H.head] protects you from the acid.</span>")
remove_self(volume)
return
else if(removed > meltdose)
H << "<span class='danger'>Your [H.head] melts away!</span>"
to_chat(H, "<span class='danger'>Your [H.head] melts away!</span>")
qdel(H.head)
H.update_inv_head(1)
H.update_hair(1)
@@ -366,11 +366,11 @@
if(H.wear_mask)
if(H.wear_mask.unacidable)
H << "<span class='danger'>Your [H.wear_mask] protects you from the acid.</span>"
to_chat(H, "<span class='danger'>Your [H.wear_mask] protects you from the acid.</span>")
remove_self(volume)
return
else if(removed > meltdose)
H << "<span class='danger'>Your [H.wear_mask] melts away!</span>"
to_chat(H, "<span class='danger'>Your [H.wear_mask] melts away!</span>")
qdel(H.wear_mask)
H.update_inv_wear_mask(1)
H.update_hair(1)
@@ -380,10 +380,10 @@
if(H.glasses)
if(H.glasses.unacidable)
H << "<span class='danger'>Your [H.glasses] partially protect you from the acid!</span>"
to_chat(H, "<span class='danger'>Your [H.glasses] partially protect you from the acid!</span>")
removed /= 2
else if(removed > meltdose)
H << "<span class='danger'>Your [H.glasses] melt away!</span>"
to_chat(H, "<span class='danger'>Your [H.glasses] melt away!</span>")
qdel(H.glasses)
H.update_inv_glasses(1)
removed -= meltdose / 2
@@ -414,7 +414,7 @@
var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc)
I.desc = "Looks like this was \an [O] some time ago."
for(var/mob/M in viewers(5, O))
M << "<span class='warning'>\The [O] melts.</span>"
to_chat(M, "<span class='warning'>\The [O] melts.</span>")
qdel(O)
remove_self(meltdose) // 10 units of acid will not melt EVERYTHING on the tile

6
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
View File

@@ -332,7 +332,7 @@
/datum/reagent/nutriment/durian/touch_mob(var/mob/M, var/amount)
if(iscarbon(M) && !M.isSynthetic())
var/message = pick("Oh god, it smells disgusting here.", "What is that stench?", "That's an awful odor.")
to_chat(M,"<span class='alien'>[message]</span>")
to_chat(M, "<span class='alien'>[message]</span>")
if(prob(CLAMP(amount, 5, 90)))
var/mob/living/L = M
L.vomit()
@@ -476,7 +476,7 @@
return
if(dose < 5 && (dose == metabolism || prob(5)))
M << "<span class='danger'>Your insides feel uncomfortably hot!</span>"
to_chat(M, "<span class='danger'>Your insides feel uncomfortably hot!</span>")
if(dose >= 5)
M.apply_effect(2, AGONY, 0)
if(prob(5))
@@ -620,7 +620,7 @@
if(!H.can_feel_pain())
return
if(dose == metabolism)
M << "<span class='danger'>You feel like your insides are burning!</span>"
to_chat(M, "<span class='danger'>You feel like your insides are burning!</span>")
else
M.apply_effect(4, AGONY, 0)
if(prob(5))

2
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks_vr.dm
View File

@@ -92,7 +92,7 @@
H.feral -= removed * 3 // should calm them down quick, provided they're actually in a state to STAY calm.
if (H.feral <=0) //check if they're unferalled
H.feral = 0
H << "<span class='info'>Your mind starts to clear, soothed into a state of clarity as your senses return.</span>"
to_chat(H, "<span class='info'>Your mind starts to clear, soothed into a state of clarity as your senses return.</span>")
log_and_message_admins("is no longer feral.", H)
/datum/reagent/ethanol/monstertamer/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)

16
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
View File

@@ -769,7 +769,7 @@
if(prob(5))
H.vomit(1)
else if(prob(5))
to_chat(H,"<span class='danger'>Something churns inside you.</span>")
to_chat(H, "<span class='danger'>Something churns inside you.</span>")
H.adjustToxLoss(10 * removed)
H.vomit(0, 1)
else
@@ -1283,11 +1283,11 @@
return
if(volume <= 0.1 && data != -1)
data = -1
M << "<span class='warning'>You lose focus...</span>"
to_chat(M, "<span class='warning'>You lose focus...</span>")
else
if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
data = world.time
M << "<span class='notice'>Your mind feels focused and undivided.</span>"
to_chat(M, "<span class='notice'>Your mind feels focused and undivided.</span>")
/datum/reagent/citalopram
name = "Citalopram"
@@ -1306,11 +1306,11 @@
return
if(volume <= 0.1 && data != -1)
data = -1
M << "<span class='warning'>Your mind feels a little less stable...</span>"
to_chat(M, "<span class='warning'>Your mind feels a little less stable...</span>")
else
if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
data = world.time
M << "<span class='notice'>Your mind feels stable... a little stable.</span>"
to_chat(M, "<span class='notice'>Your mind feels stable... a little stable.</span>")
/datum/reagent/paroxetine
name = "Paroxetine"
@@ -1329,14 +1329,14 @@
return
if(volume <= 0.1 && data != -1)
data = -1
M << "<span class='warning'>Your mind feels much less stable...</span>"
to_chat(M, "<span class='warning'>Your mind feels much less stable...</span>")
else
if(world.time > data + ANTIDEPRESSANT_MESSAGE_DELAY)
data = world.time
if(prob(90))
M << "<span class='notice'>Your mind feels much more stable.</span>"
to_chat(M, "<span class='notice'>Your mind feels much more stable.</span>")
else
M << "<span class='warning'>Your mind breaks apart...</span>"
to_chat(M, "<span class='warning'>Your mind breaks apart...</span>")
M.hallucination += 200
/datum/reagent/qerr_quem

14
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
View File

@@ -450,11 +450,11 @@
if(alien == IS_DIONA)
return
if(prob(10))
to_chat(M,"<span class='warning'>Your veins feel like they're on fire!</span>")
to_chat(M, "<span class='warning'>Your veins feel like they're on fire!</span>")
M.adjust_fire_stacks(0.1)
else if(prob(5))
M.IgniteMob()
to_chat(M,"<span class='critical'>Some of your veins rupture, the exposed blood igniting!</span>")
to_chat(M, "<span class='critical'>Some of your veins rupture, the exposed blood igniting!</span>")
/datum/reagent/condensedcapsaicin/venom
name = "Irritant toxin"
@@ -472,7 +472,7 @@
if(prob(50))
M.apply_effect(4, AGONY, 0)
if(prob(20))
to_chat(M,"<span class='danger'>You feel like your insides are burning!</span>")
to_chat(M, "<span class='danger'>You feel like your insides are burning!</span>")
else if(prob(20))
M.visible_message("<span class='warning'>[M] [pick("dry heaves!","coughs!","splutters!","rubs at their eyes!")]</span>")
else
@@ -572,7 +572,7 @@
M.UpdateAppearance()
if(prob(removed * 40)) //Additionally, let's make it so there's an 8% chance per tick for a random cosmetic/not guranteed good/bad mutation.
randmuti(M)//This should equate to 4 random cosmetic mutations per 10 injected/20 ingested/30 touching units
M << "<span class='warning'>You feel odd!</span>"
to_chat(M, "<span class='warning'>You feel odd!</span>")
M.apply_effect(10 * removed, IRRADIATE, 0)
/datum/reagent/slimejelly
@@ -595,7 +595,7 @@
M.add_chemical_effect(CE_PAINKILLER, 60)
else
if(prob(10))
M << "<span class='danger'>Your insides are burning!</span>"
to_chat(M, "<span class='danger'>Your insides are burning!</span>")
M.adjustToxLoss(rand(100, 300) * removed)
else if(prob(40))
M.heal_organ_damage(25 * removed, 0)
@@ -949,7 +949,7 @@ datum/reagent/talum_quem/affect_blood(var/mob/living/carbon/M, var/alien, var/re
M.UpdateAppearance()
if(prob(removed * 40))
randmuti(M)
M << "<span class='warning'>You feel odd!</span>"
to_chat(M, "<span class='warning'>You feel odd!</span>")
M.apply_effect(16 * removed, IRRADIATE, 0)
/datum/reagent/aslimetoxin
@@ -979,7 +979,7 @@ datum/reagent/talum_quem/affect_blood(var/mob/living/carbon/M, var/alien, var/re
M.UpdateAppearance()
if(prob(removed * 40))
randmuti(M)
M << "<span class='warning'>You feel odd!</span>"
to_chat(M, "<span class='warning'>You feel odd!</span>")
M.apply_effect(6 * removed, IRRADIATE, 0)
/*

6
code/modules/reagents/Chemistry-Recipes.dm
View File

@@ -897,7 +897,7 @@
var/location = get_turf(holder.my_atom)
for(var/mob/M in viewers(5, location))
M << "<span class='warning'>The solution spews out foam!</span>"
to_chat(M, "<span class='warning'>The solution spews out foam!</span>")
var/datum/effect/effect/system/foam_spread/s = new()
s.set_up(created_volume, location, holder, 0)
@@ -919,7 +919,7 @@
var/location = get_turf(holder.my_atom)
for(var/mob/M in viewers(5, location))
M << "<span class='warning'>The solution spews out a metalic foam!</span>"
to_chat(M, "<span class='warning'>The solution spews out a metalic foam!</span>")
var/datum/effect/effect/system/foam_spread/s = new()
s.set_up(created_volume, location, holder, 1)
@@ -937,7 +937,7 @@
var/location = get_turf(holder.my_atom)
for(var/mob/M in viewers(5, location))
M << "<span class='warning'>The solution spews out a metalic foam!</span>"
to_chat(M, "<span class='warning'>The solution spews out a metalic foam!</span>")
var/datum/effect/effect/system/foam_spread/s = new()
s.set_up(created_volume, location, holder, 2)

4
code/modules/reagents/Chemistry-Recipes_vr.dm
View File

@@ -258,7 +258,7 @@
playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
for(var/mob/living/M in range (get_turf(holder.my_atom), 7))
M.bodytemperature -= 140
M << "<span class='notice'> You suddenly feel a chill!</span>"
to_chat(M, "<span class='notice'> You suddenly feel a chill!</span>")
@@ -307,7 +307,7 @@
required_reagents = list("phoron" = 10, "bicaridine" = 10, "kelotane" = 10, "inaprovaline" = 10, "slimejelly" = 10)
on_reaction(var/datum/reagents/holder, var/created_volume)
for (var/mob/living/carbon/C in viewers(get_turf(holder.my_atom), null))
C << "<span class='notice'>A wave of energy suddenly invigorates you.</span>"
to_chat(C, "<span class='notice'>A wave of energy suddenly invigorates you.</span>")
C.adjustBruteLoss(-25)
C.adjustFireLoss(-25)
C.adjustToxLoss(-25)

28
code/modules/reagents/dispenser/cartridge.dm
View File

@@ -23,13 +23,13 @@
/obj/item/weapon/reagent_containers/chem_disp_cartridge/examine(mob/user)
..()
user << "It has a capacity of [volume] units."
to_chat(user, "It has a capacity of [volume] units.")
if(reagents.total_volume <= 0)
user << "It is empty."
to_chat(user, "It is empty.")
else
user << "It contains [reagents.total_volume] units of liquid."
to_chat(user, "It contains [reagents.total_volume] units of liquid.")
if(!is_open_container())
user << "The cap is sealed."
to_chat(user, "The cap is sealed.")
/obj/item/weapon/reagent_containers/chem_disp_cartridge/verb/verb_set_label(L as text)
set name = "Set Cartridge Label"
@@ -41,23 +41,23 @@
/obj/item/weapon/reagent_containers/chem_disp_cartridge/proc/setLabel(L, mob/user = null)
if(L)
if(user)
user << "<span class='notice'>You set the label on \the [src] to '[L]'.</span>"
to_chat(user, "<span class='notice'>You set the label on \the [src] to '[L]'.</span>")
label = L
name = "[initial(name)] - '[L]'"
else
if(user)
user << "<span class='notice'>You clear the label on \the [src].</span>"
to_chat(user, "<span class='notice'>You clear the label on \the [src].</span>")
label = ""
name = initial(name)
/obj/item/weapon/reagent_containers/chem_disp_cartridge/attack_self()
..()
if (is_open_container())
usr << "<span class = 'notice'>You put the cap on \the [src].</span>"
to_chat(usr, "<span class = 'notice'>You put the cap on \the [src].</span>")
flags ^= OPENCONTAINER
else
usr << "<span class = 'notice'>You take the cap off \the [src].</span>"
to_chat(usr, "<span class = 'notice'>You take the cap off \the [src].</span>")
flags |= OPENCONTAINER
/obj/item/weapon/reagent_containers/chem_disp_cartridge/afterattack(obj/target, mob/user , flag)
@@ -68,28 +68,28 @@
target.add_fingerprint(user)
if(!target.reagents.total_volume && target.reagents)
user << "<span class='warning'>\The [target] is empty.</span>"
to_chat(user, "<span class='warning'>\The [target] is empty.</span>")
return
if(reagents.total_volume >= reagents.maximum_volume)
user << "<span class='warning'>\The [src] is full.</span>"
to_chat(user, "<span class='warning'>\The [src] is full.</span>")
return
var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
user << "<span class='notice'>You fill \the [src] with [trans] units of the contents of \the [target].</span>"
to_chat(user, "<span class='notice'>You fill \the [src] with [trans] units of the contents of \the [target].</span>")
else if(target.is_open_container() && target.reagents) //Something like a glass. Player probably wants to transfer TO it.
if(!reagents.total_volume)
user << "<span class='warning'>\The [src] is empty.</span>"
to_chat(user, "<span class='warning'>\The [src] is empty.</span>")
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
user << "<span class='warning'>\The [target] is full.</span>"
to_chat(user, "<span class='warning'>\The [target] is full.</span>")
return
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
user << "<span class='notice'>You transfer [trans] units of the solution to \the [target].</span>"
to_chat(user, "<span class='notice'>You transfer [trans] units of the solution to \the [target].</span>")
else
return ..()

28
code/modules/reagents/reagent_containers.dm
View File

@@ -38,15 +38,15 @@
return 0
if(!target.reagents || !target.reagents.total_volume)
user << "<span class='notice'>[target] is empty.</span>"
to_chat(user, "<span class='notice'>[target] is empty.</span>")
return 1
if(reagents && !reagents.get_free_space())
user << "<span class='notice'>[src] is full.</span>"
to_chat(user, "<span class='notice'>[src] is full.</span>")
return 1
var/trans = target.reagents.trans_to_obj(src, target:amount_per_transfer_from_this)
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>")
return 1
/obj/item/weapon/reagent_containers/proc/standard_splash_mob(var/mob/user, var/mob/target) // This goes into afterattack
@@ -54,11 +54,11 @@
return
if(!reagents || !reagents.total_volume)
user << "<span class='notice'>[src] is empty.</span>"
to_chat(user, "<span class='notice'>[src] is empty.</span>")
return 1
if(target.reagents && !target.reagents.get_free_space())
user << "<span class='notice'>[target] is full.</span>"
to_chat(user, "<span class='notice'>[target] is full.</span>")
return 1
var/contained = reagentlist()
@@ -68,7 +68,7 @@
return 1
/obj/item/weapon/reagent_containers/proc/self_feed_message(var/mob/user)
user << "<span class='notice'>You eat \the [src]</span>"
to_chat(user, "<span class='notice'>You eat \the [src]</span>")
/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>")
@@ -84,18 +84,18 @@
return 0
if(!reagents || !reagents.total_volume)
user << "<span class='notice'>\The [src] is empty.</span>"
to_chat(user, "<span class='notice'>\The [src] is empty.</span>")
return 1
if(target == user)
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = user
if(!H.check_has_mouth())
user << "Where do you intend to put \the [src]? You don't have a mouth!"
to_chat(user, "Where do you intend to put \the [src]? You don't have a mouth!")
return
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
user << "<span class='warning'>\The [blocked] is in the way!</span>"
to_chat(user, "<span class='warning'>\The [blocked] is in the way!</span>")
return
user.setClickCooldown(user.get_attack_speed(src)) //puts a limit on how fast people can eat/drink things
@@ -107,11 +107,11 @@
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = target
if(!H.check_has_mouth())
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!")
return
var/obj/item/blocked = H.check_mouth_coverage()
if(blocked)
user << "<span class='warning'>\The [blocked] is in the way!</span>"
to_chat(user, "<span class='warning'>\The [blocked] is in the way!</span>")
return
other_feed_message_start(user, target)
@@ -133,13 +133,13 @@
return 0
if(!reagents || !reagents.total_volume)
user << "<span class='notice'>[src] is empty.</span>"
to_chat(user, "<span class='notice'>[src] is empty.</span>")
return 1
if(!target.reagents.get_free_space())
user << "<span class='notice'>[target] is full.</span>"
to_chat(user, "<span class='notice'>[target] is full.</span>")
return 1
var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
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>")
return 1

24
code/modules/reagents/reagent_containers/borghydro.dm
View File

@@ -67,29 +67,29 @@
return
if(!reagent_volumes[reagent_ids[mode]])
user << "<span class='warning'>The injector is empty.</span>"
to_chat(user, "<span class='warning'>The injector is empty.</span>")
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)
user << "<span class='danger'>\The [H] is missing that limb!</span>"
to_chat(user, "<span class='danger'>\The [H] is missing that limb!</span>")
return
else if(affected.robotic >= ORGAN_ROBOT)
user << "<span class='danger'>You cannot inject a robotic limb.</span>"
to_chat(user, "<span class='danger'>You cannot inject a robotic limb.</span>")
return
if(M.can_inject(user, 1, ignore_thickness = bypass_protection))
user << "<span class='notice'>You inject [M] with the injector.</span>"
M << "<span class='notice'>You feel a tiny prick!</span>"
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>")
if(M.reagents)
var/t = min(amount_per_transfer_from_this, reagent_volumes[reagent_ids[mode]])
M.reagents.add_reagent(reagent_ids[mode], t)
reagent_volumes[reagent_ids[mode]] -= t
add_attack_logs(user, M, "Borg injected with [reagent_ids[mode]]")
user << "<span class='notice'>[t] units injected. [reagent_volumes[reagent_ids[mode]]] units remaining.</span>"
to_chat(user, "<span class='notice'>[t] units injected. [reagent_volumes[reagent_ids[mode]]] units remaining.</span>")
return
/obj/item/weapon/reagent_containers/borghypo/attack_self(mob/user as mob) //Change the mode
@@ -102,7 +102,7 @@
else
t += "<a href='?src=\ref[src];reagent=[reagent_ids[i]]'>[reagent_names[i]]</a>"
t = "Available reagents: [t]."
user << t
to_chat(user,t)
return
@@ -113,7 +113,7 @@
playsound(loc, 'sound/effects/pop.ogg', 50, 0)
mode = t
var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]]
usr << "<span class='notice'>Synthesizer is now producing '[R.name]'.</span>"
to_chat(usr, "<span class='notice'>Synthesizer is now producing '[R.name]'.</span>")
/obj/item/weapon/reagent_containers/borghypo/examine(mob/user)
if(!..(user, 2))
@@ -121,7 +121,7 @@
var/datum/reagent/R = SSchemistry.chemical_reagents[reagent_ids[mode]]
user << "<span class='notice'>It is currently producing [R.name] and has [reagent_volumes[reagent_ids[mode]]] out of [volume] units left.</span>"
to_chat(user, "<span class='notice'>It is currently producing [R.name] and has [reagent_volumes[reagent_ids[mode]]] out of [volume] units left.</span>")
/obj/item/weapon/reagent_containers/borghypo/service
name = "cyborg drink synthesizer"
@@ -145,15 +145,15 @@
return
if(!reagent_volumes[reagent_ids[mode]])
user << "<span class='notice'>[src] is out of this reagent, give it some time to refill.</span>"
to_chat(user, "<span class='notice'>[src] is out of this reagent, give it some time to refill.</span>")
return
if(!target.reagents.get_free_space())
user << "<span class='notice'>[target] is full.</span>"
to_chat(user, "<span class='notice'>[target] is full.</span>")
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
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>")
return

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

@@ -258,7 +258,7 @@
/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/item/D, mob/user as mob)
if(isprox(D))
user << "You add [D] to [src]."
to_chat(user, "You add [D] to [src].")
qdel(D)
user.put_in_hands(new /obj/item/weapon/bucket_sensor)
user.drop_from_inventory(src)
@@ -314,7 +314,7 @@ obj/item/weapon/reagent_containers/glass/bucket/wood
/obj/item/weapon/reagent_containers/glass/bucket/wood/attackby(var/obj/D, mob/user as mob)
if(isprox(D))
user << "This wooden bucket doesn't play well with electronics."
to_chat(user, "This wooden bucket doesn't play well with electronics.")
return
else if(istype(D, /obj/item/weapon/material/knife/machete/hatchet))
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>")

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

@@ -103,7 +103,7 @@
loaded_vial.update_icon()
user.put_in_hands(loaded_vial)
loaded_vial = null
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>")
update_icon()
playsound(src.loc, 'sound/weapons/flipblade.ogg', 50, 1)
return
@@ -129,7 +129,7 @@
update_icon()
playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
else
user << "<span class='notice'>\The [src] already has a vial.</span>"
to_chat(user, "<span class='notice'>\The [src] already has a vial.</span>")
else
..()

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

@@ -35,7 +35,7 @@
return
if(reagents.total_volume < amount_per_transfer_from_this)
user << "<span class='notice'>\The [src] is empty!</span>"
to_chat(user, "<span class='notice'>\The [src] is empty!</span>")
return
Spray_at(A, user, proximity)
@@ -75,11 +75,11 @@
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)
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>")
/obj/item/weapon/reagent_containers/spray/examine(mob/user)
if(..(user, 0) && loc == user)
user << "[round(reagents.total_volume)] units left."
to_chat(user, "[round(reagents.total_volume)] units left.")
return
/obj/item/weapon/reagent_containers/spray/verb/empty()
@@ -91,7 +91,7 @@
if (alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", "Yes", "No") != "Yes")
return
if(isturf(usr.loc))
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>")
reagents.splash(usr.loc, reagents.total_volume)
//space cleaner
@@ -132,15 +132,15 @@
/obj/item/weapon/reagent_containers/spray/pepper/examine(mob/user)
if(..(user, 1))
user << "The safety is [safety ? "on" : "off"]."
to_chat(user, "The safety is [safety ? "on" : "off"].")
/obj/item/weapon/reagent_containers/spray/pepper/attack_self(var/mob/user)
safety = !safety
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>")
/obj/item/weapon/reagent_containers/spray/pepper/Spray_at(atom/A as mob|obj)
if(safety)
usr << "<span class = 'warning'>The safety is on!</span>"
to_chat(usr, "<span class = 'warning'>The safety is on!</span>")
return
. = ..()