things with stuff (#6233)
* buncha things from upstream * datums globals, onclick * datums * game folder, holy shit mirror bot why * modules * icons * dme * compiles cleanly * tools purge * updates maps * double check just because. and wew lad * incidentally, this needs more work first * some things * weh * sound cleanup and icons * reeeee * compile issues * oh look, fresh code sync * cleans up some unused icons * dirty vars * reeeeeeeeeeeeeeee * wew lad. fuck off with this already
This commit is contained in:
@@ -117,6 +117,9 @@
|
||||
|
||||
|
||||
/obj/structure/bookcase/attack_hand(mob/user)
|
||||
. = ..()
|
||||
if(.)
|
||||
return
|
||||
if(contents.len)
|
||||
var/obj/item/book/choice = input("Which book would you like to remove from the shelf?") as null|obj in contents
|
||||
if(choice)
|
||||
|
||||
@@ -28,13 +28,8 @@
|
||||
var/SQLquery
|
||||
clockwork = TRUE //it'd look weird
|
||||
|
||||
/obj/machinery/computer/libraryconsole/attack_hand(mob/user)
|
||||
if(..())
|
||||
return
|
||||
interact(user)
|
||||
|
||||
/obj/machinery/computer/libraryconsole/interact(mob/user)
|
||||
user.set_machine(src)
|
||||
/obj/machinery/computer/libraryconsole/ui_interact(mob/user)
|
||||
. = ..()
|
||||
var/dat = "" // <META HTTP-EQUIV='Refresh' CONTENT='10'>
|
||||
switch(screenstate)
|
||||
if(0)
|
||||
@@ -201,8 +196,8 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
|
||||
circuit.name = "Book Inventory Management Console (Machine Board)"
|
||||
circuit.build_path = /obj/machinery/computer/libraryconsole/bookmanagement
|
||||
|
||||
/obj/machinery/computer/libraryconsole/bookmanagement/interact(mob/user)
|
||||
user.set_machine(src)
|
||||
/obj/machinery/computer/libraryconsole/bookmanagement/ui_interact(mob/user)
|
||||
. = ..()
|
||||
var/dat = "" // <META HTTP-EQUIV='Refresh' CONTENT='10'>
|
||||
switch(screenstate)
|
||||
if(0)
|
||||
@@ -511,6 +506,9 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
|
||||
return ..()
|
||||
|
||||
/obj/machinery/libraryscanner/attack_hand(mob/user)
|
||||
. = ..()
|
||||
if(.)
|
||||
return
|
||||
usr.set_machine(src)
|
||||
var/dat = "" // <META HTTP-EQUIV='Refresh' CONTENT='10'>
|
||||
if(cache)
|
||||
|
||||
Reference in New Issue
Block a user