cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 02:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes the the vast majority of 'The the' from the the code (#15597)

Browse Source 
* The the

* Some more

* Review 1

* A couple more
This commit is contained in:
SabreML
2021-06-20 10:20:32 -04:00
committed by GitHub
parent fc3185dcb6
commit 0b375de42c
185 changed files with 500 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/assembly/health.dm
+1 -1
View File
@@ -72,7 +72,7 @@
/obj/item/assembly/health/interact(mob/user)//TODO: Change this to the wires thingy
if(!secured)
user.show_message("<span class='warning'>The [name] is unsecured!</span>")
user.show_message("<span class='warning'>[src] is unsecured!</span>")
return FALSE
var/dat = text("<TT><B>Health Sensor</B> <A href='?src=[UID()];scanning=1'>[scanning?"On":"Off"]</A>")
if(scanning && health_scan)
code/modules/assembly/proximity.dm
+1 -1
View File
@@ -97,7 +97,7 @@
/obj/item/assembly/prox_sensor/interact(mob/user)//TODO: Change this to the wires thingy
if(!secured)
user.show_message("<span class='warning'>The [name] is unsecured!</span>")
user.show_message("<span class='warning'>[src] is unsecured!</span>")
return FALSE
var/second = time % 60
var/minute = (time - second) / 60
code/modules/assembly/timer.dm
+1 -1
View File
@@ -64,7 +64,7 @@
/obj/item/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires
if(!secured)
user.show_message("<span class='warning'>The [name] is unsecured!</span>")
user.show_message("<span class='warning'>[src] is unsecured!</span>")
return FALSE
var/second = time % 60
var/minute = (time - second) / 60
code/modules/atmospherics/machinery/airalarm.dm
+1 -1
View File
@@ -936,7 +936,7 @@
if(!emagged)
emagged = TRUE
if(user)
user.visible_message("<span class='warning'>Sparks fly out of the [src]!</span>", "<span class='notice'>You emag the [src], disabling its safeties.</span>")
user.visible_message("<span class='warning'>Sparks fly out of \the [src]!</span>", "<span class='notice'>You emag \the [src], disabling its safeties.</span>")
playsound(src.loc, 'sound/effects/sparks4.ogg', 50, TRUE)
return
code/modules/awaymissions/mission_code/wildwest.dm
+5 -9
View File
@@ -129,13 +129,10 @@
/obj/effect/meatgrinder
name = "Meat Grinder"
desc = "What is that thing?"
density = 1
anchored = 1
layer = 3
density = TRUE
icon = 'icons/mob/blob.dmi'
icon_state = "blobpod"
var/triggerproc = "triggerrad1" //name of the proc thats called when the mine is triggered
var/triggered = 0
var/triggered = FALSE
/obj/effect/meatgrinder/Crossed(AM as mob|obj, oldloc)
Bumped(AM)
@@ -145,10 +142,9 @@
if(triggered) return
if(istype(M, /mob/living/carbon/human))
for(var/mob/O in viewers(world.view, src.loc))
to_chat(O, "<font color='red'>[M] triggered the [bicon(src)] [src]</font>")
triggered = 1
call(src,triggerproc)(M)
visible_message("<span class='danger'>[M] triggers [src]!</span>")
triggered = TRUE
triggerrad1(M)
/obj/effect/meatgrinder/proc/triggerrad1(mob)
for(var/mob/O in viewers(world.view, src.loc))
code/modules/clothing/clothing.dm
+2 -2
View File
@@ -457,10 +457,10 @@ BLIND // can't see anything
if(istype(I, /obj/item/match) && src.loc == user)
var/obj/item/match/M = I
if(M.matchignite()) // Match isn't lit, but isn't burnt.
user.visible_message("<span class='warning'>[user] strikes a [M] on the bottom of [src], lighting it.</span>","<span class='warning'>You strike the [M] on the bottom of [src] to light it.</span>")
user.visible_message("<span class='warning'>[user] strikes a [M] on the bottom of [src], lighting it.</span>","<span class='warning'>You strike [M] on the bottom of [src] to light it.</span>")
playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, 1)
else
user.visible_message("<span class='warning'>[user] crushes the [M] into the bottom of [src], extinguishing it.</span>","<span class='warning'>You crush the [M] into the bottom of [src], extinguishing it.</span>")
user.visible_message("<span class='warning'>[user] crushes [M] into the bottom of [src], extinguishing it.</span>","<span class='warning'>You crush [M] into the bottom of [src], extinguishing it.</span>")
M.dropped()
return
code/modules/clothing/gloves/rings.dm
+2 -2
View File
@@ -29,13 +29,13 @@
if(istype(I, /obj/item/stack/sheet/mineral/diamond))
var/obj/item/stack/sheet/mineral/diamond/D = I
if(stud)
to_chat(usr, "<span class='notice'>The [src] already has a gem.</span>")
to_chat(usr, "<span class='notice'>[src] already has a gem.</span>")
else
if(D.amount >= 1)
D.use(1)
stud = 1
update_icon()
to_chat(usr, "<span class='notice'>You socket the diamond into the [src].</span>")
to_chat(usr, "<span class='notice'>You socket the diamond into [src].</span>")
// s'pensive
/obj/item/clothing/gloves/ring/silver
code/modules/clothing/masks/miscellaneous.dm
+2 -2
View File
@@ -129,7 +129,7 @@
/obj/item/clothing/mask/muzzle/safety/shock
name = "shock muzzle"
desc = "A muzzle designed to prevent biting. This one is fitted with a behavior correction system."
desc = "A muzzle designed to prevent biting. This one is fitted with a behavior correction system."
var/obj/item/assembly/trigger = null
origin_tech = "materials=1;engineering=1"
materials = list(MAT_METAL=500, MAT_GLASS=50)
@@ -147,7 +147,7 @@
trigger.master = src
trigger.holder = src
AddComponent(/datum/component/proximity_monitor)
to_chat(user, "<span class='notice'>You attach the [W] to [src].</span>")
to_chat(user, "<span class='notice'>You attach [W] to [src].</span>")
return TRUE
else if(istype(W, /obj/item/assembly))
to_chat(user, "<span class='notice'>That won't fit in [src]. Perhaps a signaler or voice analyzer would?</span>")
code/modules/clothing/spacesuits/alien.dm
+3 -4
View File
@@ -213,21 +213,20 @@
return
var/mob/living/carbon/human/H = user
if(H.shoes != src)
to_chat(user, "You will have to put on the [src] before you can do that.")
to_chat(user, "<span class='warning>You will have to put on [src] before you can do that.</span>")
return
flags |= NOSLIP
magpulse = 1
flags &= ~NODROP //kinda hard to take off magclaws when you are gripping them tightly.
to_chat(user, "You dig your claws deeply into the flooring, bracing yourself.")
to_chat(user, "It would be hard to take off the [src] without relaxing your grip first.")
to_chat(user, "It would be hard to take off [src] without relaxing your grip first.")
//In case they somehow come off while enabled.
/obj/item/clothing/shoes/magboots/vox/dropped(mob/user as mob)
..()
if(src.magpulse)
user.visible_message("The [src] go limp as they are removed from [usr]'s feet.", "The [src] go limp as they are removed from your feet.")
user.visible_message("[src] go limp as they are removed from [usr]'s feet.", "[src] go limp as they are removed from your feet.")
flags &= ~NOSLIP
magpulse = 0
flags &= ~NODROP
code/modules/clothing/suits/armor.dm
+3 -3
View File
@@ -368,7 +368,7 @@
if(!active)
return FALSE
if(reaction_check(hitby))
owner.visible_message("<span class='danger'>The [src] blocks the [attack_text], sending out jets of flame!</span>")
owner.visible_message("<span class='danger'>[src] blocks [attack_text], sending out jets of flame!</span>")
for(var/mob/living/carbon/C in range(6, owner))
if(C != owner)
C.fire_stacks += 8
@@ -405,7 +405,7 @@
if(!active)
return FALSE
if(reaction_check(hitby))
owner.visible_message("<span class='danger'>The [src] blocks the [attack_text], sending out arcs of lightning!</span>")
owner.visible_message("<span class='danger'>[src] blocks [attack_text], sending out arcs of lightning!</span>")
for(var/mob/living/M in view(6, owner))
if(M == owner)
continue
@@ -451,7 +451,7 @@
new sparkle_path(get_turf(AM), get_dir(owner, AM))
if(isliving(AM))
var/mob/living/M = AM
to_chat(M, "<span class='userdanger'>You're thrown back by the [owner]'s reactive armor!</span>")
to_chat(M, "<span class='userdanger'>You're thrown back by [owner]'s reactive armor!</span>")
INVOKE_ASYNC(AM, /atom/movable/.proc/throw_at, throw_target, ((clamp((repulse_power - (clamp(dist_from_user - 2, 0, dist_from_user))), 3, repulse_power))), 1) //So stuff gets tossed around at the same time.
disable(rand(2, 5))
return TRUE
code/modules/clothing/under/accessories/holster.dm
+8 -8
View File
@@ -40,32 +40,32 @@
var/obj/item/gun/W = I
if(!can_holster(W))
to_chat(user, "<span class='warning'>This [W] won't fit in the [src]!</span>")
to_chat(user, "<span class='warning'>This [W.name] won't fit in [src]!</span>")
return
if(!user.canUnEquip(W, 0))
to_chat(user, "<span class='warning'>You can't let go of the [W]!</span>")
to_chat(user, "<span class='warning'>You can't let go of [W]!</span>")
return
holstered = W
user.unEquip(holstered)
holstered.loc = src
holstered.add_fingerprint(user)
user.visible_message("<span class='notice'>[user] holsters the [holstered].</span>", "<span class='notice'>You holster the [holstered].</span>")
user.visible_message("<span class='notice'>[user] holsters [holstered].</span>", "<span class='notice'>You holster [holstered].</span>")
/obj/item/clothing/accessory/holster/proc/unholster(mob/user as mob)
if(!holstered)
return
if(istype(user.get_active_hand(),/obj) && istype(user.get_inactive_hand(),/obj))
to_chat(user, "<span class='warning'>You need an empty hand to draw the [holstered]!</span>")
to_chat(user, "<span class='warning'>You need an empty hand to draw [holstered]!</span>")
else
if(user.a_intent == INTENT_HARM)
usr.visible_message("<span class='warning'>[user] draws the [holstered], ready to shoot!</span></span>", \
"<span class='warning'>You draw the [holstered], ready to shoot!</span>")
usr.visible_message("<span class='warning'>[user] draws [holstered], ready to shoot!</span></span>", \
"<span class='warning'>You draw [holstered], ready to shoot!</span>")
else
user.visible_message("<span class='notice'>[user] draws the [holstered], pointing it at the ground.</span>", \
"<span class='notice'>You draw the [holstered], pointing it at the ground.</span>")
user.visible_message("<span class='notice'>[user] draws [holstered], pointing it at the ground.</span>", \
"<span class='notice'>You draw [holstered], pointing it at the ground.</span>")
user.put_in_hands(holstered)
holstered.add_fingerprint(user)
holstered = null
code/modules/customitems/item_defines.dm
+10 -10
View File
@@ -34,12 +34,12 @@
/obj/item/fluff/tattoo_gun/attack(mob/living/carbon/M as mob, mob/user as mob)
if(user.a_intent == INTENT_HARM)
user.visible_message("<span class='warning'>[user] stabs [M] with the [src]!</span>", "<span class='warning'>You stab [M] with the [src]!</span>")
to_chat(M, "<span class='userdanger'>[user] stabs you with the [src]!<br></span><span class = 'warning'>You feel a tiny prick!</span>")
user.visible_message("<span class='warning'>[user] stabs [M] with [src]!</span>", "<span class='warning'>You stab [M] with [src]!</span>")
to_chat(M, "<span class='userdanger'>[user] stabs you with [src]!<br></span><span class = 'warning'>You feel a tiny prick!</span>")
return
if(used)
to_chat(user, "<span class= 'notice'>The [src] is out of ink.</span>")
to_chat(user, "<span class= 'notice'>[src] is out of ink.</span>")
return
if(!istype(M, /mob/living/carbon/human))
@@ -62,10 +62,10 @@
return
if(target == user)
to_chat(user, "<span class= 'notice'>You use the [src] to apply a [tattoo_name] to yourself!</span>")
to_chat(user, "<span class= 'notice'>You use [src] to apply a [tattoo_name] to yourself!</span>")
else
user.visible_message("<span class='notice'>[user] begins to apply a [tattoo_name] [target] with the [src].</span>", "<span class='notice'>You begin to tattoo [target] with the [src]!</span>")
user.visible_message("<span class='notice'>[user] begins to apply a [tattoo_name] [target] with [src].</span>", "<span class='notice'>You begin to tattoo [target] with [src]!</span>")
if(!do_after(user, 30 * toolspeed, target = M))
return
user.visible_message("<span class='notice'>[user] finishes the [tattoo_name] on [target].</span>", "<span class='notice'>You finish the [tattoo_name].</span>")
@@ -108,12 +108,12 @@
tattoo_g = color2G(ink_color)
tattoo_b = color2B(ink_color)
to_chat(user, "<span class='notice'>You change the color setting on the [src].</span>")
to_chat(user, "<span class='notice'>You change the color setting on [src].</span>")
update_icon()
else
to_chat(user, "<span class='notice'>The [src] is out of ink!</span>")
to_chat(user, "<span class='notice'>[src] is out of ink!</span>")
/obj/item/fluff/bird_painter // BirdtTalon: Kahkiri
name = "Orb of Onyx"
@@ -292,7 +292,7 @@
return
if(target.change_body_accessory("Jay Wingler Tail"))
to_chat(target, "<span class='notice'>You comb your tail with the [src].</span>")
to_chat(target, "<span class='notice'>You comb your tail with [src].</span>")
used = 1
/obj/item/fluff/desolate_coat_kit //DesolateG: Micheal Smith
@@ -460,7 +460,7 @@
var/obj/item/clothing/suit/storage/S = target
var/obj/item/clothing/suit/storage/fluff/k3_webbing/webbing = new(get_turf(target))
webbing.allowed = S.allowed
to_chat(user, "<span class='notice'>You modify the [S] with [src].</span>")
to_chat(user, "<span class='notice'>You modify [S] with [src].</span>")
H.update_inv_wear_suit()
qdel(S)
qdel(src)
@@ -957,7 +957,7 @@
for(var/X in actions)
var/datum/action/A = X
A.UpdateButtonIcon()
to_chat(user, "You turn the [src]'s lighting system [flavour].")
to_chat(user, "You turn [src]'s lighting system [flavour].")
user.update_inv_wear_suit()
/obj/item/clothing/suit/hooded/hoodie/fluff/xantholne // Xantholne: Meex Zwichsnicrur
code/modules/detective_work/footprints_and_rag.dm
+3 -3
View File
@@ -25,7 +25,7 @@
/obj/item/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag)
if(ismob(target) && target.reagents && reagents.total_volume)
user.visible_message("<span class='danger'>[user] has smothered \the [target] with \the [src]!</span>", "<span class='danger'>You smother \the [target] with \the [src]!</span>", "You hear some struggling and muffled cries of surprise")
user.visible_message("<span class='danger'>[user] has smothered [target] with [src]!</span>", "<span class='danger'>You smother [target] with [src]!</span>", "You hear some struggling and muffled cries of surprise")
src.reagents.reaction(target, REAGENT_TOUCH)
src.reagents.clear_reagents()
return
@@ -35,8 +35,8 @@
/obj/item/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob,proximity)
if(!proximity) return
if(istype(A) && (src in user))
user.visible_message("[user] starts to wipe down [A] with [src]!")
user.visible_message("<span class='notice'>[user] starts to wipe down [A] with [src]!</span>")
if(do_after(user, wipespeed, target = A))
user.visible_message("[user] finishes wiping off the [A]!")
user.visible_message("<span class='notice'>[user] finishes wiping off [A]!</span>")
A.clean_blood()
return
code/modules/economy/ATM.dm
+1 -1
View File
@@ -254,7 +254,7 @@ log transactions
if("balance_statement")
if(authenticated_account)
if(world.timeofday < lastprint + PRINT_DELAY)
to_chat(usr, "<span class='notice'>The [name] flashes an error on its display.</span>")
to_chat(usr, "<span class='notice'>[src] flashes an error on its display.</span>")
return
lastprint = world.timeofday
playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, TRUE)
code/modules/economy/EFTPOS.dm
+1 -1
View File
@@ -186,6 +186,6 @@
var/transSuccess = D.charge(transaction_amount, linked_account, transaction_purpose, machine_name, D.owner_name)
if(transSuccess == TRUE)
playsound(src, 'sound/machines/chime.ogg', 50, 1)
visible_message("[bicon(src)] The [src] chimes.")
visible_message("<span class='notice'>[src] chimes!</span>")
transaction_paid = 1
//emag?
code/modules/fish/fish_items.dm
+2 -2
View File
@@ -26,7 +26,7 @@
throw_range = 7
/obj/item/fish_net/suicide_act(mob/user) //"A tiny net is a death sentence: it's a net and it's tiny!" https://www.youtube.com/watch?v=FCI9Y4VGCVw
to_chat(viewers(user), "<span class='warning'>[user] places the [src.name] on top of [user.p_their()] head, [user.p_their()] fingers tangled in the netting! It looks like [user.p_theyre()] trying to commit suicide.</span>")
visible_message("<span class='suicide'>[user] places [src] on top of [user.p_their()] head, [user.p_their()] fingers tangled in the netting! It looks like [user.p_theyre()] trying to commit suicide.</span>")
return OXYLOSS
/obj/item/fishfood
@@ -52,7 +52,7 @@
attack_verb = list("scrubbed", "brushed", "scraped")
/obj/item/tank_brush/suicide_act(mob/user)
to_chat(viewers(user), "<span class='warning'>[user] is vigorously scrubbing [user.p_them()]self raw with the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
visible_message("<span class='suicide'>[user] is vigorously scrubbing [user.p_them()]self raw with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
return BRUTELOSS|FIRELOSS
/obj/item/storage/bag/fish
code/modules/fish/fishtank.dm
+5 -6
View File
@@ -570,15 +570,14 @@
if(isAI(user))
return
user.changeNext_move(CLICK_CD_MELEE)
playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, TRUE)
if(user.a_intent == INTENT_HARM)
playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1)
user.visible_message("<span class='danger'>[user.name] bangs against the [name]!</span>", \
"<span class='danger'>You bang against the [name]!</span>", \
user.visible_message("<span class='danger'>[user] bangs against [src]!</span>",
"<span class='danger'>You bang against [src]!</span>",
"You hear a banging sound.")
else
playsound(loc, 'sound/effects/glassknock.ogg', 80, 1)
user.visible_message("<span class='notice'>[user.name] taps on the [name].</span>", \
"<span class='notice'>You tap on the [name].</span>", \
user.visible_message("<span class='notice'>[user] taps on [src].</span>",
"<span class='notice'>You tap on [src].</span>",
"You hear a knocking sound.")
/obj/machinery/fishtank/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
code/modules/food_and_drinks/drinks/bottler/bottler.dm
+1 -1
View File
@@ -206,7 +206,7 @@
containers[con_type] = min(containers[con_type], max_define)
S.use(sheets_to_use)
else
visible_message("<span class='warning'>[src] rejects the [S] because it already is fully stocked with [con_type]s.</span>")
visible_message("<span class='warning'>[src] rejects [S] because it already is fully stocked with [con_type]s.</span>")
/obj/machinery/bottler/proc/select_recipe()
for(var/datum/bottler_recipe/recipe in available_recipes)
code/modules/food_and_drinks/drinks/drinks.dm
+2 -2
View File
@@ -45,12 +45,12 @@
to_chat(chugger, "<span class='notice'>You need to open [src] first!</span>")
return
if(istype(chugger) && loc == chugger && src == chugger.get_active_hand() && reagents.total_volume)
chugger.visible_message("<span class='notice'>[chugger] raises the [src] to [chugger.p_their()] mouth and starts [pick("chugging","gulping")] it down like [pick("a savage","a mad beast","it's going out of style","there's no tomorrow")]!</span>", "<span class='notice'>You start chugging [src].</span>", "<span class='notice'>You hear what sounds like gulping.</span>")
chugger.visible_message("<span class='notice'>[chugger] raises [src] to [chugger.p_their()] mouth and starts [pick("chugging","gulping")] it down like [pick("a savage","a mad beast","it's going out of style","there's no tomorrow")]!</span>", "<span class='notice'>You start chugging [src].</span>", "<span class='notice'>You hear what sounds like gulping.</span>")
while(do_mob(chugger, chugger, 40)) //Between the default time for do_mob and the time it takes for a vampire to suck blood.
chugger.eat(src, chugger, 25) //Half of a glass, quarter of a bottle.
if(!reagents.total_volume) //Finish in style.
chugger.emote("gasp")
chugger.visible_message("<span class='notice'>[chugger] [pick("finishes","downs","polishes off","slams")] the entire [src], what a [pick("savage","monster","champ","beast")]!</span>", "<span class='notice'>You finish off the [src]![prob(50) ? " Maybe that wasn't such a good idea..." : ""]</span>", "<span class='notice'>You hear a gasp and a clink.</span>")
chugger.visible_message("<span class='notice'>[chugger] [pick("finishes","downs","polishes off","slams")] the entire [src], what a [pick("savage","monster","champ","beast")]!</span>", "<span class='notice'>You finish off [src]![prob(50) ? " Maybe that wasn't such a good idea..." : ""]</span>", "<span class='notice'>You hear a gasp and a clink.</span>")
break
/obj/item/reagent_containers/food/drinks/afterattack(obj/target, mob/user, proximity)
code/modules/food_and_drinks/drinks/drinks/cans.dm
+1 -1
View File
@@ -57,7 +57,7 @@
addtimer(CALLBACK(src, .proc/reset_shakable), 1 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
to_chat(H, "<span class='notice'>You start shaking up [src].</span>")
if(do_after(H, 1 SECONDS, target = H))
visible_message("<span class='warning'>[user] shakes up the [name]!</span>")
visible_message("<span class='warning'>[user] shakes up [src]!</span>")
if(times_shaken == 0)
times_shaken++
addtimer(CALLBACK(src, .proc/reset_shaken), 1 MINUTES, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_NO_HASH_WAIT)
code/modules/food_and_drinks/food/foods/pizza.dm
+5 -5
View File
@@ -173,7 +173,7 @@
/obj/item/pizzabox/attack_hand(mob/user)
if(open && pizza)
user.put_in_hands(pizza)
to_chat(user, "<span class='warning'>You take the [pizza] out of the [src].</span>")
to_chat(user, "<span class='warning'>You take [pizza] out of [src].</span>")
pizza = null
update_icon()
return
@@ -215,11 +215,11 @@
boxes.Add(boxestoadd)
box.update_icon()
update_icon()
to_chat(user, "<span class='warning'>You put the [box] ontop of the [src]!</span>")
to_chat(user, "<span class='warning'>You put [box] on top of [src]!</span>")
else
to_chat(user, "<span class='warning'>The stack is too high!</span>")
else
to_chat(user, "<span class='warning'>Close the [box] first!</span>")
to_chat(user, "<span class='warning'>Close [box] first!</span>")
return
if(istype(I, /obj/item/reagent_containers/food/snacks/sliceable/pizza/)) // Long ass fucking object name
@@ -230,9 +230,9 @@
update_icon()
to_chat(user, "<span class='warning'>You put the [I] in the [src]!</span>")
to_chat(user, "<span class='warning'>You put [I] in [src]!</span>")
else
to_chat(user, "<span class='warning'>You try to push the [I] through the lid but it doesn't work!</span>")
to_chat(user, "<span class='warning'>You try to push [I] through the lid but it doesn't work!</span>")
return
if(istype(I, /obj/item/pen/))
code/modules/food_and_drinks/kitchen_machinery/cooker.dm
+2 -2
View File
@@ -67,7 +67,7 @@
/obj/machinery/cooker/proc/burn_food(mob/user, obj/item/reagent_containers/props)
var/obj/item/reagent_containers/food/snacks/badrecipe/burnt = new(get_turf(src))
setRegents(props, burnt)
to_chat(user, "<span class='warning'>You smell burning coming from the [src]!</span>")
to_chat(user, "<span class='warning'>You smell burning coming from [src]!</span>")
var/datum/effect_system/smoke_spread/bad/smoke = new // burning things makes smoke!
smoke.set_up(5, 0, src)
smoke.start()
@@ -75,7 +75,7 @@
var/turf/location = get_turf(src)
var/obj/effect/decal/cleanable/liquid_fuel/oil = new(location)
oil.name = "fat"
oil.desc = "uh oh, looks like some fat from the [src]"
oil.desc = "Uh oh, looks like some fat from [src]!"
oil.loc = location
location.hotspot_expose(700, 50, 1)
//TODO have a chance of setting the tile on fire
code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+5 -5
View File
@@ -128,25 +128,25 @@
/obj/machinery/gibber/proc/move_into_gibber(mob/user, mob/living/victim)
if(occupant)
to_chat(user, "<span class='danger'>The [src] is full, empty it first!</span>")
to_chat(user, "<span class='danger'>[src] is full, empty it first!</span>")
return
if(operating)
to_chat(user, "<span class='danger'>The [src] is locked and running, wait for it to finish.</span>")
to_chat(user, "<span class='danger'>[src] is locked and running, wait for it to finish.</span>")
return
if(!ishuman(victim))
to_chat(user, "<span class='danger'>This is not suitable for the [src]!</span>")
to_chat(user, "<span class='danger'>This is not suitable for [src]!</span>")
return
if(victim.abiotic(1))
to_chat(user, "<span class='danger'>Subject may not have abiotic items on.</span>")
return
user.visible_message("<span class='danger'>[user] starts to put [victim] into the [src]!</span>")
user.visible_message("<span class='danger'>[user] starts to put [victim] into [src]!</span>")
add_fingerprint(user)
if(do_after(user, 30, target = victim) && user.Adjacent(src) && victim.Adjacent(user) && !occupant)
user.visible_message("<span class='danger'>[user] stuffs [victim] into the [src]!</span>")
user.visible_message("<span class='danger'>[user] stuffs [victim] into [src]!</span>")
victim.forceMove(src)
occupant = victim
code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
+2 -2
View File
@@ -213,7 +213,7 @@
dat += {"<B>[display_name]:</B> [R.volume] unit\s<BR>"}
if(items_counts.len==0 && reagents.reagent_list.len==0)
dat = {"<B>The [src] is empty</B><BR>"}
dat = {"<B>[src] is empty</B><BR>"}
else
dat = {"<b>Ingredients:</b><br>[dat]"}
dat += {"<HR><BR>\
@@ -394,7 +394,7 @@
/obj/machinery/kitchen_machine/proc/broke()
do_sparks(2, 1, src)
icon_state = broken_icon // Make it look all busted up and shit
visible_message("<span class='alert'>The [src] breaks!</span>") //Let them know they're stupid
visible_message("<span class='alert'>[src] breaks!</span>") //Let them know they're stupid
broken = 2 // Make it broken so it can't be used util fixed
flags = null //So you can't add condiments
operating = 0 // Turn it off again aferwards
code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
+1 -1
View File
@@ -78,7 +78,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
else
var/obj/item/multitool/M = O
M.buffer = src
to_chat(user, "<span class='notice'>You log [src] in the [M]'s buffer.</span>")
to_chat(user, "<span class='notice'>You log [src] in [M]'s buffer.</span>")
return
if(stat != 0) //NOPOWER etc
return
code/modules/games/cards.dm
+4 -4
View File
@@ -238,7 +238,7 @@
usr.visible_message("<span class='notice'>[usr] picks up the deck.</span>")
/obj/item/pack
name = "Card Pack"
name = "card pack"
desc = "For those with disposable income."
icon_state = "card_pack"
@@ -249,7 +249,7 @@
/obj/item/pack/attack_self(mob/user as mob)
user.visible_message("<span class='notice'>[name] rips open the [src]!</span>", "<span class='notice'>You rips open the [src]!</span>")
user.visible_message("<span class='notice'>[name] rips open [src]!</span>", "<span class='notice'>You rip open [src]!</span>")
var/obj/item/cardhand/H = new(get_turf(user))
H.cards += cards
@@ -410,8 +410,8 @@
if(cards.len)
update_icon()
if(H.cards.len)
usr.visible_message("<span class='notice'>The [usr] plays the [discarding].</span>", "<span class='notice'>You play the [discarding].</span>")
H.loc = get_step(usr,usr.dir)
user.visible_message("<span class='notice'>[user] plays the [discarding].</span>", "<span class='notice'>You play the [discarding].</span>")
H.loc = get_step(user, user.dir)
if(!cards.len)
qdel(src)
code/modules/games/tarot.dm
+1 -1
View File
@@ -28,5 +28,5 @@
cards -= P
cards = newcards
playsound(user, 'sound/items/cardshuffle.ogg', 50, 1)
user.visible_message("<span class ='notice'>[user] shuffles [src].</span>", "<span class='notice'>You shuffle the [src].</span>")
user.visible_message("<span class='notice'>[user] shuffles [src].</span>", "<span class='notice'>You shuffle [src].</span>")
cooldown = world.time
code/modules/hydroponics/beekeeping/beebox.dm
+1 -1
View File
@@ -174,7 +174,7 @@
queen_bee = qb.queen
qb.queen = null
else
visible_message("<span class='notice'>The [qb] refuses to settle down. Maybe it's something to do with its reagent?</span>")
visible_message("<span class='notice'>[qb] refuses to settle down. Maybe it's something to do with its reagent?</span>")
return
if(queen_bee)
code/modules/hydroponics/grown/banana.dm
+2 -2
View File
@@ -27,7 +27,7 @@
tastes = list("banana" = 1)
/obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is aiming the [name] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is aiming [src] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide.</span>")
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1, -1)
sleep(25)
if(!user)
@@ -51,7 +51,7 @@
throw_range = 7
/obj/item/grown/bananapeel/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is deliberately slipping on the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is deliberately slipping on [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
playsound(loc, 'sound/misc/slip.ogg', 50, 1, -1)
return BRUTELOSS
code/modules/hydroponics/grown/citrus.dm
+2 -2
View File
@@ -105,7 +105,7 @@
/obj/item/reagent_containers/food/snacks/grown/firelemon
seed = /obj/item/seeds/firelemon
name = "Combustible Lemon"
name = "combustible lemon"
desc = "Made for burning houses down."
icon_state = "firelemon"
bitesize_mod = 2
@@ -115,7 +115,7 @@
/obj/item/reagent_containers/food/snacks/grown/firelemon/attack_self(mob/living/user)
var/area/A = get_area(user)
user.visible_message("<span class='warning'>[user] primes the [src]!</span>", "<span class='userdanger'>You prime the [src]!</span>")
user.visible_message("<span class='warning'>[user] primes [src]!</span>", "<span class='userdanger'>You prime [src]!</span>")
investigate_log("[key_name(user)] primed a combustible lemon for detonation at [A] [COORD(user)].", INVESTIGATE_BOMB)
add_attack_logs(user, src, "primed a combustible lemon for detonation", ATKLOG_FEW)
log_game("[key_name(user)] primed a combustible lemon for detonation at [A] [COORD(user)].")
code/modules/hydroponics/grown/cotton.dm
+1 -1
View File
@@ -32,7 +32,7 @@
var/cotton_name = "raw cotton"
/obj/item/grown/cotton/attack_self(mob/user)
user.show_message("<span class='notice'>You pull some [cotton_name] out of the [name]!</span>", 1)
user.show_message("<span class='notice'>You pull some [cotton_name] out of [src]!</span>", 1)
var/seed_modifier = 0
if(seed)
seed_modifier = round(seed.potency / 25)
code/modules/hydroponics/grown/flowers.dm
+3 -3
View File
@@ -191,7 +191,7 @@
/obj/item/grown/novaflower/attack(mob/living/carbon/M, mob/user)
..()
if(isliving(M))
to_chat(M, "<span class='danger'>You are lit on fire from the intense heat of the [name]!</span>")
to_chat(M, "<span class='danger'>You are lit on fire from the intense heat of [src]!</span>")
M.adjust_fire_stacks(seed.potency / 20)
if(M.IgniteMob())
message_admins("[key_name_admin(user)] set [key_name_admin(M)] on fire")
@@ -203,12 +203,12 @@
if(force > 0)
force -= rand(1, (force / 3) + 1)
else
to_chat(usr, "<span class='warning'>All the petals have fallen off the [name] from violent whacking!</span>")
to_chat(usr, "<span class='warning'>All the petals have fallen off [src] from violent whacking!</span>")
usr.unEquip(src)
qdel(src)
/obj/item/grown/novaflower/pickup(mob/living/carbon/human/user)
. = ..()
if(!user.gloves)
to_chat(user, "<span class='danger'>The [name] burns your bare hand!</span>")
to_chat(user, "<span class='danger'>[src] burns your bare hand!</span>")
user.adjustFireLoss(rand(1, 5))
code/modules/hydroponics/grown/nettle.dm
+1 -1
View File
@@ -44,7 +44,7 @@
attack_verb = list("stung")
/obj/item/grown/nettle/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is eating some of the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is eating some of [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
return BRUTELOSS|TOXLOSS
/obj/item/grown/nettle/pickup(mob/living/user)
code/modules/hydroponics/hydroitemdefines.dm
+6 -6
View File
@@ -15,9 +15,9 @@
// *************************************
/obj/item/reagent_containers/spray/weedspray // -- Skie
name = "weed spray"
desc = "It's a toxic mixture, in spray form, to kill small weeds."
icon = 'icons/obj/hydroponics/equipment.dmi'
name = "weed spray"
icon_state = "weedspray"
item_state = "plantbgone"
volume = 100
@@ -30,13 +30,13 @@
list_reagents = list("atrazine" = 100)
/obj/item/reagent_containers/spray/weedspray/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is huffing the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
return TOXLOSS
/obj/item/reagent_containers/spray/pestspray // -- Skie
name = "pest spray"
desc = "It's some pest eliminator spray! <I>Do not inhale!</I>"
icon = 'icons/obj/hydroponics/equipment.dmi'
name = "pest spray"
icon_state = "pestspray"
item_state = "plantbgone"
volume = 100
@@ -49,7 +49,7 @@
list_reagents = list("pestkiller" = 100)
/obj/item/reagent_containers/spray/pestspray/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is huffing the [src.name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
return TOXLOSS
/obj/item/cultivator
@@ -94,7 +94,7 @@
sharp = 1
/obj/item/hatchet/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is chopping at [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is chopping at [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
return BRUTELOSS
@@ -130,7 +130,7 @@
var/swiping = FALSE
/obj/item/scythe/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is beheading [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is beheading [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
if(ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/organ/external/affecting = H.get_organ("head")
code/modules/mining/equipment/regenerative_core.dm
+1 -1
View File
@@ -15,7 +15,7 @@
return ..()
C.preserved()
to_chat(user, "<span class='notice'>You inject the [M] with the stabilizer. It will no longer go inert.</span>")
to_chat(user, "<span class='notice'>You inject [M] with the stabilizer. It will no longer go inert.</span>")
qdel(src)
/************************Hivelord core*******************/
code/modules/mining/equipment/wormhole_jaunter.dm
+1 -1
View File
@@ -39,7 +39,7 @@
var/list/L = get_destinations(user)
if(!L.len)
to_chat(user, "<span class='notice'>The [name] found no beacons in the world to anchor a wormhole to.</span>")
to_chat(user, "<span class='notice'>[src] found no beacons in the world to anchor a wormhole to.</span>")
return
var/chosen_beacon = pick(L)
var/obj/effect/portal/jaunt_tunnel/J = new(get_turf(src), get_turf(chosen_beacon), src, 100)
code/modules/mob/living/carbon/alien/larva/emote.dm
+21 -21
View File
@@ -37,73 +37,73 @@
m_type = 2
if("scratch")
if(!src.restrained())
message = "<B>The [src.name]</B> scratches."
message = "<B>[src]</B> scratches."
m_type = 1
if("whimper")
if(!muzzled)
message = "<B>The [src.name]</B> whimpers."
message = "<B>[src]</B> whimpers."
m_type = 2
// if("roar")
// if(!muzzled)
// message = "<B>The [src.name]</B> roars." Commenting out since larva shouldn't roar /N
// message = "<B>[src]</B> roars." Commenting out since larva shouldn't roar /N
// m_type = 2
if("tail")
message = "<B>The [src.name]</B> waves its tail."
message = "<B>[src]</B> waves its tail."
m_type = 1
if("gasp")
message = "<B>The [src.name]</B> gasps."
message = "<B>[src]</B> gasps."
m_type = 2
if("shiver")
message = "<B>The [src.name]</B> shivers."
message = "<B>[src]</B> shivers."
m_type = 2
if("drool")
message = "<B>The [src.name]</B> drools."
message = "<B>[src]</B> drools."
m_type = 1
if("scretch")
if(!muzzled)
message = "<B>The [src.name]</B> scretches."
message = "<B>[src]</B> scretches."
m_type = 2
if("choke")
message = "<B>The [src.name]</B> chokes."
message = "<B>[src]</B> chokes."
m_type = 2
if("moan")
message = "<B>The [src.name]</B> moans!"
message = "<B>[src]</B> moans!"
m_type = 2
if("nod")
message = "<B>The [src.name]</B> nods its head."
message = "<B>[src]</B> nods its head."
m_type = 1
// if("sit")
// message = "<B>The [src.name]</B> sits down." //Larvan can't sit down, /N
// message = "<B>[src]</B> sits down." //Larvan can't sit down, /N
// m_type = 1
if("sway")
message = "<B>The [src.name]</B> sways around dizzily."
message = "<B>[src]</B> sways around dizzily."
m_type = 1
if("sulk")
message = "<B>The [src.name]</B> sulks down sadly."
message = "<B>[src]</B> sulks down sadly."
m_type = 1
if("twitch")
message = "<B>The [src.name]</B> twitches violently."
message = "<B>[src]</B> twitches violently."
m_type = 1
if("dance")
if(!src.restrained())
message = "<B>The [src.name]</B> dances around happily."
message = "<B>[src]</B> dances around happily."
m_type = 1
if("roll")
if(!src.restrained())
message = "<B>The [src.name]</B> rolls."
message = "<B>[src]</B> rolls."
m_type = 1
if("shake")
message = "<B>The [src.name]</B> shakes its head."
message = "<B>[src]</B> shakes its head."
m_type = 1
if("gnarl")
if(!muzzled)
message = "<B>The [src.name]</B> gnarls and shows its teeth.."
message = "<B>[src]</B> gnarls and shows its teeth.."
m_type = 2
if("jump")
message = "<B>The [src.name]</B> jumps!"
message = "<B>[src]</B> jumps!"
m_type = 1
if("hiss_")
message = "<B>The [src.name]</B> hisses softly."
message = "<B>[src]</B> hisses softly."
m_type = 1
if("collapse")
Paralyse(2)
code/modules/mob/living/carbon/brain/MMI.dm
+3 -3
View File
@@ -28,7 +28,7 @@
/obj/item/mmi/attackby(obj/item/O as obj, mob/user as mob, params)
if(istype(O, /obj/item/organ/internal/brain/crystal))
to_chat(user, "<span class='warning'> This brain is too malformed to be able to use with the [src].</span>")
to_chat(user, "<span class='warning'> This brain is too malformed to be able to use with [src].</span>")
return
if(istype(O, /obj/item/organ/internal/brain/golem))
to_chat(user, "<span class='warning'>You can't find a way to plug [O] into [src].</span>")
@@ -79,8 +79,8 @@
if(radio)
to_chat(user, "<span class='warning'>[src] already has a radio installed.</span>")
else
user.visible_message("<span class='notice'>[user] begins to install the [O] into [src]...</span>", \
"<span class='notice'>You start to install the [O] into [src]...</span>")
user.visible_message("<span class='notice'>[user] begins to install [O] into [src]...</span>", \
"<span class='notice'>You start to install [O] into [src]...</span>")
if(do_after(user, 20, target=src))
if(user.drop_item())
user.visible_message("<span class='notice'>[user] installs [O] in [src].</span>", \
code/modules/mob/living/carbon/carbon.dm
+1 -1
View File
@@ -79,7 +79,7 @@
for(var/mob/M in viewers(user, null))
if(M.client)
M.show_message(text("<span class='warning'><B>[user] attacks [src]'s stomach wall with the [I.name]!</span>"), 2)
M.show_message(text("<span class='warning'><B>[user] attacks [src]'s stomach wall with [I]!</span>"), 2)
playsound(user.loc, 'sound/effects/attackblob.ogg', 50, 1)
if(prob(getBruteLoss() - 50))
code/modules/mob/living/carbon/carbon_defense.dm
+1 -1
View File
@@ -57,7 +57,7 @@
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'>[M] has shocked [src]!</span>", "<span class='userdanger'>[M] has shocked you!</span>")
do_sparks(5, TRUE, src)
var/power = M.powerlevel + rand(0,3)
code/modules/mob/living/carbon/human/human_defense.dm
+2 -2
View File
@@ -25,8 +25,8 @@ emp_act
reflected = is_type_in_list(P, safe_list) //And it's safe
if(reflected)
visible_message("<span class='danger'>The [P.name] gets reflected by [src]!</span>", \
"<span class='userdanger'>The [P.name] gets reflected by [src]!</span>")
visible_message("<span class='danger'>[P] gets reflected by [src]!</span>", \
"<span class='userdanger'>[P] gets reflected by [src]!</span>")
add_attack_logs(P.firer, src, "hit by [P.type] but got reflected")
P.reflect_back(src)
return -1
code/modules/mob/living/carbon/human/species/golem.dm
+4 -4
View File
@@ -392,8 +392,8 @@
if(!(P.original == H && P.firer == H))
if(P.flag == "bullet" || P.flag == "bomb")
playsound(H, 'sound/effects/shovel_dig.ogg', 70, 1)
H.visible_message("<span class='danger'>The [P.name] sinks harmlessly in [H]'s sandy body!</span>", \
"<span class='userdanger'>The [P.name] sinks harmlessly in [H]'s sandy body!</span>")
H.visible_message("<span class='danger'>[P] sinks harmlessly in [H]'s sandy body!</span>", \
"<span class='userdanger'>[P] sinks harmlessly in [H]'s sandy body!</span>")
return FALSE
return TRUE
@@ -425,8 +425,8 @@
/datum/species/golem/glass/bullet_act(obj/item/projectile/P, mob/living/carbon/human/H)
if(!(P.original == H && P.firer == H)) //self-shots don't reflect
if(P.is_reflectable)
H.visible_message("<span class='danger'>The [P.name] gets reflected by [H]'s glass skin!</span>", \
"<span class='userdanger'>The [P.name] gets reflected by [H]'s glass skin!</span>")
H.visible_message("<span class='danger'>[P] gets reflected by [H]'s glass skin!</span>", \
"<span class='userdanger'>[P] gets reflected by [H]'s glass skin!</span>")
P.reflect_back(H)
code/modules/mob/living/carbon/human/species/vox.dm
+1 -1
View File
@@ -93,7 +93,7 @@
H.equip_or_collect(internal_tank, slot_l_hand)
to_chat(H, "<span class='boldannounce'>Could not find an empty slot for internals! Please report this as a bug</span>")
H.internal = internal_tank
to_chat(H, "<span class='notice'>You are now running on nitrogen internals from the [internal_tank]. Your species finds oxygen toxic, so you must breathe nitrogen only.</span>")
to_chat(H, "<span class='notice'>You are now running on nitrogen internals from [internal_tank]. Your species finds oxygen toxic, so you must breathe nitrogen only.</span>")
H.update_action_buttons_icon()
/datum/species/vox/on_species_gain(mob/living/carbon/human/H)
code/modules/mob/living/living_defense.dm
+2 -2
View File
@@ -71,8 +71,8 @@
take_overall_damage(0, shock_damage, TRUE, used_weapon = "Electrocution")
if(shock_damage > 200)
visible_message(
"<span class='danger'>[src] was arc flashed by the [source]!</span>",
"<span class='userdanger'>The [source] arc flashes and electrocutes you!</span>",
"<span class='danger'>[src] was arc flashed by \the [source]!</span>",
"<span class='userdanger'>\The [source] arc flashes and electrocutes you!</span>",
"<span class='italics'>You hear a lightning-like crack!</span>")
playsound(loc, 'sound/effects/eleczap.ogg', 50, 1, -1)
explosion(loc, -1, 0, 2, 2)
code/modules/mob/living/silicon/robot/robot.dm
+2 -2
View File
@@ -719,7 +719,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
C.brute_damage = WC.brute
C.electronics_damage = WC.burn
to_chat(usr, "<span class='notice'>You install the [W.name].</span>")
to_chat(usr, "<span class='notice'>You install [W].</span>")
return
@@ -1408,7 +1408,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
/mob/living/silicon/robot/deathsquad/bullet_act(obj/item/projectile/P)
if(istype(P) && P.is_reflectable && P.starting)
visible_message("<span class='danger'>The [P.name] gets reflected by [src]!</span>", "<span class='userdanger'>The [P.name] gets reflected by [src]!</span>")
visible_message("<span class='danger'>[P] gets reflected by [src]!</span>", "<span class='userdanger'>[P] gets reflected by [src]!</span>")
P.reflect_back(src)
return -1
return ..(P)
code/modules/mob/living/simple_animal/bot/mulebot.dm
+1 -1
View File
@@ -135,7 +135,7 @@
emagged = 1
if(!open)
locked = !locked
to_chat(user, "<span class='notice'>You [locked ? "lock" : "unlock"] the [src]'s controls!</span>")
to_chat(user, "<span class='notice'>You [locked ? "lock" : "unlock"] [src]'s controls!</span>")
flick("mulebot-emagged", src)
playsound(loc, 'sound/effects/sparks1.ogg', 100, 0)
code/modules/mob/living/simple_animal/constructs.dm
+2 -2
View File
@@ -133,8 +133,8 @@
if(prob(reflectchance))
if((P.damage_type == BRUTE || P.damage_type == BURN))
adjustBruteLoss(P.damage * 0.5)
visible_message("<span class='danger'>The [P.name] gets reflected by [src]'s shell!</span>", \
"<span class='userdanger'>The [P.name] gets reflected by [src]'s shell!</span>")
visible_message("<span class='danger'>[P] gets reflected by [src]'s shell!</span>", \
"<span class='userdanger'>[P] gets reflected by [src]'s shell!</span>")
P.reflect_back(src, list(0, 0, -1, 1, -2, 2, -2, 2, -2, 2, -3, 3, -3, 3))
code/modules/mob/living/simple_animal/friendly/dog.dm
+1 -1
View File
@@ -322,7 +322,7 @@
if(valid)
if(health <= 0)
to_chat(user, "<span class='notice'>There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on [p_them()].</span>")
to_chat(user, "<span class='notice'>There is merely a dull, lifeless look in [real_name]'s eyes as you put [item_to_add] on [p_them()].</span>") // :'(
else if(user)
user.visible_message("<span class='notice'>[user] puts [item_to_add] on [real_name]'s head. [src] looks at [user] and barks once.</span>",
"<span class='notice'>You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags [p_their()] tail once and barks.</span>",
code/modules/mob/living/simple_animal/hostile/hivebot.dm
+2 -2
View File
@@ -79,12 +79,12 @@
var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(5, 0, src.loc)
smoke.start()
visible_message("<span class='danger'>The [src] warps in!</span>")
visible_message("<span class='danger'>[src] warps in!</span>")
playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1)
/mob/living/simple_animal/hostile/hivebot/tele/proc/warpbots()
icon_state = "def_radar"
visible_message("<span class='warning'>The [src] turns on!</span>")
visible_message("<span class='warning'>[src] turns on!</span>")
while(bot_amt > 0)
bot_amt--
switch(bot_type)
code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm
+3 -3
View File
@@ -43,10 +43,10 @@
target = new_target
if(target != null)
if(istype(target, /obj/item/stack/ore) && loot.len < 10)
visible_message("<span class='notice'>The [name] looks at [target.name] with hungry eyes.</span>")
visible_message("<span class='notice'>[src] looks at [target.name] with hungry eyes.</span>")
else if(isliving(target))
Aggro()
visible_message("<span class='danger'>The [name] tries to flee from [target.name]!</span>")
visible_message("<span class='danger'>[src] tries to flee from [target.name]!</span>")
retreat_distance = 10
minimum_distance = 10
if(will_burrow)
@@ -69,7 +69,7 @@
/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>")
visible_message("<span class='danger'>[src] buries into the ground, vanishing from sight!</span>")
qdel(src)
/mob/living/simple_animal/hostile/asteroid/goldgrub/bullet_act(obj/item/projectile/P)
code/modules/mob/living/simple_animal/hostile/mining/mining.dm
+1 -1
View File
@@ -48,7 +48,7 @@
if(!stat)
Aggro()
if(T.throwforce <= 20)
visible_message("<span class='notice'>The [T.name] [throw_message] [src.name]!</span>")
visible_message("<span class='notice'>[T] [throw_message] [src.name]!</span>")
return
..()
code/modules/mob/living/simple_animal/hostile/mushroom.dm
+1 -1
View File
@@ -148,7 +148,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'>[src] was bruised!</span>")
bruised = 1
/mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I as obj, mob/user as mob, params)
code/modules/mob/living/simple_animal/hostile/syndicate.dm
+3 -3
View File
@@ -50,7 +50,7 @@
user.do_attack_animation(src)
if(O.force)
if(prob(melee_block_chance))
visible_message("<span class='boldwarning'>[src] blocks the [O] with its shield! </span>")
visible_message("<span class='boldwarning'>[src] blocks [O] with its shield! </span>")
else
var/damage = O.force
if(O.damtype == STAMINA)
@@ -59,11 +59,11 @@
visible_message("<span class='boldwarning'>[src] is unharmed by [O]!</span>")
return
adjustHealth(damage)
visible_message("<span class='boldwarning'>[src] has been attacked with the [O] by [user]. </span>")
visible_message("<span class='boldwarning'>[src] has been attacked with [O] by [user]. </span>")
playsound(loc, O.hitsound, 25, 1, -1)
else
to_chat(usr, "<span class='warning'>This weapon is ineffective, it does no damage.</span>")
visible_message("<span class='warning'>[user] gently taps [src] with the [O]. </span>")
visible_message("<span class='warning'>[user] gently taps [src] with [O]. </span>")
/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/item/projectile/Proj)
code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
+1 -1
View File
@@ -319,7 +319,7 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list)
if(stat == DEAD) // Can't use if(.) for this due to the fact it can sometimes return FALSE even when mob is alive.
if(prob(2))
// 2% chance every cycle to decompose
visible_message("<span class='notice'>\The dead body of the [src] decomposes!</span>")
visible_message("<span class='notice'>The dead body of [src] decomposes!</span>")
gib()
else
if(degenerate)
code/modules/mob/living/simple_animal/slime/emote.dm
+8 -8
View File
@@ -30,38 +30,38 @@
return
return custom_emote(m_type, message)
if("bounce")
message = "<B>The [src.name]</B> bounces in place."
message = "<B>[src]</B> bounces in place."
m_type = 1
if("custom")
return custom_emote(m_type, message)
if("jiggle")
message = "<B>The [src.name]</B> jiggles!"
message = "<B>[src]</B> jiggles!"
m_type = 1
if("light")
message = "<B>The [src.name]</B> lights up for a bit, then stops."
message = "<B>[src]</B> lights up for a bit, then stops."
m_type = 1
if("moan")
message = "<B>The [src.name]</B> moans."
message = "<B>[src]</B> moans."
m_type = 2
if("shiver")
message = "<B>The [src.name]</B> shivers."
message = "<B>[src]</B> shivers."
m_type = 2
if("sway")
message = "<B>The [src.name]</B> sways around dizzily."
message = "<B>[src]</B> sways around dizzily."
m_type = 1
if("twitch")
message = "<B>The [src.name]</B> twitches."
message = "<B>[src]</B> twitches."
m_type = 1
if("vibrate")
message = "<B>The [src.name]</B> vibrates!"
message = "<B>[src]</B> vibrates!"
m_type = 1
if("noface") //mfw I have no face
code/modules/ninja/martial_art.dm
+4 -4
View File
@@ -19,9 +19,9 @@
/obj/item/creeping_widow_injector/attack_self(mob/living/carbon/human/user as mob)
if(!used)
user.visible_message("<span class='warning'>You stick the [src]'s needle into your arm and press the button.", \
"<span class='warning'>[user] sticks the [src]'s needle [user.p_their()] arm and presses the button.")
to_chat(user, "<span class='info'>The nanomachines in the [src] flow through your bloodstream.")
user.visible_message("<span class='warning'>You stick [src]'s needle into your arm and press the button.", \
"<span class='warning'>[user] sticks [src]'s needle [user.p_their()] arm and presses the button.")
to_chat(user, "<span class='info'>The nanomachines in [src] flow through your bloodstream.")
var/datum/martial_art/ninja_martial_art/N = new/datum/martial_art/ninja_martial_art(null)
N.teach(user)
@@ -31,7 +31,7 @@
desc = "A strange autoinjector made of a black metal.<br>It appears to be used up and empty."
return 0
else
to_chat(user, "<span class='warning'>The [src] has been used already!</span>")
to_chat(user, "<span class='warning'>[src] has been used already!</span>")
return 1
// Ninja martial art datum
code/modules/paperwork/folders.dm
+1 -1
View File
@@ -39,7 +39,7 @@
if(istype(W, /obj/item/paper) || istype(W, /obj/item/photo) || istype(W, /obj/item/paper_bundle) || istype(W, /obj/item/documents))
user.drop_item()
W.loc = src
to_chat(user, "<span class='notice'>You put the [W] into \the [src].</span>")
to_chat(user, "<span class='notice'>You put [W] into [src].</span>")
update_icon()
else if(istype(W, /obj/item/pen))
rename_interactive(user, W)
code/modules/paperwork/paper.dm
+1 -1
View File
@@ -405,7 +405,7 @@
src.loc = get_turf(h_user)
if(h_user.client) h_user.client.screen -= src
h_user.put_in_hands(B)
to_chat(user, "<span class='notice'>You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name].</span>")
to_chat(user, "<span class='notice'>You clip [P] to [(src.name == "paper") ? "the paper" : src.name].</span>")
src.loc = B
P.loc = B
B.amount++
code/modules/paperwork/paper_bundle.dm
+1 -1
View File
@@ -168,7 +168,7 @@
if(href_list["remove"])
var/obj/item/W = src[page]
usr.put_in_hands(W)
to_chat(usr, "<span class='notice'>You remove the [W.name] from the bundle.</span>")
to_chat(usr, "<span class='notice'>You remove [W] from the bundle.</span>")
if(amount == 1)
var/obj/item/paper/P = src[1]
usr.unEquip(src)
code/modules/paperwork/paperbin.dm
+2 -2
View File
@@ -85,7 +85,7 @@
P.loc = user.loc
user.put_in_hands(P)
P.add_fingerprint(user)
to_chat(user, "<span class='notice'>You take [P] out of the [src].</span>")
to_chat(user, "<span class='notice'>You take [P] out of [src].</span>")
else
to_chat(user, "<span class='notice'>[src] is empty!</span>")
@@ -138,7 +138,7 @@
P = new /obj/item/paper/carbon
P.loc = user.loc
user.put_in_hands(P)
to_chat(user, "<span class='notice'>You take [P] out of the [src].</span>")
to_chat(user, "<span class='notice'>You take [P] out of [src].</span>")
else
to_chat(user, "<span class='notice'>[src] is empty!</span>")
code/modules/paperwork/pen.dm
+1 -1
View File
@@ -25,7 +25,7 @@
pressure_resistance = 2
/obj/item/pen/suicide_act(mob/user)
to_chat(viewers(user), "<span class='suicide'>[user] starts scribbling numbers over [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit sudoku.</span>")
to_chat(viewers(user), "<span class='suicide'>[user] starts scribbling numbers over [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit sudoku.</span>")
return BRUTELOSS
/obj/item/pen/blue
code/modules/pda/PDA.dm
Executable → Regular
+4 -4
View File
@@ -8,7 +8,7 @@ GLOBAL_LIST_EMPTY(PDAs)
/obj/item/pda
name = "PDA"
name = "\improper PDA"
desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge."
icon = 'icons/obj/pda.dmi'
icon_state = "pda"
@@ -179,7 +179,7 @@ GLOBAL_LIST_EMPTY(PDAs)
if(ismob(loc))
var/mob/M = loc
M.put_in_hands(id)
to_chat(user, "<span class='notice'>You remove the ID from the [name].</span>")
to_chat(user, "<span class='notice'>You remove the ID from [src].</span>")
SStgui.update_uis(src)
else
id.forceMove(get_turf(src))
@@ -214,10 +214,10 @@ GLOBAL_LIST_EMPTY(PDAs)
if(issilicon(user))
return
if( can_use(user) )
if(can_use(user))
var/obj/item/pen/O = locate() in src
if(O)
to_chat(user, "<span class='notice'>You remove the [O] from [src].</span>")
to_chat(user, "<span class='notice'>You remove [O] from [src].</span>")
playsound(src, 'sound/machines/pda_button2.ogg', 50, TRUE)
if(istype(loc, /mob))
var/mob/M = loc
code/modules/power/apc.dm
+2 -2
View File
@@ -731,11 +731,11 @@
if(usr == user && opened && !issilicon(user))
if(cell)
user.visible_message("<span class='warning'>[user.name] removes [cell] from [src]!", "<span class='notice'>You remove [cell].</span>")
user.put_in_hands(cell)
cell.add_fingerprint(user)
cell.update_icon()
cell = null
user.visible_message("<span class='warning'>[user.name] removes [cell] from [src]!", "You remove the [cell].</span>")
charging = FALSE
update_icon()
return
@@ -1050,7 +1050,7 @@
smoke.start()
do_sparks(3, 1, src)
for(var/mob/M in viewers(src))
M.show_message("<span class='danger'>The [name] suddenly lets out a blast of smoke and some sparks!", 3, "<span class='danger'>You hear sizzling electronics.</span>", 2)
M.show_message("<span class='danger'>[src] suddenly lets out a blast of smoke and some sparks!", 3, "<span class='danger'>You hear sizzling electronics.</span>", 2)
/obj/machinery/power/apc/surplus()
code/modules/power/cable.dm
+2 -2
View File
@@ -498,9 +498,9 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/suicide_act(mob/user)
if(locate(/obj/structure/chair/stool) in user.loc)
user.visible_message("<span class='suicide'>[user] is making a noose with the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is making a noose with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
else
user.visible_message("<span class='suicide'>[user] is strangling [user.p_them()]self with the [name]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
return OXYLOSS
/obj/item/stack/cable_coil/New(loc, length = MAXCOIL, paramcolor = null)
code/modules/power/cell.dm
+1 -1
View File
@@ -92,7 +92,7 @@
. += "The charge meter reads [round(percent() )]%."
/obj/item/stock_parts/cell/suicide_act(mob/user)
to_chat(viewers(user), "<span class='suicide'>[user] is licking the electrodes of the [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
to_chat(viewers(user), "<span class='suicide'>[user] is licking the electrodes of [src]! It looks like [user.p_theyre()] trying to commit suicide.</span>")
return FIRELOSS
/obj/item/stock_parts/cell/attackby(obj/item/W, mob/user, params)
code/modules/power/port_gen.dm
+2 -2
View File
@@ -279,9 +279,9 @@
var/obj/item/stack/addstack = O
var/amount = min((max_sheets - sheets), addstack.amount)
if(amount < 1)
to_chat(user, "<span class='notice'>The [src.name] is full!</span>")
to_chat(user, "<span class='notice'>[src] is full!</span>")
return
to_chat(user, "<span class='notice'>You add [amount] sheet\s to the [src.name].</span>")
to_chat(user, "<span class='notice'>You add [amount] sheet\s to [src].</span>")
sheets += amount
addstack.use(amount)
SStgui.update_uis(src)
code/modules/power/singularity/containment_field.dm
+1 -1
View File
@@ -109,7 +109,7 @@
if(prob(20))
user.Stun(2)
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] was shocked by [src]!</span>", \
"<span class='userdanger'>Energy pulse detected, system damaged!</span>", \
"<span class='italics'>You hear an electrical crack.</span>")
code/modules/power/singularity/emitter.dm
+1 -1
View File
@@ -197,7 +197,7 @@
else
state = EMITTER_NEEDS_WRENCH
anchored = FALSE
user.visible_message("<span class='notice'>[user] unsecures [src] reinforcing bolts from the floor.</span>",
user.visible_message("<span class='notice'>[user] unsecures [src]'s reinforcing bolts from the floor.</span>",
"<span class='notice'>You undo the external reinforcing bolts.</span>",
"<span class='notice'>You hear a ratchet.</span>")
playsound(src, I.usesound, I.tool_volume, TRUE)
code/modules/power/singularity/field_generator.dm
+5 -5
View File
@@ -64,11 +64,11 @@ field_generator power level display
if(state == FG_WELDED)
if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on
if(active >= FG_CHARGING)
to_chat(user, "<span class='warning'>You are unable to turn off the [name] once it is online!</span>")
to_chat(user, "<span class='warning'>You are unable to turn off [src] once it is online!</span>")
return 1
else
user.visible_message("[user.name] turns on the [name].", \
"<span class='notice'>You turn on the [name].</span>", \
user.visible_message("[user] turns on [src].", \
"<span class='notice'>You turn on [src].</span>", \
"<span class='italics'>You hear heavy droning.</span>")
turn_on()
investigate_log("<font color='green'>activated</font> by [user.key].","singulo")
@@ -100,7 +100,7 @@ field_generator power level display
"<span class='italics'>You hear ratchet.</span>")
anchored = 0
if(FG_WELDED)
to_chat(user, "<span class='warning'>The [name] needs to be unwelded from the floor!</span>")
to_chat(user, "<span class='warning'>[src] needs to be unwelded from the floor!</span>")
else
return ..()
@@ -188,7 +188,7 @@ field_generator power level display
check_power_level()
return 1
else
visible_message("<span class='danger'>The [name] shuts down!</span>", "<span class='italics'>You hear something shutting down.</span>")
visible_message("<span class='danger'>[src] shuts down!</span>", "<span class='italics'>You hear something shutting down.</span>")
turn_off()
investigate_log("ran out of power and <font color='red'>deactivated</font>","singulo")
power = 0
code/modules/power/singularity/generator.dm
+4 -4
View File
@@ -26,13 +26,13 @@
anchored = !anchored
playsound(src.loc, W.usesound, 75, 1)
if(anchored)
user.visible_message("[user.name] secures [src.name] to the floor.", \
"You secure the [src.name] to the floor.", \
user.visible_message("[user.name] secures [src] to the floor.", \
"You secure [src] to the floor.", \
"You hear a ratchet")
src.add_hiddenprint(user)
else
user.visible_message("[user.name] unsecures [src.name] from the floor.", \
"You unsecure the [src.name] from the floor.", \
user.visible_message("[user.name] unsecures [src] from the floor.", \
"You unsecure [src.name] from the floor.", \
"You hear a ratchet")
return
return ..()
code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+2 -2
View File
@@ -201,7 +201,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
var/obj/item/stack/cable_coil/C = W
if(C.use(1))
playsound(loc, C.usesound, 50, 1)
user.visible_message("[user.name] adds wires to the [name].", \
user.visible_message("[user] adds wires to [src].", \
"You add some wires.")
construction_state = ACCELERATOR_WIRED
update_icon()
@@ -302,7 +302,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
var/obj/item/stack/cable_coil/C = W
if(C.use(1))
playsound(loc, C.usesound, 50, 1)
user.visible_message("[user.name] adds wires to the [name].", \
user.visible_message("[user] adds wires to [src].", \
"You add some wires.")
construction_state = ACCELERATOR_WIRED
update_icon()
code/modules/power/singularity/singularity.dm
+3 -3
View File
@@ -412,12 +412,12 @@
if(istype(H.glasses, /obj/item/clothing/glasses/meson))
var/obj/item/clothing/glasses/meson/MS = H.glasses
if(MS.vision_flags == SEE_TURFS)
to_chat(H, "<span class='notice'>You look directly into the [src.name], good thing you had your protective eyewear on!</span>")
to_chat(H, "<span class='notice'>You look directly into [src], good thing you had your protective eyewear on!</span>")
return
M.apply_effect(3, STUN)
M.visible_message("<span class='danger'>[M] stares blankly at the [src.name]!</span>", \
"<span class='userdanger'>You look directly into the [src.name] and feel weak.</span>")
M.visible_message("<span class='danger'>[M] stares blankly at [src]!</span>", \
"<span class='userdanger'>You look directly into [src] and feel weak.</span>")
return
code/modules/power/smes.dm
+3 -3
View File
@@ -154,7 +154,7 @@
return
if(user.loc == loc)
to_chat(user, "<span class='warning'>You must not be on the same tile as the [src].</span>")
to_chat(user, "<span class='warning'>You must not be on the same tile as [src].</span>")
return
//Direction the terminal will face to
@@ -173,7 +173,7 @@
to_chat(user, "<span class='warning'>You must remove the floor plating first.</span>")
return
to_chat(user, "<span class='notice'>You start adding cable to the [src].</span>")
to_chat(user, "<span class='notice'>You start adding cable to [src].</span>")
playsound(loc, C.usesound, 50, 1)
if(do_after(user, 50, target = src))
@@ -429,7 +429,7 @@
if(is_station_level(src.z))
if(prob(1)) //explosion
for(var/mob/M in viewers(src))
M.show_message("<span class='warning'>The [src.name] is making strange noises!</span>", 3, "<span class='warning'>You hear sizzling electronics.</span>", 2)
M.show_message("<span class='warning'>[src] is making strange noises!</span>", 3, "<span class='warning'>You hear sizzling electronics.</span>", 2)
sleep(10*pick(4,5,6,7,10,14))
var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(3, 0, src.loc)
code/modules/projectiles/guns/energy.dm
+3 -3
View File
@@ -165,10 +165,10 @@
/obj/item/gun/energy/suicide_act(mob/user)
if(can_shoot())
user.visible_message("<span class='suicide'>[user] is putting the barrel of the [name] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide.</span>")
sleep(25)
if(user.l_hand == src || user.r_hand == src)
user.visible_message("<span class='suicide'>[user] melts [user.p_their()] face off with the [name]!</span>")
user.visible_message("<span class='suicide'>[user] melts [user.p_their()] face off with [src]!</span>")
playsound(loc, fire_sound, 50, 1, -1)
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
cell.use(shot.e_cost)
@@ -178,7 +178,7 @@
user.visible_message("<span class='suicide'>[user] panics and starts choking to death!</span>")
return OXYLOSS
else
user.visible_message("<span class='suicide'>[user] is pretending to blow [user.p_their()] brains out with the [name]! It looks like [user.p_theyre()] trying to commit suicide!</b></span>")
user.visible_message("<span class='suicide'>[user] is pretending to blow [user.p_their()] brains out with [src]! It looks like [user.p_theyre()] trying to commit suicide!</b></span>")
playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
return OXYLOSS
code/modules/projectiles/guns/energy/special.dm
+1 -1
View File
@@ -129,7 +129,7 @@
/obj/item/gun/energy/kinetic_accelerator/suicide_act(mob/user)
if(!suppressed)
playsound(loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
user.visible_message("<span class='suicide'>[user] cocks the [name] and pretends to blow [user.p_their()] brains out! It looks like [user.p_theyre()] trying to commit suicide!</b></span>")
user.visible_message("<span class='suicide'>[user] cocks [src] and pretends to blow [user.p_their()] brains out! It looks like [user.p_theyre()] trying to commit suicide!</b></span>")
shoot_live_shot(user, user, FALSE, FALSE)
return OXYLOSS
code/modules/projectiles/guns/grenade_launcher.dm
+1 -1
View File
@@ -25,7 +25,7 @@
return
I.loc = src
grenades += I
to_chat(user, "<span class='notice'>You put the grenade in the [name].</span>")
to_chat(user, "<span class='notice'>You put the grenade in [src].</span>")
to_chat(user, "<span class='notice'>[grenades.len] / [max_grenades] grenades.</span>")
else
to_chat(user, "<span class='warning'>The grenade launcher cannot hold more grenades.</span>")
code/modules/projectiles/guns/magic.dm
+2 -2
View File
@@ -75,10 +75,10 @@
return
/obj/item/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj)
to_chat(user, "<span class='warning'>The [name] whizzles quietly.</span>")
to_chat(user, "<span class='warning'>[src] whizzles quietly.</span>")
return
/obj/item/gun/magic/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] is twisting the [name] above [user.p_their()] head, releasing a magical blast! It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is twisting [src] above [user.p_their()] head, releasing a magical blast! It looks like [user.p_theyre()] trying to commit suicide.</span>")
playsound(loc, fire_sound, 50, 1, -1)
return FIRELOSS
code/modules/projectiles/guns/projectile.dm
+3 -3
View File
@@ -164,17 +164,17 @@
/obj/item/gun/projectile/suicide_act(mob/user)
if(chambered && chambered.BB && !chambered.BB.nodamage)
user.visible_message("<span class='suicide'>[user] is putting the barrel of the [name] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide.</span>")
sleep(25)
if(user.l_hand == src || user.r_hand == src)
process_fire(user, user, 0, zone_override = "head")
user.visible_message("<span class='suicide'>[user] blows [user.p_their()] brains out with the [name]!</span>")
user.visible_message("<span class='suicide'>[user] blows [user.p_their()] brains out with [src]!</span>")
return BRUTELOSS
else
user.visible_message("<span class='suicide'>[user] panics and starts choking to death!</span>")
return OXYLOSS
else
user.visible_message("<span class='suicide'>[user] is pretending to blow [user.p_their()] brains out with the [name]! It looks like [user.p_theyre()] trying to commit suicide!</b></span>")
user.visible_message("<span class='suicide'>[user] is pretending to blow [user.p_their()] brains out with [src]! It looks like [user.p_theyre()] trying to commit suicide!</b></span>")
playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
return OXYLOSS
code/modules/projectiles/guns/projectile/shotgun.dm
+2 -2
View File
@@ -115,7 +115,7 @@
return
else
afterattack(user, user)
user.visible_message("The [src] goes click!", "<span class='notice'>The [src] you are holding goes click.</span>")
user.visible_message("[src] goes click!", "<span class='notice'>[src] you are holding goes click.</span>")
if(magazine.ammo_count()) //Spill the mag onto the floor
user.visible_message("<span class='danger'>[user.name] opens [src] up and the shells go goes flying around!</span>", "<span class='userdanger'>You open [src] up and the shells go goes flying everywhere!!</span>")
while(get_ammo(0) > 0)
@@ -158,7 +158,7 @@
return
else
afterattack(user, user)
user.visible_message("The [src] goes click!", "<span class='notice'>The [src] you are holding goes click.</span>")
user.visible_message("[src] goes click!", "<span class='notice'>[src] you are holding goes click.</span>")
if(magazine.ammo_count()) //Spill the mag onto the floor
user.visible_message("<span class='danger'>[user.name] opens [src] up and the shells go goes flying around!</span>", "<span class='userdanger'>You open [src] up and the shells go goes flying everywhere!!</span>")
while(get_ammo() > 0)
code/modules/projectiles/projectile/bullets.dm
+2 -2
View File
@@ -252,8 +252,8 @@
return 1
else
blocked = 100
target.visible_message("<span class='danger'>The [name] was deflected!</span>", \
"<span class='userdanger'>You were protected against the [name]!</span>")
target.visible_message("<span class='danger'>[src] was deflected!</span>", \
"<span class='userdanger'>You were protected against [src]!</span>")
..(target, blocked, hit_zone)
reagents.set_reacting(TRUE)
reagents.handle_reactions()
code/modules/projectiles/projectile/special.dm
+1 -1
View File
@@ -159,7 +159,7 @@
/obj/item/projectile/clown/Bump(atom/A as mob|obj|turf|area)
do_sparks(3, 1, src)
new /obj/effect/decal/cleanable/ash(loc)
visible_message("<span class='warning'>The [name] explodes!</span>","<span class='warning'>You hear a snap!</span>")
visible_message("<span class='warning'>[src] explodes!</span>","<span class='warning'>You hear a snap!</span>")
playsound(src, 'sound/effects/snap.ogg', 50, 1)
qdel(src)
code/modules/reagents/chemistry/holder.dm
+1 -1
View File
@@ -458,7 +458,7 @@
ME2.Uses--
if(ME2.Uses <= 0) // give the notification that the slime core is dead
for(var/mob/living/M in seen)
to_chat(M, "<span class='notice'>[bicon(my_atom)] The [my_atom]'s power is consumed in the reaction.</span>")
to_chat(M, "<span class='notice'>[bicon(my_atom)] [my_atom]'s power is consumed in the reaction.</span>")
ME2.name = "used slime extract"
ME2.desc = "This extract has been used up."
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+1 -1
View File
@@ -571,7 +571,7 @@
cell.update_icon()
cell.loc = get_turf(src)
cell = null
to_chat(user, "<span class='notice'>You remove the cell from the [src].</span>")
to_chat(user, "<span class='notice'>You remove the cell from [src].</span>")
update_icon()
return
..()
code/modules/reagents/chemistry/machinery/chem_master.dm
+1 -1
View File
@@ -88,7 +88,7 @@
return
if(panel_open)
to_chat(user, "<span class='warning'>You can't use the [name] while it's panel is opened!</span>")
to_chat(user, "<span class='warning'>You can't use [src] while it's panel is opened!</span>")
return TRUE
if(istype(I, /obj/item/reagent_containers/glass) || istype(I, /obj/item/reagent_containers/food/drinks/drinkingglass))
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+2 -2
View File
@@ -432,7 +432,7 @@
slime.update_name()
continue
slime.rabid = 1
slime.visible_message("<span class='danger'>The [slime] is driven into a frenzy!</span>")
slime.visible_message("<span class='danger'>[slime] is driven into a frenzy!</span>")
/datum/chemical_reaction/slimespeed
@@ -563,7 +563,7 @@
SSblackbox.record_feedback("tally", "slime_cores_used", 1, type)
if(holder.my_atom)
var/obj/item/stack/ore/bluespace_crystal/BC = new(get_turf(holder.my_atom))
BC.visible_message("<span class='notice'>The [BC.name] appears out of thin air!</span>")
BC.visible_message("<span class='notice'>[BC] appears out of thin air!</span>")
//Cerulean
/datum/chemical_reaction/slimepsteroid2
code/modules/reagents/reagent_containers/dropper.dm
+1 -1
View File
@@ -115,7 +115,7 @@
/obj/item/reagent_containers/dropper/precision/viral_injector/attack(mob/living/M, mob/living/user, def_zone)
if(M.can_inject(user, TRUE))
to_chat(user, "<span class='warning'>You stab [M] with the [src].</span>")
to_chat(user, "<span class='warning'>You stealthily stab [M] with [src].</span>")
if(reagents.total_volume && M.reagents)
var/list/injected = list()
for(var/datum/reagent/R in reagents.reagent_list)
code/modules/reagents/reagent_containers/iv_bag.dm
+1 -1
View File
@@ -60,7 +60,7 @@
return
if(get_dist(get_turf(src), get_turf(injection_target)) > 1)
to_chat(injection_target, "<span class='userdanger'>The [src]'s' needle is ripped out of you!</span>")
to_chat(injection_target, "<span class='userdanger'>[src]'s needle is ripped out of you!</span>")
injection_target.apply_damage(3, BRUTE, pick("r_arm", "l_arm"))
end_processing()
return
code/modules/recycling/disposal.dm
+8 -8
View File
@@ -120,11 +120,11 @@
if(ismob(G.affecting))
var/mob/GM = G.affecting
for(var/mob/V in viewers(usr))
V.show_message("[usr] starts putting [GM.name] into the disposal.", 3)
V.show_message("[usr] starts putting [GM] into the disposal.", 3)
if(do_after(usr, 20, target = GM))
GM.forceMove(src)
for(var/mob/C in viewers(src))
C.show_message("<span class='warning'>[GM.name] has been placed in the [src] by [user].</span>", 3)
C.show_message("<span class='warning'>[GM] has been placed in [src] by [user].</span>", 3)
qdel(G)
add_attack_logs(usr, GM, "Disposal'ed", !!GM.ckey ? null : ATKLOG_ALL)
return
@@ -137,11 +137,11 @@
if(I)
I.forceMove(src)
to_chat(user, "You place \the [I] into the [src].")
to_chat(user, "You place [I] into [src].")
for(var/mob/M in viewers(src))
if(M == user)
continue
M.show_message("[user.name] places \the [I] into the [src].", 3)
M.show_message("[user.name] places [I] into [src].", 3)
update()
@@ -203,11 +203,11 @@
return
if(target == user && !user.stat && !user.IsWeakened() && !user.stunned && !user.paralysis) // if drop self, then climbed in
// must be awake, not stunned or whatever
msg = "[user.name] climbs into the [src]."
to_chat(user, "You climb into the [src].")
msg = "[user.name] climbs into [src]."
to_chat(user, "You climb into [src].")
else if(target != user && !user.restrained() && !user.stat && !user.IsWeakened() && !user.stunned && !user.paralysis)
msg = "[user.name] stuffs [target.name] into the [src]!"
to_chat(user, "You stuff [target.name] into the [src]!")
msg = "[user.name] stuffs [target.name] into [src]!"
to_chat(user, "You stuff [target.name] into [src]!")
if(!iscarbon(user))
target.LAssailant = null
else
code/modules/research/circuitprinter.dm
+1 -1
View File
@@ -95,7 +95,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
default_deconstruction_crowbar(user, O)
return
else
to_chat(user, "<span class='warning'>You can't load the [src.name] while it's opened.</span>")
to_chat(user, "<span class='warning'>You can't load [src] while it's opened.</span>")
return
if(O.is_open_container())
return FALSE
code/modules/research/destructive_analyzer.dm
+4 -4
View File
@@ -62,10 +62,10 @@ Note: Must be placed within 3 tiles of the R&D Console
if(disabled)
return
if(!linked_console)
to_chat(user, "<span class='warning'>The [src.name] must be linked to an R&D console first!</span>")
to_chat(user, "<span class='warning'>[src] must be linked to an R&D console first!</span>")
return
if(busy)
to_chat(user, "<span class='warning'>The [src.name] is busy right now.</span>")
to_chat(user, "<span class='warning'>[src] is busy right now.</span>")
return
if(istype(O, /obj/item) && !loaded_item)
if(!O.origin_tech)
@@ -76,12 +76,12 @@ Note: Must be placed within 3 tiles of the R&D Console
to_chat(user, "<span class='warning'>You cannot deconstruct this item!</span>")
return
if(!user.drop_item())
to_chat(user, "<span class='warning'>\The [O] is stuck to your hand, you cannot put it in the [src.name]!</span>")
to_chat(user, "<span class='warning'>[O] is stuck to your hand, you cannot put it in [src]!</span>")
return
busy = 1
loaded_item = O
O.loc = src
to_chat(user, "<span class='notice'>You add the [O.name] to the [src.name]!</span>")
to_chat(user, "<span class='notice'>You add [O] to [src]!</span>")
flick("d_analyzer_la", src)
spawn(10)
icon_state = "d_analyzer_l"
code/modules/research/experimentor.dm
+11 -11
View File
@@ -16,7 +16,7 @@
#define FAIL 8
/obj/machinery/r_n_d/experimentor
name = "E.X.P.E.R.I-MENTOR"
name = "\improper E.X.P.E.R.I-MENTOR"
icon = 'icons/obj/machines/heavy_lathe.dmi'
icon_state = "h_lathe"
density = 1
@@ -129,16 +129,16 @@
return
if(!checkCircumstances(O))
to_chat(user, "<span class='warning'>The [O] is not yet valid for the [src] and must be completed!</span>")
to_chat(user, "<span class='warning'>[O] is not yet valid for [src] and must be completed!</span>")
return
if(disabled)
return
if(!linked_console)
to_chat(user, "<span class='warning'>The [src] must be linked to an R&D console first!</span>")
to_chat(user, "<span class='warning'>[src] must be linked to an R&D console first!</span>")
return
if(loaded_item)
to_chat(user, "<span class='warning'>The [src] is already loaded.</span>")
to_chat(user, "<span class='warning'>[src] is already loaded.</span>")
return
if(istype(O, /obj/item))
if(!O.origin_tech)
@@ -152,7 +152,7 @@
return
loaded_item = O
O.loc = src
to_chat(user, "<span class='notice'>You add the [O.name] to the machine.</span>")
to_chat(user, "<span class='notice'>You add [O] to the machine.</span>")
flick("h_lathe_load", src)
return
@@ -263,7 +263,7 @@
visible_message("<span class='warning'>[src] malfunctions!</span>")
exp = SCANTYPE_OBLITERATE
if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("<span class='danger'>[src] malfunctions, throwing the [exp_on]!</span>")
visible_message("<span class='danger'>[src] malfunctions, throwing [exp_on]!</span>")
var/mob/living/target = locate(/mob/living) in oview(7,src)
if(target)
var/obj/item/throwing = loaded_item
@@ -443,7 +443,7 @@
if(exp == SCANTYPE_OBLITERATE)
visible_message("<span class='warning'>[exp_on] activates the crushing mechanism, [exp_on] is destroyed!</span>")
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message("<span class='warning'>[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!</span>")
visible_message("<span class='warning'>[src]'s crushing mechanism slowly and smoothly descends, flattening [exp_on]!</span>")
new /obj/item/stack/sheet/plasteel(get_turf(pick(oview(1,src))))
if(linked_console.linked_lathe)
var/datum/component/material_container/linked_materials = linked_console.linked_lathe.GetComponent(/datum/component/material_container)
@@ -478,7 +478,7 @@
visible_message("<span class='warning'>[exp_on] [a], and [b], the experiment was a failure.</span>")
if(exp == SCANTYPE_DISCOVER)
visible_message("[src] scans the [exp_on], revealing its true nature!")
visible_message("[src] scans [exp_on], revealing its true nature!")
playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 3, -1)
var/obj/item/relic/R = loaded_item
R.reveal()
@@ -710,17 +710,17 @@
to_chat(user, "<span class='danger'>[src] begins to heat up!</span>")
spawn(rand(35,100))
if(src.loc == user)
visible_message("<span class='notice'>The [src]'s top opens, releasing a powerful blast!</span>")
visible_message("<span class='notice'>[src]'s top opens, releasing a powerful blast!</span>")
explosion(user.loc, -1, rand(1,5), rand(1,5), rand(1,5), rand(1,5), flame_range = 2)
warn_admins(user, "Explosion")
qdel(src) //Comment this line to produce a light grenade (the bomb that keeps on exploding when used)!!
/obj/item/relic/proc/teleport(mob/user)
to_chat(user, "<span class='notice'>The [src] begins to vibrate!</span>")
to_chat(user, "<span class='notice'>[src] begins to vibrate!</span>")
spawn(rand(10,30))
var/turf/userturf = get_turf(user)
if(src.loc == user && is_teleport_allowed(userturf.z)) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!
visible_message("<span class='notice'>The [src] twists and bends, relocating itself!</span>")
visible_message("<span class='notice'>[src] twists and bends, relocating itself!</span>")
throwSmoke(userturf)
do_teleport(user, userturf, 8, asoundin = 'sound/effects/phasein.ogg')
throwSmoke(get_turf(user))
code/modules/research/protolathe.dm
+1 -1
View File
@@ -102,7 +102,7 @@ Note: Must be placed west/left of and R&D console to function.
default_deconstruction_crowbar(user, O)
return 1
else
to_chat(user, "<span class='warning'>You can't load the [src.name] while it's opened.</span>")
to_chat(user, "<span class='warning'>You can't load [src] while it's opened.</span>")
return 1
if(O.is_open_container())
return FALSE
code/modules/research/xenobiology/xenobio_camera.dm
+1 -1
View File
@@ -176,7 +176,7 @@
if(istype(M.buffer, /obj/machinery/monkey_recycler))
connected_recycler = M.buffer
connected_recycler.connected += src
to_chat(user, "<span class='notice'>You link [src] to the recycler stored in the [M]'s buffer.</span>")
to_chat(user, "<span class='notice'>You link [src] to the recycler stored in [M]'s buffer.</span>")
/datum/action/innate/slime_place
name = "Place Slimes"
code/modules/spacepods/lock_buster.dm
+1 -1
View File
@@ -11,4 +11,4 @@
icon_state = "lock_buster_on"
else
icon_state = "lock_buster_off"
to_chat(usr, "<span class='notice'>You turn the [src] [on ? "on" : "off"].</span>")
to_chat(usr, "<span class='notice'>You turn [src] [on ? "on" : "off"].</span>")
code/modules/spacepods/spacepod.dm
+15 -15
View File
@@ -257,7 +257,7 @@
deal_damage(15)
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
to_chat(user, "<span class='warning'>You slash at [src]!</span>")
visible_message("<span class='warning'>The [user] slashes at [src.name]'s armor!</span>")
visible_message("<span class='warning'>[user] slashes at [src]'s armor!</span>")
/obj/spacepod/proc/deal_damage(damage)
var/oldhealth = health
@@ -391,22 +391,22 @@
else if(istype(W, /obj/item/lock_buster))
var/obj/item/lock_buster/L = W
if(L.on && equipment_system.lock_system)
user.visible_message(user, "<span class='warning'>[user] is drilling through the [src]'s lock!</span>",
"<span class='notice'>You start drilling through the [src]'s lock!</span>")
user.visible_message(user, "<span class='warning'>[user] is drilling through [src]'s lock!</span>",
"<span class='notice'>You start drilling through [src]'s lock!</span>")
if(do_after(user, 100 * W.toolspeed, target = src))
QDEL_NULL(equipment_system.lock_system)
unlocked = TRUE
user.visible_message(user, "<span class='warning'>[user] has destroyed the [src]'s lock!</span>",
"<span class='notice'>You destroy the [src]'s lock!</span>")
user.visible_message(user, "<span class='warning'>[user] has destroyed [src]'s lock!</span>",
"<span class='notice'>You destroy [src]'s lock!</span>")
else
user.visible_message(user, "<span class='warning'>[user] fails to break through the [src]'s lock!</span>",
"<span class='notice'>You were unable to break through the [src]'s lock!</span>")
user.visible_message(user, "<span class='warning'>[user] fails to break through [src]'s lock!</span>",
"<span class='notice'>You were unable to break through [src]'s lock!</span>")
return
if(L.on && unlocked == FALSE) //The buster is on, we don't have a lock system, and the pod is still somehow locked, unlocking.
unlocked = TRUE
user.visible_message(user, "<span class='notice'>[user] repairs [src]'s doors with [L].</span>",
"<span class='notice'>You repair [src]'s doors with [L].</span>")
to_chat(user, "<span class='notice'>Turn the [L] on first.</span>")
to_chat(user, "<span class='notice'>Turn [L] on first.</span>")
return
else if(cargo_hold.storage_slots > 0 && !hatch_open && unlocked) // must be the last option as all items not listed prior will be stored
@@ -471,7 +471,7 @@
target = passengers[1]
if(target && istype(target))
src.visible_message("<span class='warning'>[user] is trying to rip the door open and pull [target] out of the [src]!</span>",
src.visible_message("<span class='warning'>[user] is trying to rip the door open and pull [target] out of [src]!</span>",
"<span class='warning'>You see [user] outside the door trying to rip it open!</span>")
if(do_after(user, 50, target = src))
target.Stun(1)
@@ -479,11 +479,11 @@
eject_pilot()
else
eject_passenger(target)
target.visible_message("<span class='warning'>[user] flings the door open and tears [target] out of the [src]</span>",
"<span class='warning'>The door flies open and you are thrown out of the [src] and to the ground!</span>")
target.visible_message("<span class='warning'>[user] flings the door open and tears [target] out of [src]</span>",
"<span class='warning'>The door flies open and you are thrown out of [src] and to the ground!</span>")
return
target.visible_message("<span class='warning'>[user] was unable to get the door open!</span>",
"<span class='warning'>You manage to keep [user] out of the [src]!</span>")
"<span class='warning'>You manage to keep [user] out of [src]!</span>")
if(!hatch_open)
if(cargo_hold.storage_slots > 0)
@@ -867,9 +867,9 @@
occupant_sanity_check()
if(usr.restrained())
to_chat(usr, "<span class='notice'>You attempt to stumble out of the [src]. This will take two minutes.</span>")
to_chat(usr, "<span class='notice'>You attempt to stumble out of [src]. This will take two minutes.</span>")
if(pilot)
to_chat(pilot, "<span class='warning'>[usr] is trying to escape the [src].</span>")
to_chat(pilot, "<span class='warning'>[usr] is trying to escape [src].</span>")
if(!do_after(usr, 1200, target = src))
return
@@ -1016,7 +1016,7 @@
else
to_chat(user, "<span class='notice'>You fail to find anything of value.</span>")
else
to_chat(user, "<span class='notice'>You decide against searching the [src]</span>")
to_chat(user, "<span class='notice'>You decide against searching [src]</span>")
/obj/spacepod/proc/enter_after(delay as num, mob/user as mob, numticks = 5)
var/delayfraction = delay/numticks
code/modules/station_goals/shield.dm
+1 -1
View File
@@ -126,7 +126,7 @@
to_chat(user, "<span class='warning'>You can only activate satellites which are in space.</span>")
return FALSE
if(user)
to_chat(user, "<span class='notice'>You [active ? "deactivate": "activate"] the [src]</span>")
to_chat(user, "<span class='notice'>You [active ? "deactivate": "activate"] [src]</span>")
active = !active
if(active)
animate(src, pixel_y = 2, time = 10, loop = -1)
code/modules/surgery/organs/augments_internal.dm
+2 -2
View File
@@ -99,12 +99,12 @@
if(L_item)
A = pick(oview(range))
L_item.throw_at(A, range, 2)
to_chat(owner, "<span class='notice'>Your left arm spasms and throws the [L_item.name]!</span>")
to_chat(owner, "<span class='notice'>Your left arm spasms and throws [L_item]!</span>")
l_hand_obj = null
if(R_item)
A = pick(oview(range))
R_item.throw_at(A, range, 2)
to_chat(owner, "<span class='notice'>Your right arm spasms and throws the [R_item.name]!</span>")
to_chat(owner, "<span class='notice'>Your right arm spasms and throws [R_item]!</span>")
r_hand_obj = null
/obj/item/organ/internal/cyberimp/brain/anti_drop/proc/release_items()
code/modules/surgery/robotics.dm
+2 -2
View File
@@ -209,7 +209,7 @@
current_type = "burn"
var/obj/item/stack/cable_coil/C = tool
if(!(affected.burn_dam > 0))
to_chat(user, "<span class='warning'>The [affected] does not have any burn damage!</span>")
to_chat(user, "<span class='warning'>\The [affected] does not have any burn damage!</span>")
return -1
if(!istype(C))
return -1
@@ -223,7 +223,7 @@
else if(implement_type in implements_heal_brute)
current_type = "brute"
if(!(affected.brute_dam > 0 || affected.disfigured))
to_chat(user, "<span class='warning'>The [affected] does not require welding repair!</span>")
to_chat(user, "<span class='warning'>\The [affected] does not require welding repair!</span>")
return -1
if(tool.tool_behaviour == TOOL_WELDER)
if(!tool.use(1))
code/modules/telesci/telesci_computer.dm
+1 -1
View File
@@ -70,7 +70,7 @@
if(M.buffer && istype(M.buffer, /obj/machinery/telepad))
telepad = M.buffer
M.buffer = null
to_chat(user, "<span class = 'caution'>You upload the data from the [W.name]'s buffer.</span>")
to_chat(user, "<span class='notice'>You upload the data from [M]'s buffer.</span>")
updateUsrDialog()
else
return ..()