cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-18 11:44:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-14206

Browse Source
This commit is contained in:
Razgriz
2022-12-15 15:24:53 -07:00
committed by GitHub
parent ce917585ea ec97a3d32f
commit ba4b775d6c
8 changed files with 64 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/material_container.dm
+6 -1
View File
@@ -140,7 +140,12 @@
return
// Cache this since S may go away after use()
var/list/sheet_matter = S.matter
var/list/sheet_matter
if(istype(S, /obj/item/stack/material))
var/obj/item/stack/material/MS = S
sheet_matter = list(MS.material.name = 2000)
else
sheet_matter = S.matter
// Calculate total amount of material for one sheet
var/matter_per_sheet = 0
code/game/magic/archived_book.dm
+14 -15
View File
@@ -39,19 +39,24 @@ var/global/datum/book_manager/book_mgr = new()
if(!src.holder)
to_chat(src, "Only administrators may use this command.")
return
//VOREStation Edit Start
var/obj/machinery/librarycomp/our_comp
for(var/obj/machinery/librarycomp/l in world)
if(istype(l, /obj/machinery/librarycomp))
our_comp = l
break
var/isbn = tgui_input_number(usr, "ISBN number?", "Delete Book")
if(!isbn)
if(!our_comp)
to_chat(usr, "<span class = 'warning'>Unable to locate a library computer to use for book deleting.</span>")
return
if(BOOKS_USE_SQL && config.sql_enabled)
var/DBConnection/dbcon = new()
dbcon.Connect("dbi:mysql:[sqldb]:[sqladdress]:[sqlport]","[sqllogin]","[sqlpass]")
if(!dbcon.IsConnected())
tgui_alert_async(usr, "Connection to Archive has been severed. Aborting.")
return
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()
if(!SSdbcore.IsConnected()) //CHOMP Edit
dat += "<font color=red><b>ERROR</b>: Unable to contact External Archive. Please contact your system administrator for assistance.</font>"
else
<<<<<<< HEAD
var/DBQuery/query = dbcon.NewQuery("DELETE FROM library WHERE id=[isbn]")
if(!query.Execute())
to_chat(usr,query.ErrorMsg())
@@ -59,11 +64,6 @@ var/global/datum/book_manager/book_mgr = new()
else
book_mgr.remove(isbn)
log_admin("[usr.key] has deleted the book [isbn]")
=======
dat += {"<A href='?our_comp=\ref[our_comp];[HrefToken()];orderbyid=1'>(Order book by SS<sup>13</sup>BN)</A><BR><BR>
<table>
<tr><td><A href='?our_comp=\ref[our_comp];[HrefToken()];sort=author>AUTHOR</A></td><td><A href='?our_comp=\ref[our_comp];[HrefToken()];sort=title>TITLE</A></td><td><A href='?our_comp=\ref[our_comp];[HrefToken()];sort=category>CATEGORY</A></td><td></td></tr>"}
var/DBQuery/query = dbcon_old.NewQuery("SELECT id, author, title, category FROM library ORDER BY [sortby]")
query.Execute()
var/show_admin_options = check_rights(R_ADMIN, show_msg = FALSE)
@@ -82,7 +82,6 @@ var/global/datum/book_manager/book_mgr = new()
usr << browse(dat, "window=library")
onclose(usr, "library")
//VOREStation Edit End
>>>>>>> fe91b1a43b... Merge pull request #14206 from ItsSelis/selis-href-adds
// delete a book
/datum/book_manager/proc/remove(var/id)
code/modules/admin/admin_verb_lists_vr.dm
+2 -1
View File
@@ -129,7 +129,8 @@ var/list/admin_verbs_admin = list(
/datum/admins/proc/view_feedback,
/client/proc/make_mentor,
/client/proc/unmake_mentor,
/client/proc/removetickets
/client/proc/removetickets,
/client/proc/delbook
)
var/list/admin_verbs_ban = list(
code/modules/admin/admin_verbs_vr.dm
+1 -5
View File
@@ -73,9 +73,6 @@
log_and_message_admins("removed a security ticket from the global list: \"[input]\"", usr)
else
<<<<<<< HEAD
tgui_alert_async(usr, "The ticket list is empty.","Empty")
=======
tgui_alert_async(usr, "The ticket list is empty.","Empty")
/client/proc/delbook()
@@ -100,7 +97,7 @@
dat += "<h3>ADMINISTRATIVE MANAGEMENT</h3>"
establish_old_db_connection()
if(!dbcon_old.IsConnected())
if(!SSdbcore.IsConnected())
dat += "<font color=red><b>ERROR</b>: Unable to contact External Archive. Please contact your system administrator for assistance.</font>"
else
dat += {"<A href='?our_comp=\ref[our_comp];[HrefToken()];orderbyid=1'>(Order book by SS<sup>13</sup>BN)</A><BR><BR>
@@ -124,4 +121,3 @@
usr << browse(dat, "window=library")
onclose(usr, "library")
>>>>>>> fe91b1a43b... Merge pull request #14206 from ItsSelis/selis-href-adds
code/modules/library/lib_machines.dm
+38 -1
View File
@@ -308,6 +308,43 @@
user << browse(dat, "window=library")
onclose(user, "library")
//VOREStation Addition Start
/obj/machinery/librarycomp/attack_ghost(mob/user)
var/show_admin_options = check_rights(R_ADMIN, show_msg = FALSE)
if(!show_admin_options)
. = ..()
else
usr.set_machine(src)
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()
if(!SSdbcore.IsConnected())
dat += "<font color=red><b>ERROR</b>: Unable to contact External Archive. Please contact your system administrator for assistance.</font>"
else
dat += {"<A href='?src=\ref[src];orderbyid=1'>(Order book by SS<sup>13</sup>BN)</A><BR><BR>
<table>
<tr><td><A href='?src=\ref[src];sort=author>AUTHOR</A></td><td><A href='?src=\ref[src];sort=title>TITLE</A></td><td><A href='?src=\ref[src];sort=category>CATEGORY</A></td><td></td></tr>"}
var/DBQuery/query = SSdbcore.NewQuery("SELECT id, author, title, category FROM library ORDER BY [sortby]")
query.Execute()
while(query.NextRow())
var/id = query.item[1]
var/author = query.item[2]
var/title = query.item[3]
var/category = query.item[4]
dat += "<tr><td>[author]</td><td>[title]</td><td>[category]</td><td><A href='?src=\ref[src];delid=[id]'>\[Del\]</A>"
dat += "</td></tr>"
dat += "</table>"
dat += "<BR><A href='?src=\ref[src];switchscreen=0'>(Return to main menu)</A><BR>"
user << browse(dat, "window=library")
onclose(user, "library")
//VOREStation Addition End
/obj/machinery/librarycomp/emag_act(var/remaining_charges, var/mob/user)
if (src.density && !src.emagged)
src.emagged = 1
@@ -567,4 +604,4 @@
b.icon_state = "book[rand(1,7)]"
qdel(O)
else
..()
..()
maps/groundbase/gb-centcomm.dmm
+1
View File
@@ -13678,6 +13678,7 @@
/area/centcom/terminal)
"SK" = (
/obj/structure/table/reinforced,
/obj/machinery/librarycomp,
/turf/simulated/floor/tiled,
/area/centcom/control)
"SL" = (
maps/stellar_delight/ship_centcom.dmm
+1
View File
@@ -4501,6 +4501,7 @@
/area/shuttle/ccboat)
"qB" = (
/obj/structure/table/reinforced,
/obj/machinery/librarycomp,
/turf/simulated/floor/tiled,
/area/centcom/control)
"qE" = (
maps/tether/submaps/tether_centcom.dmm
+1
View File
@@ -7043,6 +7043,7 @@
/area/centcom/medical)
"DJ" = (
/obj/structure/table/reinforced,
/obj/machinery/librarycomp,
/turf/simulated/floor/tiled,
/area/centcom/control)
"DK" = (