cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 04:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50012 from kingofkosmos/time_tenses_to_present

Browse Source 
Verb time tenses to present tense
This commit is contained in:
Rohesie
2020-03-19 16:19:49 -03:00
committed by GitHub
parent 00df055345 23467e6cd7
commit d74c0bfba1
59 changed files with 116 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/airlock.dm
+4 -4
View File
@@ -953,25 +953,25 @@
if(user.a_intent != INTENT_HELP)
if(!W.tool_start_check(user, amount=0))
return
user.visible_message("<span class='notice'>[user] is [welded ? "unwelding":"welding"] the airlock.</span>", \
user.visible_message("<span class='notice'>[user] begins [welded ? "unwelding":"welding"] the airlock.</span>", \
"<span class='notice'>You begin [welded ? "unwelding":"welding"] the airlock...</span>", \
"<span class='hear'>You hear welding.</span>")
if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/weld_checks, W, user)))
welded = !welded
user.visible_message("<span class='notice'>[user.name] has [welded? "welded shut":"unwelded"] [src].</span>", \
user.visible_message("<span class='notice'>[user] [welded? "welds shut":"unwelds"] [src].</span>", \
"<span class='notice'>You [welded ? "weld the airlock shut":"unweld the airlock"].</span>")
update_icon()
else
if(obj_integrity < max_integrity)
if(!W.tool_start_check(user, amount=0))
return
user.visible_message("<span class='notice'>[user] is welding the airlock.</span>", \
user.visible_message("<span class='notice'>[user] begins welding the airlock.</span>", \
"<span class='notice'>You begin repairing the airlock...</span>", \
"<span class='hear'>You hear welding.</span>")
if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/weld_checks, W, user)))
obj_integrity = max_integrity
machine_stat &= ~BROKEN
user.visible_message("<span class='notice'>[user.name] has repaired [src].</span>", \
user.visible_message("<span class='notice'>[user] finishes welding [src].</span>", \
"<span class='notice'>You finish repairing the airlock.</span>")
update_icon()
else
code/game/machinery/firealarm.dm
+2 -2
View File
@@ -184,9 +184,9 @@
if(W.tool_behaviour == TOOL_MULTITOOL)
detecting = !detecting
if (src.detecting)
user.visible_message("<span class='notice'>[user] has reconnected [src]'s detecting unit!</span>", "<span class='notice'>You reconnect [src]'s detecting unit.</span>")
user.visible_message("<span class='notice'>[user] reconnects [src]'s detecting unit!</span>", "<span class='notice'>You reconnect [src]'s detecting unit.</span>")
else
user.visible_message("<span class='notice'>[user] has disconnected [src]'s detecting unit!</span>", "<span class='notice'>You disconnect [src]'s detecting unit.</span>")
user.visible_message("<span class='notice'>[user] disconnects [src]'s detecting unit!</span>", "<span class='notice'>You disconnect [src]'s detecting unit.</span>")
return
else if(W.tool_behaviour == TOOL_WIRECUTTER)
code/game/machinery/flasher.dm
+1 -1
View File
@@ -63,7 +63,7 @@
if (bulb)
user.visible_message("<span class='notice'>[user] begins to disconnect [src]'s flashbulb.</span>", "<span class='notice'>You begin to disconnect [src]'s flashbulb...</span>")
if(W.use_tool(src, user, 30, volume=50) && bulb)
user.visible_message("<span class='notice'>[user] has disconnected [src]'s flashbulb!</span>", "<span class='notice'>You disconnect [src]'s flashbulb.</span>")
user.visible_message("<span class='notice'>[user] disconnects [src]'s flashbulb!</span>", "<span class='notice'>You disconnect [src]'s flashbulb.</span>")
bulb.forceMove(loc)
bulb = null
power_change()
code/game/machinery/igniter.dm
+2 -2
View File
@@ -100,9 +100,9 @@
add_fingerprint(user)
src.disable = !src.disable
if (src.disable)
user.visible_message("<span class='notice'>[user] has disabled \the [src]!</span>", "<span class='notice'>You disable the connection to \the [src].</span>")
user.visible_message("<span class='notice'>[user] disables \the [src]!</span>", "<span class='notice'>You disable the connection to \the [src].</span>")
if (!src.disable)
user.visible_message("<span class='notice'>[user] has reconnected \the [src]!</span>", "<span class='notice'>You fix the connection to \the [src].</span>")
user.visible_message("<span class='notice'>[user] reconnects \the [src]!</span>", "<span class='notice'>You fix the connection to \the [src].</span>")
update_icon()
else
return ..()
code/game/mecha/equipment/tools/medical_tools.dm
+1 -1
View File
@@ -323,7 +323,7 @@
if(length(mobs))
var/mob/living/carbon/M = pick(mobs)
var/R
mechsyringe.visible_message("<span class=\"attack\"> [M] was hit by the syringe!</span>")
mechsyringe.visible_message("<span class=\"attack\"> [M] is hit by the syringe!</span>")
if(M.can_inject(null, 1))
if(mechsyringe.reagents)
for(var/datum/reagent/A in mechsyringe.reagents.reagent_list)
code/game/mecha/mecha_construction_paths.dm
+1 -1
View File
@@ -59,7 +59,7 @@
. = user.transferItemToLoc(I, parent)
if(.)
var/atom/parent_atom = parent
user.visible_message("<span class='notice'>[user] has connected [I] to [parent].</span>", "<span class='notice'>You connect [I] to [parent].</span>")
user.visible_message("<span class='notice'>[user] connects [I] to [parent].</span>", "<span class='notice'>You connect [I] to [parent].</span>")
parent_atom.add_overlay(I.icon_state+"+o")
qdel(I)
code/game/objects/effects/effect_system/effects_smoke.dm
+1 -1
View File
@@ -178,7 +178,7 @@
if(!isnull(U.welded) && !U.welded) //must be an unwelded vent pump or vent scrubber.
U.welded = TRUE
U.update_icon()
U.visible_message("<span class='danger'>[U] was frozen shut!</span>")
U.visible_message("<span class='danger'>[U] is frozen shut!</span>")
for(var/mob/living/L in T)
L.ExtinguishMob()
for(var/obj/item/Item in T)
code/game/objects/items.dm
+2 -2
View File
@@ -519,11 +519,11 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
user.do_attack_animation(M)
if(M != user)
M.visible_message("<span class='danger'>[user] has stabbed [M] in the eye with [src]!</span>", \
M.visible_message("<span class='danger'>[user] stabs [M] in the eye with [src]!</span>", \
"<span class='userdanger'>[user] stabs you in the eye with [src]!</span>")
else
user.visible_message( \
"<span class='danger'>[user] has stabbed [user.p_them()]self in the eyes with [src]!</span>", \
"<span class='danger'>[user] stabs [user.p_them()]self in the eyes with [src]!</span>", \
"<span class='userdanger'>You stab yourself in the eyes with [src]!</span>" \
)
if(is_human_victim)
code/game/objects/items/defib.dm
+2 -2
View File
@@ -463,8 +463,8 @@
if(!req_defib && !combat)
return
busy = TRUE
M.visible_message("<span class='danger'>[user] has touched [M] with [src]!</span>", \
"<span class='userdanger'>[user] has touched [M] with [src]!</span>")
M.visible_message("<span class='danger'>[user] touches [M] with [src]!</span>", \
"<span class='userdanger'>[user] touches [M] with [src]!</span>")
M.adjustStaminaLoss(60)
M.Knockdown(75)
M.Jitter(50)
code/game/objects/items/devices/PDA/PDA.dm
+2 -2
View File
@@ -924,12 +924,12 @@ GLOBAL_LIST_EMPTY(PDAs)
switch(scanmode)
if(PDA_SCANNER_MEDICAL)
C.visible_message("<span class='alert'>[user] has analyzed [C]'s vitals!</span>")
C.visible_message("<span class='notice'>[user] analyzes [C]'s vitals.</span>")
healthscan(user, C, 1)
add_fingerprint(user)
if(PDA_SCANNER_HALOGEN)
C.visible_message("<span class='warning'>[user] has analyzed [C]'s radiation levels!</span>")
C.visible_message("<span class='notice'>[user] analyzes [C]'s radiation levels.</span>")
user.show_message("<span class='notice'>Analyzing Results for [C]:</span>")
if(C.radiation)
code/game/objects/items/devices/lightreplacer.dm
+1 -1
View File
@@ -174,7 +174,7 @@
AddUses(new_bulbs)
bulb_shards = bulb_shards % shards_required
if(new_bulbs != 0)
to_chat(user, "<span class='notice'>\The [src] has fabricated a new bulb from the broken glass it has stored. It now has [uses] uses.</span>")
to_chat(user, "<span class='notice'>\The [src] fabricates a new bulb from the broken glass it has stored. It now has [uses] uses.</span>")
playsound(src.loc, 'sound/machines/ding.ogg', 50, TRUE)
return new_bulbs
code/game/objects/items/devices/scanners.dm
+2 -2
View File
@@ -535,7 +535,7 @@ GENE SCANNER
var/icon = target
var/render_list = list()
if(!silent && isliving(user))
user.visible_message("<span class='notice'>[user] has used the analyzer on [icon2html(icon, viewers(user))] [target].</span>", "<span class='notice'>You use the analyzer on [icon2html(icon, user)] [target].</span>")
user.visible_message("<span class='notice'>[user] uses the analyzer on [icon2html(icon, viewers(user))] [target].</span>", "<span class='notice'>You use the analyzer on [icon2html(icon, user)] [target].</span>")
render_list += "<span class='boldnotice'>Results of analysis of [icon2html(icon, user)] [target].</span>"
var/list/airs = islist(mixture) ? mixture : list(mixture)
@@ -684,7 +684,7 @@ GENE SCANNER
gene_scan(M, user)
else
user.visible_message("<span class='notice'>[user] failed to analyse [M]'s genetic sequence.</span>", "<span class='warning'>[M] has no readable genetic sequence!</span>")
user.visible_message("<span class='notice'>[user] fails to analyze [M]'s genetic sequence.</span>", "<span class='warning'>[M] has no readable genetic sequence!</span>")
/obj/item/sequence_scanner/attack_self(mob/user)
display_sequence(user)
code/game/objects/items/dice.dm
+1 -1
View File
@@ -208,7 +208,7 @@ obj/item/dice/d6/ebony
if(special_faces.len == sides)
result = special_faces[result]
if(user != null) //Dice was rolled in someone's hand
user.visible_message("<span class='notice'>[user] has thrown [src]. It lands on [result]. [comment]</span>", \
user.visible_message("<span class='notice'>[user] throws [src]. It lands on [result]. [comment]</span>", \
"<span class='notice'>You throw [src]. It lands on [result]. [comment]</span>", \
"<span class='hear'>You hear [src] rolling, it sounds like a [fake_result].</span>")
else if(!src.throwing) //Dice was thrown and is coming to rest
code/game/objects/items/implants/implantchair.dm
+2 -2
View File
@@ -90,12 +90,12 @@
if(istype(I, /obj/item/implant))
var/obj/item/implant/P = I
if(P.implant(M))
visible_message("<span class='warning'>[M] has been implanted by [src].</span>")
visible_message("<span class='warning'>[M] is implanted by [src].</span>")
return TRUE
else if(istype(I, /obj/item/organ))
var/obj/item/organ/P = I
P.Insert(M, FALSE, FALSE)
visible_message("<span class='warning'>[M] has been implanted by [src].</span>")
visible_message("<span class='warning'>[M] is implanted by [src].</span>")
return TRUE
/obj/machinery/implantchair/update_icon_state()
code/game/objects/items/implants/implanter.dm
+1 -1
View File
@@ -35,7 +35,7 @@
if (M == user)
to_chat(user, "<span class='notice'>You implant yourself.</span>")
else
M.visible_message("<span class='notice'>[user] has implanted [M].</span>", "<span class='notice'>[user] implants you.</span>")
M.visible_message("<span class='notice'>[user] implants [M].</span>", "<span class='notice'>[user] implants you.</span>")
imp = null
update_icon()
else
code/game/objects/items/robot/robot_items.dm
+2 -2
View File
@@ -25,8 +25,8 @@
M.Paralyze(100)
M.apply_effect(EFFECT_STUTTER, 5)
M.visible_message("<span class='danger'>[user] has prodded [M] with [src]!</span>", \
"<span class='userdanger'>[user] has prodded you with [src]!</span>")
M.visible_message("<span class='danger'>[user] prods [M] with [src]!</span>", \
"<span class='userdanger'>[user] prods you with [src]!</span>")
playsound(loc, 'sound/weapons/egloves.ogg', 50, TRUE, -1)
code/game/objects/items/singularityhammer.dm
+1 -1
View File
@@ -120,7 +120,7 @@
var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread
s.set_up(5, 1, target.loc)
s.start()
target.visible_message("<span class='danger'>[target.name] was shocked by [src]!</span>", \
target.visible_message("<span class='danger'>[target.name] is shocked by [src]!</span>", \
"<span class='userdanger'>You feel a powerful shock course through your body sending you flying!</span>", \
"<span class='hear'>You hear a heavy electrical crack!</span>")
var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
code/game/objects/items/storage/book.dm
+3 -3
View File
@@ -207,7 +207,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
SS.release_shades(user)
qdel(SS)
new /obj/item/nullrod/claymore(get_turf(sword))
user.visible_message("<span class='notice'>[user] has purified [sword]!</span>")
user.visible_message("<span class='notice'>[user] purifies [sword]!</span>")
qdel(sword)
else if(istype(A, /obj/item/soulstone) && !iscultist(user))
var/obj/item/soulstone/SS = A
@@ -228,7 +228,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
for(var/mob/living/simple_animal/shade/EX in SS)
EX.icon_state = "ghost1"
EX.name = "Purified [initial(EX.name)]"
user.visible_message("<span class='notice'>[user] has purified [SS]!</span>")
user.visible_message("<span class='notice'>[user] purifies [SS]!</span>")
else if(istype(A, /obj/item/nullrod/scythe/talking))
var/obj/item/nullrod/scythe/talking/sword = A
to_chat(user, "<span class='notice'>You begin to exorcise [sword]...</span>")
@@ -241,7 +241,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning",
sword.possessed = FALSE //allows the chaplain (or someone else) to reroll a new spirit for their sword
sword.name = initial(sword.name)
REMOVE_TRAIT(sword, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT) //in case the "sword" is a possessed dummy
user.visible_message("<span class='notice'>[user] has exorcised [sword]!</span>", \
user.visible_message("<span class='notice'>[user] exorcises [sword]!</span>", \
"<span class='notice'>You successfully exorcise [sword]!</span>")
/obj/item/storage/book/bible/booze
code/game/objects/items/storage/lockbox.dm
+1 -1
View File
@@ -54,7 +54,7 @@
desc += "It appears to be broken."
icon_state = src.icon_broken
if(user)
visible_message("<span class='warning'>\The [src] has been broken by [user] with an electromagnetic card!</span>")
visible_message("<span class='warning'>\The [src] is broken by [user] with an electromagnetic card!</span>")
return
/obj/item/storage/lockbox/Entered()
code/game/objects/items/stunbaton.dm
+4 -4
View File
@@ -198,8 +198,8 @@
else
to_chat(user, "<span class='danger'>The baton is still charging!</span>")
else
M.visible_message("<span class='warning'>[user] has prodded [M] with [src]. Luckily it was off.</span>", \
"<span class='warning'>[user] has prodded you with [src]. Luckily it was off</span>")
M.visible_message("<span class='warning'>[user] prods [M] with [src]. Luckily it was off.</span>", \
"<span class='warning'>[user] prods you with [src]. Luckily it was off.</span>")
else
if(turned_on)
if(attack_cooldown_check <= world.time)
@@ -233,8 +233,8 @@
if(user)
L.lastattacker = user.real_name
L.lastattackerckey = user.ckey
L.visible_message("<span class='danger'>[user] has stunned [L] with [src]!</span>", \
"<span class='userdanger'>[user] has stunned you with [src]!</span>")
L.visible_message("<span class='danger'>[user] stuns [L] with [src]!</span>", \
"<span class='userdanger'>[user] stuns you with [src]!</span>")
log_combat(user, L, "stunned")
playsound(src, stun_sound, 50, TRUE, -1)
code/game/objects/structures.dm
+1 -1
View File
@@ -36,7 +36,7 @@
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
structureclimber.Paralyze(40)
structureclimber.visible_message("<span class='warning'>[structureclimber] has been knocked off [src].", "You're knocked off [src]!", "You see [structureclimber] get knocked off [src].</span>")
structureclimber.visible_message("<span class='warning'>[structureclimber] is knocked off [src].</span>", "<span class='warning'>You're knocked off [src]!</span>", "<span class='warning'>You see [structureclimber] get knocked off [src].</span>")
/obj/structure/ui_act(action, params)
. = ..()
code/game/objects/structures/reflector.dm
+1 -1
View File
@@ -105,7 +105,7 @@
"<span class='hear'>You hear welding.</span>")
if(W.use_tool(src, user, 40, volume=40))
obj_integrity = max_integrity
user.visible_message("<span class='notice'>[user] has repaired [src].</span>", \
user.visible_message("<span class='notice'>[user] repairs [src].</span>", \
"<span class='notice'>You finish repairing [src].</span>")
else if(!anchored)
code/game/objects/structures/tables_racks.dm
+1 -1
View File
@@ -512,7 +512,7 @@
/obj/structure/table/optable/tablepush(mob/living/user, mob/living/pushed_mob)
pushed_mob.forceMove(loc)
pushed_mob.set_resting(TRUE, TRUE)
visible_message("<span class='notice'>[user] has laid [pushed_mob] on [src].</span>")
visible_message("<span class='notice'>[user] lays [pushed_mob] on [src].</span>")
check_patient()
/obj/structure/table/optable/proc/check_patient()
code/game/turfs/closed/minerals.dm
+2 -2
View File
@@ -452,7 +452,7 @@
name = "gibtonite deposit"
desc = "An active gibtonite reserve. Run!"
stage = GIBTONITE_ACTIVE
visible_message("<span class='danger'>There was gibtonite inside! It's going to explode!</span>")
visible_message("<span class='danger'>There's gibtonite inside! It's going to explode!</span>")
var/notify_admins = 0
if(z != 5)
@@ -486,7 +486,7 @@
stage = GIBTONITE_STABLE
if(det_time < 0)
det_time = 0
visible_message("<span class='notice'>The chain reaction was stopped! The gibtonite had [det_time] reactions left till the explosion!</span>")
visible_message("<span class='notice'>The chain reaction stopped! The gibtonite had [det_time] reactions left till the explosion!</span>")
/turf/closed/mineral/gibtonite/gets_drilled(mob/user, triggered_by_explosion = 0)
if(stage == GIBTONITE_UNSTRUCK && mineralAmt >= 1) //Gibtonite deposit is activated
code/modules/antagonists/abductor/equipment/abduction_gear.dm
+1 -1
View File
@@ -568,7 +568,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
"<span class='userdanger'>You feel a strange wave of heavy drowsiness wash over you, but your tinfoil protection deflects most of it!</span>")
L.drowsyness += 2
return
L.visible_message("<span class='danger'>[user] has induced sleep in [L] with [src]!</span>", \
L.visible_message("<span class='danger'>[user] induces sleep in [L] with [src]!</span>", \
"<span class='userdanger'>You suddenly feel very drowsy!</span>")
L.Sleeping(sleep_time)
log_combat(user, L, "put to sleep")
code/modules/antagonists/cult/blood_magic.dm
+2 -2
View File
@@ -601,7 +601,7 @@
if(QDELETED(candidate))
channeling = FALSE
return
user.visible_message("<span class='danger'>The dark cloud receedes from what was formerly [candidate], revealing a\n [construct_class]!</span>")
user.visible_message("<span class='danger'>The dark cloud recedes from what was formerly [candidate], revealing a\n [construct_class]!</span>")
switch(construct_class)
if("Juggernaut")
makeNewConstruct(/mob/living/simple_animal/hostile/construct/armored, candidate, user, 0, T)
@@ -734,7 +734,7 @@
uses += 50
user.Beam(H,icon_state="drainbeam",time=10)
playsound(get_turf(H), 'sound/magic/enter_blood.ogg', 50)
H.visible_message("<span class='danger'>[user] has drained some of [H]'s blood!</span>")
H.visible_message("<span class='danger'>[user] drains some of [H]'s blood!</span>")
to_chat(user,"<span class='cultitalic'>Your blood rite gains 50 charges from draining [H]'s blood.</span>")
new /obj/effect/temp_visual/cult/sparks(get_turf(H))
else
code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
+1 -1
View File
@@ -697,7 +697,7 @@ This is here to make the tiles around the station mininuke change when it's arme
/obj/item/disk/nuclear/proc/manual_suicide(mob/living/user)
user.remove_atom_colour(ADMIN_COLOUR_PRIORITY)
user.visible_message("<span class='suicide'>[user] was destroyed by the nuclear blast!</span>")
user.visible_message("<span class='suicide'>[user] is destroyed by the nuclear blast!</span>")
user.adjustOxyLoss(200)
user.death(0)
code/modules/detectivework/footprints_and_rag.dm
+2 -2
View File
@@ -30,12 +30,12 @@
var/log_object = "containing [reagentlist]"
if(user.a_intent == INTENT_HARM && !C.is_mouth_covered())
reagents.trans_to(C, reagents.total_volume, transfered_by = user, method = INGEST)
C.visible_message("<span class='danger'>[user] has smothered \the [C] with \the [src]!</span>", "<span class='userdanger'>[user] has smothered you with \the [src]!</span>", "<span class='hear'>You hear some struggling and muffled cries of surprise.</span>")
C.visible_message("<span class='danger'>[user] smothers \the [C] with \the [src]!</span>", "<span class='userdanger'>[user] smothers you with \the [src]!</span>", "<span class='hear'>You hear some struggling and muffled cries of surprise.</span>")
log_combat(user, C, "smothered", src, log_object)
else
reagents.reaction(C, TOUCH)
reagents.clear_reagents()
C.visible_message("<span class='notice'>[user] has touched \the [C] with \the [src].</span>")
C.visible_message("<span class='notice'>[user] touches \the [C] with \the [src].</span>")
log_combat(user, C, "touched", src, log_object)
else if(istype(A) && (src in user))
code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+3 -3
View File
@@ -139,7 +139,7 @@
if(clean_spray.reagents.has_reagent(/datum/reagent/space_cleaner, clean_spray.amount_per_transfer_from_this))
clean_spray.reagents.remove_reagent(/datum/reagent/space_cleaner, clean_spray.amount_per_transfer_from_this,1)
playsound(loc, 'sound/effects/spray3.ogg', 50, TRUE, -6)
user.visible_message("<span class='notice'>[user] has cleaned \the [src].</span>", "<span class='notice'>You clean \the [src].</span>")
user.visible_message("<span class='notice'>[user] cleans \the [src].</span>", "<span class='notice'>You clean \the [src].</span>")
dirty = 0
update_icon()
else
@@ -150,7 +150,7 @@
var/obj/item/soap/P = O
user.visible_message("<span class='notice'>[user] starts to clean \the [src].</span>", "<span class='notice'>You start to clean \the [src]...</span>")
if(do_after(user, P.cleanspeed, target = src))
user.visible_message("<span class='notice'>[user] has cleaned \the [src].</span>", "<span class='notice'>You clean \the [src].</span>")
user.visible_message("<span class='notice'>[user] cleans \the [src].</span>", "<span class='notice'>You clean \the [src].</span>")
dirty = 0
update_icon()
return TRUE
@@ -182,7 +182,7 @@
return FALSE
ingredients += O
user.visible_message("<span class='notice'>[user] has added \a [O] to \the [src].</span>", "<span class='notice'>You add [O] to \the [src].</span>")
user.visible_message("<span class='notice'>[user] adds \a [O] to \the [src].</span>", "<span class='notice'>You add [O] to \the [src].</span>")
return
..()
code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+1 -1
View File
@@ -91,7 +91,7 @@
if(accept_check(O))
load(O)
user.visible_message("<span class='notice'>[user] has added \the [O] to \the [src].</span>", "<span class='notice'>You add \the [O] to \the [src].</span>")
user.visible_message("<span class='notice'>[user] adds \the [O] to \the [src].</span>", "<span class='notice'>You add \the [O] to \the [src].</span>")
updateUsrDialog()
if (visible_contents)
update_icon()
code/modules/hydroponics/grown.dm
+1 -1
View File
@@ -114,7 +114,7 @@
if(trash)
generate_trash(T)
visible_message("<span class='warning'>[src] has been squashed.</span>","<span class='hear'>You hear a smack.</span>")
visible_message("<span class='warning'>[src] is squashed.</span>","<span class='hear'>You hear a smack.</span>")
if(seed)
for(var/datum/plant_gene/trait/trait in seed.genes)
trait.on_squash(src, target)
code/modules/mining/ores_coins.dm
+2 -2
View File
@@ -263,7 +263,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
primed = FALSE
if(det_timer)
deltimer(det_timer)
user.visible_message("<span class='notice'>The chain reaction was stopped! ...The ore's quality looks diminished.</span>", "<span class='notice'>You stopped the chain reaction. ...The ore's quality looks diminished.</span>")
user.visible_message("<span class='notice'>The chain reaction stopped! ...The ore's quality looks diminished.</span>", "<span class='notice'>You stopped the chain reaction. ...The ore's quality looks diminished.</span>")
icon_state = "Gibtonite ore"
quality = GIBTONITE_QUALITY_LOW
return
@@ -430,7 +430,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
var/oldloc = loc
sleep(15)
if(loc == oldloc && user && !user.incapacitated())
user.visible_message("<span class='notice'>[user] has flipped [src]. It lands on [coinflip].</span>", \
user.visible_message("<span class='notice'>[user] flips [src]. It lands on [coinflip].</span>", \
"<span class='notice'>You flip [src]. It lands on [coinflip].</span>", \
"<span class='hear'>You hear the clattering of loose change.</span>")
return TRUE//did the coin flip? useful for suicide_act
code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+1 -1
View File
@@ -78,7 +78,7 @@ Doesn't work on other aliens/AI.*/
if(locate(/obj/structure/alien/weeds/node) in get_turf(user))
to_chat(user, "<span class='warning'>There's already a weed node here!</span>")
return 0
user.visible_message("<span class='alertalien'>[user] has planted some alien weeds!</span>")
user.visible_message("<span class='alertalien'>[user] plants some alien weeds!</span>")
new/obj/structure/alien/weeds/node(user.loc)
return 1
code/modules/mob/living/carbon/alien/humanoid/queen.dm
+1 -1
View File
@@ -65,7 +65,7 @@
to_chat(user, "<span class='alertalien'>There's already an egg here.</span>")
return FALSE
user.visible_message("<span class='alertalien'>[user] has laid an egg!</span>")
user.visible_message("<span class='alertalien'>[user] lays an egg!</span>")
new /obj/structure/alien/egg(user.loc)
return TRUE
code/modules/mob/living/carbon/carbon.dm
+1 -1
View File
@@ -262,7 +262,7 @@
"<span class='notice'>You stop, drop, and roll!</span>")
sleep(30)
if(fire_stacks <= 0)
visible_message("<span class='danger'>[src] has successfully extinguished [p_them()]self!</span>", \
visible_message("<span class='danger'>[src] successfully extinguishes [p_them()]self!</span>", \
"<span class='notice'>You extinguish yourself.</span>")
ExtinguishMob()
return
code/modules/mob/living/carbon/carbon_defense.dm
+2 -2
View File
@@ -164,8 +164,8 @@
if(M.powerlevel < 0)
M.powerlevel = 0
visible_message("<span class='danger'>The [M.name] has shocked [src]!</span>", \
"<span class='userdanger'>The [M.name] has shocked you!</span>")
visible_message("<span class='danger'>The [M.name] shocks [src]!</span>", \
"<span class='userdanger'>The [M.name] shocks you!</span>")
do_sparks(5, TRUE, src)
var/power = M.powerlevel + rand(0,3)
code/modules/mob/living/living.dm
+2 -2
View File
@@ -259,8 +259,8 @@
if(AM.pulledby)
if(!supress_message)
AM.visible_message("<span class='danger'>[src] has pulled [AM] from [AM.pulledby]'s grip.</span>", \
"<span class='danger'>[src] has pulled you from [AM.pulledby]'s grip.</span>", null, null, src)
AM.visible_message("<span class='danger'>[src] pulls [AM] from [AM.pulledby]'s grip.</span>", \
"<span class='danger'>[src] pulls you from [AM.pulledby]'s grip.</span>", null, null, src)
to_chat(src, "<span class='notice'>You pull [AM] from [AM.pulledby]'s grip!</span>")
log_combat(AM, AM.pulledby, "pulled from", src)
AM.pulledby.stop_pulling() //an object can't be pulled by two mobs at once.
code/modules/mob/living/silicon/robot/robot_defense.dm
+4 -4
View File
@@ -28,7 +28,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
adjustBruteLoss(-30)
updatehealth()
add_fingerprint(user)
visible_message("<span class='notice'>[user] has fixed some of the dents on [src].</span>")
visible_message("<span class='notice'>[user] fixes some of the dents on [src].</span>")
return
if(istype(W, /obj/item/stack/cable_coil) && wiresexposed)
@@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
adjustFireLoss(-30)
adjustToxLoss(-30)
updatehealth()
user.visible_message("<span class='notice'>[user] has fixed some of the burnt wires on [src].</span>", "<span class='notice'>You fix some of the burnt wires on [src].</span>")
user.visible_message("<span class='notice'>[user] fixes some of the burnt wires on [src].</span>", "<span class='notice'>You fix some of the burnt wires on [src].</span>")
else
to_chat(user, "<span class='warning'>You need more cable to repair [src]!</span>")
else
@@ -254,8 +254,8 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
Stun(40)
step(src,get_dir(M,src))
log_combat(M, src, "pushed")
visible_message("<span class='danger'>[M] has forced back [src]!</span>", \
"<span class='userdanger'>[M] has forced back [src]!</span>", null, COMBAT_MESSAGE_RANGE)
visible_message("<span class='danger'>[M] forces back [src]!</span>", \
"<span class='userdanger'>[M] forces back [src]!</span>", null, COMBAT_MESSAGE_RANGE)
playsound(loc, 'sound/weapons/pierce.ogg', 50, TRUE, -1)
else
..()
code/modules/mob/living/simple_animal/bot/honkbot.dm
+2 -2
View File
@@ -210,8 +210,8 @@ Maintenance panel panel is [open ? "opened" : "closed"]"},
log_combat(src,C,"honked")
C.visible_message("<span class='danger'>[src] has honked [C]!</span>",\
"<span class='userdanger'>[src] has honked you!</span>")
C.visible_message("<span class='danger'>[src] honks [C]!</span>",\
"<span class='userdanger'>[src] honks you!</span>")
else
C.stuttering = 20
C.Paralyze(80)
code/modules/mob/living/simple_animal/bot/secbot.dm
+2 -2
View File
@@ -293,8 +293,8 @@ Auto Patrol: []"},
if(declare_arrests)
var/area/location = get_area(src)
speak("[arrest_type ? "Detaining" : "Arresting"] level [threat] scumbag <b>[C]</b> in [location].", radio_channel)
C.visible_message("<span class='danger'>[src] has stunned [C]!</span>",\
"<span class='userdanger'>[src] has stunned you!</span>")
C.visible_message("<span class='danger'>[src] stuns [C]!</span>",\
"<span class='userdanger'>[src] stuns you!</span>")
/mob/living/simple_animal/bot/secbot/handle_automated_action()
if(!..())
code/modules/mob/living/simple_animal/hostile/alien.dm
+2 -2
View File
@@ -115,7 +115,7 @@
return
if(locate(/obj/structure/alien/weeds/node) in get_turf(src))
return
visible_message("<span class='alertalien'>[src] has planted some alien weeds!</span>")
visible_message("<span class='alertalien'>[src] plants some alien weeds!</span>")
new /obj/structure/alien/weeds/node(loc)
/mob/living/simple_animal/hostile/alien/proc/LayEggs()
@@ -123,7 +123,7 @@
return
if(locate(/obj/structure/alien/egg) in get_turf(src))
return
visible_message("<span class='alertalien'>[src] has laid an egg!</span>")
visible_message("<span class='alertalien'>[src] lays an egg!</span>")
new /obj/structure/alien/egg(loc)
/mob/living/simple_animal/hostile/alien/queen/large
code/modules/mob/living/simple_animal/hostile/cockroach.dm
+1 -1
View File
@@ -78,7 +78,7 @@
else
if(isstructure(AM))
if(prob(squish_chance))
AM.visible_message("<span class='notice'>[src] was crushed under [AM].</span>")
AM.visible_message("<span class='notice'>[src] is crushed under [AM].</span>")
adjustBruteLoss(1)
else
visible_message("<span class='notice'>[src] avoids getting crushed.</span>")
code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
+12 -12
View File
@@ -48,24 +48,24 @@
burrow = new
spit.Grant(src)
burrow.Grant(src)
/datum/action/innate/goldgrub
background_icon_state = "bg_default"
/datum/action/innate/goldgrub/spitore
name = "Spit Ore"
desc = "Vomit out all of your consumed ores."
/datum/action/innate/goldgrub/spitore/Activate()
var/mob/living/simple_animal/hostile/asteroid/goldgrub/G = owner
if(G.stat == DEAD || G.is_burrowed)
return
G.barf_contents()
/datum/action/innate/goldgrub/burrow
name = "Burrow"
desc = "Burrow under soft ground, evading predators and increasing your speed."
/obj/effect/dummy/phased_mob/goldgrub
name = "water"
icon = 'icons/effects/effects.dmi'
@@ -75,7 +75,7 @@
invisibility = 60
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/canmove = TRUE
/obj/effect/dummy/phased_mob/goldgrub/relaymove(mob/user, direction)
forceMove(get_step(src,direction))
@@ -87,7 +87,7 @@
/obj/effect/dummy/phased_mob/goldgrub/singularity_act()
return
/datum/action/innate/goldgrub/burrow/Activate()
var/mob/living/simple_animal/hostile/asteroid/goldgrub/G = owner
var/obj/effect/dummy/phased_mob/goldgrub/holder = null
@@ -113,7 +113,7 @@
holder = new /obj/effect/dummy/phased_mob/goldgrub(T)
G.forceMove(holder)
G.is_burrowed = TRUE
/mob/living/simple_animal/hostile/asteroid/goldgrub/GiveTarget(new_target)
target = new_target
if(target != null)
@@ -132,7 +132,7 @@
EatOre(target)
return
return ..()
/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/EatOre(atom/movable/targeted_ore)
if(targeted_ore && targeted_ore.loc != src)
targeted_ore.forceMove(src)
@@ -142,20 +142,20 @@
/mob/living/simple_animal/hostile/asteroid/goldgrub/death(gibbed)
barf_contents()
return ..()
/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/barf_contents()
visible_message("<span class='danger'>[src] spits out its consumed ores!</span>")
playsound(src, 'sound/effects/splat.ogg', 50, TRUE)
for(var/atom/movable/AM in src)
AM.forceMove(loc)
/mob/living/simple_animal/hostile/asteroid/goldgrub/proc/Burrow()//Begin the chase to kill the goldgrub in time
if(!stat)
visible_message("<span class='danger'>The [name] buries into the ground, vanishing from sight!</span>")
qdel(src)
/mob/living/simple_animal/hostile/asteroid/goldgrub/bullet_act(obj/projectile/P)
visible_message("<span class='danger'>The [P.name] was repelled by [name]'s girth!</span>")
visible_message("<span class='danger'>The [P.name] is repelled by [name]'s girth!</span>")
return BULLET_ACT_BLOCK
/mob/living/simple_animal/hostile/asteroid/goldgrub/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
code/modules/mob/living/simple_animal/hostile/mushroom.dm
+1 -1
View File
@@ -154,7 +154,7 @@
/mob/living/simple_animal/hostile/mushroom/proc/Bruise()
if(!bruised && !stat)
src.visible_message("<span class='notice'>The [src.name] was bruised!</span>")
src.visible_message("<span class='notice'>The [src.name] is bruised!</span>")
bruised = 1
/mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I, mob/user, params)
code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
+1 -1
View File
@@ -26,7 +26,7 @@
addtimer(CALLBACK(src, .proc/bear_fruit), growth_time)
/obj/structure/alien/resin/flower_bud_enemy/proc/bear_fruit()
visible_message("<span class='danger'>the plant has borne fruit!</span>")
visible_message("<span class='danger'>The plant has borne fruit!</span>")
new /mob/living/simple_animal/hostile/venus_human_trap(get_turf(src))
qdel(src)
code/modules/mob/living/simple_animal/slime/powers.dm
+3 -3
View File
@@ -105,8 +105,8 @@
M.unbuckle_all_mobs(force=1) //Slimes rip other mobs (eg: shoulder parrots) off (Slimes Vs Slimes is already handled in CanFeedon())
if(M.buckle_mob(src, force=TRUE))
layer = M.layer+0.01 //appear above the target mob
M.visible_message("<span class='danger'>[name] has latched onto [M]!</span>", \
"<span class='userdanger'>[name] has latched onto [M]!</span>")
M.visible_message("<span class='danger'>[name] latches onto [M]!</span>", \
"<span class='userdanger'>[name] latches onto [M]!</span>")
else
to_chat(src, "<span class='warning'><i>I have failed to latch onto the subject!</i></span>")
@@ -118,7 +118,7 @@
"I am not satisified", "I can not feed from this subject", \
"I do not feel nourished", "This subject is not food")]!</span>")
if(!silent)
visible_message("<span class='warning'>[src] has let go of [buckled]!</span>", \
visible_message("<span class='warning'>[src] lets go of [buckled]!</span>", \
"<span class='notice'><i>I stopped feeding.</i></span>")
layer = initial(layer)
buckled.unbuckle_mob(src,force=TRUE)
code/modules/mob/mob_helpers.dm
+1 -1
View File
@@ -414,7 +414,7 @@
if((brute_heal > 0 && affecting.brute_dam > 0) || (burn_heal > 0 && affecting.burn_dam > 0))
if(affecting.heal_damage(brute_heal, burn_heal, 0, BODYPART_ROBOTIC))
H.update_damage_overlays()
user.visible_message("<span class='notice'>[user] has fixed some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.name].</span>", \
user.visible_message("<span class='notice'>[user] fixes some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.name].</span>", \
"<span class='notice'>You fix some of the [dam ? "dents on" : "burnt wires in"] [H == user ? "your" : "[H]'s"] [affecting.name].</span>")
return 1 //successful heal
else
code/modules/modular_computers/computers/item/computer.dm
+1 -1
View File
@@ -413,7 +413,7 @@
to_chat(user, "<span class='warning'>Remove all components from \the [src] before disassembling it.</span>")
return
new /obj/item/stack/sheet/metal( get_turf(src.loc), steel_sheet_cost )
physical.visible_message("<span class='notice'>\The [src] has been disassembled by [user].</span>")
physical.visible_message("<span class='notice'>\The [src] is disassembled by [user].</span>")
relay_qdel()
qdel(src)
return
code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
+1 -1
View File
@@ -34,7 +34,7 @@ It is possible to destroy the net by the occupant or someone else.
/obj/structure/energy_net/Destroy()
if(!success)
if(!QDELETED(affecting))
affecting.visible_message("<span class='notice'>[affecting.name] was recovered from the energy net!</span>", "<span class='notice'>You were recovered from the energy net!</span>", "<span class='hear'>You hear a grunt.</span>")
affecting.visible_message("<span class='notice'>[affecting.name] is recovered from the energy net!</span>", "<span class='notice'>You are recovered from the energy net!</span>", "<span class='hear'>You hear a grunt.</span>")
if(!QDELETED(master))//As long as they still exist.
to_chat(master, "<span class='userdanger'>ERROR</span>: unable to initiate transport protocol. Procedure terminated.")
return ..()
code/modules/power/apc.dm
+7 -7
View File
@@ -436,23 +436,23 @@
if (has_electronics == APC_ELECTRONICS_INSTALLED)
has_electronics = APC_ELECTRONICS_MISSING
if (machine_stat & BROKEN)
user.visible_message("<span class='notice'>[user.name] has broken the power control board inside [src.name]!</span>",\
user.visible_message("<span class='notice'>[user.name] breaks the power control board inside [src.name]!</span>",\
"<span class='notice'>You break the charred power control board and remove the remains.</span>",
"<span class='hear'>You hear a crack.</span>")
return
else if (obj_flags & EMAGGED)
obj_flags &= ~EMAGGED
user.visible_message("<span class='notice'>[user.name] has discarded an emagged power control board from [src.name]!</span>",\
user.visible_message("<span class='notice'>[user.name] discards an emagged power control board from [src.name]!</span>",\
"<span class='notice'>You discard the emagged power control board.</span>")
return
else if (malfhack)
user.visible_message("<span class='notice'>[user.name] has discarded a strangely programmed power control board from [src.name]!</span>",\
user.visible_message("<span class='notice'>[user.name] discards a strangely programmed power control board from [src.name]!</span>",\
"<span class='notice'>You discard the strangely programmed board.</span>")
malfai = null
malfhack = 0
return
else
user.visible_message("<span class='notice'>[user.name] has removed the power control board from [src.name]!</span>",\
user.visible_message("<span class='notice'>[user.name] removes the power control board from [src.name]!</span>",\
"<span class='notice'>You remove the power control board.</span>")
new /obj/item/electronics/apc(loc)
return
@@ -529,11 +529,11 @@
if(W.use_tool(src, user, 50, volume=50, amount=3))
if ((machine_stat & BROKEN) || opened==APC_COVER_REMOVED)
new /obj/item/stack/sheet/metal(loc)
user.visible_message("<span class='notice'>[user.name] has cut [src] apart with [W].</span>",\
user.visible_message("<span class='notice'>[user.name] cuts [src] apart with [W].</span>",\
"<span class='notice'>You disassembled the broken APC frame.</span>")
else
new /obj/item/wallframe/apc(loc)
user.visible_message("<span class='notice'>[user.name] has cut [src] from the wall with [W].</span>",\
user.visible_message("<span class='notice'>[user.name] cuts [src] from the wall with [W].</span>",\
"<span class='notice'>You cut the APC frame from the wall.</span>")
qdel(src)
return TRUE
@@ -554,7 +554,7 @@
if(!user.transferItemToLoc(W, src))
return
cell = W
user.visible_message("<span class='notice'>[user.name] has inserted the power cell to [src.name]!</span>",\
user.visible_message("<span class='notice'>[user.name] inserts the power cell to [src.name]!</span>",\
"<span class='notice'>You insert the power cell.</span>")
chargecount = 0
update_icon()
code/modules/power/singularity/containment_field.dm
+1 -1
View File
@@ -123,7 +123,7 @@
if(prob(20))
user.Stun(40)
user.take_overall_damage(0, shock_damage)
user.visible_message("<span class='danger'>[user.name] was shocked by the [src.name]!</span>", \
user.visible_message("<span class='danger'>[user.name] is shocked by the [src.name]!</span>", \
"<span class='userdanger'>Energy pulse detected, system damaged!</span>", \
"<span class='hear'>You hear an electrical crack.</span>")
code/modules/power/smes.dm
+1 -1
View File
@@ -140,7 +140,7 @@
return
if(!terminal)
C.use(10)
user.visible_message("<span class='notice'>[user.name] has built a power terminal.</span>",\
user.visible_message("<span class='notice'>[user.name] builds a power terminal.</span>",\
"<span class='notice'>You build the power terminal.</span>")
//build the terminal and link it to the network
code/modules/projectiles/gun.dm
+6 -6
View File
@@ -432,8 +432,8 @@
if(I.use_tool(src, user, FIRING_PIN_REMOVAL_DELAY, volume = 50))
if(!pin) //check to see if the pin is still there, or we can spam messages by clicking multiple times during the tool delay
return
user.visible_message("<span class='notice'>[pin] was pried out of [src] by [user], destroying the pin in the process.</span>",
"<span class='warning'>You pried [pin] out with [I], destroying the pin in the process.</span>", null, 3)
user.visible_message("<span class='notice'>[pin] is pried out of [src] by [user], destroying the pin in the process.</span>",
"<span class='warning'>You pry [pin] out with [I], destroying the pin in the process.</span>", null, 3)
QDEL_NULL(pin)
return TRUE
@@ -450,8 +450,8 @@
if(I.use_tool(src, user, FIRING_PIN_REMOVAL_DELAY, 5, volume = 50))
if(!pin) //check to see if the pin is still there, or we can spam messages by clicking multiple times during the tool delay
return
user.visible_message("<span class='notice'>[pin] was spliced out of [src] by [user], melting part of the pin in the process.</span>",
"<span class='warning'>You spliced [pin] out of [src] with [I], melting part of the pin in the process.</span>", null, 3)
user.visible_message("<span class='notice'>[pin] is spliced out of [src] by [user], melting part of the pin in the process.</span>",
"<span class='warning'>You splice [pin] out of [src] with [I], melting part of the pin in the process.</span>", null, 3)
QDEL_NULL(pin)
return TRUE
@@ -467,8 +467,8 @@
if(I.use_tool(src, user, FIRING_PIN_REMOVAL_DELAY, volume = 50))
if(!pin) //check to see if the pin is still there, or we can spam messages by clicking multiple times during the tool delay
return
user.visible_message("<span class='notice'>[pin] was ripped out of [src] by [user], mangling the pin in the process.</span>",
"<span class='warning'>You ripped [pin] out of [src] with [I], mangling the pin in the process.</span>", null, 3)
user.visible_message("<span class='notice'>[pin] is ripped out of [src] by [user], mangling the pin in the process.</span>",
"<span class='warning'>You rip [pin] out of [src] with [I], mangling the pin in the process.</span>", null, 3)
QDEL_NULL(pin)
return TRUE
code/modules/projectiles/projectile/bullets/dart_syringe.dm
+2 -2
View File
@@ -19,8 +19,8 @@
return BULLET_ACT_HIT
else
blocked = 100
target.visible_message("<span class='danger'>\The [src] was deflected!</span>", \
"<span class='userdanger'>You were protected against \the [src]!</span>")
target.visible_message("<span class='danger'>\The [src] is deflected!</span>", \
"<span class='userdanger'>You are protected against \the [src]!</span>")
..(target, blocked)
reagents.flags &= ~(NO_REACT)
code/modules/projectiles/projectile/bullets/dnainjector.dm
+2 -2
View File
@@ -15,8 +15,8 @@
return BULLET_ACT_HIT
else
blocked = 100
target.visible_message("<span class='danger'>\The [src] was deflected!</span>", \
"<span class='userdanger'>You were protected against \the [src]!</span>")
target.visible_message("<span class='danger'>\The [src] is deflected!</span>", \
"<span class='userdanger'>You are protected against \the [src]!</span>")
return ..()
/obj/projectile/bullet/dnainjector/Destroy()
code/modules/reagents/reagent_containers.dm
+2 -2
View File
@@ -92,8 +92,8 @@
reagents.total_volume *= rand(5,10) * 0.1 //Not all of it makes contact with the target
var/mob/M = target
var/R
target.visible_message("<span class='danger'>[M] has been splashed with something!</span>", \
"<span class='userdanger'>[M] has been splashed with something!</span>")
target.visible_message("<span class='danger'>[M] is splashed with something!</span>", \
"<span class='userdanger'>[M] is splashed with something!</span>")
for(var/datum/reagent/A in reagents.reagent_list)
R += "[A.type] ([num2text(A.volume)]),"
code/modules/reagents/reagent_dispenser.dm
+1 -1
View File
@@ -104,7 +104,7 @@
playsound(src, 'sound/effects/refill.ogg', 50, TRUE)
W.update_icon()
else
user.visible_message("<span class='warning'>[user] catastrophically fails at refilling [user.p_their()] [I.name]!</span>", "<span class='userdanger'>That was stupid of you.</span>")
user.visible_message("<span class='danger'>[user] catastrophically fails at refilling [user.p_their()] [I.name]!</span>", "<span class='userdanger'>That was stupid of you.</span>")
log_bomber(user, "detonated a", src, "via welding tool")
boom()
return
code/modules/recycling/disposal/bin.dm
+1 -1
View File
@@ -140,7 +140,7 @@
if(user == target)
user.visible_message("<span class='warning'>[user] climbs into [src].</span>", "<span class='notice'>You climb into [src].</span>")
else
target.visible_message("<span class='danger'>[user] has placed [target] in [src].</span>", "<span class='userdanger'>[user] has placed you in [src].</span>")
target.visible_message("<span class='danger'>[user] places [target] in [src].</span>", "<span class='userdanger'>[user] places you in [src].</span>")
log_combat(user, target, "stuffed", addition="into [src]")
target.LAssailant = user
update_icon()
code/modules/surgery/bodyparts/dismemberment.dm
+1 -1
View File
@@ -17,7 +17,7 @@
var/obj/item/bodypart/affecting = C.get_bodypart(BODY_ZONE_CHEST)
affecting.receive_damage(clamp(brute_dam/2 * affecting.body_damage_coeff, 15, 50), clamp(burn_dam/2 * affecting.body_damage_coeff, 0, 50)) //Damage the chest based on limb's existing damage
C.visible_message("<span class='danger'><B>[C]'s [src.name] has been violently dismembered!</B></span>")
C.visible_message("<span class='danger'><B>[C]'s [src.name] is violently dismembered!</B></span>")
C.emote("scream")
SEND_SIGNAL(C, COMSIG_ADD_MOOD_EVENT, "dismembered", /datum/mood_event/dismembered)
drop_limb()