-
-
Notifications
You must be signed in to change notification settings - Fork 682
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Standardizes & documents Attack Chain. Telekinesis cleanup (#10903)
* tgstation/tgstation#46391 * tgstation/tgstation#49471 * tgstation/tgstation#54475 * tgstation/tgstation#54589 * tgstation/tgstation#54642 * cleanup * 515 * woops
- Loading branch information
1 parent
634339f
commit 22f035f
Showing
46 changed files
with
442 additions
and
283 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
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
27 changes: 27 additions & 0 deletions
27
code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm
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,27 @@ | ||
// Atom attack signals. Format: | ||
// When the signal is called: (signal arguments) | ||
// All signals send the source datum of the signal as the first argument | ||
|
||
///from base of atom/attackby(): (/obj/item, /mob/living, params) | ||
#define COMSIG_PARENT_ATTACKBY "atom_attackby" | ||
///Return this in response if you don't want afterattack to be called | ||
#define COMPONENT_NO_AFTERATTACK (1<<0) | ||
///from base of atom/attack_hulk(): (/mob/living/carbon/human) | ||
#define COMSIG_ATOM_HULK_ATTACK "hulk_attack" | ||
///from base of atom/animal_attack(): (/mob/user) | ||
#define COMSIG_ATOM_ATTACK_ANIMAL "attack_animal" | ||
//from base of atom/attack_basic_mob(): (/mob/user) | ||
#define COMSIG_ATOM_ATTACK_BASIC_MOB "attack_basic_mob" | ||
|
||
/* Attack signals. They should share the returned flags, to standardize the attack chain. */ | ||
/// tool_act -> pre_attack -> target.attackby (item.attack) -> afterattack | ||
///Ends the attack chain. If sent early might cause posterior attacks not to happen. | ||
#define COMPONENT_CANCEL_ATTACK_CHAIN (1<<0) | ||
///Skips the specific attack step, continuing for the next one to happen. | ||
#define COMPONENT_SKIP_ATTACK (1<<1) | ||
///from base of atom/attack_ghost(): (mob/dead/observer/ghost) | ||
#define COMSIG_ATOM_ATTACK_GHOST "atom_attack_ghost" | ||
///from base of atom/attack_hand(): (mob/user) | ||
#define COMSIG_ATOM_ATTACK_HAND "atom_attack_hand" | ||
///from base of atom/attack_paw(): (mob/user) | ||
#define COMSIG_ATOM_ATTACK_PAW "atom_attack_paw" |
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
20 changes: 20 additions & 0 deletions
20
code/__DEFINES/dcs/signals/signals_mob/signals_mobattack.dm
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,20 @@ | ||
// Format: | ||
// When the signal is called: (signal arguments) | ||
// All signals send the source datum of the signal as the first argument | ||
|
||
/* Attack signals. They should share the returned flags, to standardize the attack chain. */ | ||
|
||
///from base of atom/attack_hand(): (mob/user) | ||
#define COMSIG_MOB_ATTACK_HAND "mob_attack_hand" | ||
///from base of /obj/item/attack(): (mob/M, mob/user) | ||
#define COMSIG_MOB_ITEM_ATTACK "mob_item_attack" | ||
///from base of obj/item/afterattack(): (atom/target, mob/user, proximity_flag, click_parameters) | ||
#define COMSIG_MOB_ITEM_AFTERATTACK "mob_item_afterattack" | ||
///from base of obj/item/attack_qdeleted(): (atom/target, mob/user, proxiumity_flag, click_parameters) | ||
#define COMSIG_MOB_ITEM_ATTACK_QDELETED "mob_item_attack_qdeleted" | ||
///from base of mob/RangedAttack(): (atom/A, params) | ||
#define COMSIG_MOB_ATTACK_RANGED "mob_attack_ranged" | ||
///from mob/living/carbon/human/UnarmedAttack(): (atom/target, proximity) | ||
#define COMSIG_HUMAN_EARLY_UNARMED_ATTACK "human_early_unarmed_attack" | ||
///from mob/living/carbon/human/UnarmedAttack(): (atom/target, proximity) | ||
#define COMSIG_HUMAN_MELEE_UNARMED_ATTACK "human_melee_unarmed_attack" |
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
19 changes: 19 additions & 0 deletions
19
code/__DEFINES/dcs/signals/signals_obj/signals_item/signals_itemattack.dm
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,19 @@ | ||
// Format: | ||
// When the signal is called: (signal arguments) | ||
// All signals send the source datum of the signal as the first argument | ||
|
||
/* Attack signals. They should share the returned flags, to standardize the attack chain. */ | ||
///from base of obj/item/attack(): (/mob/living/target, /mob/living/user) | ||
#define COMSIG_ITEM_ATTACK "item_attack" | ||
|
||
#define COMSIG_MOB_ITEM_ATTACKBY "item_attackby" | ||
///from base of obj/item/attack_self(): (/mob) | ||
#define COMSIG_ITEM_ATTACK_SELF "item_attack_self" | ||
///from base of obj/item/attack_obj(): (/obj, /mob) | ||
#define COMSIG_ITEM_ATTACK_OBJ "item_attack_obj" | ||
///from base of obj/item/pre_attack(): (atom/target, mob/user, params) | ||
#define COMSIG_ITEM_PRE_ATTACK "item_pre_attack" | ||
///from base of obj/item/afterattack(): (atom/target, mob/user, params) | ||
#define COMSIG_ITEM_AFTERATTACK "item_afterattack" | ||
///from base of obj/item/attack_qdeleted(): (atom/target, mob/user, params) | ||
#define COMSIG_ITEM_ATTACK_QDELETED "item_attack_qdeleted" |
Oops, something went wrong.