diff --git a/README.md b/README.md
index ba5228347d..6ab8053014 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,23 @@
-# Cataclysm 2040
-
- 
+ 
+---
+
Five days after an event called the Cataclysm, the mundane routine of a civilized world has transformed into a desparate fight for survival of the human race. From the mist of government conspiracies and cover-ups, the few who saw the coming dangers prepared themselves for the end of the world...
Cataclysm 2040 is a turn-based roguelike survival game set in a cyberpunk post-apocalyptic future. Forked from the critically acclaimed [Cataclysm: Dark Days Ahead](https://github.com/CleverRaven/Cataclysm-DDA/), Cataclysm 2040 is a revival project that seeks to restore the original futuristic setting and thematics of Cataclysm prior to the "present-day" retcon.
+*[CHANGELOG](data/changelog.txt)*
+
+---
+
+
+ 
+
+
+---
+
## Design Philosophy
In order to properly set the scope for this fork, I'd like to take a moment to discuss the design philosophy behind Cataclysm 2040.
@@ -49,10 +59,7 @@ I am one person and I don't have hundreds of contributors like C:DDA does, so it
## Core Supported Platforms
-As of this writing, this fork is maintained by a single person. As such, Cataclysm 2040 simply doesn't have the capacity to support the broad range of platforms available for Cataclysm: DDA. The only officially supported platforms with pre-compiled release binaries are:
-
-- macOS (arm64 - Apple Silicon)
-- Linux (x86_64)
+As of this writing, this fork is maintained by a single person. As such, Cataclysm 2040 simply doesn't have the capacity to support the broad range of platforms available for Cataclysm: DDA. Currently, the only officially supported platform with pre-compiled release binaries is macOS (arm64 - Apple Silicon).
No other platforms or architectures are officially supported, but you're free to use the compilation guides written for Cataclysm: DDA to build your own binaries. At this time, we're not in any major package managers.
@@ -67,7 +74,7 @@ At the current time of writing, I don't have automated CI set up for Cataclysm 2
Cataclysm 2040 pre-built releases are named using the following notation:
Codename BuildDate <--- The convention we use
- Alie 2024.1 <--- Example of an actual release version name
+ Alie 2024.2 <--- Example of an actual release version name
This notation is designed to tell you the release family codename as well as the date that the build was assembled (which has an associated tag in this repo).
diff --git a/build-data/osx/AppIcon.icns b/build-data/osx/AppIcon.icns
index 6d59e7acb4..5b4f3da433 100644
Binary files a/build-data/osx/AppIcon.icns and b/build-data/osx/AppIcon.icns differ
diff --git a/build-data/osx/AppIcon.iconset/icon_128x128.png b/build-data/osx/AppIcon.iconset/icon_128x128.png
index 84a2bce40f..5dcf71294c 100644
Binary files a/build-data/osx/AppIcon.iconset/icon_128x128.png and b/build-data/osx/AppIcon.iconset/icon_128x128.png differ
diff --git a/build-data/osx/AppIcon.iconset/icon_128x128@2x.png b/build-data/osx/AppIcon.iconset/icon_128x128@2x.png
index a6309161d2..5857b084a4 100644
Binary files a/build-data/osx/AppIcon.iconset/icon_128x128@2x.png and b/build-data/osx/AppIcon.iconset/icon_128x128@2x.png differ
diff --git a/build-data/osx/AppIcon.iconset/icon_16x16.png b/build-data/osx/AppIcon.iconset/icon_16x16.png
index 7a9fad7d99..3053c50688 100644
Binary files a/build-data/osx/AppIcon.iconset/icon_16x16.png and b/build-data/osx/AppIcon.iconset/icon_16x16.png differ
diff --git a/build-data/osx/AppIcon.iconset/icon_16x16@2x.png b/build-data/osx/AppIcon.iconset/icon_16x16@2x.png
index 0be9fe64ed..6c8dec3d78 100644
Binary files a/build-data/osx/AppIcon.iconset/icon_16x16@2x.png and b/build-data/osx/AppIcon.iconset/icon_16x16@2x.png differ
diff --git a/build-data/osx/AppIcon.iconset/icon_256x256.png b/build-data/osx/AppIcon.iconset/icon_256x256.png
index 16cada2f4d..95b69b50b6 100644
Binary files a/build-data/osx/AppIcon.iconset/icon_256x256.png and b/build-data/osx/AppIcon.iconset/icon_256x256.png differ
diff --git a/build-data/osx/AppIcon.iconset/icon_256x256@2x.png b/build-data/osx/AppIcon.iconset/icon_256x256@2x.png
index c3418df6ac..9e10f646cb 100644
Binary files a/build-data/osx/AppIcon.iconset/icon_256x256@2x.png and b/build-data/osx/AppIcon.iconset/icon_256x256@2x.png differ
diff --git a/build-data/osx/AppIcon.iconset/icon_32x32.png b/build-data/osx/AppIcon.iconset/icon_32x32.png
index f41ef97ee8..b1d9bf5744 100644
Binary files a/build-data/osx/AppIcon.iconset/icon_32x32.png and b/build-data/osx/AppIcon.iconset/icon_32x32.png differ
diff --git a/build-data/osx/AppIcon.iconset/icon_32x32@2x.png b/build-data/osx/AppIcon.iconset/icon_32x32@2x.png
index 6da3167dde..a736fce360 100644
Binary files a/build-data/osx/AppIcon.iconset/icon_32x32@2x.png and b/build-data/osx/AppIcon.iconset/icon_32x32@2x.png differ
diff --git a/build-data/osx/AppIcon.iconset/icon_512x512.png b/build-data/osx/AppIcon.iconset/icon_512x512.png
index cb582cf219..bfe3d98d87 100644
Binary files a/build-data/osx/AppIcon.iconset/icon_512x512.png and b/build-data/osx/AppIcon.iconset/icon_512x512.png differ
diff --git a/build-data/osx/AppIcon.iconset/icon_512x512@2x.png b/build-data/osx/AppIcon.iconset/icon_512x512@2x.png
index 1e7d3312c4..50132dc1d3 100644
Binary files a/build-data/osx/AppIcon.iconset/icon_512x512@2x.png and b/build-data/osx/AppIcon.iconset/icon_512x512@2x.png differ
diff --git a/build-data/osx/AppIcon.iconset/icon_64x64.png b/build-data/osx/AppIcon.iconset/icon_64x64.png
index c4345f494a..8713deed1a 100644
Binary files a/build-data/osx/AppIcon.iconset/icon_64x64.png and b/build-data/osx/AppIcon.iconset/icon_64x64.png differ
diff --git a/build-data/osx/CD2040-AppIcon_sourcefile.xcf b/build-data/osx/CD2040-AppIcon_sourcefile.xcf
new file mode 100644
index 0000000000..c45b31e6d4
Binary files /dev/null and b/build-data/osx/CD2040-AppIcon_sourcefile.xcf differ
diff --git a/build-scripts/2040/README.md b/build-scripts/2040/README.md
new file mode 100644
index 0000000000..3302972250
--- /dev/null
+++ b/build-scripts/2040/README.md
@@ -0,0 +1,2 @@
+# Cataclysm 2040 Build Process
+This is a WIP folder for writing down my (currently manual) build process. Eventually, this should be automated via an actual CI script. However, I don't really have the time to do that right now.
diff --git a/build-scripts/2040/build_cd2040_linux.sh b/build-scripts/2040/build_cd2040_linux.sh
new file mode 100644
index 0000000000..8375d8589a
--- /dev/null
+++ b/build-scripts/2040/build_cd2040_linux.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# Bypass all linters and checks to build CD2040 (yolo) and then pack it up into a tarball
+make -j8 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1 LOCALISE=0 LINTJSON=0 ASTYLE=0 RUNTESTS=0
+mkdir cataclysm2040-linux64-tiles-sounds-alie2024_1
+mv cataclysm-launcher cataclysm2040-linux64-tiles-sounds-alie2024_1/
+mv cataclysm-tiles cataclysm2040-linux64-tiles-sounds-alie2024_1/
+mv data cataclysm2040-linux64-tiles-sounds-alie2024_1/
+mv gfx cataclysm2040-linux64-tiles-sounds-alie2024_1/
+mv lang cataclysm2040-linux64-tiles-sounds-alie2024_1/
+mv README.md cataclysm2040-linux64-tiles-sounds-alie2024_1/
+mv doc cataclysm2040-linux64-tiles-sounds-alie2024_1/
+mv LICENSE.txt cataclysm2040-linux64-tiles-sounds-alie2024_1/
+mv LICENSE-OFL-Terminus-Font.txt cataclysm2040-linux64-tiles-sounds-alie2024_1/
+tar czf cataclysm2040-linux64-tiles-sounds-alie2024_1.tar.gz cataclysm2040-linux64-tiles-sounds-alie2024_1
+
diff --git a/build-scripts/2040/build_cd2040_macos.sh b/build-scripts/2040/build_cd2040_macos.sh
new file mode 100644
index 0000000000..b91d1d1afd
--- /dev/null
+++ b/build-scripts/2040/build_cd2040_macos.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# Build a .app for Apple Silicon, then do the fixes so that it actually works.
+# I know building as root is bad. Don't bully me. I ran into some permission issues but didn't have time to fix it. Yolo, I'll fix it later...
+make app RELEASE=1 TILES=1 LOCALIZE=0 SOUND=1 NATIVE=osx
+cd Cataclysm.app/Contents/Resources/
+rm cataclysm-tiles
+mv ../../../cataclysm-tiles .
+cd ../../../
+dylibbundler -of -b -x Cataclysm.app/Contents/Resources/cataclysm-tiles -d Cataclysm.app/Contents/Resources/ -p @Cataclysm.app/
+# Turn our .app into a DMG. Needs some cleanup.
+# ./node_modules/create-dmg/cli.js Cataclysm.app --dmg-title='Cataclysm 2040'
diff --git a/data/changelog.txt b/data/changelog.txt
index 4c6c3bda3b..95d7a2af97 100644
--- a/data/changelog.txt
+++ b/data/changelog.txt
@@ -1,3 +1,37 @@
+# Alie 2024.2
+This is the initial release for Cataclysm 2040. This development was forked immediately after Cataclysm:DDA 0.G.
+
+Features:
+(#13) Lock Vehicle Doors (DDA61087)
+
+Content:
+(#11) Restore CBMs from Zombie Corpses
+(#17) Remove AFS Formless Ruins
+
+Interface:
+0d6070e Made ChibiUltica the default tileset
+
+Mods:
+(#3) Fixed & un-deprecated No Fungi mod
+(#4) Add Whaley Hair and Tattoo
+(#5) Backport Sky Islands
+(#9) Add Useful Helicopters and make piloting/A&P mechanic free
+(#10) Set Default Mods
+
+Balance:
+(#2) Remove Proficiencies
+(#7) Disable Portal Storms
+(#8) Remove Welding Rods
+(#14) Turn Skill Rust off by default
+
+Build:
+(#1) Apple Silicon support
+(#15) Define Release Model
+
+---
+# Cataclysm: Dark Days Ahead below this line
+---
+
# 0.G (Gaiman)
## Highlights
diff --git a/data/credits/en.credits b/data/credits/en.credits
index 4a75ebae7a..0aa0fae5a0 100644
--- a/data/credits/en.credits
+++ b/data/credits/en.credits
@@ -2,9 +2,21 @@
# The following line is for reference
##############################################################################
Original author: Project Manager:
-Whales (retired) KevinGranade
+Whales (retired) Neon
-Current Main Developers:
+Special thanks to:
+The entire CleverRaven team - For maintaining the amazing game this fork is based off of.
+
+For web details about the project please see:
+https://github.com/neonspectra/Cataclysm-2040
+
+Cataclysm 2040 is released under CC-BY-SA 3.0:
+https://creativecommons.org/licenses/by-sa/3.0/
+
+******************************************************************************
+
+Main Developers (0.G):
+Kevin Granade - C:DDA project maintainer.
I-am-Erk - Ultica, lore writing, ideas guy.
KorGgenT - Professional yak shaver.
diff --git a/data/json/vehicleparts/doors.json b/data/json/vehicleparts/doors.json
index b694243bda..ecadea7386 100644
--- a/data/json/vehicleparts/doors.json
+++ b/data/json/vehicleparts/doors.json
@@ -91,7 +91,7 @@
"damage_reduction": { "all": 20 },
"description": "A door. Solid construction means you can't see through it when closed.",
"durability": 240,
- "flags": [ "CARGO", "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "DOOR" ],
+ "flags": [ "CARGO", "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "DOOR", "LOCKABLE_DOOR" ],
"item": "frame",
"location": "center",
"looks_like": "door",
@@ -165,7 +165,7 @@
"damage_reduction": { "all": 30 },
"description": "A strong door. Solid construction means you can't see through it when closed.",
"durability": 660,
- "flags": [ "CARGO", "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "DOOR" ],
+ "flags": [ "CARGO", "OBSTACLE", "OPAQUE", "OPENABLE", "BOARDABLE", "DOOR", "LOCKABLE_DOOR" ],
"item": "hdframe",
"location": "center",
"looks_like": "door_opaque",
@@ -253,7 +253,7 @@
"damage_reduction": { "all": 20 },
"description": "A strong door. Solid construction means you can't see through it when closed.",
"durability": 450,
- "flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "OPAQUE", "DOOR" ],
+ "flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "OPAQUE", "DOOR", "LOCKABLE_DOOR" ],
"item": "frame",
"location": "center",
"looks_like": "door_opaque",
@@ -279,7 +279,7 @@
"damage_reduction": { "all": 30 },
"description": "A very strong door. A window lets you see through it when closed.",
"durability": 900,
- "flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "DOOR", "WINDOW" ],
+ "flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "DOOR", "WINDOW", "LOCKABLE_DOOR" ],
"item": "hdframe",
"location": "center",
"looks_like": "hatch",
@@ -305,7 +305,7 @@
"damage_reduction": { "all": 30 },
"description": "A very strong door. Solid construction means you can't see through it when closed.",
"durability": 1000,
- "flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "OPAQUE", "DOOR" ],
+ "flags": [ "CARGO", "LOCKABLE_CARGO", "OBSTACLE", "OPENABLE", "MULTISQUARE", "BOARDABLE", "COVERED", "OPAQUE", "DOOR", "LOCKABLE_DOOR" ],
"item": "hdframe",
"location": "center",
"looks_like": "hatch_opaque",
diff --git a/data/mods/default.json b/data/mods/default.json
index 471f7d067c..1e33826a41 100644
--- a/data/mods/default.json
+++ b/data/mods/default.json
@@ -4,6 +4,6 @@
"id": "dev:default",
"name": "default",
"description": "contains all the mods recommended by the developers",
- "dependencies": [ "dda", "aftershock", "no_npc_food", "personal_portal_storms", "no_fungal_growth", "no_fungi", "package_bionic_professions", "blazeindustries", "useful_helicopters", "Tamable_Wildlife", "MMA", "WHALEYHAIR1", "magiclysm" ]
+ "dependencies": [ "dda", "aftershock", "no_npc_food", "personal_portal_storms", "no_fungal_growth", "No_Fungi", "package_bionic_professions", "blazeindustries", "useful_helicopters", "Tamable_Wildlife", "WHALEYHAIR1", "magiclysm" ]
}
]
diff --git a/data/screenshots/showcase-2024.png b/data/screenshots/showcase-2024.png
new file mode 100644
index 0000000000..c1e9fa67f3
Binary files /dev/null and b/data/screenshots/showcase-2024.png differ
diff --git a/data/screenshots/titlebanner.png b/data/screenshots/titlebanner.png
new file mode 100644
index 0000000000..70adb96f6a
Binary files /dev/null and b/data/screenshots/titlebanner.png differ
diff --git a/data/screenshots/ultica-showcase-sep-2021.png b/data/screenshots/ultica-showcase-sep-2021.png
deleted file mode 100644
index 2bfe65cd66..0000000000
Binary files a/data/screenshots/ultica-showcase-sep-2021.png and /dev/null differ
diff --git a/doc/2040/C DDA Design Outline.pdf b/doc/2040/C DDA Design Outline.pdf
new file mode 100644
index 0000000000..34a9162936
Binary files /dev/null and b/doc/2040/C DDA Design Outline.pdf differ
diff --git a/doc/2040/Lore - The Cataclysm Dark Days Ahead Wiki.pdf b/doc/2040/Lore - The Cataclysm Dark Days Ahead Wiki.pdf
new file mode 100644
index 0000000000..f581bfaf96
Binary files /dev/null and b/doc/2040/Lore - The Cataclysm Dark Days Ahead Wiki.pdf differ
diff --git a/doc/2040/README.md b/doc/2040/README.md
new file mode 100644
index 0000000000..88b3f42a49
--- /dev/null
+++ b/doc/2040/README.md
@@ -0,0 +1,2 @@
+# Cataclysm 2040 Documentation
+This folder is for 2040-specific documentation. As of now, but much is in here. For now, I'm mainly using this as a dumping ground for historical design documents that reference the 2040 setting in case they get removed from the internet so that we can access them later.
diff --git a/doc/2040/Timeline - The Cataclysm Dark Days Ahead Wiki.pdf b/doc/2040/Timeline - The Cataclysm Dark Days Ahead Wiki.pdf
new file mode 100644
index 0000000000..dcd6eb5b28
Binary files /dev/null and b/doc/2040/Timeline - The Cataclysm Dark Days Ahead Wiki.pdf differ