Skip to content
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

Jump to bottom

Starts refactoring Xenomorph.dm and other xenocode. #4941

Closed
wants to merge 18 commits into from
Closed

Starts refactoring Xenomorph.dm and other xenocode. #4941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
caf18a0
refactors Initialize() and recalculate_actions()
Birdtalon Nov 15, 2023
c13ebcb
refactor set_hive_and_update()
Birdtalon Nov 15, 2023
0189d62
refactors xeno numbering, adds 999 numbers to all hives
Birdtalon Nov 15, 2023
0552628
removes istype predalien larva
Birdtalon Nov 15, 2023
a204781
organises file structure, moves all defines into xeno_defines.dm, sep…
Birdtalon Nov 15, 2023
959257c
moves some defines back to mobs.dm
Birdtalon Nov 15, 2023
4eadf0d
fixes runtimes
Birdtalon Nov 15, 2023
0040681
move name updating on evo to life()
Birdtalon Nov 16, 2023
98075f3
silly funny 666 joke
Birdtalon Nov 16, 2023
2bc6a51
single letter var treatment
Birdtalon Nov 16, 2023
90ff0dc
starts on hive_status.dm
Birdtalon Nov 16, 2023
631e24c
some missed single letter vars
Birdtalon Nov 16, 2023
a73d186
addresses unit tests
Birdtalon Nov 16, 2023
1e891fe
bugfixes
Birdtalon Nov 16, 2023
7900c8a
some more single letter vars in hive_status.dm
Birdtalon Nov 18, 2023
5e9a56a
more single letter vars in hive_status.dm
Birdtalon Nov 18, 2023
1b18d4d
Merge branch 'master' into xenohell
Birdtalon Nov 18, 2023
ea2fa5a
missed var
Birdtalon Nov 18, 2023
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
8 changes: 0 additions & 8 deletions code/__DEFINES/job.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,14 +358,6 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
#define JOB_PLAYTIME_TIER_3 (70 HOURS)
#define JOB_PLAYTIME_TIER_4 (175 HOURS)

#define XENO_NO_AGE -1
#define XENO_YOUNG 0
#define XENO_NORMAL 1
#define XENO_MATURE 2
#define XENO_ELDER 3
#define XENO_ANCIENT 4
#define XENO_PRIME 5

/// For monthly time tracking
#define JOB_OBSERVER "Observer"
#define TIMELOCK_JOB(role_id, hours) new/datum/timelock(role_id, hours, role_id)
Expand Down
20 changes: 0 additions & 20 deletions code/__DEFINES/mobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,26 +117,6 @@
#define CANSLOW (1<<19)
#define NO_PERMANENT_DAMAGE (1<<20)

// =============================
// hive types

#define XENO_HIVE_NORMAL "xeno_hive_normal"
#define XENO_HIVE_CORRUPTED "xeno_hive_corrupted"
#define XENO_HIVE_ALPHA "xeno_hive_alpha"
#define XENO_HIVE_BRAVO "xeno_hive_bravo"
#define XENO_HIVE_CHARLIE "xeno_hive_charlie"
#define XENO_HIVE_DELTA "xeno_hive_delta"
#define XENO_HIVE_FERAL "xeno_hive_feral"
#define XENO_HIVE_TAMED "xeno_hive_tamed"
#define XENO_HIVE_MUTATED "xeno_hive_mutated"
#define XENO_HIVE_FORSAKEN "xeno_hive_forsaken"
#define XENO_HIVE_YAUTJA "xeno_hive_yautja"
#define XENO_HIVE_RENEGADE "xeno_hive_renegade"

#define ALL_XENO_HIVES list(XENO_HIVE_NORMAL, XENO_HIVE_CORRUPTED, XENO_HIVE_ALPHA, XENO_HIVE_BRAVO, XENO_HIVE_CHARLIE, XENO_HIVE_DELTA, XENO_HIVE_FERAL, XENO_HIVE_TAMED, XENO_HIVE_MUTATED, XENO_HIVE_FORSAKEN, XENO_HIVE_YAUTJA, XENO_HIVE_RENEGADE)

//=================================================

// =============================
// slowdowns
#define XENO_SLOWED_AMOUNT 0.7
Expand Down
31 changes: 31 additions & 0 deletions code/__DEFINES/xeno.dm → code/__DEFINES/xeno_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
// Xeno ages

#define XENO_NO_AGE -1
#define XENO_YOUNG 0
#define XENO_NORMAL 1
#define XENO_MATURE 2
#define XENO_ELDER 3
#define XENO_ANCIENT 4
#define XENO_PRIME 5


// =============================
// hive types

#define XENO_HIVE_NORMAL "xeno_hive_normal"
#define XENO_HIVE_CORRUPTED "xeno_hive_corrupted"
#define XENO_HIVE_ALPHA "xeno_hive_alpha"
#define XENO_HIVE_BRAVO "xeno_hive_bravo"
#define XENO_HIVE_CHARLIE "xeno_hive_charlie"
#define XENO_HIVE_DELTA "xeno_hive_delta"
#define XENO_HIVE_FERAL "xeno_hive_feral"
#define XENO_HIVE_TAMED "xeno_hive_tamed"
#define XENO_HIVE_MUTATED "xeno_hive_mutated"
#define XENO_HIVE_FORSAKEN "xeno_hive_forsaken"
#define XENO_HIVE_YAUTJA "xeno_hive_yautja"
#define XENO_HIVE_RENEGADE "xeno_hive_renegade"

#define ALL_XENO_HIVES list(XENO_HIVE_NORMAL, XENO_HIVE_CORRUPTED, XENO_HIVE_ALPHA, XENO_HIVE_BRAVO, XENO_HIVE_CHARLIE, XENO_HIVE_DELTA, XENO_HIVE_FERAL, XENO_HIVE_TAMED, XENO_HIVE_MUTATED, XENO_HIVE_FORSAKEN, XENO_HIVE_YAUTJA, XENO_HIVE_RENEGADE)

//=================================================

#define XENOCON_THRESHOLD 6000

#define TUNNEL_MOVEMENT_XENO_DELAY 20
Expand Down
Loading