Skip to content
Merged
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
403c192
Update shutters.dm
Marshmellow105 Nov 12, 2025
200f9a9
Revert "Update shutters.dm"
Marshmellow105 Nov 12, 2025
e4e7f51
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Nov 14, 2025
15f86e4
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Nov 14, 2025
7195872
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Nov 21, 2025
898f16a
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Nov 22, 2025
2359fc4
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Dec 6, 2025
1afce2b
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Dec 7, 2025
92677ce
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Jan 17, 2026
fe51445
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Feb 1, 2026
aa83314
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Feb 6, 2026
b8d7740
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Mar 16, 2026
75236b2
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Apr 18, 2026
201da4c
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Apr 23, 2026
576a771
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Apr 26, 2026
68dc3c1
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Apr 28, 2026
a43bd3b
Merge remote-tracking branch 'upstream/master'
Marshmellow105 May 17, 2026
f69778e
Merge remote-tracking branch 'upstream/master'
Marshmellow105 May 18, 2026
013b257
Merge remote-tracking branch 'upstream/master'
Marshmellow105 May 23, 2026
13704c4
Merge remote-tracking branch 'upstream/master'
Marshmellow105 May 23, 2026
acbff0d
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Jun 15, 2026
b064a5d
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Jul 15, 2026
c27d987
Merge remote-tracking branch 'upstream/master'
Marshmellow105 Jul 27, 2026
15912a8
does that
Marshmellow105 Jul 30, 2026
cef3c3e
Merge branch 'master' of https://github.com/Marshmellow105/SecondCity
Marshmellow105 Jul 30, 2026
5c0dde6
photocopiers gratis
Marshmellow105 Aug 1, 2026
58ab385
Merge branch 'master' into pd-changes
Marshmellow105 Aug 1, 2026
9d5148f
Merge branch 'master' into pd-changes
Marshmellow105 Aug 1, 2026
b192e8a
Merge branch 'master' into pd-changes
dwinters99 Aug 2, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 36 additions & 24 deletions _maps/map_files/Vampire/special_fran/special_francisco.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -13664,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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -18210,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" = (
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -25083,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" = (
Expand Down Expand Up @@ -26604,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" = (
Expand Down Expand Up @@ -26826,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" = (
Expand Down Expand Up @@ -30879,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" = (
Expand Down Expand Up @@ -32634,9 +32646,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" = (
Expand Down Expand Up @@ -36019,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" = (
Expand Down Expand Up @@ -50182,7 +50194,7 @@ hUM
hUM
rhD
ryJ
mMM
hTN
wnZ
tOk
rOF
Expand Down Expand Up @@ -60884,7 +60896,7 @@ rfg
rfg
rfg
rfg
iBu
nHE
lVj
lVj
tFx
Expand Down
Loading