From 8ebe8c87722367459023601af43841fa13bb0ad2 Mon Sep 17 00:00:00 2001 From: Schnayy Date: Thu, 23 Jan 2020 22:51:38 -0600 Subject: [PATCH] Adds book cart to library --- code/modules/library/lib_items.dm | 27 +++++++++++++++++++++++ html/changelogs/schnayy-bookcart.yml | 6 +++++ icons/obj/library.dmi | Bin 31060 -> 31962 bytes maps/southern_cross/southern_cross-1.dmm | 9 ++++++-- 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/schnayy-bookcart.yml diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index cf8d3215a6..009980bec5 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -96,7 +96,34 @@ else icon_state = "book-5" +/* +Book Cart +*/ +/obj/structure/bookcase/bookcart + name = "book cart" + icon = 'icons/obj/library.dmi' + icon_state = "bookcart-0" + anchored = 0 + opacity = 0 + +/obj/structure/bookcase/bookcart/attackby(obj/item/O as obj, mob/user as mob) + if(istype(O, /obj/item/weapon/book)) + user.drop_item() + O.loc = src + update_icon() + else + return + +/obj/structure/bookcase/bookcart/update_icon() + if(contents.len < 5) + icon_state = "bookcart-[contents.len]" + else + icon_state = "bookcart-5" + +/* +Book Cart End +*/ /obj/structure/bookcase/manuals/medical name = "Medical Manuals bookcase" diff --git a/html/changelogs/schnayy-bookcart.yml b/html/changelogs/schnayy-bookcart.yml new file mode 100644 index 0000000000..7268566f5d --- /dev/null +++ b/html/changelogs/schnayy-bookcart.yml @@ -0,0 +1,6 @@ + author: schnayy + +delete-after: True + +changes: + - rscadd: "Adds book cart to library." \ No newline at end of file diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi index 35dee6f7c565b4cc18ead82eb6165cf60ea8926b..e1d6b69aafc36bac2f3a90393b0afce1f5ee087e 100644 GIT binary patch delta 12520 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 Dw)UAR delta 11612 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 diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm index f9cf1ac946..f05668d0ad 100644 --- a/maps/southern_cross/southern_cross-1.dmm +++ b/maps/southern_cross/southern_cross-1.dmm @@ -8703,7 +8703,7 @@ "dkg" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/bed/chair{dir = 4},/turf/simulated/floor/tiled/dark,/area/chapel/main) "dkh" = (/obj/structure/table/glass,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled/dark,/area/chapel/main) "dki" = (/obj/machinery/door/firedoor,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/chapel/main) -"dkj" = (/turf/simulated/floor/airless,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/cryo/station) +"dkj" = (/obj/machinery/newscaster{pixel_y = -30},/obj/structure/bookcase/bookcart,/turf/simulated/floor/wood,/area/library) "dkk" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/door/airlock/glass{name = "Coffee Shop"},/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/coffee_shop) "dkl" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = list(12,25,27,28,35)},/turf/simulated/floor/plating,/area/library) "dkm" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Cafeteria"},/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/cafeteria) @@ -8810,7 +8810,7 @@ "dmj" = (/obj/machinery/light,/turf/simulated/floor/wood,/area/library) "dmk" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor/wood,/area/library) "dml" = (/obj/machinery/door/window/westleft{name = "Library Desk Door"; req_access = list(37)},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/wood,/area/library) -"dmm" = (/obj/machinery/libraryscanner,/obj/machinery/newscaster{pixel_y = -30},/turf/simulated/floor/wood,/area/library) +"dmm" = (/turf/simulated/floor/airless,/obj/structure/shuttle/engine/propulsion{icon_state = "burst_r"; dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/cryo/station) "dmn" = (/obj/machinery/ai_status_display{pixel_y = -32},/obj/structure/table/woodentable,/obj/machinery/librarycomp{pixel_y = 0},/turf/simulated/floor/wood,/area/library) "dmo" = (/obj/structure/table/woodentable,/obj/item/device/taperecorder{pixel_y = 0},/obj/item/device/tape/random,/obj/item/device/tape/random,/obj/item/device/camera,/obj/machinery/button/windowtint{id = "library_window_tint"; pixel_x = -11; pixel_y = -24},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/turf/simulated/floor/carpet,/area/library) "dmp" = (/obj/structure/bookcase{name = "bookcase (Reference)"},/obj/item/weapon/book/codex/lore/vir,/obj/item/weapon/book/codex/lore/vir,/obj/item/weapon/book/codex/lore/robutt,/obj/item/weapon/book/codex/corp_regs,/turf/simulated/floor/wood,/area/library) @@ -11675,6 +11675,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa >>>>>>> d974caf... Merge pull request #6457 from Woodratt/09162019_BarKitchenOverhaul aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacUrdkTdkUdiMdkVdkWdkXdjsdkYdjsdjsdkZdjsdkvdladlbdlzdlddkxdledlfdlgdiMdlhcUKdlidixdhudhudixdljdlkdixdlldhudixdixdlmdixdlndixdlodlpdlqdhxdlrdhxdlsdixdjAaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacUrcAYdltdiMdludjsdlvdjsdkYdlwdlxdlydmpdlAdlBdlCdlDdlDdlEdlFdlGdlHdiMdfkdlIdlJdlKdlLdlMdlNdlOdlPdlQdlRddzdlSdixdlTdlUdlVdixdlWdlWdlXdlYdlZdhxdmadjpdjBaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +<<<<<<< HEAD aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacUrcUrcUrcUrcUrcUrcUrdmediMdiMdmfdmgdmhdkYdmidlxdmjdmpdmkdmldmjdmmdmndkxdmodYrdmqdiMdmrdmsdmtdmudmvdmwdmxdmydmzdmAdmBdmCdmDdixdixdixdixdixdixdixdixdixdmEdmFdmFdmFdmGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa <<<<<<< HEAD <<<<<<< HEAD @@ -11685,6 +11686,10 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ======= aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadmHdmHdmHdmIdmHdmHdkjdmKdmLdmMdiMdmNdmOdmOdmPdmQdiMdiMdiMdiMdiMdiMdiMdiMdiMdiMdiMdiMdmRdmSdcLdmTdmUdmUdmUdmUdmUdmUdmUdmUdmUdmUdmUdmVdmWdmVdmXdmYdmZdnadmVdnbdncdVtdpRdmGaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa >>>>>>> a54c9d5... Merge pull request #6581 from Shadow-Quill/Emergency-Shutter-Fixx +======= +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacUrcUrcUrcUrcUrcUrcUrdmediMdiMdmfdmgdmhdkYdmidlxdmjdmpdmkdmldmjdkjdmndkxdmodYrdmqdiMdmrdmsdmtdmudmvdmwdmxdmydmzdmAdmBdmCdmDdixdixdixdixdixdixdixdixdixdmEdmFdmFdmFdmGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadmHdmHdmHdmIdmHdmHdmmdmKdmLdmMdiMdmNdmOdmOdmPdmQdiMdiMdiMdiMdiMdiMdiMdiMdiMdiMdiMdiMdmRdmSdcLdmTdmUdmUdmUdmUdmUdmUdmUdmUdmUdmUdmUdmVdmWdmVdmXdmYdmZdnadmVdnbdncdVtdpRdmGaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +>>>>>>> 18199a5... Adds book cart to library (#6645) aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadmHdngdrgdrgdrgdnidnidmKdnjdnkdnkdnldnkdnmdnndnodnpdnqdnrdnsdntdnudnvdnwdnxdnydnzdnAdnBdfkcUKdVAdmUdnDdnEdnFdnGdnHdnIdmUdnJdnKdmUdmXdmXdmXdmXdmXdmXdmXdmXdnLdnMecBdqCdnfaaaaaaaaaaaaaaeaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadmIdnPdnQdnRdnRdnSdmIdnTdnUdnVdnWdnXdnYdnZdoadobdocdoddoedofdogdohdoidojdokdoldomdomdomdondoodopdmUdmUdmUdoqdordosdotdoudovdowdmUdoxdoydozdoAdoBdoCdoDdmXdnbdnMdnMdrfdnfaaaaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadmHdngdoGdoHdoHdoIdoJdmcdoLdoMdoNdoOdoPdoQdoRdoPdoPdoOdoSdoTdoUdoVdoWdoXdoYdoZdpadpbdoYdfkdpcdpddmUdpedpfdpgdphdpidpjdmUdpkdnKdmUdpldpmdpndpodppdpqdprdmXdnbdpsdnMdrMdnfaafaafaafaafaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa