From b847e9672194daf49c80df3a08027546cc6e96b8 Mon Sep 17 00:00:00 2001 From: Julian56 <117036822+Huffie56@users.noreply.github.com> Date: Thu, 7 Dec 2023 21:43:14 +0100 Subject: [PATCH] refactor shutter and linked buttons in CL office. (#5149) # About the pull request basically refactoring shutter and buttons also adding lights because it was too dark for an office and some button and separation for qol while i was there... # Explain why it's good for the game 1-i added the three door because it's dark 2-i separated the shutter for the windows and the door because it seem like it's been something simple that make sense 3-added the button to the shutter for the door inside because it's way more practical. 4-refactoring code to be less dmm dependent because it's cleaner and avoid to touch dmm file if you want to modify them in the future... # Testing Photographs and Procedure
Screenshots & Videos Put screenshots and videos here with an empty line between the screenshots and the `
` tags.
# Changelog :cl: maptweak: added a button inside the CL office to open the shutter for the door and rearranged other buttons. maptweak: separated shutter for cl office door and for the windows. maptweak: add three lights in CL office and quarter. /:cl: --------- Co-authored-by: Julien --- code/game/machinery/door_control.dm | 28 ++++ code/game/machinery/doors/shutters.dm | 20 +++ maps/map_files/USS_Almayer/USS_Almayer.dmm | 157 ++++++++------------- 3 files changed, 108 insertions(+), 97 deletions(-) diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 030e732ea75f..545d4c35bb5a 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -234,3 +234,31 @@ desiredstate = !desiredstate +/obj/structure/machinery/door_control/cl + req_access_txt = "200" +// seperating quarter and office because we might want to allow more access to the office than quarter in the future. +/obj/structure/machinery/door_control/cl/office +/obj/structure/machinery/door_control/cl/office/door + name = "Office Door Shutter" + id = "cl_office_door" +/obj/structure/machinery/door_control/cl/office/window + name = "Office Windows Shutters" + id = "cl_office_windows" +/obj/structure/machinery/door_control/cl/office/divider + name = "Room Divider" + id = "RoomDivider" +//special button that unlock the cl lock on is evac pod door bypassing general lockdown. +/obj/structure/machinery/door_control/cl/office/evac + name = "Evac Pod Door Control" + id = "cl_evac" + normaldoorcontrol = 1 +/obj/structure/machinery/door_control/cl/quarter +/obj/structure/machinery/door_control/cl/quarter/officedoor + name = "Quarter Door Shutter" + id = "cl_quarter_door" +/obj/structure/machinery/door_control/cl/quarter/backdoor + name = "Maintenance Door Shutter" + id = "cl_quarter_maintenance" +/obj/structure/machinery/door_control/cl/quarter/windows + name = "Quarter Windows Shutters" + id = "cl_quarter_windows" diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index da904f255c40..2cc85ce53ac8 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -155,3 +155,23 @@ if(HAS_TRAIT(attacking_item, TRAIT_TOOL_CROWBAR)) return ..() + +//make a subtype for CL office so it as a proper name. +/obj/structure/machinery/door/poddoor/shutters/almayer/cl + name = "\improper Corporate Liason Privacy Shutters" +//adding a subtype for CL office to use to secure access to cl office. +/obj/structure/machinery/door/poddoor/shutters/almayer/cl/office +/obj/structure/machinery/door/poddoor/shutters/almayer/cl/office/door + id = "cl_office_door" +/obj/structure/machinery/door/poddoor/shutters/almayer/cl/office/window + id = "cl_office_windows" +//adding a subtype for CL quarter to use to secure access to cl quarter.(including seperation with the office) +/obj/structure/machinery/door/poddoor/shutters/almayer/cl/quarter +/obj/structure/machinery/door/poddoor/shutters/almayer/cl/quarter/backdoor + id = "cl_quarter_maintenance" + dir = 4 +/obj/structure/machinery/door/poddoor/shutters/almayer/cl/quarter/door + id = "cl_quarter_door" + dir = 4 +/obj/structure/machinery/door/poddoor/shutters/almayer/cl/quarter/window + id = "cl_quarter_windows" diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 263bce521d2a..d940706c547c 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -8660,12 +8660,8 @@ }, /area/almayer/medical/medical_science) "aCv" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 2; - id = "cl_shutters 2"; - name = "\improper Privacy Shutters" - }, /obj/structure/window/framed/almayer, +/obj/structure/machinery/door/poddoor/shutters/almayer/cl/quarter/window, /turf/open/floor/plating, /area/almayer/command/corporateliason) "aCw" = ( @@ -13241,10 +13237,7 @@ /obj/structure/machinery/door/firedoor/border_only/almayer{ dir = 2 }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "cl_shutters"; - name = "\improper Privacy Shutters" - }, +/obj/structure/machinery/door/poddoor/shutters/almayer/cl/office/window, /turf/open/floor/plating, /area/almayer/command/corporateliason) "aYq" = ( @@ -16644,12 +16637,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) -"bqy" = ( -/obj/structure/sign/poster/hero/voteno{ - pixel_y = 32 - }, -/turf/open/floor/wood/ship, -/area/almayer/command/corporateliason) "bqF" = ( /obj/structure/dropship_equipment/fuel/fuel_enhancer, /turf/open/floor/almayer{ @@ -17643,12 +17630,9 @@ }, /area/almayer/hallways/starboard_umbilical) "bvY" = ( -/obj/structure/machinery/door_control{ - id = "cl_shutters 2"; - name = "Quarters Shutters"; +/obj/structure/machinery/door_control/cl/quarter/backdoor{ pixel_x = -25; - pixel_y = 23; - req_access_txt = "200" + pixel_y = 23 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -23422,12 +23406,9 @@ dir = 2; name = "\improper Weyland-Yutani Office" }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - id = "cl_shutters"; - name = "\improper Privacy Shutters" - }, /obj/structure/pipes/standard/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/structure/machinery/door/poddoor/shutters/almayer/cl/office/door, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -23831,11 +23812,8 @@ icon_state = "pottedplant_18"; pixel_y = 7 }, -/obj/structure/machinery/door_control{ - id = "cl_shutters 3"; - name = "Quarters Shutters"; - pixel_x = -25; - req_access_txt = "200" +/obj/structure/machinery/door_control/cl/quarter/officedoor{ + pixel_x = -25 }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) @@ -23927,11 +23905,8 @@ }, /area/almayer/engineering/engine_core) "bXW" = ( -/obj/structure/machinery/door_control{ - id = "cl_shutters 3"; - name = "Quarters Shutters"; - pixel_x = 25; - req_access_txt = "200" +/obj/structure/machinery/door_control/cl/quarter/officedoor{ + pixel_x = 25 }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) @@ -30410,16 +30385,13 @@ /obj/structure/pipes/vents/pump{ dir = 8 }, -/obj/structure/machinery/door_control{ - id = "cl_shutters 2"; - name = "Quarters Shutters"; - pixel_x = 25; - req_access_txt = "200" - }, /obj/structure/sign/safety/bathunisex{ pixel_x = 8; pixel_y = -32 }, +/obj/structure/machinery/door_control/cl/quarter/backdoor{ + pixel_x = 25 + }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "dyK" = ( @@ -31513,12 +31485,9 @@ /obj/structure/bed/chair/office/dark{ dir = 8 }, -/obj/structure/machinery/door_control{ - id = "cl_shutters 2"; - name = "Quarters Shutters"; +/obj/structure/machinery/door_control/cl/quarter/windows{ pixel_x = 11; - pixel_y = 37; - req_access_txt = "200" + pixel_y = 37 }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) @@ -34977,6 +34946,9 @@ pixel_x = -5; pixel_y = 5 }, +/obj/structure/machinery/light{ + dir = 8 + }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "fqg" = ( @@ -38023,28 +37995,14 @@ pixel_x = 5; pixel_y = 3 }, -/obj/structure/machinery/door_control{ - id = "cl_shutters"; - name = "Privacy Shutters"; - pixel_x = -5; - pixel_y = 8; - req_access_txt = "200" - }, -/obj/structure/machinery/door_control{ - id = "RoomDivider"; - name = "Room Divider"; +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/door_control/cl/office/evac{ pixel_x = -5; - pixel_y = -4; - req_access_txt = "200" + pixel_y = 4 }, -/obj/structure/surface/table/woodentable/fancy, -/obj/structure/machinery/door_control{ - id = "cl_evac"; - name = "Evac Pod Door Control"; - normaldoorcontrol = 1; +/obj/structure/machinery/door_control/cl/office/divider{ pixel_x = -5; - pixel_y = 2; - req_access_txt = "200" + pixel_y = -3 }, /turf/open/floor/carpet, /area/almayer/command/corporateliason) @@ -39606,6 +39564,12 @@ icon_state = "silver" }, /area/almayer/command/cic) +"hlq" = ( +/obj/structure/machinery/door_control/cl/office/door{ + pixel_y = 25 + }, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) "hlw" = ( /obj/structure/platform_decoration{ dir = 4 @@ -40663,16 +40627,12 @@ }, /area/almayer/squads/delta) "hIL" = ( -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "cl_shutters 2"; - name = "\improper Privacy Shutters" - }, /obj/structure/machinery/door/airlock/almayer/maint{ access_modified = 1; req_access_txt = "200"; req_one_access = null }, +/obj/structure/machinery/door/poddoor/shutters/almayer/cl/quarter/backdoor, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -47100,11 +47060,8 @@ /turf/open/floor/plating, /area/almayer/command/airoom) "kpl" = ( -/obj/structure/machinery/door_control{ - id = "cl_shutters"; - name = "Privacy Shutters"; - pixel_y = -20; - req_access_txt = "200" +/obj/structure/machinery/door_control/cl/office/door{ + pixel_y = -20 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -51881,12 +51838,6 @@ }, /area/almayer/shipboard/brig/lobby) "mkx" = ( -/obj/structure/machinery/door_control{ - id = "cl_shutters 2"; - name = "Quarters Shutters"; - pixel_x = -25; - req_access_txt = "200" - }, /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; pixel_x = 1; @@ -53877,14 +53828,10 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, -/obj/structure/machinery/door/poddoor/shutters/almayer{ - dir = 4; - id = "cl_shutters 3"; - name = "\improper Privacy Shutters" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/machinery/door/poddoor/shutters/almayer/cl/quarter/door, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -55655,6 +55602,12 @@ icon_state = "cargo" }, /area/almayer/living/commandbunks) +"nKJ" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/wood/ship, +/area/almayer/command/corporateliason) "nLa" = ( /obj/structure/bed/chair{ dir = 4 @@ -65092,14 +65045,22 @@ /area/almayer/living/briefing) "rEm" = ( /obj/structure/surface/table/woodentable/fancy, +/obj/item/ashtray/bronze{ + pixel_x = 2; + pixel_y = 9 + }, +/obj/structure/machinery/door_control/cl/office/window{ + pixel_x = 6; + pixel_y = 4 + }, +/obj/structure/machinery/door_control/cl/office/door{ + pixel_x = 6; + pixel_y = -3 + }, /obj/item/spacecash/c500{ - pixel_x = 4; + pixel_x = -10; pixel_y = 8 }, -/obj/item/ashtray/bronze{ - pixel_x = -13; - pixel_y = -4 - }, /turf/open/floor/carpet, /area/almayer/command/corporateliason) "rEn" = ( @@ -67873,6 +67834,9 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/structure/machinery/light{ + dir = 4 + }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "sQO" = ( @@ -73962,13 +73926,12 @@ /obj/structure/flora/pottedplant{ icon_state = "pottedplant_21" }, -/obj/structure/sign/poster/io{ - name = "propaganda poster"; - pixel_y = 32 - }, /obj/structure/sign/safety/escapepod{ pixel_x = -17 }, +/obj/structure/sign/poster/hero/voteno{ + pixel_y = 32 + }, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "vjx" = ( @@ -113805,7 +113768,7 @@ akU avj kpl awE -xgr +hlq bYj btz bsc @@ -114008,7 +113971,7 @@ akU avj awE awE -bqy +xgr bYj eUR gEI @@ -116850,7 +116813,7 @@ qVM csz awE qMe -bYj +nKJ bYj dyF awE