-
-
Notifications
You must be signed in to change notification settings - Fork 683
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.
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
Interaction Chain & Damage refactoring #9838
Closed
Closed
Changes from all commits
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
b648b31
Initial damage procs
PowerfulBacon 08f8598
Converts half of all apply_damage instances to the new apply damage s…
PowerfulBacon 7d9cc2f
Some more damage bits and pieces
PowerfulBacon 40c6bd4
Bunch of damage related stuff
PowerfulBacon 29eadfa
attack clicks
PowerfulBacon 6512d03
Some alien improvements
PowerfulBacon 8070348
Update living_damage_extensions.dm
PowerfulBacon ddc01b7
Completes 1/3 of the attackby to item_interact refactoring
PowerfulBacon 2487eff
Converts 24 more files from attackby to item_interact
PowerfulBacon dcab4d9
Some more conversions
PowerfulBacon 1816a37
A bunch more conversions from attackby to item interact
PowerfulBacon a45b587
Converts some more attackbys into item_interacts
PowerfulBacon e7ea856
Some more updates
PowerfulBacon b8ef4f1
Makes the code compile and work
PowerfulBacon 57cc747
Fixes damages not applying to objects
PowerfulBacon 224c6a2
Changes the damage types
PowerfulBacon 95e6207
Moves some stuff out of species
PowerfulBacon 2643781
Some fixes
PowerfulBacon d0c3c2e
More systemic damage part 1
PowerfulBacon 13daaeb
Some more damage refactors
PowerfulBacon 7563f3d
Damage conversions
PowerfulBacon 10d805a
on_damaged
PowerfulBacon 1376168
Returns the amount of damage dealt
PowerfulBacon f603e33
Mob attacks
PowerfulBacon 4b67474
Adds in the unit test
PowerfulBacon a808490
Bunch of adjustBruteLoss conversions
PowerfulBacon 4d720c0
adjustBruteLoss
PowerfulBacon 652e29c
Slime damaging rework
PowerfulBacon b2e43f6
Update test_mob_attacks.dm
PowerfulBacon b0981b3
Fixes simplemobs not taking damage, fixes humans not updating their d…
PowerfulBacon 6ac2528
Allows the larvae probability to be rigged in order to make the unit …
PowerfulBacon a5dca9e
Deal generic attack takes into account simplemob melee damage type
PowerfulBacon c901d28
Factory boss update health now makes sense
PowerfulBacon 7cec74c
AdjustCloneLoss updates. Changes adjustBruteLoss to adjustBruteLossAb…
PowerfulBacon dd6b9db
Removes update health
PowerfulBacon fd91217
Adds in an item damage unit test that fails on all items
PowerfulBacon 4dc4d72
Fixes a space at the start of the line
PowerfulBacon 6ec406b
63 attackby conversions
PowerfulBacon 03e3698
Update floodlight.dm
PowerfulBacon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
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
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 |
---|---|---|
@@ -0,0 +1,22 @@ | ||
|
||
GLOBAL_LIST_EMPTY(damage_type_singletons) | ||
|
||
#define GET_DAMAGE(damage_type) (length(GLOB.damage_type_singletons) ? GLOB.damage_type_singletons[damage_type] : (create_damage_singletons())[damage_type]) | ||
|
||
/proc/create_damage_singletons() | ||
GLOB.damage_type_singletons = list() | ||
for (var/type in subtypesof(/datum/damage)) | ||
GLOB.damage_type_singletons[type] = new type | ||
return GLOB.damage_type_singletons | ||
|
||
GLOBAL_LIST_EMPTY(damage_source_singletons) | ||
|
||
#define GET_DAMAGE_SOURCE(source_type) (length(GLOB.damage_source_singletons) ? GLOB.damage_source_singletons[source_type] : (create_source_singletons())[source_type]) | ||
|
||
/proc/create_source_singletons() | ||
GLOB.damage_source_singletons = list() | ||
for (var/type in subtypesof(/datum/damage_source)) | ||
GLOB.damage_source_singletons[type] = new type | ||
return GLOB.damage_source_singletons | ||
|
||
#define FIND_DAMAGE_SOURCE locate() in GLOB.damage_source_singletons |
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
This file was deleted.
Oops, something went wrong.
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,8 @@ | ||
|
||
// Rig probability | ||
GLOBAL_VAR_INIT(rigged_prob, null) | ||
|
||
/proc/safe_prob(probability) | ||
if (!isnull(GLOB.rigged_prob)) | ||
return GLOB.rigged_prob | ||
return prob(probability) |
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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't forget to toggle this back when done!