cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 23:49:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298

Browse Source
This commit is contained in:
MistakeNot4892
2022-08-25 14:26:20 +10:00
parent a37e070121 62596ad725
commit d717a4b50a
1603 changed files with 70496 additions and 61794 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/library/lib_items.dm
+3 -3
View File
@@ -33,7 +33,7 @@
O.loc = src
update_icon()
else if(istype(O, /obj/item/weapon/pen))
var/newname = sanitizeSafe(input(usr, "What would you like to title this bookshelf?"), MAX_NAME_LEN)
var/newname = sanitizeSafe(tgui_input_text(usr, "What would you like to title this bookshelf?", null, null, MAX_NAME_LEN), MAX_NAME_LEN)
if(!newname)
return
else
@@ -229,7 +229,7 @@ Book Cart End
var/choice = tgui_input_list(usr, "What would you like to change?", "Change What?", list("Title", "Contents", "Author", "Cancel"))
switch(choice)
if("Title")
var/newtitle = reject_bad_text(sanitizeSafe(input(usr, "Write a new title:")))
var/newtitle = reject_bad_text(sanitizeSafe(tgui_input_text(usr, "Write a new title:")))
if(!newtitle)
to_chat(usr, "The title is invalid.")
return
@@ -244,7 +244,7 @@ Book Cart End
else
src.dat += content
if("Author")
var/newauthor = sanitize(input(usr, "Write the author's name:"))
var/newauthor = sanitize(tgui_input_text(usr, "Write the author's name:"))
if(!newauthor)
to_chat(usr, "The name is invalid.")
return
code/modules/library/lib_machines.dm
+8 -15
View File
@@ -73,7 +73,7 @@
return
if(href_list["settitle"])
var/newtitle = input(usr, "Enter a title to search for:") as text|null
var/newtitle = tgui_input_text(usr, "Enter a title to search for:")
if(newtitle)
title = sanitize(newtitle)
else
@@ -87,7 +87,7 @@
category = "Any"
category = sanitizeSQL(category)
if(href_list["setauthor"])
var/newauthor = input(usr, "Enter an author to search for:") as text|null
var/newauthor = tgui_input_text(usr, "Enter an author to search for:")
if(newauthor)
author = sanitize(newauthor)
else
@@ -341,14 +341,7 @@
screenstate = 5
if("6")
if(!bibledelay)
var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible(src.loc)
if(GLOB.religion)
B.icon_state = GLOB.bible_icon_state
B.item_state = GLOB.bible_item_state
B.name = GLOB.bible_name
B.deity_name = GLOB.deity
new /obj/item/weapon/storage/bible(src.loc)
bibledelay = 1
spawn(60)
bibledelay = 0
@@ -372,9 +365,9 @@
if(checkoutperiod < 1)
checkoutperiod = 1
if(href_list["editbook"])
buffer_book = sanitizeSafe(input(usr, "Enter the book's title:") as text|null)
buffer_book = sanitizeSafe(tgui_input_text(usr, "Enter the book's title:"))
if(href_list["editmob"])
buffer_mob = sanitize(input(usr, "Enter the recipient's name:") as text|null, MAX_NAME_LEN)
buffer_mob = sanitize(tgui_input_text(usr, "Enter the recipient's name:", null, null, MAX_NAME_LEN), MAX_NAME_LEN)
if(href_list["checkout"])
var/datum/borrowbook/b = new /datum/borrowbook
b.bookname = sanitizeSafe(buffer_book)
@@ -389,7 +382,7 @@
var/obj/item/weapon/book/b = locate(href_list["delbook"])
inventory.Remove(b)
if(href_list["setauthor"])
var/newauthor = sanitize(input(usr, "Enter the author's name: ") as text|null)
var/newauthor = sanitize(tgui_input_text(usr, "Enter the author's name: "))
if(newauthor)
scanner.cache.author = newauthor
if(href_list["setcategory"])
@@ -469,7 +462,7 @@
query.Execute()
if(href_list["orderbyid"])
var/orderid = input(usr, "Enter your order:") as num|null
var/orderid = tgui_input_number(usr, "Enter your order:")
if(orderid)
if(isnum(orderid))
var/nhref = "src=\ref[src];targetid=[orderid]"
@@ -578,4 +571,4 @@
b.icon_state = "book[rand(1,7)]"
qdel(O)
else
..()
..()