diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index a3e472e993b..5bcc5a049c4 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1161,16 +1161,14 @@ /turf/open/floor/plating, /area/station/science/server) "axd" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = -32 - }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/sign/map/meta/left{ + pixel_y = -32 + }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) "axe" = ( @@ -2967,9 +2965,7 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; +/obj/structure/sign/map/meta/left{ pixel_y = 32 }, /turf/open/floor/iron, @@ -10121,17 +10117,15 @@ /turf/closed/wall, /area/station/commons/toilet/restrooms) "dIP" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = 32 - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/map/meta/left{ + pixel_y = 32 + }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) "dIS" = ( @@ -10780,14 +10774,12 @@ "dTv" = ( /obj/structure/closet/secure_closet/personal, /obj/item/clothing/under/misc/assistantformal, -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/shoes/winterboots, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/sign/map/meta/right{ + pixel_y = 32 + }, /turf/open/floor/iron/dark, /area/station/commons/locker) "dTN" = ( @@ -20310,14 +20302,12 @@ /turf/open/floor/plating, /area/station/cargo/warehouse) "hoE" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = 32 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/structure/sign/map/meta/left{ + pixel_y = 32 + }, /turf/open/floor/iron, /area/station/hallway/primary/central) "hoN" = ( @@ -20794,14 +20784,12 @@ /obj/structure/closet/secure_closet/personal, /obj/machinery/light/small/directional/north, /obj/item/clothing/under/misc/assistantformal, -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = 32 - }, /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/shoes/winterboots, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/sign/map/meta/left{ + pixel_y = 32 + }, /turf/open/floor/iron/dark, /area/station/commons/locker) "hxu" = ( @@ -21256,17 +21244,15 @@ /turf/open/floor/iron/white, /area/station/medical/cryo) "hET" = ( -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/structure/sign/map/meta/right{ + pixel_y = 32 + }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) "hEV" = ( @@ -24995,13 +24981,11 @@ /turf/open/floor/iron, /area/station/commons/storage/tools) "iSk" = ( -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/sign/map/meta/right{ + pixel_y = 32 + }, /turf/open/floor/iron, /area/station/hallway/primary/port) "iSl" = ( @@ -27903,16 +27887,14 @@ /turf/open/floor/wood, /area/station/commons/lounge) "jPE" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/sign/map/meta/left{ + pixel_y = 32 + }, /turf/open/floor/iron, /area/station/hallway/primary/port) "jPH" = ( @@ -31554,14 +31536,12 @@ /area/station/security/prison/mess) "ldJ" = ( /obj/machinery/light/directional/north, -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, +/obj/structure/sign/map/meta/right{ + pixel_y = 32 + }, /turf/open/floor/iron, /area/station/hallway/primary/central) "ldK" = ( @@ -33396,11 +33376,6 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "lQW" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = -32 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 4 @@ -33408,6 +33383,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/sign/map/meta/left{ + pixel_y = -32 + }, /turf/open/floor/iron, /area/station/hallway/primary/port) "lRA" = ( @@ -36890,14 +36868,12 @@ /area/station/maintenance/port) "ncV" = ( /obj/machinery/vending/coffee, -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = 32 - }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/delivery, +/obj/structure/sign/map/meta/left{ + pixel_y = 32 + }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "ndk" = ( @@ -40339,14 +40315,12 @@ /turf/open/floor/iron/white, /area/station/science/cytology) "onI" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = 32 - }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/sign/map/meta/left{ + pixel_y = 32 + }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "onN" = ( @@ -42379,6 +42353,20 @@ }, /turf/open/floor/engine/cult, /area/station/service/library) +"oZm" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/structure/sign/map/meta/right{ + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "oZs" = ( /obj/structure/bed/medical/emergency{ dir = 4 @@ -43419,14 +43407,12 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "psp" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = 32 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/sign/map/meta/left{ + pixel_y = 32 + }, /turf/open/floor/iron, /area/station/hallway/primary/central) "psr" = ( @@ -47122,14 +47108,12 @@ /turf/open/floor/iron/white, /area/station/medical/pharmacy) "qJU" = ( -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/sign/map/meta/right{ + pixel_y = 32 + }, /turf/open/floor/iron, /area/station/hallway/primary/central) "qKg" = ( @@ -51059,9 +51043,7 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) "rZA" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; +/obj/structure/sign/map/meta/left{ pixel_y = 32 }, /turf/open/floor/wood, @@ -56561,14 +56543,12 @@ pixel_y = 4 }, /obj/machinery/airalarm/directional/east, -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security in red at the top, you see engineering in yellow, science in purple, escape in checkered red-and-white, medbay in green, arrivals in checkered red-and-blue, and then cargo in brown."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, +/obj/structure/sign/map/meta/right{ + pixel_y = 32 + }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "tWe" = ( @@ -59853,11 +59833,6 @@ /turf/open/floor/iron, /area/station/engineering/main) "vbq" = ( -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, /obj/machinery/light/directional/north, /obj/structure/table, /obj/item/phone{ @@ -59867,6 +59842,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/structure/sign/map/meta/right{ + pixel_y = 32 + }, /turf/open/floor/iron/checker, /area/station/engineering/atmos/storage/gas) "vbt" = ( @@ -60663,11 +60641,6 @@ /turf/open/floor/iron, /area/station/maintenance/port/aft) "vpM" = ( -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = -32 - }, /obj/item/kirbyplants/organic/plant3, /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -60676,6 +60649,9 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/structure/sign/map/meta/right{ + pixel_y = -32 + }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) "vpP" = ( @@ -61878,11 +61854,6 @@ /turf/open/floor/plating, /area/station/maintenance/port/aft) "vJB" = ( -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = -32 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment{ dir = 9 @@ -61890,6 +61861,9 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners{ dir = 1 }, +/obj/structure/sign/map/meta/right{ + pixel_y = -32 + }, /turf/open/floor/iron, /area/station/hallway/primary/port) "vJX" = ( @@ -63335,10 +63309,6 @@ }, /turf/closed/wall, /area/station/maintenance/port/fore) -"wgJ" = ( -/obj/structure/sign/map/right, -/turf/closed/wall, -/area/station/commons/storage/tools) "wgQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -63625,11 +63595,6 @@ /turf/open/floor/iron/dark, /area/station/science/ordnance) "wnQ" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = 32 - }, /obj/structure/tank_dispenser{ pixel_x = -1 }, @@ -63637,6 +63602,9 @@ dir = 4 }, /obj/structure/window/reinforced/spawner/directional/west, +/obj/structure/sign/map/meta/left{ + pixel_y = 32 + }, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -67306,13 +67274,11 @@ /area/station/engineering/atmos) "xEr" = ( /obj/effect/spawner/random/vending/snackvend, -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security in red at the top, you see engineering in yellow, science in purple, escape in checkered red-and-white, medbay in green, arrivals in checkered red-and-blue, and then cargo in brown."; - icon_state = "map-right-MS"; - pixel_y = 32 - }, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/delivery, +/obj/structure/sign/map/meta/right{ + pixel_y = 32 + }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) "xEt" = ( @@ -67376,9 +67342,7 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "xFx" = ( -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; +/obj/structure/sign/map/meta/right{ pixel_y = 32 }, /turf/open/floor/wood, @@ -103895,8 +103859,8 @@ qXB yko kBm nmN -wgJ -vFB +dZm +oZm kFp aeb bvJ diff --git a/code/game/objects/structures/signs/signs_departments.dm b/code/game/objects/structures/signs/signs_departments.dm index 9966ced8f47..c71de5f99d8 100644 --- a/code/game/objects/structures/signs/signs_departments.dm +++ b/code/game/objects/structures/signs/signs_departments.dm @@ -99,6 +99,14 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/departments/morgue, 32) MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/departments/engineering, 32) +/obj/structure/sign/departments/atmospherics + name = "\improper Atmospherics sign" + sign_change_name = "Department - Engineering: Atmospherics" + desc = "A sign labelling an area where your life-giving air comes from." + icon_state = "atmos" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/departments/engineering, 32) + ///////SCIENCE /obj/structure/sign/departments/science @@ -177,10 +185,18 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/departments/botany/alt3, 32) name = "\improper Janitor sign" sign_change_name = "Department - Janitor" desc = "A sign labelling an area where the janitor works." - icon_state = "custodian" + icon_state = "custodian1" MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/departments/custodian, 32) +/obj/structure/sign/departments/custodian_alt + name = "\improper Janitor sign" + sign_change_name = "Department - Janitor Alt" + desc = "A sign labelling an area where the janitor works." + icon_state = "custodian2" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/departments/custodian_alt, 32) + /obj/structure/sign/departments/holy name = "\improper Chapel sign" sign_change_name = "Department - Chapel" @@ -205,6 +221,22 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/departments/holy, 32) MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/departments/lawyer, 32) +/obj/structure/sign/departments/restaurant + name = "\improper Restaurant sign" + sign_change_name = "Department - Restaurant" + desc = "A sign labelling an area where the food is served." + icon_state = "restaurant" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/departments/restaurant, 32) + +/obj/structure/sign/departments/bar + name = "\improper Bar sign" + sign_change_name = "Department - Bar" + desc = "A sign labelling an area where drinks are mixed." + icon_state = "bar" + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/departments/bar, 32) + ///////SUPPLY /obj/structure/sign/departments/cargo diff --git a/code/game/objects/structures/signs/signs_maps.dm b/code/game/objects/structures/signs/signs_maps.dm index 2ed5cfa9341..a6701ed7e90 100644 --- a/code/game/objects/structures/signs/signs_maps.dm +++ b/code/game/objects/structures/signs/signs_maps.dm @@ -7,9 +7,21 @@ /obj/structure/sign/map/left icon_state = "map-left" + desc = "A navigational chart of the decommissioned Spinward Sector Station SS-02: 'Box' Class Outpost." /obj/structure/sign/map/right icon_state = "map-right" + desc = "A navigational chart of the decommissioned Spinward Sector Station SS-02: 'Box' Class Outpost." + +/obj/structure/sign/map/meta + desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), \ + escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)." + +/obj/structure/sign/map/meta/left + icon_state = "map-left-MS" + +/obj/structure/sign/map/meta/right + icon_state = "map-right-MS" /obj/structure/sign/directions/science name = "science department sign" diff --git a/icons/obj/machines/restaurant_portal.dmi b/icons/obj/machines/restaurant_portal.dmi index 847aae13d3e..e385a894717 100644 Binary files a/icons/obj/machines/restaurant_portal.dmi and b/icons/obj/machines/restaurant_portal.dmi differ diff --git a/icons/obj/signs.dmi b/icons/obj/signs.dmi index f9a3301d828..321e758ee26 100644 Binary files a/icons/obj/signs.dmi and b/icons/obj/signs.dmi differ