From a96fa724cfcd3cbf1deaae7ae9dbda17eb5cefe3 Mon Sep 17 00:00:00 2001 From: Mickyan <38563876+Mickyan@users.noreply.github.com> Date: Thu, 10 Dec 2020 02:16:32 +0100 Subject: [PATCH] Adds the distinguished employees gallery to Meta and Delta (#55292) * adds photo gallery to meta and delta * newline --- .../map_files/Deltastation/DeltaStation2.dmm | 22 +++++-- _maps/map_files/MetaStation/MetaStation.dmm | 66 +++++++++++++------ code/modules/photography/photos/frame.dm | 19 ++++++ 3 files changed, 80 insertions(+), 27 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 2158e083e22..ee229792502 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -66344,9 +66344,6 @@ /turf/open/floor/wood, /area/bridge/showroom/corporate) "cBs" = ( -/obj/machinery/status_display/ai{ - pixel_y = 32 - }, /obj/machinery/camera{ c_tag = "Bridge - Corporate Lounge"; name = "command camera" @@ -66361,6 +66358,14 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/sign/picture_frame/showroom/one{ + pixel_x = -8; + pixel_y = 32 + }, +/obj/structure/sign/picture_frame/showroom/two{ + pixel_x = 8; + pixel_y = 32 + }, /turf/open/floor/plasteel/dark, /area/bridge/showroom/corporate) "cBt" = ( @@ -66378,9 +66383,6 @@ /turf/open/floor/plasteel/dark, /area/bridge/showroom/corporate) "cBu" = ( -/obj/machinery/status_display/evac{ - pixel_y = 32 - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -66391,6 +66393,14 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/structure/sign/picture_frame/showroom/three{ + pixel_x = -8; + pixel_y = 32 + }, +/obj/structure/sign/picture_frame/showroom/four{ + pixel_x = 8; + pixel_y = 32 + }, /turf/open/floor/plasteel/dark, /area/bridge/showroom/corporate) "cBv" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index b9bedc5b7f6..a1a8da86d99 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -10723,8 +10723,8 @@ /obj/effect/turf_decal/trimline/red/filled/line{ dir = 9 }, -/mob/living/simple_animal/pet/dog/pug/mcgriff, /obj/machinery/power/apc/auto_name/north, +/mob/living/simple_animal/pet/dog/pug/mcgriff, /turf/open/floor/plasteel, /area/security/warden) "ayB" = ( @@ -18382,14 +18382,14 @@ freq = 1400; location = "QM #3" }, -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #3"; - suffix = "#3" - }, /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/mob/living/simple_animal/bot/mulebot{ + home_destination = "QM #3"; + suffix = "#3" + }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "aRQ" = ( @@ -21946,6 +21946,22 @@ }, /turf/open/floor/wood, /area/library) +"aZP" = ( +/obj/structure/table/wood, +/obj/structure/sign/picture_frame/showroom/three{ + pixel_x = -8; + pixel_y = 32 + }, +/obj/structure/sign/picture_frame/showroom/four{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/item/paicard{ + desc = "A real Nanotrasen success, these personal AIs provide all of the companionship of an AI without any law related red-tape."; + name = "\improper Nanotrasen-brand personal AI device exhibit" + }, +/turf/open/floor/wood, +/area/bridge/showroom/corporate) "aZQ" = ( /obj/effect/landmark/start/ai/secondary, /obj/item/radio/intercom{ @@ -28816,15 +28832,15 @@ freq = 1400; location = "QM #1" }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /mob/living/simple_animal/bot/mulebot{ beacon_freq = 1400; home_destination = "QM #1"; suffix = "#1" }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "bql" = ( @@ -37157,11 +37173,6 @@ /area/bridge/showroom/corporate) "bNe" = ( /obj/structure/table/wood, -/obj/item/phone{ - desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; - pixel_x = -3; - pixel_y = 3 - }, /obj/item/cigbutt/cigarbutt{ pixel_x = 5; pixel_y = -1 @@ -37172,6 +37183,10 @@ /obj/item/radio/intercom{ pixel_y = 21 }, +/obj/item/reagent_containers/food/drinks/mug{ + pixel_x = -4; + pixel_y = 4 + }, /turf/open/floor/wood, /area/bridge/showroom/corporate) "bNf" = ( @@ -39761,7 +39776,20 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bTZ" = ( -/obj/structure/bookcase, +/obj/structure/table/wood, +/obj/structure/sign/picture_frame/showroom/one{ + pixel_x = -8; + pixel_y = 32 + }, +/obj/structure/sign/picture_frame/showroom/two{ + pixel_x = 8; + pixel_y = 32 + }, +/obj/item/phone{ + desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; + pixel_x = -3; + pixel_y = 3 + }, /turf/open/floor/wood, /area/bridge/showroom/corporate) "bUa" = ( @@ -62598,10 +62626,6 @@ /obj/item/poster/random_official, /obj/item/poster/random_official, /obj/item/poster/random_official, -/obj/item/paicard{ - desc = "A real Nanotrasen success, these personal AIs provide all of the companionship of an AI without any law related red-tape."; - name = "\improper Nanotrasen-brand personal AI device exhibit" - }, /obj/structure/cable, /turf/open/floor/carpet, /area/bridge/showroom/corporate) @@ -65163,10 +65187,10 @@ dir = 8; pixel_x = 14 }, +/obj/machinery/power/apc/auto_name/north, /mob/living/simple_animal/hostile/retaliate/goat{ name = "Pete" }, -/obj/machinery/power/apc/auto_name/north, /turf/open/floor/plasteel/kitchen_coldroom/freezerfloor, /area/crew_quarters/kitchen/coldroom) "eII" = ( @@ -107911,7 +107935,7 @@ bGH bGH bJP bLw -bTZ +aZP dDg bQg bRD diff --git a/code/modules/photography/photos/frame.dm b/code/modules/photography/photos/frame.dm index 938732092a8..2fc33b9b673 100644 --- a/code/modules/photography/photos/frame.dm +++ b/code/modules/photography/photos/frame.dm @@ -165,3 +165,22 @@ I.forceMove(F) F.update_icon() qdel(src) + + +/obj/structure/sign/picture_frame/showroom + name = "distinguished crew display" + desc = "A photo frame to commemorate crewmembers that distinguished themselves in the line of duty. WARNING: unauthorized tampering will be severely punished." + can_decon = FALSE + +//persistent frames, make sure the same ID doesn't appear more than once per map +/obj/structure/sign/picture_frame/showroom/one + persistence_id = "frame_showroom1" + +/obj/structure/sign/picture_frame/showroom/two + persistence_id = "frame_showroom2" + +/obj/structure/sign/picture_frame/showroom/three + persistence_id = "frame_showroom3" + +/obj/structure/sign/picture_frame/showroom/four + persistence_id = "frame_showroom4"