diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm index 978e2056dfe..99cdaf632ae 100644 --- a/code/game/machinery/holosign.dm +++ b/code/game/machinery/holosign.dm @@ -48,11 +48,23 @@ name = "surgery holosign" desc = "Small wall-mounted holographic projector. This one reads SURGERY." on_icon = "surgery" + +/obj/machinery/holosign/service + name = "service holosign" + on_icon = "serviceopen" + desc = "A small wall-mounted holographic projector. This one reads OPEN." + +/obj/machinery/holosign/service/update_icon() + if(!lit) + icon_state = "serviceclosed" + else + icon_state = on_icon + ////////////////////SWITCH/////////////////////////////////////// /obj/machinery/button/switch/holosign name = "holosign switch" - desc = "A remote control switch for holosign." + desc = "A remote control switch for a holosign." icon_state = "light0" /obj/machinery/button/switch/holosign/attack_hand(mob/user as mob) diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 24cb5773a00..bea18af979b 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -145,6 +145,20 @@ icon_state = "Commie" desc = "The name of a bar, located at Pluto's biggest spaceport." desc_extended = "People's Preferred is the name of the drinking hole at Pluto's biggest spaceport. Everyone stops there and everyone loves it there. It's what the people prefer, apparently." +/singleton/sign/double/bar/we_are_open + name = "We Are Open!" + icon_state = "We Are Open!" + desc = "The bar's sign flashing 'We Are Open!' indicating that it is indeed open for business." + desc_extended = "Sometimes it doesn't need a fancy sign, slogan, or flashy colours to draw in people to the bar. The service and booze usually does. This sign here simply lets crew know that they are getting both here, right now." +/singleton/sign/double/bar/closed + name = "Closed" + icon_state = "Closed" + desc = "The sign flashes 'CLOSED'. A real tragedy for crew far and wide." +/singleton/sign/double/bar/free_drinks + name = "Free Drinks!" + icon_state = "Free Drinks!" + desc = "Either the XO or the Captain were in a really good mood, someone's pranking the crew, or it is your lucky day. Cheers!" + /singleton/sign/double/kitchen/event_horizon // Start of the kitchen signs. Don't mix it up. name = "Event Horizon" icon_state = "Event Horizon" diff --git a/html/changelogs/KingOfThePing - 20963.yml b/html/changelogs/KingOfThePing - 20963.yml new file mode 100644 index 00000000000..2ab8ac42b6a --- /dev/null +++ b/html/changelogs/KingOfThePing - 20963.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: KingOfThePing + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added three new signs to the bar: Free Drinks! We Are Open! and Closed!, from BayStation12." + - rscadd: "Added a new holosign in a classic (american) diner design to both the kitchen and the bar. Toggle on and off with the new button." diff --git a/icons/obj/barsigns.dmi b/icons/obj/barsigns.dmi index f6c1658aec7..627304ee97d 100644 Binary files a/icons/obj/barsigns.dmi and b/icons/obj/barsigns.dmi differ diff --git a/icons/obj/holosign.dmi b/icons/obj/holosign.dmi index 16236419a38..89cd1330852 100644 Binary files a/icons/obj/holosign.dmi and b/icons/obj/holosign.dmi differ diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index b192ea56860..e9f4f28800a 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -9484,6 +9484,9 @@ /obj/structure/closet/walllocker/medical/firstaid{ pixel_x = -32 }, +/obj/machinery/light/floor{ + dir = 8 + }, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "bnG" = ( @@ -26570,7 +26573,7 @@ /obj/machinery/light_switch{ dir = 8; pixel_x = -20; - pixel_y = 2 + pixel_y = -1 }, /obj/machinery/button/remote/blast_door{ dir = 8; @@ -26596,6 +26599,12 @@ pixel_y = 7; req_access = list(28) }, +/obj/machinery/button/switch/holosign{ + id = 4; + dir = 8; + pixel_y = 7; + pixel_x = -20 + }, /turf/simulated/floor/tiled/white, /area/horizon/kitchen) "dJl" = ( @@ -29239,9 +29248,14 @@ }, /obj/machinery/orderterminal{ dir = 1; - pixel_x = -9; + pixel_x = 14; pixel_y = 32 }, +/obj/machinery/atm{ + dir = 1; + pixel_y = 32; + pixel_x = -6 + }, /turf/simulated/floor/lino, /area/horizon/crew_quarters/lounge/bar) "eeB" = ( @@ -35708,6 +35722,12 @@ }, /turf/simulated/floor/tiled/dark, /area/horizon/security/evidence_storage) +"fae" = ( +/obj/machinery/holosign/service{ + id = 4 + }, +/turf/simulated/wall, +/area/horizon/crew_quarters/lounge/bar) "faj" = ( /obj/machinery/door/firedoor, /obj/structure/cable/green{ @@ -36456,6 +36476,12 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/security) +"feE" = ( +/obj/machinery/holosign/service{ + id = 3 + }, +/turf/simulated/wall, +/area/horizon/crew_quarters/lounge/bar) "feI" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -39442,7 +39468,7 @@ }, /obj/machinery/vending/dinnerware/plastic{ density = 0; - pixel_x = -17; + pixel_x = 10; pixel_y = 24 }, /obj/machinery/camera/network/service{ @@ -53774,10 +53800,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atm{ - dir = 1; - pixel_y = 32 - }, /turf/simulated/floor/lino, /area/horizon/crew_quarters/lounge/bar) "hEI" = ( @@ -83247,6 +83269,12 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/button/switch/holosign{ + id = 3; + dir = 4; + pixel_x = 20; + pixel_y = 28 + }, /turf/simulated/floor/wood, /area/horizon/bar) "lRO" = ( @@ -84803,22 +84831,12 @@ /turf/unsimulated/floor/marble, /area/antag/wizard) "mdq" = ( -/obj/machinery/camera/network/service{ - c_tag = "Service - Deck 2 - Bar Starboard"; - dir = 8 - }, -/obj/machinery/button/remote/blast_door{ - dir = 4; - id = "bar_viewing_shutters"; - name = "Viewing Shutters"; - pixel_x = 19 - }, /obj/machinery/button/remote/blast_door{ dir = 4; id = "bar_shutter"; name = "Desk Shutters"; pixel_x = 19; - pixel_y = 33; + pixel_y = 34; req_access = list(25) }, /turf/simulated/floor/lino, @@ -102858,14 +102876,10 @@ /turf/simulated/floor/tiled, /area/engineering/break_room) "oLW" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/random/pottedplant, /obj/structure/platform{ dir = 4 }, -/obj/item/device/radio/intercom/west, /turf/simulated/floor/wood, /area/horizon/crew_quarters/lounge/bar) "oMc" = ( @@ -156947,6 +156961,13 @@ id = "bar_shutter"; name = "Bar Shutter" }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "bar_viewing_shutters"; + name = "Viewing Shutters"; + pixel_x = 19; + pixel_y = -9 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/bar) "wBf" = ( @@ -165596,6 +165617,10 @@ /obj/machinery/media/jukebox/audioconsole/wall{ pixel_y = -32 }, +/obj/machinery/camera/network/service{ + c_tag = "Service - Deck 2 - Bar Starboard"; + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/bar) "xKn" = ( @@ -266307,7 +266332,7 @@ ooh ooh ooh ooh -ooh +feE rnD tuq ooh @@ -269130,7 +269155,7 @@ lxg mCa fee xqh -ooh +fae hEG txd cJn