diff --git a/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm b/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm index 9bb394663ad0f..d41de462c9769 100644 --- a/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm +++ b/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm @@ -73,7 +73,7 @@ /area/ruin/space/has_grav/powered/authorship) "o" = ( /obj/structure/table/wood, -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /turf/open/floor/mineral/titanium/purple, /area/ruin/space/has_grav/powered/authorship) "p" = ( diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 27e69a18d864e..1e7ca9f984818 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -24,7 +24,7 @@ pixel_y = 24 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /turf/open/floor/plasteel/dark, /area/ruin/space/has_grav/listeningstation) "af" = ( diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 9712d8a9eb48a..909aae3b51f27 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -302,7 +302,7 @@ /turf/open/floor/plasteel/cafeteria, /area/security/prison) "aaM" = ( -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /obj/structure/table, /obj/machinery/newscaster{ pixel_x = -32 @@ -17731,7 +17731,7 @@ /area/library) "aTd" = ( /obj/structure/table/wood, -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /obj/machinery/light_switch{ pixel_y = 28 }, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 1f0f3c3a510c9..70684d078727d 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -17539,7 +17539,7 @@ /area/security/prison) "aMe" = ( /obj/structure/table, -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /obj/structure/cable, /turf/open/floor/plating, /area/security/prison) @@ -64428,7 +64428,7 @@ /area/library) "cpz" = ( /obj/structure/table/wood, -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /obj/machinery/newscaster{ pixel_x = 32 }, @@ -113600,6 +113600,14 @@ }, /turf/open/floor/plasteel, /area/maintenance/port) +"kzm" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/turf/open/floor/plasteel/white, +/area/medical/medbay/central) "kDh" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral{ @@ -113615,14 +113623,6 @@ /obj/structure/displaycase/forsale, /turf/open/floor/plasteel/dark, /area/crew_quarters/bar) -"kzm" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/turf/open/floor/plasteel/white, -/area/medical/medbay/central) "kEN" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall, diff --git a/_maps/map_files/Donutstation/Donutstation.dmm b/_maps/map_files/Donutstation/Donutstation.dmm index 3e0e24d6194eb..e6c7851023636 100644 --- a/_maps/map_files/Donutstation/Donutstation.dmm +++ b/_maps/map_files/Donutstation/Donutstation.dmm @@ -16357,7 +16357,7 @@ /area/library) "aLD" = ( /obj/structure/table/wood, -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /turf/open/floor/carpet, /area/library) "aLE" = ( @@ -19541,7 +19541,7 @@ /area/maintenance/disposal/incinerator) "aSY" = ( /obj/structure/table, -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/prison/rec) diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index aea38b4705ffc..b9a2222b39518 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -48855,7 +48855,7 @@ dir = 1 }, /obj/structure/table/wood, -/obj/machinery/computer/libraryconsole/bookmanagement{ +/obj/machinery/computer/bookmanagement{ pixel_y = 5 }, /obj/machinery/light{ @@ -58121,7 +58121,7 @@ /turf/open/floor/plasteel/dark, /area/crew_quarters/locker) "bJz" = ( -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /obj/structure/table, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red, @@ -87942,7 +87942,7 @@ /area/engine/engineering) "cEr" = ( /obj/structure/table/wood, -/obj/machinery/computer/libraryconsole/bookmanagement{ +/obj/machinery/computer/bookmanagement{ pixel_y = 5 }, /obj/effect/turf_decal/tile/neutral, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 06969e9a678a7..c7f7d627adb4e 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -481,7 +481,7 @@ /area/security/prison) "abl" = ( /obj/structure/table, -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/security/prison) @@ -64517,7 +64517,7 @@ /area/hallway/primary/central) "cVe" = ( /obj/structure/table/wood, -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /obj/structure/noticeboard{ desc = "A board for pinning important notices upon. Probably helpful for keeping track of requests."; dir = 8; diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index faac3a6a42126..38f7525c92e75 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -106,7 +106,7 @@ /area/mine/laborcamp) "au" = ( /obj/structure/table, -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/mine/laborcamp) diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index b5ee1ff531be8..55a98ad4f2a7c 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -1626,7 +1626,7 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAS) "afn" = ( -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /obj/structure/table, /obj/machinery/newscaster{ pixel_x = -32 @@ -44929,7 +44929,7 @@ /area/library/lounge) "clp" = ( /obj/structure/table/wood, -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /turf/open/floor/plasteel/dark, /area/library) "cls" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 80d299181dd67..0663bebcd7cb2 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -11959,7 +11959,7 @@ /area/centcom/holding) "Bs" = ( /obj/structure/table/wood, -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /turf/open/floor/wood, /area/centcom/holding) "Bu" = ( diff --git a/_maps/shuttles/emergency_imfedupwiththisworld.dmm b/_maps/shuttles/emergency_imfedupwiththisworld.dmm index 59fa477058e5c..27f3f1b198c20 100644 --- a/_maps/shuttles/emergency_imfedupwiththisworld.dmm +++ b/_maps/shuttles/emergency_imfedupwiththisworld.dmm @@ -163,7 +163,7 @@ /area/shuttle/escape) "A" = ( /obj/structure/table/wood, -/obj/machinery/computer/libraryconsole/bookmanagement, +/obj/machinery/computer/bookmanagement, /turf/open/floor/wood, /area/shuttle/escape) "B" = ( diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index bc0b228790ec6..40721defdb4f3 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -197,13 +197,13 @@ /obj/item/circuitboard/computer/libraryconsole/attackby(obj/item/I, mob/user, params) if(I.tool_behaviour == TOOL_SCREWDRIVER) - if(build_path == /obj/machinery/computer/libraryconsole/bookmanagement) + if(build_path == /obj/machinery/computer/bookmanagement) name = "Library Visitor Console (Computer Board)" build_path = /obj/machinery/computer/libraryconsole to_chat(user, "Defaulting access protocols.") else name = "Book Inventory Management Console (Computer Board)" - build_path = /obj/machinery/computer/libraryconsole/bookmanagement + build_path = /obj/machinery/computer/bookmanagement to_chat(user, "Access protocols successfully updated.") else return ..() diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index ffe88fd46991e..71e21669200a7 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -315,7 +315,7 @@ throw_speed = 3 throw_range = 5 w_class = WEIGHT_CLASS_TINY - var/obj/machinery/computer/libraryconsole/bookmanagement/computer //Associated computer - Modes 1 to 3 use this + var/obj/machinery/computer/bookmanagement/computer //Associated computer - Modes 1 to 3 use this var/obj/item/book/book //Currently scanned book var/mode = 0 //0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 28a0da4407c85..c658c906fd88f 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -162,14 +162,21 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums // TODO: Make this an actual /obj/machinery/computer that can be crafted from circuit boards and such // It is August 22nd, 2012... This TODO has already been here for months.. I wonder how long it'll last before someone does something about it. // It's December 25th, 2014, and this is STILL here, and it's STILL relevant. Kill me -/obj/machinery/computer/libraryconsole/bookmanagement +/obj/machinery/computer/bookmanagement name = "book inventory management console" desc = "Librarian's command station." - screenstate = 0 // 0 - Main Menu, 1 - Inventory, 2 - Checked Out, 3 - Check Out a Book verb_say = "beeps" verb_ask = "beeps" verb_exclaim = "beeps" pass_flags = PASSTABLE + + icon_state = "oldcomp" + icon_screen = "library" + icon_keyboard = null + circuit = /obj/item/circuitboard/computer/libraryconsole + + var/screenstate = 0 // 0 - Main Menu, 1 - Inventory, 2 - Checked Out, 3 - Check Out a Book + var/arcanecheckout = 0 var/buffer_book var/buffer_mob @@ -182,7 +189,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums var/page = 1 //current page of the external archives var/cooldown = 0 -/obj/machinery/computer/libraryconsole/bookmanagement/proc/build_library_menu() +/obj/machinery/computer/bookmanagement/proc/build_library_menu() if(libcomp_menu) return load_library_db_to_cache() @@ -198,13 +205,13 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums libcomp_menu[page] = "" libcomp_menu[page] += "[C.author][C.title][C.category]\[Order\]\n" -/obj/machinery/computer/libraryconsole/bookmanagement/Initialize() +/obj/machinery/computer/bookmanagement/Initialize() . = ..() if(circuit) circuit.name = "Book Inventory Management Console (Machine Board)" - circuit.build_path = /obj/machinery/computer/libraryconsole/bookmanagement + circuit.build_path = /obj/machinery/computer/bookmanagement -/obj/machinery/computer/libraryconsole/bookmanagement/ui_interact(mob/user) +/obj/machinery/computer/bookmanagement/ui_interact(mob/user) . = ..() var/dat = "" // switch(screenstate) @@ -316,17 +323,17 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) popup.open() -/obj/machinery/computer/libraryconsole/bookmanagement/proc/findscanner(viewrange) +/obj/machinery/computer/bookmanagement/proc/findscanner(viewrange) for(var/obj/machinery/libraryscanner/S in range(viewrange, get_turf(src))) return S return null -/obj/machinery/computer/libraryconsole/bookmanagement/proc/print_forbidden_lore(mob/user) +/obj/machinery/computer/bookmanagement/proc/print_forbidden_lore(mob/user) new /obj/item/melee/cultblade/dagger(get_turf(src)) to_chat(user, "Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a sinister dagger sitting on the desk. You don't even remember where it came from...") user.visible_message("[user] stares at the blank screen for a few moments, [user.p_their()] expression frozen in fear. When [user.p_they()] finally awaken[user.p_s()] from it, [user.p_they()] look[user.p_s()] a lot older.", 2) -/obj/machinery/computer/libraryconsole/bookmanagement/attackby(obj/item/W, mob/user, params) +/obj/machinery/computer/bookmanagement/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/barcodescanner)) var/obj/item/barcodescanner/scanner = W scanner.computer = src @@ -335,11 +342,11 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums else return ..() -/obj/machinery/computer/libraryconsole/bookmanagement/emag_act(mob/user) +/obj/machinery/computer/bookmanagement/emag_act(mob/user) if(density && !(obj_flags & EMAGGED)) obj_flags |= EMAGGED -/obj/machinery/computer/libraryconsole/bookmanagement/Topic(href, href_list) +/obj/machinery/computer/bookmanagement/Topic(href, href_list) if(..()) usr << browse(null, "window=library") onclose(usr, "library")