Skip to content

Special Fran Port #11

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

Draft
FalloutFalcon wants to merge 46 commits into
base: master
Choose a base branch
from
Draft

Special Fran Port #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 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
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
#include "map_files\Vampire\special_fran\special_francisco.dmm"
// APOC EDIT ADD END
#endif
#ifdef ALL_TEMPLATES
#include "templates.dm"
Expand Down
Loading
Loading