Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions code/game/machinery/bots/mulebot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
SPAN_NOTICE("You repair [src]!")
)
else
to_chat(user, SPAN_NOTICE(" [src] does not need a repair!"))
to_chat(user, SPAN_NOTICE("[src] does not need a repair!"))
else if(load && ismob(load)) // chance to knock off rider
if(prob(1+I.force * 2))
unload(0)
Expand Down Expand Up @@ -410,15 +410,15 @@
if (held_item && HAS_TRAIT(held_item, TRAIT_TOOL_MULTITOOL))
switch(href_list["wire"])
if("1","2")
to_chat(usr, SPAN_NOTICE(" [icon2html(src, usr)] The charge light flickers."))
to_chat(usr, SPAN_NOTICE("[icon2html(src, usr)] The charge light flickers."))
if("4")
to_chat(usr, SPAN_NOTICE(" [icon2html(src, usr)] The external warning lights flash briefly."))
to_chat(usr, SPAN_NOTICE("[icon2html(src, usr)] The external warning lights flash briefly."))
if("8")
to_chat(usr, SPAN_NOTICE(" [icon2html(src, usr)] The load platform clunks."))
to_chat(usr, SPAN_NOTICE("[icon2html(src, usr)] The load platform clunks."))
if("16", "32")
to_chat(usr, SPAN_NOTICE(" [icon2html(src, usr)] The drive motor whines briefly."))
to_chat(usr, SPAN_NOTICE("[icon2html(src, usr)] The drive motor whines briefly."))
else
to_chat(usr, SPAN_NOTICE(" [icon2html(src, usr)] You hear a radio crackle."))
to_chat(usr, SPAN_NOTICE("[icon2html(src, usr)] You hear a radio crackle."))
else
to_chat(usr, SPAN_NOTICE(" You need a multitool!"))

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/books/book.dm
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
/obj/item/book/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
if(user.zone_selected == "eyes")
user.visible_message(SPAN_NOTICE("You open up the book and show it to [M]. "),
SPAN_NOTICE(" [user] opens up a book and shows it to [M]. "))
SPAN_NOTICE("[user] opens up a book and shows it to [M]. "))
show_browser(M, "<body class='paper'><TT><I>Penned by [author].</I></TT> <BR>[dat]</body>", "window=book")

/obj/item/lore_book
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/weapons/energy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@
icon_state = "sword[sword_color]"
w_class = SIZE_LARGE
playsound(user, 'sound/weapons/saberon.ogg', 25, 1)
to_chat(user, SPAN_NOTICE(" [src] is now active."))
to_chat(user, SPAN_NOTICE("[src] is now active."))

else
force = 3
heat_source = 0
icon_state = "[base_sword_icon]0"
w_class = SIZE_SMALL
playsound(user, 'sound/weapons/saberoff.ogg', 25, 1)
to_chat(user, SPAN_NOTICE(" [src] can now be concealed."))
to_chat(user, SPAN_NOTICE("[src] can now be concealed."))

if(istype(user,/mob/living/carbon/human))
var/mob/living/carbon/human/H = user
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/weapons/swords_axes_etc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,15 @@
icon_state = "eshield[active]"
w_class = SIZE_LARGE
playsound(user, 'sound/weapons/saberon.ogg', 25, 1)
to_chat(user, SPAN_NOTICE(" [src] is now active."))
to_chat(user, SPAN_NOTICE("[src] is now active."))
shield_chance = readied_block

else
force = 3
icon_state = "eshield[active]"
w_class = SIZE_TINY
playsound(user, 'sound/weapons/saberoff.ogg', 25, 1)
to_chat(user, SPAN_NOTICE(" [src] can now be concealed."))
to_chat(user, SPAN_NOTICE("[src] can now be concealed."))
shield_chance = SHIELD_CHANCE_NONE

if(istype(user,/mob/living/carbon/human))
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cm_marines/m2c.dm
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@
return
if((rounds > 0) && (user.a_intent & (INTENT_GRAB)))
playsound(src.loc, 'sound/items/m56dauto_load.ogg', 75, 1)
user.visible_message(SPAN_NOTICE(" [user] removes [src]'s ammo box."),SPAN_NOTICE(" You remove [src]'s ammo box, preparing the gun for disassembly."))
user.visible_message(SPAN_NOTICE("[user] removes [src]'s ammo box."),SPAN_NOTICE(" You remove [src]'s ammo box, preparing the gun for disassembly."))
var/obj/item/ammo_magazine/m2c/used_ammo = new(user.loc)
used_ammo.current_rounds = rounds
user.put_in_active_hand(used_ammo)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/cm_preds/yaut_weapons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
. += "Stack up your combo meter by using [SPAN_RED("HARM")] intent, you can then use these combo stacks on different intents to do different finishers."
. += "Finish your combo on [SPAN_GREEN("HELP")] intent to slam the target to the ground, incapacitating them for a few seconds, if the target is a xenomorph you do extra damage as well."
. += "Finish your combo on [SPAN_BLUE("SHOVE")] intent to throw the target away from you, if you have some chains wrapped around the gauntlet, you'll pull them back towards you. If you are using the special ability, the throw range will be further."
. += "Finish your combo on [SPAN_ORANGE("GRAB")] intent to do an execution that instantly kills your target, they must already be unconcious or in critical state."
. += "Finish your combo on [SPAN_ORANGE("GRAB")] intent to do an execution that instantly kills your target, they must already be unconscious or in critical state."

/obj/item/weapon/bracer_attachment/chain_gauntlets/attack(mob/living/carbon/target, mob/living/carbon/human/user)
. = ..()
Expand Down Expand Up @@ -732,7 +732,7 @@
if(isyautja(hit_atom))
var/mob/living/carbon/human/human = hit_atom
if(human.put_in_hands(src))
hit_atom.visible_message(SPAN_NOTICE(" [hit_atom] expertly catches [src] out of the air. "),
hit_atom.visible_message(SPAN_NOTICE("[hit_atom] expertly catches [src] out of the air. "),
SPAN_NOTICE(" You easily catch [src]. "))
return
..()
Expand Down Expand Up @@ -1097,7 +1097,7 @@
busy_fishing = TRUE
user.visible_message(SPAN_NOTICE("[user] starts aiming \the [src] at the water..."), SPAN_NOTICE("You prepare to catch something in the water..."), max_distance = 3)
if(do_after(user, 5 SECONDS, INTERRUPT_ALL, BUSY_ICON_HOSTILE))
if(prob(60)) // fishing rods are prefered
if(prob(60)) // fishing rods are preferred
busy_fishing = FALSE
to_chat(user, SPAN_WARNING("You fail to catch anything!"))
return
Expand Down Expand Up @@ -1776,7 +1776,7 @@

/obj/item/weapon/gun/bow
name = "hunting bow"
desc = "An abnormal-sized weapon with an exeptionally tight string. Requires extraordinary strength to draw."
desc = "An abnormal-sized weapon with an exceptionally tight string. Requires extraordinary strength to draw."
icon = 'icons/obj/items/hunter/pred_gear.dmi'
icon_state = "bow"
item_state = "bow"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/economy/ATM.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ log transactions
/obj/structure/machinery/atm/attackby(obj/item/I as obj, mob/user as mob)
if(inoperable())
to_chat(user, SPAN_NOTICE("You try to use it ,but it appears to be unpowered!"))
return //so it doesnt brazil IDs when unpowered
return //so it doesn't brazil IDs when unpowered
if(istype(I, /obj/item/card))
var/obj/item/card/id/idcard = I
if(!held_card)
Expand Down Expand Up @@ -280,7 +280,7 @@ log transactions
T.time = worldtime2text()
authenticated_account.transaction_log.Add(T)

to_chat(usr, SPAN_NOTICE(" [icon2html(src, usr)] Access granted. Welcome user '[authenticated_account.owner_name].'"))
to_chat(usr, SPAN_NOTICE("[icon2html(src, usr)] Access granted. Welcome user '[authenticated_account.owner_name].'"))

previous_account_number = tried_account_num
if("e_withdrawal")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ GLOBAL_VAR_INIT(chicken_count, 0)
eggsleft += rand(1, 4)
//world << eggsleft
else
to_chat(user, SPAN_NOTICE(" [name] doesn't seem hungry!"))
to_chat(user, SPAN_NOTICE("[name] doesn't seem hungry!"))
else
..()

Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/simple_animal/friendly/mouse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
density = FALSE
layer = ABOVE_LYING_MOB_LAYER
min_oxy = 16 //Require at least 16kPA oxygen
minbodytemp = 223 //Below -50 Degrees Celcius
maxbodytemp = 323 //Above 50 Degrees Celcius
minbodytemp = 223 //Below -50 Degrees Celsius
maxbodytemp = 323 //Above 50 Degrees Celsius
universal_speak = FALSE
universal_understand = TRUE
holder_type = /obj/item/holder/mouse
Expand Down Expand Up @@ -97,7 +97,7 @@
wander = TRUE
else if(!stat && prob(5))
var/mob/M = AM
to_chat(M, SPAN_NOTICE(" [icon2html(src, M)] Squeek!"))
to_chat(M, SPAN_NOTICE("[icon2html(src, M)] Squeek!"))
M << 'sound/effects/mousesqueek.ogg'
..()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
for(var/mob/W in viewers(user, null))
W.show_message(text(SPAN_DANGER("[user] has spot-welded some of the damage to [src]!")), SHOW_MESSAGE_VISIBLE)
else
to_chat(user, SPAN_NOTICE(" [src] is undamaged!"))
to_chat(user, SPAN_NOTICE("[src] is undamaged!"))
else
to_chat(user, "Need more welding fuel!")
return
Expand Down