-
Notifications
You must be signed in to change notification settings - Fork 71
Soak #944
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
Open
Magisterium2022
wants to merge
144
commits into
DarkPack13:master
Choose a base branch
from
Magisterium2022:soak
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Soak #944
Changes from all commits
Commits
Show all changes
144 commits
Select commit
Hold shift + click to select a range
191c442
Update carbon.dm
Magisterium2022 ccdb971
Update carbon_defines.dm
Magisterium2022 c3aaf6c
Update human.dm
Magisterium2022 08d747a
Update _species.dm
Magisterium2022 a008f1b
Update damage_procs.dm
Magisterium2022 9569ee7
Update damage_procs.dm
Magisterium2022 8942be8
Update carbon.dm
Magisterium2022 cbde8d3
Update human.dm
Magisterium2022 f44fb5e
Merge branch 'DarkPack13:master' into soak
Magisterium2022 13740b6
Update human.dm
Magisterium2022 be98f64
Update human.dm
Magisterium2022 e71927f
Update transformation.dm
Magisterium2022 745cd74
Update damage_procs.dm
Magisterium2022 3420262
Update roll_subtypes.dm
Magisterium2022 400f776
Update transformation.dm
Magisterium2022 f3b321e
Update new_player.dm
Magisterium2022 807f242
Update carbon.dm
Magisterium2022 9d513c2
Update human.dm
Magisterium2022 3bafb59
Update damage_procs.dm
Magisterium2022 9aa1697
Update carbon.dm
Magisterium2022 f87ef36
Merge branch 'DarkPack13:master' into soak
Magisterium2022 08a42f9
Update human.dm
Magisterium2022 a94e736
Update embracing.dm
Magisterium2022 8bcdc3f
Update silver_damage.dm
Magisterium2022 6c654f7
Update damage_procs.dm
Magisterium2022 09e7c8f
Update human.dm
Magisterium2022 449c0c0
Merge branch 'DarkPack13:master' into soak
Magisterium2022 85f17aa
Update kindred_splat.dm
Magisterium2022 3d9f432
Update ghoul_splat.dm
Magisterium2022 bf0f467
Update gaining_splats.dm
Magisterium2022 48966aa
Update gaining_splats.dm
Magisterium2022 7b71ea6
Update fera_splat.dm
Magisterium2022 63128dd
Update kindred_splat.dm
Magisterium2022 5dc17b0
Update ghoul_splat.dm
Magisterium2022 b001891
Update fera_splat.dm
Magisterium2022 9db2909
Update ticker.dm
Magisterium2022 a5d7177
Update code/modules/mob/living/carbon/human/_species.dm
Magisterium2022 ea38841
Update modular_darkpack/master_files/code/modules/mob/living/carbon/h…
Magisterium2022 6de9afd
Update modular_darkpack/master_files/code/modules/mob/living/carbon/h…
Magisterium2022 73e7e25
Update code/modules/mob/living/carbon/damage_procs.dm
Magisterium2022 d20b255
Update modular_darkpack/master_files/code/modules/mob/living/carbon/h…
Magisterium2022 f170dc9
Update code/modules/mob/living/carbon/damage_procs.dm
Magisterium2022 822bca2
Merge branch 'master' into soak
Magisterium2022 7783c1a
Merge branch 'master' into soak
Magisterium2022 6414ab1
Update carbon_defines.dm
Magisterium2022 1c65555
Merge branch 'DarkPack13:master' into soak
Magisterium2022 b6560ee
Update quietus.dm
Magisterium2022 f80f3bb
Update thanatosis.dm
Magisterium2022 bfb142c
Update possession_datums.dm
Magisterium2022 82fc4d4
Update levinbolt.dm
Magisterium2022 0dd6b8e
Update levinbolt.dm
Magisterium2022 8dd2c71
Update lure_of_flames.dm
Magisterium2022 a3de37f
Update scorptions_touch.dm
Magisterium2022 db780e8
Update damage_procs.dm
Magisterium2022 847d791
Update levinbolt.dm
Magisterium2022 15ea5cc
Update lure_of_flames.dm
Magisterium2022 162498e
Update levinbolt.dm
Magisterium2022 abfb959
Update levinbolt.dm
Magisterium2022 f16d55a
Update lure_of_flames.dm
Magisterium2022 d7db7c8
Update damage_procs.dm
Magisterium2022 64bb20d
Update _species.dm
Magisterium2022 8bce751
Update recalculate_max_health.dm
Magisterium2022 e4898d5
Update __socialrole.dm
Magisterium2022 ec8d815
Update fortitude.dm
Magisterium2022 a283ba4
Delete modular_darkpack/modules/powers/code/discipline/fortitude/fort…
Magisterium2022 2c46506
Update tgstation.dme
Magisterium2022 db9a2a7
Update fortitude.dm
Magisterium2022 07dc636
Update modular_darkpack/master_files/code/modules/mob/living/carbon/h…
Magisterium2022 4bf9dea
Update modular_darkpack/master_files/code/modules/mob/living/carbon/h…
Magisterium2022 df63699
Merge branch 'master' into soak
Magisterium2022 22c84bf
Merge branch 'master' into soak
Magisterium2022 583c931
Update mob_procs.dm
Magisterium2022 afeccc1
Update mob_procs.dm
Magisterium2022 a0e87b8
Update mob_procs.dm
Magisterium2022 60098a4
Update ticker.dm
Magisterium2022 3223c04
Update ticker.dm
Magisterium2022 fe251f4
Merge branch 'master' into soak
Magisterium2022 6c9a848
Merge branch 'master' into soak
Magisterium2022 46f56f1
Update combat.dm
Magisterium2022 c07d96d
Update baton.dm
Magisterium2022 2d09b06
Update combat_eyestab.dm
Magisterium2022 4d85362
Update combat_pistol_whip.dm
Magisterium2022 2209af9
Update combat.dm
Magisterium2022 085e68f
Update thanatosis.dm
Magisterium2022 8ea2b4f
Merge branch 'master' into soak
Magisterium2022 cf87e0e
Update new_player.dm
Magisterium2022 38fc884
Update _species.dm
Magisterium2022 d58dd47
Update quietus.dm
Magisterium2022 88c2afd
Update modular_darkpack/modules/npc/code/human/socialroles/__socialro…
Magisterium2022 8196ede
Merge branch 'master' into soak
Magisterium2022 a1881e4
Delete modular_darkpack/modules/storyteller_stats/code/mob_affecting_…
Magisterium2022 3d85cf2
Update mob_procs.dm
Magisterium2022 51c0788
Update tgstation.dme
Magisterium2022 4db43d2
Merge branch 'master' into soak
Magisterium2022 da82d0f
Update damage_procs.dm
Magisterium2022 4909655
Update thanatosis.dm
Magisterium2022 fbf61b4
Update levinbolt.dm
Magisterium2022 e209264
Update lure_of_flames.dm
Magisterium2022 988b17f
Update damage_procs.dm
Magisterium2022 7f79e28
Update damage_procs.dm
Magisterium2022 9109fd8
Update levinbolt.dm
Magisterium2022 6a8e249
Update lure_of_flames.dm
Magisterium2022 b7592b3
Update liver.dm
Magisterium2022 523c260
Update mob_damage.dm
Magisterium2022 0e832b2
Update combat_blocking.dm
Magisterium2022 a4ef254
Update tail_wag.dm
Magisterium2022 62d3049
Merge branch 'DarkPack13:master' into soak
Magisterium2022 e2c3354
Update explosion_action.dm
Magisterium2022 33cb96f
Update hulk.dm
Magisterium2022 480f9c4
Update human_through_recycler.dm
Magisterium2022 6512c1c
Update medical_wounds.dm
Magisterium2022 b7f0f3c
Update damage_procs.dm
Magisterium2022 e95eb97
Update roll_subtypes.dm
Magisterium2022 e51b6e4
Update robot_defense.dm
Magisterium2022 446050e
Update goliath.dm
Magisterium2022 dca5f2d
Update human.dm
Magisterium2022 d69b3a4
Update visceratika.dm
Magisterium2022 9dd6a23
Update human.dm
Magisterium2022 61b033e
Update damage_procs.dm
Magisterium2022 4714ac3
Update silver_damage.dm
Magisterium2022 c21f7c5
Update damage_procs.dm
Magisterium2022 44f6ef5
Update damage_procs.dm
Magisterium2022 d448eb8
Merge branch 'master' into soak
Magisterium2022 a6f93f3
Update silver_damage.dm
Magisterium2022 49e9b35
Update human.dm
Magisterium2022 acd2947
Merge branch 'master' into soak
Magisterium2022 28f3b76
Update possession_datums.dm
Magisterium2022 cc2adbe
Update scorptions_touch.dm
Magisterium2022 981a27a
FIXES
FalloutFalcon b45ca54
yea
FalloutFalcon 5d9a48c
yea
FalloutFalcon 816450a
Merge branch 'DarkPack13:master' into soak
Magisterium2022 aac0503
Merge pull request #11 from FalloutFalcon/soak-pr-fixes
Magisterium2022 463e499
Update human.dm
Magisterium2022 05ea5cf
Update silver_damage.dm
Magisterium2022 9cc8bf8
Update damage_procs.dm
Magisterium2022 24c7e6e
Update damage_procs.dm
Magisterium2022 54d2886
Update damage_procs.dm
Magisterium2022 0ea2abc
Update human.dm
Magisterium2022 e7b1522
Update carbon_defines.dm
Magisterium2022 5286a82
Update living_defines.dm
Magisterium2022 844f046
Merge branch 'DarkPack13:master' into soak
Magisterium2022 0d41924
Update ticker.dm
Magisterium2022 151d110
Update new_player.dm
Magisterium2022 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -8,4 +8,3 @@ | |
|
|
||
| var/fakediablerist = FALSE | ||
| var/can_be_embraced = TRUE | ||
|
|
||
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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.
Uh oh!
There was an error while loading. Please reload this page.