-
-
Notifications
You must be signed in to change notification settings - Fork 285
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'citrp/master' into thog
- Loading branch information
Showing
619 changed files
with
398,464 additions
and
12,263 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #ifdef FORCE_MAP | ||
| #error Duplicate FORCE_MAP, what are you doing!? | ||
| #endif | ||
|
|
||
| #define FORCE_MAP "victory" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,57 @@ | ||
| //* This file is explicitly licensed under the MIT license. *// | ||
| //* Copyright (c) 2023 Citadel Station developers. *// | ||
| //* Copyright (c) 2024 Citadel Station Developers *// | ||
|
|
||
| //? damage types | ||
|
|
||
| // todo: refactor damage types | ||
| //* direct damage types; maps to most systems in the game *// | ||
|
|
||
| //? damage_mode bitfield | ||
| #define DAMAGE_TYPE_BRUTE "brute" | ||
| #define DAMAGE_TYPE_BURN "burn" | ||
|
|
||
| #define DAMAGE_MODE_SHARP (1<<0) //! sharp weapons like knives, spears, etc | ||
| #define DAMAGE_MODE_EDGE (1<<1) //! weapons with an edge, like knives, being used as such. without this, sharp = pierce | ||
| #define DAMAGE_MODE_ABLATING (1<<2) //! pulse lasers, etc, basically blows a crater | ||
| #define DAMAGE_MODE_PIERCE (1<<3) //! specifically highly-piercing weapons like bullets, even worse than sharp. | ||
| #define DAMAGE_MODE_SHRED (1<<4) //! messy, shredded wounds instead of a clean cut / pierce. strong. | ||
| #define DAMAGE_MODE_GRADUAL (1<<5) //! disallow bone breaks, ablation, etc; used for gradual sources like depressurization | ||
| #define DAMAGE_MODE_INTERNAL (1<<6) //! coming from internal; used to flag that something isn't coming through the skin. certain defenses don't work if this is set. | ||
| #define DAMAGE_MODE_REDIRECT (1<<7) //! if zone doesn't exist / etc, allow redirection | ||
| #define DAMAGE_MODE_NO_OVERFLOW (1<<8)//! temporary - re-evaluate when health is reworked. prevents damage from overflowing caps. | ||
| //* special damage types; only relevant for certain biologies *// | ||
| //* most of these will be reworked in brainmed update *// | ||
|
|
||
| /// body toxins / systems instability | ||
| #define DAMAGE_TYPE_TOX "tox" | ||
| /// oxygen deprivation | ||
| #define DAMAGE_TYPE_OXY "oxy" | ||
| /// dna damage | ||
| #define DAMAGE_TYPE_CLONE "clone" | ||
| /// pain | ||
| /// todo: stamina vs pain | ||
| #define DAMAGE_TYPE_HALLOSS "halloss" | ||
|
|
||
| //* special hybrid types; processed specially depending on type *// | ||
|
|
||
| /// passed to electrocute_act() | ||
| /// todo: remove | ||
| #define DAMAGE_TYPE_ELECTROCUTE "electrocute" | ||
| /// bioacid ; toxins for organics, acid for synthetics | ||
| /// todo: better hybrid type handling | ||
| #define DAMAGE_TYPE_BIOACID "bioacid" | ||
| /// searing; half brute, half bur | ||
| /// todo: better hybrid type handling | ||
| #define DAMAGE_TYPE_SEARING "searing" | ||
|
|
||
| //? damage_mode bitfield ?// | ||
|
|
||
| /// sharp weapons like knives, spears, etc | ||
| #define DAMAGE_MODE_SHARP (1<<0) | ||
| /// weapons with an edge, like knives, being used as such. without this, sharp = pierce | ||
| #define DAMAGE_MODE_EDGE (1<<1) | ||
| /// pulse lasers, etc, basically blows a crater | ||
| #define DAMAGE_MODE_ABLATING (1<<2) | ||
| /// specifically highly-piercing weapons like bullets, even worse than sharp. | ||
| /// | ||
| /// * for pierce-ness checks, 'sharp withot edge' is fine. having this flag is pretty much second tier of piercing. | ||
| #define DAMAGE_MODE_PIERCE (1<<3) | ||
| /// messy, shredded wounds instead of a clean cut / pierce. strong. | ||
| #define DAMAGE_MODE_SHRED (1<<4) | ||
| /// disallow bone breaks, ablation, etc; used for gradual sources like depressurization | ||
| #define DAMAGE_MODE_GRADUAL (1<<5) | ||
| /// coming from internal; used to flag that something isn't coming through the skin. certain defenses don't work if this is set. | ||
| #define DAMAGE_MODE_INTERNAL (1<<6) | ||
| /// if zone doesn't exist / etc, allow redirection | ||
| #define DAMAGE_MODE_REDIRECT (1<<7) | ||
| /// temporary - re-evaluate when health is reworked. prevents damage from overflowing caps. | ||
| #define DAMAGE_MODE_NO_OVERFLOW (1<<8) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| //* This file is explicitly licensed under the MIT license. *// | ||
| //* Copyright (c) 2024 Citadel Station Developers *// | ||
|
|
||
| //* /datum/hardsuit_breach breach_type's *// | ||
|
|
||
| #define HARDSUIT_BREACH_TYPE_BRUTE "brute" | ||
| #define HARDSUIT_BREACH_TYPE_BURN "burn" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| //* This file is explicitly licensed under the MIT license. *// | ||
| //* Copyright (c) 2024 Citadel Station Developers *// | ||
|
|
||
| //* Wound types *// | ||
|
|
||
| #define WOUND_TYPE_CUT "cut" | ||
| #define WOUND_TYPE_PIERCE "pierce" | ||
| #define WOUND_TYPE_BRUISE "bruise" | ||
| #define WOUND_TYPE_BURN "burn" | ||
| #define WOUND_TYPE_OTHER "other" |
Oops, something went wrong.