diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index e8ab64fea54..80090ad585f 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -9136,7 +9136,9 @@ id = "chemisttop"; name = "Chemistry Lobby Shutters" }, -/obj/item/folder/yellow, +/obj/item/folder/yellow{ + pixel_x = 5 + }, /obj/machinery/door/window/left/directional/north{ name = "Chemistry Desk" }, @@ -9145,6 +9147,10 @@ req_access = list("pharmacy") }, /obj/effect/turf_decal/delivery, +/obj/structure/desk_bell{ + pixel_x = -8; + pixel_y = -2 + }, /turf/open/floor/iron, /area/station/medical/pharmacy) "cvr" = ( @@ -13118,8 +13124,12 @@ "dDm" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/folder, -/obj/item/pen, +/obj/item/folder{ + pixel_x = -6 + }, +/obj/item/pen{ + pixel_x = -6 + }, /obj/machinery/door/window/left/directional/south{ name = "Research Lab Desk"; req_access = list("science") @@ -13129,6 +13139,9 @@ name = "Research and Development Shutter" }, /obj/effect/turf_decal/delivery, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron, /area/station/science/lab) "dDP" = ( @@ -21227,6 +21240,10 @@ id = "cafe_counter"; name = "Kitchen Counter Shutters" }, +/obj/structure/desk_bell{ + pixel_x = -7; + pixel_y = 6 + }, /turf/open/floor/iron/white/smooth_half{ dir = 1 }, @@ -25423,13 +25440,20 @@ "gZK" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/folder/yellow, -/obj/item/pen, +/obj/item/folder/yellow{ + pixel_x = -6 + }, +/obj/item/pen{ + pixel_x = -6 + }, /obj/effect/turf_decal/delivery, /obj/machinery/door/window/right/directional/south{ name = "Delivery Office Desk"; req_access = list("mail_sorting") }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron, /area/station/cargo/sorting) "gZT" = ( @@ -30539,13 +30563,20 @@ "iwt" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/folder/yellow, -/obj/item/pen, +/obj/item/folder/yellow{ + pixel_x = -6 + }, +/obj/item/pen{ + pixel_x = -6 + }, /obj/machinery/door/window/left/directional/south{ dir = 1; req_access = list("cargo") }, /obj/effect/turf_decal/delivery, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron, /area/station/cargo/office) "iwy" = ( @@ -42991,9 +43022,17 @@ name = "Engineering Desk"; req_access = list("engineering") }, -/obj/item/paper_bin, -/obj/item/pen, +/obj/item/paper_bin{ + pixel_x = -4 + }, +/obj/item/pen{ + pixel_x = -4 + }, /obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 8; + pixel_y = 9 + }, /turf/open/floor/iron/half{ dir = 8 }, @@ -55993,14 +56032,23 @@ /area/station/hallway/primary/central/aft) "piI" = ( /obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/pen{ + pixel_x = -6; + pixel_y = 5 + }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/flasher/directional/east{ id = "hopflash"; pixel_x = 0; pixel_y = 26 }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) "pjb" = ( @@ -58252,6 +58300,10 @@ /obj/item/storage/box/matches{ pixel_y = 5 }, +/obj/structure/desk_bell{ + pixel_x = 7; + pixel_y = 10 + }, /turf/open/floor/iron/dark/smooth_half{ dir = 1 }, @@ -64098,7 +64150,12 @@ /obj/structure/table/reinforced, /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, -/obj/item/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup{ + pixel_x = -7 + }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron, /area/station/medical/medbay/lobby) "rxd" = ( @@ -85476,14 +85533,20 @@ /obj/machinery/door/firedoor, /obj/structure/table/reinforced, /obj/item/folder/white{ - pixel_x = 2; + pixel_x = -2; pixel_y = 2 }, -/obj/item/folder/yellow, +/obj/item/folder/yellow{ + pixel_x = -4 + }, /obj/machinery/door/window/right/directional/west{ name = "Hydroponics Desk"; req_access = list("hydroponics") }, +/obj/structure/desk_bell{ + pixel_x = 8; + pixel_y = 9 + }, /turf/open/floor/plating, /area/station/service/hydroponics) "wYJ" = ( @@ -87273,8 +87336,12 @@ "xwd" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/folder, -/obj/item/pen, +/obj/item/folder{ + pixel_x = -4 + }, +/obj/item/pen{ + pixel_x = -4 + }, /obj/machinery/door/poddoor/shutters/preopen{ id = "roboticsprivacy"; name = "Robotics Shutters" @@ -87285,6 +87352,9 @@ }, /obj/machinery/door/window/left/directional/east, /obj/effect/turf_decal/delivery, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron, /area/station/science/robotics/lab) "xwq" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index c7d49160fec..8edbd3fed01 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -236,6 +236,9 @@ name = "Cargo Desk"; req_access = list("cargo") }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron, /area/station/cargo/office) "afp" = ( @@ -8765,6 +8768,24 @@ /obj/machinery/mecha_part_fabricator, /turf/open/floor/iron, /area/station/science/robotics/lab) +"cOF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + id = "commissaryshutter"; + name = "Vacant Commissary Shutter" + }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/turf/open/floor/iron, +/area/station/commons/vacant_room/commissary) "cOP" = ( /obj/structure/chair{ dir = 1; @@ -12539,12 +12560,19 @@ req_access = list("science") }, /obj/item/paper_bin{ - pixel_x = -3; + pixel_x = -9; pixel_y = 7 }, -/obj/item/folder, -/obj/item/pen, +/obj/item/folder{ + pixel_x = -6 + }, +/obj/item/pen{ + pixel_x = -6 + }, /obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/plating, /area/station/hallway/primary/starboard) "dYn" = ( @@ -16902,6 +16930,9 @@ }, /obj/machinery/door/firedoor, /obj/machinery/light/directional/south, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) "fvk" = ( @@ -19271,6 +19302,9 @@ }, /obj/machinery/firealarm/directional/south, /obj/structure/table/wood, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron, /area/station/service/bar) "gjM" = ( @@ -22668,6 +22702,9 @@ req_access = list("hydroponics") }, /obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron, /area/station/service/hydroponics) "hnf" = ( @@ -49333,6 +49370,9 @@ name = "Robotics Lab Shutters" }, /obj/machinery/door/firedoor, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/plating, /area/station/science/robotics/lab) "pTB" = ( @@ -54682,6 +54722,9 @@ /obj/machinery/flasher/directional/north{ id = "hopflash" }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron, /area/station/command/heads_quarters/hop) "rGd" = ( @@ -59758,6 +59801,9 @@ }, /obj/effect/turf_decal/bot, /obj/structure/table/reinforced, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron, /area/station/cargo/sorting) "tnB" = ( @@ -61053,14 +61099,20 @@ }, /obj/machinery/door/firedoor, /obj/item/paper_bin{ - pixel_x = -3; + pixel_x = -6; pixel_y = 7 }, -/obj/item/pen, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 5 + }, /obj/machinery/door/poddoor/preopen{ id = "Engineering"; name = "Engineering Security Door" }, +/obj/structure/desk_bell{ + pixel_x = 6 + }, /turf/open/floor/iron, /area/station/engineering/lobby) "tGS" = ( @@ -75030,12 +75082,19 @@ name = "Pharmacy Desk"; req_access = list("pharmacy") }, -/obj/item/folder/white, -/obj/item/pen, +/obj/item/folder/white{ + pixel_x = -5 + }, +/obj/item/pen{ + pixel_x = -5 + }, /obj/machinery/door/poddoor/preopen{ id = "pharmacy_shutters"; name = "Pharmacy Shutter" }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron, /area/station/medical/pharmacy) "yhp" = ( @@ -230410,7 +230469,7 @@ wde gst gst eYs -eYs +cOF gst jWU oiK diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 7e333e6e419..78a6bc8e945 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -6091,8 +6091,18 @@ name = "Cargo Desk"; req_access = list("mail_sorting") }, -/obj/item/clipboard, -/obj/item/folder, +/obj/item/clipboard{ + pixel_y = -2; + pixel_x = 3 + }, +/obj/item/folder{ + pixel_y = -2; + pixel_x = 3 + }, +/obj/structure/desk_bell{ + pixel_x = -8; + pixel_y = 10 + }, /turf/open/floor/plating, /area/station/cargo/office) "bTT" = ( @@ -21980,8 +21990,12 @@ dir = 1 }, /obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, +/obj/item/paper_bin{ + pixel_x = -5 + }, +/obj/item/pen{ + pixel_x = -5 + }, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, @@ -21994,6 +22008,10 @@ dir = 8 }, /obj/machinery/status_display/evac/directional/north, +/obj/structure/desk_bell{ + pixel_x = 7; + pixel_y = 10 + }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "glG" = ( @@ -30659,13 +30677,19 @@ /area/station/hallway/primary/central) "ixv" = ( /obj/structure/table/wood, +/obj/structure/desk_bell{ + pixel_x = -7; + pixel_y = 9 + }, /obj/item/storage/box/matches{ - pixel_x = -4; + pixel_x = -1; pixel_y = 6 }, -/obj/item/lighter, /obj/item/lighter{ - pixel_x = 4; + pixel_x = 2 + }, +/obj/item/lighter{ + pixel_x = 8; pixel_y = 4 }, /obj/machinery/door/firedoor, @@ -31612,7 +31636,9 @@ /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, -/obj/item/folder/yellow, +/obj/item/folder/yellow{ + pixel_x = 3 + }, /obj/machinery/door/poddoor/preopen{ id = "Engineering"; name = "Engineering Blast Doors" @@ -31621,6 +31647,10 @@ name = "Engineering Desk"; req_access = list("engineering") }, +/obj/structure/desk_bell{ + pixel_x = -7; + pixel_y = 10 + }, /turf/open/floor/plating, /area/station/engineering/lobby) "iJB" = ( @@ -32003,8 +32033,12 @@ "iQy" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, -/obj/item/folder/yellow, -/obj/item/pen, +/obj/item/folder/yellow{ + pixel_x = -4 + }, +/obj/item/pen{ + pixel_x = -4 + }, /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistry_shutters_2"; name = "Chemistry Hall Shutters" @@ -32015,6 +32049,10 @@ name = "Chemistry Desk"; req_access = list("pharmacy") }, +/obj/structure/desk_bell{ + pixel_x = 7; + pixel_y = 6 + }, /turf/open/floor/plating, /area/station/medical/pharmacy) "iQT" = ( @@ -55475,8 +55513,12 @@ /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, -/obj/item/folder, -/obj/item/pen, +/obj/item/folder{ + pixel_x = 6 + }, +/obj/item/pen{ + pixel_x = 6 + }, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics_shutters"; name = "Robotics Privacy Shutters" @@ -55485,6 +55527,10 @@ name = "Robotics Desk"; req_access = list("robotics") }, +/obj/structure/desk_bell{ + pixel_x = -7; + pixel_y = 8 + }, /turf/open/floor/plating, /area/station/science/robotics/lab) "pFd" = ( @@ -56018,6 +56064,10 @@ name = "Atmospherics Desk"; req_access = list("atmospherics") }, +/obj/structure/desk_bell{ + pixel_x = 8; + pixel_y = 10 + }, /turf/open/floor/plating, /area/station/engineering/atmos/storage/gas) "pNe" = ( @@ -59794,14 +59844,22 @@ "qSr" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/clipboard, -/obj/item/folder/yellow, +/obj/item/clipboard{ + pixel_x = 3 + }, +/obj/item/folder/yellow{ + pixel_x = 3 + }, /obj/machinery/door/window/left/directional/west{ dir = 4; name = "Mailroom Desk"; req_access = list("mail_sorting") }, /obj/effect/landmark/start/hangover, +/obj/structure/desk_bell{ + pixel_x = -8; + pixel_y = 10 + }, /turf/open/floor/iron, /area/station/cargo/sorting) "qSC" = ( @@ -68092,6 +68150,10 @@ /area/station/command/heads_quarters/rd) "tjU" = ( /obj/structure/table/reinforced, +/obj/structure/desk_bell{ + pixel_x = -7; + pixel_y = 8 + }, /obj/item/storage/bag/tray, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ @@ -70193,6 +70255,10 @@ /area/station/service/chapel/dock) "tPl" = ( /obj/structure/table/reinforced, +/obj/structure/desk_bell{ + pixel_x = -7; + pixel_y = 8 + }, /obj/item/food/grown/watermelon, /obj/item/food/grown/wheat, /obj/item/food/grown/whitebeet, @@ -78909,11 +78975,16 @@ id = "emmd"; name = "Emergency Medical Lockdown Shutters" }, -/obj/item/folder/white, +/obj/item/folder/white{ + pixel_x = 4 + }, /obj/item/clothing/head/soft/paramedic{ - pixel_x = 3; + pixel_x = 7; pixel_y = 6 }, +/obj/structure/desk_bell{ + pixel_x = -7 + }, /turf/open/floor/iron/dark, /area/station/medical/paramedic) "wkB" = ( @@ -83620,8 +83691,12 @@ /obj/structure/table/reinforced, /obj/effect/turf_decal/delivery, /obj/machinery/door/firedoor, -/obj/item/folder, -/obj/item/pen, +/obj/item/folder{ + pixel_x = 3 + }, +/obj/item/pen{ + pixel_x = 4 + }, /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters"; name = "Research Privacy Shutter" @@ -83630,6 +83705,10 @@ name = "Research Lab Desk"; req_access = list("science") }, +/obj/structure/desk_bell{ + pixel_x = -7; + pixel_y = 8 + }, /turf/open/floor/plating, /area/station/science/lab) "xxz" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 0ce082ddee6..4d4bcaa19f2 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -6617,6 +6617,9 @@ }, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron, /area/station/cargo/sorting) "cwu" = ( @@ -16306,6 +16309,9 @@ id = "kitchen_counter"; name = "Kitchen Counter Shutters" }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron/cafeteria{ dir = 5 }, @@ -17266,13 +17272,20 @@ name = "Robotics Desk"; req_access = list("robotics") }, -/obj/item/folder, -/obj/item/pen, +/obj/item/folder{ + pixel_x = -6 + }, +/obj/item/pen{ + pixel_x = -5 + }, /obj/machinery/door/poddoor/shutters/preopen{ id = "roboticsprivacy"; name = "Robotics Shutters" }, /obj/effect/turf_decal/tile/purple/fourcorners, +/obj/structure/desk_bell{ + pixel_x = 6 + }, /turf/open/floor/iron, /area/station/science/robotics/lab) "guC" = ( @@ -29888,8 +29901,15 @@ name = "Research Lab Desk"; req_access = list("science") }, -/obj/item/folder, -/obj/item/pen, +/obj/item/folder{ + pixel_x = -6 + }, +/obj/item/pen{ + pixel_x = -7 + }, +/obj/structure/desk_bell{ + pixel_x = 6 + }, /turf/open/floor/iron/white, /area/station/science/lab) "kHg" = ( @@ -30373,12 +30393,18 @@ "kQI" = ( /obj/structure/table, /obj/item/paper_bin{ - pixel_x = -2; + pixel_x = -4; pixel_y = 4 }, -/obj/item/pen, +/obj/item/pen{ + pixel_x = -4; + pixel_y = 3 + }, /obj/effect/turf_decal/delivery, /obj/machinery/bluespace_vendor/directional/east, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron, /area/station/hallway/secondary/command) "kQT" = ( @@ -39147,7 +39173,7 @@ dir = 8 }, /obj/item/stack/spacecash/c1{ - pixel_y = 5 + pixel_y = 9 }, /obj/item/reagent_containers/glass/rag, /obj/structure/table/reinforced{ @@ -39156,6 +39182,9 @@ /obj/effect/turf_decal/trimline/neutral/line{ dir = 1 }, +/obj/structure/desk_bell{ + pixel_x = 7 + }, /turf/open/floor/iron/dark, /area/station/service/cafeteria) "nYJ" = ( @@ -42011,6 +42040,17 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) +"oYX" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/desk_bell{ + pixel_x = -11 + }, +/turf/open/floor/iron, +/area/station/service/bar) "oYZ" = ( /turf/closed/wall, /area/station/command/heads_quarters/rd) @@ -52745,6 +52785,9 @@ name = "Pharmacy Shutters" }, /obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/desk_bell{ + pixel_x = -8 + }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) "sEE" = ( @@ -57799,6 +57842,10 @@ req_access = list("hydroponics") }, /obj/effect/turf_decal/tile/green/fourcorners, +/obj/structure/desk_bell{ + pixel_x = 6; + pixel_y = 10 + }, /turf/open/floor/iron, /area/station/service/hydroponics) "uqp" = ( @@ -60456,8 +60503,12 @@ name = "Atmospherics Desk"; req_access = list("atmospherics") }, -/obj/item/folder/yellow, -/obj/item/pen, +/obj/item/folder/yellow{ + pixel_x = 5 + }, +/obj/item/pen{ + pixel_x = 5 + }, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id = "atmos"; @@ -60468,6 +60519,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/hidden, +/obj/structure/desk_bell{ + pixel_x = -8 + }, /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) "vnj" = ( @@ -63237,12 +63291,19 @@ name = "Engineering Desk"; req_access = list("engineering") }, -/obj/item/folder/yellow, -/obj/item/pen, +/obj/item/folder/yellow{ + pixel_x = 4 + }, +/obj/item/pen{ + pixel_x = 5 + }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, /obj/structure/cable, /obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/structure/desk_bell{ + pixel_x = -8 + }, /turf/open/floor/iron, /area/station/engineering/break_room) "wlt" = ( @@ -102289,7 +102350,7 @@ gjr hnr qpM bGJ -aLk +oYX tju sTH uiK diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 7a33bb2d12a..88bed93d7c9 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -7097,6 +7097,9 @@ dir = 2; name = "Access Queue" }, +/obj/structure/desk_bell{ + pixel_x = -7 + }, /turf/open/floor/plating, /area/station/command/heads_quarters/hop) "cAd" = ( @@ -15153,6 +15156,17 @@ "fjq" = ( /turf/open/floor/iron/stairs/medium, /area/station/hallway/secondary/construction/engineering) +"fjr" = ( +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/structure/desk_bell{ + pixel_x = 7 + }, +/turf/open/floor/iron, +/area/station/service/bar) "fjQ" = ( /obj/structure/grille, /turf/closed/wall/r_wall, @@ -25001,6 +25015,9 @@ name = "Chemistry Desk"; req_access = list("pharmacy") }, +/obj/structure/desk_bell{ + pixel_x = -7 + }, /turf/open/floor/iron, /area/station/medical/pharmacy) "iCT" = ( @@ -29574,6 +29591,9 @@ name = "Cargo Desk"; req_access = list("cargo") }, +/obj/structure/desk_bell{ + pixel_x = -7 + }, /turf/open/floor/iron, /area/station/cargo/office) "kdV" = ( @@ -47226,6 +47246,9 @@ req_access = list("mail_sorting") }, /obj/structure/disposalpipe/segment, +/obj/structure/desk_bell{ + pixel_x = -7 + }, /turf/open/floor/plating, /area/station/cargo/sorting) "pXv" = ( @@ -57729,7 +57752,12 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/folder, +/obj/item/folder{ + pixel_x = 5 + }, +/obj/structure/desk_bell{ + pixel_x = -7 + }, /turf/open/floor/iron/white, /area/station/science/lab) "tzS" = ( @@ -62685,6 +62713,18 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"vhV" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchencounter"; + name = "Kitchen Counter Shutters" + }, +/obj/structure/desk_bell{ + pixel_x = -7 + }, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "vik" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 1 @@ -69481,6 +69521,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/desk_bell{ + pixel_x = -7 + }, /turf/open/floor/iron, /area/station/engineering/atmos) "xCm" = ( @@ -104269,7 +104312,7 @@ tju nwb uZy dyc -aeT +fjr ykL xKV nxy @@ -168261,7 +168304,7 @@ mro mDJ mro iQy -fhD +vhV mUX prk ocp diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 2a45a9323b3..31d4779be75 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -118,6 +118,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ null, \ new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE), \ new/datum/stack_recipe("filing cabinet", /obj/structure/filingcabinet, 2, time = 10 SECONDS, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("desk bell", /obj/structure/desk_bell, 2, time = 3 SECONDS), \ new/datum/stack_recipe("floodlight frame", /obj/structure/floodlight_frame, 5, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("voting box", /obj/structure/votebox, 15, time = 50), \ new/datum/stack_recipe("pestle", /obj/item/pestle, 1, time = 50), \ diff --git a/code/modules/paperwork/desk_bell.dm b/code/modules/paperwork/desk_bell.dm new file mode 100644 index 00000000000..3b08769aff3 --- /dev/null +++ b/code/modules/paperwork/desk_bell.dm @@ -0,0 +1,108 @@ +// A receptionist's bell + +/obj/structure/desk_bell + name = "desk bell" + desc = "The cornerstone of any customer service job. You feel an unending urge to ring it." + icon = 'icons/obj/bureaucracy.dmi' + icon_state = "desk_bell" + layer = OBJ_LAYER + anchored = FALSE + pass_flags = PASSTABLE // Able to place on tables + max_integrity = 5000 // To make attacking it not instantly break it + /// The amount of times this bell has been rang, used to check the chance it breaks + var/times_rang = 0 + /// Is this bell broken? + var/broken_ringer = FALSE + /// The cooldown for ringing the bell + COOLDOWN_DECLARE(ring_cooldown) + /// The length of the cooldown. Setting it to 0 will skip all cooldowns alltogether. + var/ring_cooldown_length = 0.3 SECONDS // This is here to protect against tinnitus. + /// The sound the bell makes + var/ring_sound = 'sound/machines/microwave/microwave-end.ogg' + +/obj/structure/desk_bell/Initialize(mapload) + . = ..() + register_context() + +/obj/structure/desk_bell/add_context(atom/source, list/context, obj/item/held_item, mob/user) + . = ..() + + if(held_item?.tool_behaviour == TOOL_WRENCH) + context[SCREENTIP_CONTEXT_RMB] = "Disassemble" + return CONTEXTUAL_SCREENTIP_SET + + if(broken_ringer) + if(held_item?.tool_behaviour == TOOL_SCREWDRIVER) + context[SCREENTIP_CONTEXT_LMB] = "Fix" + else + var/click_context = "Ring" + if(prob(1)) + click_context = "Annoy" + context[SCREENTIP_CONTEXT_LMB] = click_context + return CONTEXTUAL_SCREENTIP_SET + +/obj/structure/desk_bell/attack_hand(mob/living/user, list/modifiers) + . = ..() + if(!COOLDOWN_FINISHED(src, ring_cooldown) && ring_cooldown_length) + return TRUE + if(!ring_bell(user)) + to_chat(user, span_notice("[src] is silent. Some idiot broke it.")) + if(ring_cooldown_length) + COOLDOWN_START(src, ring_cooldown, ring_cooldown_length) + return TRUE + +/obj/structure/desk_bell/attackby(obj/item/weapon, mob/living/user, params) + . = ..() + times_rang += weapon.force + ring_bell(user) + +// Fix the clapper +/obj/structure/desk_bell/screwdriver_act(mob/living/user, obj/item/tool) + if(broken_ringer) + balloon_alert(user, "repairing...") + tool.play_tool_sound(src) + if(tool.use_tool(src, user, 5 SECONDS)) + balloon_alert_to_viewers("repaired") + playsound(user, 'sound/items/change_drill.ogg', 50, vary = TRUE) + broken_ringer = FALSE + times_rang = 0 + return TOOL_ACT_TOOLTYPE_SUCCESS + return FALSE + return ..() + +// Deconstruct +/obj/structure/desk_bell/wrench_act_secondary(mob/living/user, obj/item/tool) + balloon_alert(user, "taking apart...") + tool.play_tool_sound(src) + if(tool.use_tool(src, user, 5 SECONDS)) + balloon_alert(user, "disassembled") + playsound(user, 'sound/items/deconstruct.ogg', 50, vary = TRUE) + if(!broken_ringer) // Drop 2 if it's not broken. + new/obj/item/stack/sheet/iron(drop_location()) + new/obj/item/stack/sheet/iron(drop_location()) + qdel(src) + return TOOL_ACT_TOOLTYPE_SUCCESS + return ..() + +/// Check if the clapper breaks, and if it does, break it +/obj/structure/desk_bell/proc/check_clapper(mob/living/user) + if(((times_rang >= 10000) || prob(times_rang/100)) && ring_cooldown_length) + to_chat(user, span_notice("You hear [src]'s clapper fall off of its hinge. Nice job, you broke it.")) + broken_ringer = TRUE + +/// Ring the bell +/obj/structure/desk_bell/proc/ring_bell(mob/living/user) + if(broken_ringer) + return FALSE + check_clapper(user) + // The lack of varying is intentional. The only variance occurs on the strike the bell breaks. + playsound(src, ring_sound, 70, vary = broken_ringer, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) + flick("desk_bell_ring", src) + times_rang++ + return TRUE + +// A warning to all who enter; the ringing sound STACKS. It won't be deafening because it only goes every decisecond, +// but I did feel like my ears were going to start bleeding when I tested it with my autoclicker. +/obj/structure/desk_bell/speed_demon + desc = "The cornerstone of any customer service job. This one's been modified for hyper-performance." + ring_cooldown_length = 0 diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index b9804546f62..40862122940 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 3634ad03a8e..409de04578a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3715,6 +3715,7 @@ #include "code\modules\paperwork\carbonpaper.dm" #include "code\modules\paperwork\clipboard.dm" #include "code\modules\paperwork\contract.dm" +#include "code\modules\paperwork\desk_bell.dm" #include "code\modules\paperwork\filingcabinet.dm" #include "code\modules\paperwork\folders.dm" #include "code\modules\paperwork\folders_premade.dm"