mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-28 10:01:58 +00:00
ff6b41aa07
## About The Pull Request - Afterattack is a very simple proc now: All it does is this, and all it's used for is for having a convenient place to put effects an item does after a successful attack (IE, the attack was not blocked)  - An overwhelming majority of afterattack implementations have been moved to `interact_with_atom` or the new `ranged_interact_with_atom` I have manually tested many of the refactored procs but there was 200+ so it's kinda hard ## Why It's Good For The Game Afterattack is one of the worst parts of the attack chain, as it simultaneously serves as a way of doing random interactions NOT AT ALL related to attacks (despite the name) while ALSO serving as the defacto way to do a ranged interaction with an item This means careless coders (most of them) may throw stuff in afterattack without realizing how wide reaching it is, which causes bugs. By making two well defined, separate procs for handing adjacent vs ranged interactions, it becomes WAY WAY WAY more easy to develop for. If you want to do something when you click on something else and you're adjacent, use `interact_with_atom` If you want to do something when you click on something else and you're not adjacent, use 'ranged_interact_with_atom` This does result in some instances of boilerplate as shown here:  But I think it's acceptable, feel free to oppose if you don't I'm sure we can think of another solution ~~Additionally it makes it easier to implement swing combat. That's a bonus I guess~~ ## Changelog 🆑 Melbert refactor: Over 200 item interactions have been refactored to use a newer, easier-to-use system. Report any oddities with using items on other objects you may see (such as surgery, reagent containers like cups and spray bottles, or construction devices), especially using something at range (such as guns or chisels) refactor: Item-On-Modsuit interactions have changed slightly. While on combat mode, you will attempt to "use" the item on the suit instead of inserting it into the suit's storage. This means being on combat mode while the suit's panel is open will block you from inserting items entirely via click (but other methods such as hotkey, clicking on the storage boxes, and mousedrop will still work). refactor: The detective's scanner will now be inserted into storage items if clicked normally, and will scan the storage item if on combat mode /🆑
41 lines
2.0 KiB
Plaintext
41 lines
2.0 KiB
Plaintext
// Tool types, if you add new ones please add them to /obj/item/debug/omnitool in code/game/objects/items/debug_items.dm
|
|
#define TOOL_CROWBAR "crowbar"
|
|
#define TOOL_MULTITOOL "multitool"
|
|
#define TOOL_SCREWDRIVER "screwdriver"
|
|
#define TOOL_WIRECUTTER "cutters"
|
|
#define TOOL_WRENCH "wrench"
|
|
#define TOOL_WELDER "welder"
|
|
#define TOOL_ANALYZER "analyzer"
|
|
#define TOOL_MINING "mining"
|
|
#define TOOL_SHOVEL "shovel"
|
|
#define TOOL_RETRACTOR "retractor"
|
|
#define TOOL_HEMOSTAT "hemostat"
|
|
#define TOOL_CAUTERY "cautery"
|
|
#define TOOL_DRILL "drill"
|
|
#define TOOL_SCALPEL "scalpel"
|
|
#define TOOL_SAW "saw"
|
|
#define TOOL_BONESET "bonesetter"
|
|
#define TOOL_KNIFE "knife"
|
|
#define TOOL_BLOODFILTER "bloodfilter"
|
|
#define TOOL_ROLLINGPIN "rolling pin"
|
|
/// Can be used to scrape rust off an any atom; which will result in the Rust Component being qdel'd
|
|
#define TOOL_RUSTSCRAPER "rustscraper"
|
|
|
|
// If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY,
|
|
// tool sound is only played when op is started. If not, it's played twice.
|
|
#define MIN_TOOL_SOUND_DELAY 20
|
|
#define MIN_TOOL_OPERATING_DELAY 40 //minimum delay for operating sound. Prevent overlaps and overhand sound.
|
|
/// Return when an item interaction is successful.
|
|
/// This cancels the rest of the chain entirely and indicates success.
|
|
#define ITEM_INTERACT_SUCCESS (1<<0) // Same as TRUE, as most tool (legacy) tool acts return TRUE on success
|
|
/// Return to prevent the rest of the attack chain from being executed / preventing the item user from thwacking the target.
|
|
/// Similar to [ITEM_INTERACT_SUCCESS], but does not necessarily indicate success.
|
|
#define ITEM_INTERACT_BLOCKING (1<<1)
|
|
/// Only for people who get confused by the naming scheme
|
|
#define ITEM_INTERACT_FAILURE ITEM_INTERACT_BLOCKING
|
|
/// Return to skip the rest of the interaction chain, going straight to attack.
|
|
#define ITEM_INTERACT_SKIP_TO_ATTACK (1<<2)
|
|
|
|
/// Combination flag for any item interaction that blocks the rest of the attack chain
|
|
#define ITEM_INTERACT_ANY_BLOCKER (ITEM_INTERACT_SUCCESS | ITEM_INTERACT_BLOCKING)
|