From 403c1926404c3ea5257de85368dc461bd730cc5c Mon Sep 17 00:00:00 2001 From: Marshmellow105 <118340622+Marshmellow105@users.noreply.github.com> Date: Wed, 12 Nov 2025 20:52:40 +1000 Subject: [PATCH 1/4] Update shutters.dm --- code/game/machinery/doors/shutters.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index 04ced0d2ea7a..e32b747e0263 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -3,8 +3,8 @@ name = "shutters" desc = "Heavy duty mechanical shutters with an atmospheric seal that keeps them airtight once closed." icon = 'modular_darkpack/master_files/icons/obj/doors/shutters.dmi' // DARKPACK EDIT CHANGE - layer = SHUTTER_LAYER - closingLayer = SHUTTER_LAYER + layer = NAVIGATION_EYE_LAYER // DARKPACK EDIT CHANGE + closingLayer = NAVIGATION_EYE_LAYER // DARKPACK EDIT CHANGE damage_deflection = 20 armor_type = /datum/armor/poddoor_shutters max_integrity = 100 From 200f9a95fbc310e4030ac9b6ecdbb9a30ac0db41 Mon Sep 17 00:00:00 2001 From: Marshmellow105 <118340622+Marshmellow105@users.noreply.github.com> Date: Wed, 12 Nov 2025 21:10:23 +1000 Subject: [PATCH 2/4] Revert "Update shutters.dm" This reverts commit 403c1926404c3ea5257de85368dc461bd730cc5c. --- code/game/machinery/doors/shutters.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index e32b747e0263..04ced0d2ea7a 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -3,8 +3,8 @@ name = "shutters" desc = "Heavy duty mechanical shutters with an atmospheric seal that keeps them airtight once closed." icon = 'modular_darkpack/master_files/icons/obj/doors/shutters.dmi' // DARKPACK EDIT CHANGE - layer = NAVIGATION_EYE_LAYER // DARKPACK EDIT CHANGE - closingLayer = NAVIGATION_EYE_LAYER // DARKPACK EDIT CHANGE + layer = SHUTTER_LAYER + closingLayer = SHUTTER_LAYER damage_deflection = 20 armor_type = /datum/armor/poddoor_shutters max_integrity = 100 From 15912a8d89cc115630f0ad62026a5135c908b2fc Mon Sep 17 00:00:00 2001 From: Marshmellow105 <118340622+Marshmellow105@users.noreply.github.com> Date: Fri, 31 Jul 2026 08:00:29 +1000 Subject: [PATCH 3/4] does that --- .../special_fran/special_francisco.dmm | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/_maps/map_files/Vampire/special_fran/special_francisco.dmm b/_maps/map_files/Vampire/special_fran/special_francisco.dmm index cb00b2a5352e..f739887f9fb4 100644 --- a/_maps/map_files/Vampire/special_fran/special_francisco.dmm +++ b/_maps/map_files/Vampire/special_fran/special_francisco.dmm @@ -10407,7 +10407,7 @@ /obj/structure/table/wood, /obj/item/storage/box/deputy, /obj/item/camera/detective, -/obj/item/detective_scanner, +/obj/item/detective_scanner/darkpack, /turf/open/floor/wood/ornate, /area/vtm/interior/police) "gfl" = ( @@ -13569,6 +13569,11 @@ /obj/structure/rack, /turf/open/floor/plating/rough, /area/vtm/interior/supply) +"hTN" = ( +/obj/structure/table/wood, +/obj/item/camera/detective, +/turf/open/floor/wood/smooth/old, +/area/vtm/interior/police/fed) "hTQ" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/vampdoor/wood, @@ -17317,12 +17322,12 @@ "kbu" = ( /obj/item/storage/box/deputy, /obj/item/camera/detective, -/obj/item/detective_scanner, +/obj/item/detective_scanner/darkpack, /obj/structure/table, -/obj/item/detective_scanner, -/obj/item/detective_scanner, -/obj/item/detective_scanner, -/obj/item/detective_scanner, +/obj/item/detective_scanner/darkpack, +/obj/item/detective_scanner/darkpack, +/obj/item/detective_scanner/darkpack, +/obj/item/detective_scanner/darkpack, /turf/open/floor/city/toilet/large, /area/vtm/interior/police) "kbG" = ( @@ -23238,6 +23243,15 @@ /obj/structure/closet/secure_closet/chemical, /turf/open/floor/city/circled/large, /area/vtm/interior/clinic) +"nHE" = ( +/obj/structure/vampdoor/glass, +/obj/effect/mapping_helpers/door/access/police, +/obj/effect/mapping_helpers/door/lock, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/open/floor/wood/smooth/old, +/area/vtm/interior/police) "nHQ" = ( /turf/open/floor/wood/smooth/old, /area/vtm/interior/bianchiBank) @@ -32634,9 +32648,9 @@ /area/vtm/interior/voivodate/cave) "sWp" = ( /obj/structure/table/wood, -/obj/item/detective_scanner, -/obj/item/detective_scanner, -/obj/item/detective_scanner, +/obj/item/detective_scanner/darkpack, +/obj/item/detective_scanner/darkpack, +/obj/item/detective_scanner/darkpack, /turf/open/floor/wood/smooth/old, /area/vtm/interior/police/fed) "sWq" = ( @@ -50182,7 +50196,7 @@ hUM hUM rhD ryJ -mMM +hTN wnZ tOk rOF @@ -60884,7 +60898,7 @@ rfg rfg rfg rfg -iBu +nHE lVj lVj tFx From 5c0dde660ab18854f4c0e9916cef4f963023e143 Mon Sep 17 00:00:00 2001 From: Marshmellow105 <118340622+Marshmellow105@users.noreply.github.com> Date: Sat, 1 Aug 2026 19:26:28 +1000 Subject: [PATCH 4/4] photocopiers gratis --- .../special_fran/special_francisco.dmm | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/_maps/map_files/Vampire/special_fran/special_francisco.dmm b/_maps/map_files/Vampire/special_fran/special_francisco.dmm index f739887f9fb4..247e50b96a9c 100644 --- a/_maps/map_files/Vampire/special_fran/special_francisco.dmm +++ b/_maps/map_files/Vampire/special_fran/special_francisco.dmm @@ -169,7 +169,7 @@ /turf/open/floor/wood/smooth, /area/vtm/interior) "agy" = ( -/obj/machinery/photocopier/prebuilt, +/obj/machinery/photocopier/gratis/prebuilt, /obj/machinery/light/directional/west, /turf/open/floor/city/plating, /area/vtm/interior/endron_facility/restricted) @@ -798,7 +798,7 @@ /turf/open/floor/city/toilet/large, /area/vtm/interior/police) "azv" = ( -/obj/machinery/photocopier/prebuilt, +/obj/machinery/photocopier/gratis/prebuilt, /turf/open/floor/wood/smooth/old, /area/vtm/interior/chantry) "aAH" = ( @@ -1121,7 +1121,7 @@ /turf/open/floor/wood/smooth, /area/vtm/interior) "aIL" = ( -/obj/machinery/photocopier/prebuilt, +/obj/machinery/photocopier/gratis/prebuilt, /obj/machinery/light/prince/directional/south, /turf/open/floor/wood/smooth/old, /area/vtm/interior/chantry) @@ -9027,7 +9027,7 @@ /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, -/obj/machinery/photocopier/prebuilt, +/obj/machinery/photocopier/gratis/prebuilt, /turf/open/floor/city/circled/large, /area/vtm/interior/endron_facility/restricted) "foV" = ( @@ -13669,7 +13669,7 @@ /area/vtm/interior/police) "hWh" = ( /obj/structure/coclock, -/obj/machinery/photocopier/prebuilt, +/obj/machinery/photocopier/gratis/prebuilt, /turf/open/floor/city/factory, /area/vtm/interior/radio) "hWp" = ( @@ -18215,7 +18215,7 @@ /area/vtm/interior/sewer) "kCn" = ( /obj/machinery/light/directional/east, -/obj/machinery/photocopier/prebuilt, +/obj/machinery/photocopier/gratis/prebuilt, /turf/open/floor/wood/smooth, /area/vtm/interior/endron_facility/restricted) "kCO" = ( @@ -25097,7 +25097,7 @@ /turf/open/floor/plating/rough, /area/vtm/interior/clinic) "oHg" = ( -/obj/machinery/photocopier/prebuilt, +/obj/machinery/photocopier/gratis/prebuilt, /turf/open/floor/city/plating_mono, /area/vtm/interior/endron_facility/restricted) "oHh" = ( @@ -26618,7 +26618,7 @@ /turf/open/floor/city/plating_stone, /area/vtm/interior/voivodate) "pCo" = ( -/obj/machinery/photocopier/prebuilt, +/obj/machinery/photocopier/gratis/prebuilt, /turf/open/floor/city/plating, /area/vtm/interior/endron_facility/restricted) "pCw" = ( @@ -26840,7 +26840,7 @@ /area/vtm/interior/chantry) "pJt" = ( /obj/effect/turf_decal/siding/white, -/obj/machinery/photocopier/prebuilt, +/obj/machinery/photocopier/gratis/prebuilt, /turf/open/floor/wood/old, /area/vtm/interior/chantry) "pKb" = ( @@ -30893,9 +30893,7 @@ /turf/open/floor/carpet/darkpack/blackgold, /area/vtm/interior/gang) "rTS" = ( -/obj/machinery/photocopier/prebuilt{ - density = 0 - }, +/obj/machinery/photocopier/gratis/prebuilt, /turf/open/floor/carpet/darkpack/cyan, /area/vtm/interior/clinic) "rUn" = ( @@ -36033,7 +36031,7 @@ /turf/open/floor/city/plating, /area/vtm/interior/endron_facility/restricted) "uQV" = ( -/obj/machinery/photocopier/prebuilt, +/obj/machinery/photocopier/gratis/prebuilt, /turf/open/floor/wood/smooth/old, /area/vtm/interior/police) "uRs" = (