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

upstream-merge-16484 [MDB IGNORE] (#9289)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
Selis
2024-10-25 21:39:18 +02:00
committed by GitHub
parent b32c1ed032
commit 026253a175
277 changed files with 471452 additions and 36179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/modules/library/lib_items.dm
View File

@@ -131,9 +131,9 @@ Book Cart End
/obj/structure/bookcase/manuals/medical/New()
..()
new /obj/item/book/manual/medical_cloning(src)
new /obj/item/book/manual/wiki/medical_diagnostics_manual(src) // CHOMPEdit
new /obj/item/book/manual/wiki/medical_diagnostics_manual(src) // CHOMPEdit
new /obj/item/book/manual/wiki/medical_diagnostics_manual(src) // CHOMPEdit
new /obj/item/book/manual/wiki/medical_diagnostics_manual(src)
new /obj/item/book/manual/wiki/medical_diagnostics_manual(src)
new /obj/item/book/manual/wiki/medical_diagnostics_manual(src)
update_icon()
@@ -142,10 +142,10 @@ Book Cart End
/obj/structure/bookcase/manuals/engineering/New()
..()
new /obj/item/book/manual/wiki/engineering_construction(src) // CHOMPEdit
new /obj/item/book/manual/wiki/engineering_construction(src)
new /obj/item/book/manual/engineering_particle_accelerator(src)
new /obj/item/book/manual/wiki/engineering_hacking(src) // CHOMPEdit
new /obj/item/book/manual/wiki/engineering_guide(src) // CHOMPEdit
new /obj/item/book/manual/wiki/engineering_hacking(src)
new /obj/item/book/manual/wiki/engineering_guide(src)
new /obj/item/book/manual/atmospipes(src)
new /obj/item/book/manual/engineering_singularity_safety(src)
new /obj/item/book/manual/evaguide(src)
@@ -199,7 +199,7 @@ Book Cart End
to_chat(user, span_notice("The pages of [title] have been cut out!"))
return
if(src.dat)
display_content(user) // CHOMPEdit
display_content(user)
user.visible_message("[user] opens a book titled \"[src.title]\" and begins reading intently.")
playsound(src, 'sound/bureaucracy/bookopen.ogg', 50, 1)
onclose(user, "book")
@@ -207,11 +207,9 @@ Book Cart End
else
to_chat(user, "This book is completely blank!")
// CHOMPEdit Start
/// Proc that handles sending the book information to the user, as well as some housekeeping stuff.
/obj/item/book/proc/display_content(mob/living/user)
user << browse("<TT><I>Penned by [author].</I></TT> <BR>" + "[dat]", "window=book")
// CHOMPEdit End
/obj/item/book/attackby(obj/item/W as obj, mob/user as mob)
if(carved)
@@ -303,7 +301,7 @@ Book Cart End
if(user.zone_sel.selecting == O_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]."))
display_content(M) // CHOMPEdit
display_content(M)
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam
/*

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

@@ -44,7 +44,7 @@
<A href='?src=\ref[src];setauthor=1'>Filter by Author: [author]</A><BR>
<A href='?src=\ref[src];search=1'>\[Start Search\]</A><BR>"}
if(1)
establish_old_db_connection()
establish_db_connection()
if(!SSdbcore.IsConnected()) //CHOMPEdit TGSQL
dat += span_red(span_bold("ERROR") + ": Unable to contact External Archive. Please contact your system administrator for assistance.") + "<BR>"
else if(!SQLquery)
@@ -281,7 +281,7 @@
<A href='?src=\ref[src];switchscreen=0'>No.</A><BR>"}
if(8)
dat += "<h3>External Archive</h3>" //VOREStation Edit
establish_old_db_connection()
establish_db_connection()
//dat += "<h3>" + span_red("arning: System Administrator has slated this archive for removal. Personal uploads should be taken to the NT board of internal literature.") + "</h3>" //VOREStation Removal
@@ -320,7 +320,7 @@
var/dat = "<HEAD><TITLE>Book Inventory Management</TITLE></HEAD><BODY>\n" // <META HTTP-EQUIV='Refresh' CONTENT='10'>
dat += "<h3>ADMINISTRATIVE MANAGEMENT</h3>"
establish_old_db_connection()
establish_db_connection()
if(!SSdbcore.IsConnected())
dat += span_red(span_bold("ERROR") + ": Unable to contact External Archive. Please contact your system administrator for assistance.")
@@ -441,7 +441,7 @@
if(scanner.cache.unique)
tgui_alert_async(usr, "This book has been rejected from the database. Aborting!")
else
establish_old_db_connection()
establish_db_connection()
if(!SSdbcore.IsConnected()) //CHOMPEdit TGSQL
tgui_alert_async(usr, "Connection to Archive has been severed. Aborting.")
else
@@ -467,7 +467,7 @@
if(href_list["targetid"])
var/sqlid = sanitizeSQL(href_list["targetid"])
establish_old_db_connection()
establish_db_connection()
if(!SSdbcore.IsConnected()) //CHOMPEdit TGSQL
tgui_alert_async(usr, "Connection to Archive has been severed. Aborting.")
if(bibledelay)