-
-
Notifications
You must be signed in to change notification settings - Fork 382
More action updates #16126
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
SandPoot
wants to merge
5
commits into
citadel-station:master
Choose a base branch
from
SandPoot:more-action-updates
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
More action updates #16126
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
3e44b2a
yea
SandPoot fe3631b
i was idle and saw that someone wasn't returning the value of parent …
SandPoot 079b927
Merge branch 'master' of https://github.com/Citadel-Station-13/Citade…
SandPoot 9cd7305
fix some stuff
SandPoot 885bb5e
the fixer
SandPoot 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| ///Action button checks if user is restrained | ||
| #define AB_CHECK_RESTRAINED (1<<0) | ||
| ///Action button checks if user is stunned | ||
| #define AB_CHECK_STUN (1<<1) | ||
| ///Action button checks if user is resting | ||
| #define AB_CHECK_LYING (1<<2) | ||
| ///Action button checks if user is conscious | ||
| #define AB_CHECK_CONSCIOUS (1<<3) | ||
|
|
||
| /* | ||
| DEFINE_BITFIELD(check_flags, list( | ||
| "CHECK IF RESTRAINED" = AB_CHECK_RESTRAINED, | ||
| "CHECK IF STUNNED" = AB_CHECK_STUN, | ||
| "CHECK IF LYING DOWN" = AB_CHECK_LYING, | ||
| "CHECK IF CONSCIOUS" = AB_CHECK_CONSCIOUS, | ||
| )) */ | ||
|
|
||
| ///Action button triggered with right click | ||
| #define TRIGGER_SECONDARY_ACTION (1<<0) | ||
| ///Action triggered to ignore any availability checks | ||
| #define TRIGGER_FORCE_AVAILABLE (1<<1) | ||
|
|
||
| #define ACTION_BUTTON_DEFAULT_BACKGROUND "_use_ui_default_background" | ||
|
|
||
| #define UPDATE_BUTTON_NAME (1<<0) | ||
| #define UPDATE_BUTTON_ICON (1<<1) | ||
| #define UPDATE_BUTTON_BACKGROUND (1<<2) | ||
| #define UPDATE_BUTTON_OVERLAY (1<<3) | ||
| #define UPDATE_BUTTON_STATUS (1<<4) | ||
|
|
||
| /// Takes in a typepath of a `/datum/action` and adds it to `src`. | ||
| /// Only useful if you want to add the action and never desire to reference it again ever. | ||
| #define GRANT_ACTION(typepath) do {\ | ||
| var/datum/action/_ability = new typepath(src);\ | ||
| _ability.Grant(src);\ | ||
| } while (FALSE) |
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 |
|---|---|---|
| @@ -1,6 +1,53 @@ | ||
| // Action signals | ||
|
|
||
| ///from base of datum/action/proc/Trigger(): (datum/action) | ||
| #define COMSIG_ACTION_TRIGGER "action_trigger" | ||
| // Return to block the trigger from occurring | ||
| #define COMPONENT_ACTION_BLOCK_TRIGGER (1<<0) | ||
| /// From /datum/action/Grant(): (mob/grant_to) | ||
| #define COMSIG_ACTION_GRANTED "action_grant" | ||
| /// From /datum/action/Grant(): (datum/action) | ||
| #define COMSIG_MOB_GRANTED_ACTION "mob_action_grant" | ||
| /// From /datum/action/Remove(): (mob/removed_from) | ||
| #define COMSIG_ACTION_REMOVED "action_removed" | ||
| /// From /datum/action/Remove(): (datum/action) | ||
| #define COMSIG_MOB_REMOVED_ACTION "mob_action_removed" | ||
| /// From /datum/action/apply_button_overlay() | ||
| #define COMSIG_ACTION_OVERLAY_APPLY "action_overlay_applied" | ||
|
|
||
| // Cooldown action signals | ||
|
|
||
| /// From base of /datum/action/cooldown/proc/PreActivate(), sent to the action owner: (datum/action/cooldown/activated) | ||
| #define COMSIG_MOB_ABILITY_STARTED "mob_ability_base_started" | ||
| /// Return to block the ability from starting / activating | ||
| #define COMPONENT_BLOCK_ABILITY_START (1<<0) | ||
| /// From base of /datum/action/cooldown/proc/PreActivate(), sent to the action owner: (datum/action/cooldown/finished) | ||
| #define COMSIG_MOB_ABILITY_FINISHED "mob_ability_base_finished" | ||
|
|
||
| /// From base of /datum/action/cooldown/proc/set_statpanel_format(): (list/stat_panel_data) | ||
| #define COMSIG_ACTION_SET_STATPANEL "ability_set_statpanel" | ||
|
|
||
| // Specific cooldown action signals | ||
|
|
||
| /// From base of /datum/action/cooldown/mob_cooldown/blood_warp/proc/blood_warp(): () | ||
| #define COMSIG_BLOOD_WARP "mob_ability_blood_warp" | ||
| /// From base of /datum/action/cooldown/mob_cooldown/charge/proc/do_charge(): () | ||
| #define COMSIG_STARTED_CHARGE "mob_ability_charge_started" | ||
| /// From base of /datum/action/cooldown/mob_cooldown/charge/proc/do_charge(): () | ||
| #define COMSIG_FINISHED_CHARGE "mob_ability_charge_finished" | ||
| /// From base of /datum/action/cooldown/mob_cooldown/lava_swoop/proc/swoop_attack(): () | ||
| #define COMSIG_SWOOP_INVULNERABILITY_STARTED "mob_swoop_invulnerability_started" | ||
| /// From base of /datum/action/cooldown/mob_cooldown/lava_swoop/proc/swoop_attack(): () | ||
| #define COMSIG_LAVA_ARENA_FAILED "mob_lava_arena_failed" | ||
|
|
||
| /// From /datum/action/vehicle/sealed/mecha/mech_toggle_safeties/proc/update_action_icon(): () | ||
| #define COMSIG_MECH_SAFETIES_TOGGLE "mech_safeties_toggle" | ||
|
|
||
| /// From /datum/action/cooldown/mob_cooldown/assume_form/proc/assume_appearances(), sent to the action owner: (atom/movable/target) | ||
| #define COMSIG_ACTION_DISGUISED_APPEARANCE "mob_ability_disguise_appearance" | ||
|
|
||
| /// From /datum/action/cooldown/manual_heart/Activate(): () | ||
| #define COMSIG_HEART_MANUAL_PULSE "heart_manual_pulse" | ||
|
|
||
| /// From /datum/action/cooldown/mob_cooldown/capture_photo/Activate(): | ||
| #define COMSIG_ACTION_PHOTO_CAPTURED "action_photo_captured" |
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 |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| // /obj/item signals | ||
| #define COMSIG_ITEM_ATTACK "item_attack" //from base of obj/item/attack(): (/mob/living/target, /mob/living/user) | ||
| #define COMSIG_ITEM_ATTACK_SELF "item_attack_self" //from base of obj/item/attack_self(): (/mob) | ||
| #define COMPONENT_NO_INTERACT 1 | ||
| #define COMSIG_ITEM_ATTACK_OBJ "item_attack_obj" //from base of obj/item/attack_obj(): (/obj, /mob) | ||
| #define COMPONENT_NO_ATTACK_OBJ 1 | ||
| #define COMSIG_ITEM_PRE_ATTACK "item_pre_attack" //from base of obj/item/pre_attack(): (atom/target, mob/user, params) | ||
| #define COMPONENT_NO_ATTACK 1 | ||
| #define COMSIG_ITEM_AFTERATTACK "item_afterattack" //from base of obj/item/afterattack(): (atom/target, mob/user, params) | ||
| #define COMSIG_ITEM_ALT_AFTERATTACK "item_alt_afterattack" //from base of obj/item/altafterattack(): (atom/target, mob/user, proximity, params) | ||
| #define COMSIG_ITEM_EQUIPPED "item_equip" //from base of obj/item/equipped(): (/mob/equipper, slot) | ||
| /// A mob has just unequipped an item. | ||
| #define COMSIG_MOB_UNEQUIPPED_ITEM "mob_unequipped_item" | ||
| // Do not grant actions on equip. | ||
| #define COMPONENT_NO_GRANT_ACTIONS 1 | ||
| #define COMSIG_ITEM_DROPPED "item_drop" //from base of obj/item/dropped(): (mob/user) | ||
| // relocated, tell inventory procs if those called this that the item isn't available anymore. | ||
| #define COMPONENT_DROPPED_RELOCATION 1 | ||
| #define COMSIG_ITEM_PICKUP "item_pickup" //from base of obj/item/pickup(): (/mob/taker) | ||
|
|
||
| /// Sent from obj/item/item_action_slot_check(): (mob/user, datum/action, slot) | ||
| #define COMSIG_ITEM_UI_ACTION_SLOT_CHECKED "item_action_slot_checked" | ||
| /// Return to prevent the default behavior (attack_selfing) from occurring. | ||
| #define COMPONENT_ITEM_ACTION_SLOT_INVALID (1<<0) | ||
|
|
||
| #define COMSIG_ITEM_ATTACK_ZONE "item_attack_zone" //from base of mob/living/carbon/attacked_by(): (mob/living/carbon/target, mob/living/user, hit_zone) | ||
| #define COMSIG_ITEM_IMBUE_SOUL "item_imbue_soul" //return a truthy value to prevent ensouling, checked in /obj/effect/proc_holder/spell/targeted/lichdom/cast(): (mob/user) | ||
| #define COMSIG_ITEM_HIT_REACT "item_hit_react" //from base of obj/item/hit_reaction(): (list/args) | ||
| #define COMSIG_ITEM_WEARERCROSSED "wearer_crossed" //called on item when crossed by something (): (/atom/movable) | ||
| #define COMSIG_ITEM_SHARPEN_ACT "sharpen_act" //from base of item/sharpener/attackby(): (amount, max) | ||
| #define COMPONENT_BLOCK_SHARPEN_APPLIED 1 | ||
| #define COMPONENT_BLOCK_SHARPEN_BLOCKED 2 | ||
| #define COMPONENT_BLOCK_SHARPEN_ALREADY 4 | ||
| #define COMPONENT_BLOCK_SHARPEN_MAXED 8 | ||
| #define COMSIG_ITEM_MICROWAVE_ACT "microwave_act" //called on item when microwaved (): (obj/machinery/microwave/M) | ||
|
|
||
| // /obj/item signals for economy | ||
| #define COMSIG_ITEM_SOLD "item_sold" //called when an item is sold by the exports subsystem | ||
| #define COMSIG_STRUCTURE_UNWRAPPED "structure_unwrapped" //called when a wrapped up structure is opened by hand | ||
| #define COMSIG_ITEM_UNWRAPPED "item_unwrapped" //called when a wrapped up item is opened by hand | ||
| #define COMSIG_ITEM_SPLIT_VALUE 1 | ||
| #define COMSIG_ITEM_SPLIT_PROFIT "item_split_profits" //Called when getting the item's exact ratio for cargo's profit. | ||
|
|
||
| #define COMSIG_ITEM_WORN_OVERLAYS "item_worn_overlays" //from base of obj/item/worn_overlays(): (isinhands, icon_file, used_state, style_flags, list/overlays) | ||
| #define COMSIG_ARMOR_PLATED "armor_plated" //called when an armor plate is successfully applied to an object | ||
| // THE FOLLOWING TWO BLOCKS SHOULD RETURN BLOCK FLAGS AS DEFINED IN __DEFINES/combat.dm! | ||
| #define COMSIG_ITEM_CHECK_BLOCK "check_block" //from base of obj/item/check_block(): (mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) | ||
| #define COMSIG_ITEM_RUN_BLOCK "run_block" //from base of obj/item/run_block(): (mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) | ||
| // Item mouse siganls | ||
| #define COMSIG_ITEM_MOUSE_EXIT "item_mouse_exit" //from base of obj/item/MouseExited(): (location, control, params) | ||
| #define COMSIG_ITEM_MOUSE_ENTER "item_mouse_enter" //from base of obj/item/MouseEntered(): (location, control, params) | ||
| #define COMSIG_ITEM_DECONSTRUCTOR_DEEPSCAN "deconstructor_deepscan" //Called by deconstructive analyzers deepscanning an item: (obj/machinery/rnd/destructive_analyzer/analyzer_machine, mob/user, list/information_list) | ||
| #define COMSIG_ITEM_DISABLE_EMBED "item_disable_embed" ///from [/obj/item/proc/disableEmbedding]: | ||
| #define COMSIG_MINE_TRIGGERED "minegoboom" ///from [/obj/effect/mine/proc/triggermine]: | ||
| // Uncovered information | ||
| #define COMPONENT_DEEPSCAN_UNCOVERED_INFORMATION 1 | ||
| ///Called when an item is being offered, from [/obj/item/proc/on_offered(mob/living/carbon/offerer)] | ||
| #define COMSIG_ITEM_OFFERING "item_offering" | ||
| ///Interrupts the offer proc | ||
| #define COMPONENT_OFFER_INTERRUPT (1<<0) | ||
| ///Called when an someone tries accepting an offered item, from [/obj/item/proc/on_offer_taken(mob/living/carbon/offer, mob/living/carbon/taker)] | ||
| #define COMSIG_ITEM_OFFER_TAKEN "item_offer_taken" | ||
| ///Interrupts the offer acceptance | ||
| #define COMPONENT_OFFER_TAKE_INTERRUPT (1<<0) | ||
| ///from [/obj/structure/closet/supplypod/proc/endlaunch]: | ||
| #define COMSIG_SUPPLYPOD_LANDED "supplypodgoboom" | ||
|
|
||
| // /obj/item/grenade signals | ||
| #define COMSIG_GRENADE_PRIME "grenade_prime" //called in /obj/item/gun/process_fire (user, target, params, zone_override) | ||
| #define COMSIG_GRENADE_ARMED "grenade_armed" //called in /obj/item/gun/process_fire (user, target, params, zone_override) | ||
|
|
||
| // /obj/item/clothing signals | ||
| #define COMSIG_SHOES_STEP_ACTION "shoes_step_action" //from base of obj/item/clothing/shoes/proc/step_action(): () | ||
| #define COMSIG_SUIT_MADE_HELMET "suit_made_helmet" //from base of obj/item/clothing/suit/MakeHelmet(): (helmet) | ||
|
|
||
| // /obj/item/implant signals | ||
| #define COMSIG_IMPLANT_ACTIVATED "implant_activated" //from base of /obj/item/implant/proc/activate(): () | ||
| #define COMSIG_IMPLANT_IMPLANTING "implant_implanting" //from base of /obj/item/implant/proc/implant(): (list/args) | ||
| #define COMPONENT_STOP_IMPLANTING 1 | ||
| #define COMSIG_IMPLANT_OTHER "implant_other" //called on already installed implants when a new one is being added in /obj/item/implant/proc/implant(): (list/args, obj/item/implant/new_implant) | ||
| //#define COMPONENT_STOP_IMPLANTING 1 //The name makes sense for both | ||
| #define COMPONENT_DELETE_NEW_IMPLANT 2 | ||
| #define COMPONENT_DELETE_OLD_IMPLANT 4 | ||
| #define COMSIG_IMPLANT_EXISTING_UPLINK "implant_uplink_exists" //called on implants being implanted into someone with an uplink implant: (datum/component/uplink) | ||
| //This uses all return values of COMSIG_IMPLANT_OTHER | ||
| #define COMSIG_IMPLANT_REMOVING "implant_removing" //from base of /obj/item/implant/proc/removed() (list/args) | ||
|
|
||
| // /obj/item/pda signals | ||
| #define COMSIG_PDA_CHANGE_RINGTONE "pda_change_ringtone" //called on pda when the user changes the ringtone: (mob/living/user, new_ringtone) | ||
| #define COMPONENT_STOP_RINGTONE_CHANGE 1 | ||
|
|
||
| // /obj/item/radio signals | ||
| #define COMSIG_RADIO_NEW_FREQUENCY "radio_new_frequency" //called from base of /obj/item/radio/proc/set_frequency(): (list/args) | ||
|
|
||
| // /obj/item/pen signals | ||
| #define COMSIG_PEN_ROTATED "pen_rotated" //called after rotation in /obj/item/pen/attack_self(): (rotation, mob/living/carbon/user) | ||
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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| #define INVISIBILITY_NONE 0 | ||
|
|
||
| #define SEE_INVISIBLE_MINIMUM 5 | ||
|
|
||
| #define INVISIBILITY_LIGHTING 20 | ||
|
|
||
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.
nitpick - for all of the dcs files, it's best to have signals be like this
or atleast like this
#define ... //! textthis way langserv comments it
not really too important but just as a note
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.
ah, my bad, if you could tell i was reorganizing stuff, moving the object/item stuff into its own file