Skip to content

Special Fran Port #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FalloutFalcon merged 105 commits into from
Apr 29, 2026
Merged

Special Fran Port #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
0315abe
stuff.
FalloutFalcon Feb 9, 2026
cf46ef1
stuffs
FalloutFalcon Feb 10, 2026
cfd1246
yea
FalloutFalcon Feb 10, 2026
7102cb8
yea
FalloutFalcon Feb 10, 2026
cd585f1
yea
FalloutFalcon Feb 11, 2026
a131380
yea
FalloutFalcon Feb 11, 2026
f150669
yea
FalloutFalcon Feb 11, 2026
fcb4ec0
yea
FalloutFalcon Feb 11, 2026
f1f37e5
yea
FalloutFalcon Feb 11, 2026
b0e4b44
cockroach compile fail
dwinters99 Feb 13, 2026
8cf70ef
compile fails
dwinters99 Feb 13, 2026
e121ee9
unatomic
dwinters99 Feb 13, 2026
1945eda
move these files where they go and other stuff
dwinters99 Feb 13, 2026
40069d9
ABBY!!!
dwinters99 Feb 13, 2026
38f6ae8
fix some var edits n stuff
dwinters99 Feb 13, 2026
7b453a5
unatomic
dwinters99 Feb 13, 2026
b831817
Merge remote-tracking branch 'origin/special-fran' into special-frank
dwinters99 Feb 13, 2026
7ef9ea1
some updatepaths and hedging my bets on the splat applicator
dwinters99 Feb 13, 2026
b31764c
yeah man whatever whoops middle finger
dwinters99 Feb 13, 2026
9ca694f
abby help me...
dwinters99 Feb 13, 2026
6afa2e8
PLAYTEST PANIC
dwinters99 Feb 21, 2026
c933789
fao;edz
dwinters99 Feb 21, 2026
c15b96d
coment
dwinters99 Feb 21, 2026
4eed7ad
linter
FalloutFalcon Feb 21, 2026
fbbb3e5
Merge branch 'special-fran' of https://github.com/FalloutFalcon/Secon…
FalloutFalcon Feb 21, 2026
a80dd54
Merge branch 'master' of https://github.com/DarkPack13/SecondCity int…
FalloutFalcon Feb 21, 2026
8d13461
fix
FalloutFalcon Feb 21, 2026
d8657f9
some fixes
FalloutFalcon Feb 21, 2026
fc40913
plants
FalloutFalcon Feb 21, 2026
34099c0
uea
FalloutFalcon Feb 21, 2026
6c717ee
fix
FalloutFalcon Feb 21, 2026
7d2726d
fix i think
FalloutFalcon Feb 21, 2026
6f9d7b4
fixes
FalloutFalcon Feb 21, 2026
30a1cd1
minor map fixes
FalloutFalcon Feb 21, 2026
2132914
yea
FalloutFalcon Feb 21, 2026
129edd1
yea
FalloutFalcon Feb 21, 2026
050a003
yea
FalloutFalcon Feb 21, 2026
f2cfcb9
yea
FalloutFalcon Feb 22, 2026
b08ad66
yea
FalloutFalcon Feb 22, 2026
4cb4849
yea
FalloutFalcon Feb 22, 2026
9121ec3
umbra placeholder
FalloutFalcon Feb 22, 2026
3dd0777
Merge branch 'master' of https://github.com/ApocryphaXIII/Apocrypha13…
FalloutFalcon Feb 24, 2026
75c6a2c
yea
FalloutFalcon Feb 24, 2026
12ccd59
small fixes
FalloutFalcon Feb 24, 2026
cc79ae0
mappin tweaks
FalloutFalcon Feb 24, 2026
78ee09d
yea
FalloutFalcon Feb 24, 2026
b8841cc
yea
FalloutFalcon Feb 25, 2026
adce6a0
bum fix
dwinters99 Mar 18, 2026
9c870d3
ultraspore bandaid
dwinters99 Mar 18, 2026
8081884
congratz on the litter abby
dwinters99 Mar 18, 2026
525ab27
undef
dwinters99 Mar 18, 2026
89a7379
emissives
dwinters99 Mar 18, 2026
6ab77d7
more emmy
dwinters99 Mar 18, 2026
09a6163
rename
dwinters99 Mar 18, 2026
eb5766d
ok yes
dwinters99 Mar 18, 2026
60d15bf
rage against the machine
dwinters99 Mar 18, 2026
d73f95d
blood
dwinters99 Mar 19, 2026
dddd65e
Merge branch 'special-fran' of https://github.com/FalloutFalcon/Secon…
FalloutFalcon Mar 19, 2026
61ce371
Merge branch 'master' of https://github.com/ApocryphaXIII/Apocrypha13…
FalloutFalcon Mar 19, 2026
f929a96
modern updatepaths
dwinters99 Mar 22, 2026
65f3eb5
Merge branch 'master' into special-fran
FalloutFalcon Mar 24, 2026
54ecb45
the fix
Aquidu Mar 24, 2026
eaceb5b
Merge pull request #30 from Aquidu/special-fran
FalloutFalcon Mar 25, 2026
aeca224
Merge branch 'master' into special-fran
FalloutFalcon Apr 1, 2026
6e26cdd
fix the splat applicator oversight
dwinters99 Apr 2, 2026
82670ae
lint fixes
KCartridge Apr 2, 2026
71b149b
three lights same tile epic fix
KCartridge Apr 3, 2026
dc9354e
more lint fix also size fix oops
KCartridge Apr 3, 2026
2a1506d
qdel lint fix
KCartridge Apr 3, 2026
fa39218
umbra, fixes, club revamp
KCartridge Apr 3, 2026
f2c2cb8
llintsss
KCartridge Apr 3, 2026
5d403ab
lint fix but real
KCartridge Apr 3, 2026
6a2db9d
church renovations wip
KCartridge Apr 4, 2026
6cf1b1f
umbra lint fixes
KCartridge Apr 4, 2026
10acaf7
interior reworks, forest parking, residential squeeze, anarch basement
KCartridge Apr 6, 2026
003d8ce
Merge branch 'master' of https://github.com/ApocryphaXIII/Apocrypha13…
FalloutFalcon Apr 7, 2026
aa99830
square/round grate + rusty
dwinters99 Apr 7, 2026
0d4930c
drains
dwinters99 Apr 7, 2026
dae2ebd
whole bunch of stuff
KCartridge Apr 8, 2026
a988e48
linters
KCartridge Apr 8, 2026
cb7ecd3
call this b a dryer the way im lintin
KCartridge Apr 8, 2026
e42305f
carwash
dwinters99 Apr 8, 2026
4832db7
Merge branch 'special-fran' of https://github.com/ApocryphaXIII/Apocr…
dwinters99 Apr 8, 2026
4ba320d
oopsie ehehe
dwinters99 Apr 9, 2026
0aab516
malformed varedit
dwinters99 Apr 9, 2026
a93a5a2
abby can we sloppy makeout
dwinters99 Apr 10, 2026
351372d
malformed varedits
dwinters99 Apr 10, 2026
323d2a1
do it right idiot
dwinters99 Apr 10, 2026
b886663
Merge branch 'master' into special-fran
dwinters99 Apr 11, 2026
f49c78c
reverts some changes to maps from upstream that arent meant to get to…
FalloutFalcon Apr 11, 2026
16801e3
Merge branch 'special-fran' of https://github.com/ApocryphaXIII/Apocr…
FalloutFalcon Apr 11, 2026
9506993
fix 2 light lints
dwinters99 Apr 11, 2026
4ff5b3f
Merge branch 'special-fran' of https://github.com/ApocryphaXIII/Apocr…
dwinters99 Apr 11, 2026
36056ba
ugh
dwinters99 Apr 11, 2026
e1a00a4
misplaced cordon
dwinters99 Apr 12, 2026
c2d3634
Merge branch 'master' into special-fran
FalloutFalcon Apr 24, 2026
9ba4d5d
makes some forest props wooden again
FalloutFalcon Apr 24, 2026
8e99cc7
beeg cleanup of behavoir for shortcut. (it works now)
FalloutFalcon Apr 24, 2026
4cd4627
fix
FalloutFalcon Apr 24, 2026
9889e36
define
FalloutFalcon Apr 24, 2026
18ac0e9
fix space linters
FalloutFalcon Apr 24, 2026
ddf7cb5
adds nagivate landmarks for most the outside areas.
FalloutFalcon Apr 25, 2026
d0d5bf0
fixes so bonus maps only load on special fran
FalloutFalcon Apr 29, 2026
b49a90d
random comments mostly
FalloutFalcon Apr 29, 2026
ed23172
fix harddel
FalloutFalcon Apr 29, 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
3 changes: 3 additions & 0 deletions _maps/_basemap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
#include "map_files\debug\multiz.dmm"
#include "map_files\debug\runtimestation.dmm"
// DARKPACK EDIT CHANGE END
// APOC EDIT ADD START - (Special Fran)
#include "map_files\Vampire\special_fran\special_francisco.dmm"
// APOC EDIT ADD END
#endif
#ifdef ALL_TEMPLATES
#include "templates.dm"
Expand Down
Loading
Loading