cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compatability, Re-enables old library

Browse Source
This commit is contained in:
Unknown
2019-11-08 10:47:32 -05:00
parent 551dd02a80
commit 7931795ddd
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/library/lib_machines.dm
View File

@@ -225,7 +225,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
<A href='?src=\ref[src];checkout=1'>(Commit Entry)</A><BR> <A href='?src=\ref[src];checkout=1'>(Commit Entry)</A><BR>
<A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>"} <A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>"}
if(4) if(4)
dat += "<h3>Deprecated Archive</h3>" dat += "<h3>External Archive</h3>" //VOREStation Edit
establish_old_db_connection() establish_old_db_connection()
dat += "<h3><font color=red>Warning: System Administrator has slated this archive for removal. Personal uploads should be taken to the NT board of internal literature.</font></h3>" dat += "<h3><font color=red>Warning: System Administrator has slated this archive for removal. Personal uploads should be taken to the NT board of internal literature.</font></h3>"
@@ -251,7 +251,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
dat += "<H3>ERROR</H3>" dat += "<H3>ERROR</H3>"
dat+= "<FONT color=red>Library Database is in Secure Management Mode.</FONT><BR>\ dat+= "<FONT color=red>Library Database is in Secure Management Mode.</FONT><BR>\
Contact a System Administrator for more information.<BR>" Contact a System Administrator for more information.<BR>"
/* //VOREstation Edit Start
dat += "<H3>Upload a New Title</H3>" dat += "<H3>Upload a New Title</H3>"
if(!scanner) if(!scanner)
for(var/obj/machinery/libraryscanner/S in range(9)) for(var/obj/machinery/libraryscanner/S in range(9))
@@ -269,7 +269,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
dat += {"<TT>Author: </TT><A href='?src=\ref[src];setauthor=1'>[scanner.cache.author]</A><BR> dat += {"<TT>Author: </TT><A href='?src=\ref[src];setauthor=1'>[scanner.cache.author]</A><BR>
<TT>Category: </TT><A href='?src=\ref[src];setcategory=1'>[upload_category]</A><BR> <TT>Category: </TT><A href='?src=\ref[src];setcategory=1'>[upload_category]</A><BR>
<A href='?src=\ref[src];upload=1'>\[Upload\]</A><BR>"} <A href='?src=\ref[src];upload=1'>\[Upload\]</A><BR>"}
*/ //VOREStation Edit End
dat += "<A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>" dat += "<A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>"
if(7) if(7)
dat += {"<h3>Accessing Forbidden Lore Vault v 1.3</h3> dat += {"<h3>Accessing Forbidden Lore Vault v 1.3</h3>
@@ -391,7 +391,8 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
if(newcategory) if(newcategory)
upload_category = newcategory upload_category = newcategory
/* if(href_list["upload"]) //VOREStation Edit Start
if(href_list["upload"])
if(scanner) if(scanner)
if(scanner.cache) if(scanner.cache)
var/choice = input("Are you certain you wish to upload this title to the Archive?") in list("Confirm", "Abort") var/choice = input("Are you certain you wish to upload this title to the Archive?") in list("Confirm", "Abort")
@@ -419,7 +420,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
else else
log_game("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs") log_game("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs")
alert("Upload Complete.") alert("Upload Complete.")
*/ //VOREStation Edit End
if(href_list["targetid"]) if(href_list["targetid"])
var/sqlid = sanitizeSQL(href_list["targetid"]) var/sqlid = sanitizeSQL(href_list["targetid"])

9
code/modules/lore_codex/codex.dm
View File

@@ -23,12 +23,8 @@
desc = "Contains useful information about the world around you. It seems to have been written for travelers to Virgo-Erigone, human or not. It also \ desc = "Contains useful information about the world around you. It seems to have been written for travelers to Virgo-Erigone, human or not. It also \
has the words 'Don't Panic' in small, friendly letters on the cover." has the words 'Don't Panic' in small, friendly letters on the cover."
icon_state = "codex" icon_state = "codex"
<<<<<<< HEAD
root_type = /datum/lore/codex/category/main_virgo_lore root_type = /datum/lore/codex/category/main_virgo_lore
=======
root_type = /datum/lore/codex/category/main_vir_lore
libcategory = "Reference" libcategory = "Reference"
>>>>>>> 41fc81e... Setup for New Library (#6514)
/obj/item/weapon/book/codex/lore/robutt /obj/item/weapon/book/codex/lore/robutt
name = "A Buyer's Guide to Artificial Bodies" name = "A Buyer's Guide to Artificial Bodies"
@@ -54,8 +50,5 @@
icon_state = "corp_regs" icon_state = "corp_regs"
root_type = /datum/lore/codex/category/main_corp_regs root_type = /datum/lore/codex/category/main_corp_regs
throwforce = 5 // Throw the book at 'em. throwforce = 5 // Throw the book at 'em.
<<<<<<< HEAD
*/
=======
libcategory = "Reference" libcategory = "Reference"
>>>>>>> 41fc81e... Setup for New Library (#6514) */