Merge branch 'master' into Arokha/matdefs

This commit is contained in:
Aronai Sieyes
2021-07-07 14:29:30 -04:00
committed by GitHub
283 changed files with 4118 additions and 1405 deletions
+4 -2
View File
@@ -87,8 +87,10 @@
to_chat(usr, "<span class='info'>There isn't enough space left on \the [src] to write anything.</span>")
return
var/t = sanitize(input(usr, "Enter what you want to write:", "Write", null, null) as message, free_space, extra = 0)
var/raw_t = tgui_input_message(usr, "Enter what you want to write:", "Write")
if(!raw_t)
return
var/t = sanitize(raw_t, free_space, extra = 0)
if(!t)
return
+1 -1
View File
@@ -37,7 +37,7 @@
var/text = sanitizeSafe(input(usr, "What would you like to write?") as text, writing_space)
if(!text || thing.loc != user || (!Adjacent(user) && loc != user) || user.incapacitated())
return
user.visible_message(SPAN_NOTICE("\The [user] jots a note down on \the [src]."))
user.visible_message("<b>\The [user]</b> jots a note down on \the [src].")
written_by = user.ckey
if(written_text)
written_text = "[written_text] [text]"