mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-13 17:14:47 +01:00
416dea02aa
## About The Pull Request Isolates signpost teleport code into a component `/datum/component/houlihan_teleport`, which takes a question argument and a list of zlevels. Removes `/obj/structure/no_effect_signpost` and turns existing mapped-in instances into `/obj/structure/signpost`s Adds/documents/fixes some attack signals that were added to the element ## Jebediah <img width="100%" alt="image" src="https://github.com/user-attachments/assets/b227e5bd-1c93-41b3-b87f-1a559cf81112" /> ## Changelog 🆑 refactor: Signposts have had their code improved internally. Please make an issue if a signpost that should teleport you no longer can. /🆑
311 lines
11 KiB
Plaintext
311 lines
11 KiB
Plaintext
/// Checks for RIGHT_CLICK in modifiers and runs resolve_right_click_attack if so. Returns TRUE if normal chain blocked.
|
|
/mob/living/proc/right_click_attack_chain(atom/target, list/modifiers)
|
|
if (!LAZYACCESS(modifiers, RIGHT_CLICK))
|
|
return
|
|
var/secondary_result = resolve_right_click_attack(target, modifiers)
|
|
|
|
if (secondary_result == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN || secondary_result == SECONDARY_ATTACK_CONTINUE_CHAIN)
|
|
return TRUE
|
|
else if (secondary_result != SECONDARY_ATTACK_CALL_NORMAL)
|
|
CRASH("resolve_right_click_attack (probably attack_hand_secondary) did not return a SECONDARY_ATTACK_* define.")
|
|
|
|
/**
|
|
* Checks if this mob is in a valid state to punch someone.
|
|
*
|
|
* (Potentially) gives feedback to the mob if they cannot.
|
|
*/
|
|
/mob/living/proc/can_unarmed_attack()
|
|
return !HAS_TRAIT(src, TRAIT_HANDS_BLOCKED)
|
|
|
|
/mob/living/carbon/can_unarmed_attack()
|
|
. = ..()
|
|
if(!.)
|
|
return FALSE
|
|
|
|
if(!has_active_hand()) //can't attack without a hand.
|
|
var/obj/item/bodypart/check_arm = get_active_hand()
|
|
if(check_arm?.bodypart_disabled)
|
|
to_chat(src, span_warning("Your [check_arm.name] is in no condition to be used."))
|
|
return FALSE
|
|
|
|
to_chat(src, span_notice("You look at your arm and sigh."))
|
|
return FALSE
|
|
|
|
return TRUE
|
|
|
|
/mob/living/UnarmedAttack(atom/attack_target, proximity_flag, list/modifiers)
|
|
// The sole reason for this signal needing to exist is making FotNS incompatible with Hulk.
|
|
// Note that it is send before [proc/can_unarmed_attack] is called, keep this in mind.
|
|
var/sigreturn = SEND_SIGNAL(src, COMSIG_LIVING_EARLY_UNARMED_ATTACK, attack_target, proximity_flag, modifiers)
|
|
if(sigreturn & COMPONENT_CANCEL_ATTACK_CHAIN)
|
|
return TRUE
|
|
if(sigreturn & COMPONENT_SKIP_ATTACK)
|
|
return FALSE
|
|
|
|
if(!can_unarmed_attack())
|
|
return FALSE
|
|
|
|
sigreturn = SEND_SIGNAL(src, COMSIG_LIVING_UNARMED_ATTACK, attack_target, proximity_flag, modifiers)
|
|
if(sigreturn & COMPONENT_CANCEL_ATTACK_CHAIN)
|
|
return TRUE
|
|
if(sigreturn & COMPONENT_SKIP_ATTACK)
|
|
return FALSE
|
|
|
|
if(!right_click_attack_chain(attack_target, modifiers))
|
|
resolve_unarmed_attack(attack_target, modifiers)
|
|
return TRUE
|
|
|
|
/mob/living/carbon/human/UnarmedAttack(atom/attack_target, proximity_flag, list/modifiers)
|
|
// Humans can always check themself regardless of having their hands blocked or w/e
|
|
if(src == attack_target && !combat_mode && HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
|
|
check_self_for_injuries()
|
|
return TRUE
|
|
|
|
return ..()
|
|
|
|
/mob/living/carbon/resolve_unarmed_attack(atom/attack_target, list/modifiers)
|
|
return attack_target.attack_paw(src, modifiers)
|
|
|
|
/mob/living/carbon/human/resolve_unarmed_attack(atom/attack_target, list/modifiers)
|
|
if(!ISADVANCEDTOOLUSER(src))
|
|
return ..()
|
|
|
|
return attack_target.attack_hand(src, modifiers)
|
|
|
|
/mob/living/carbon/human/resolve_right_click_attack(atom/target, list/modifiers)
|
|
return target.attack_hand_secondary(src, modifiers)
|
|
|
|
/// Return TRUE to cancel other attack hand effects that respect it. Modifiers is the assoc list for click info such as if it was a right click.
|
|
/atom/proc/attack_hand(mob/user, list/modifiers)
|
|
. = FALSE
|
|
if(!(interaction_flags_atom & INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND))
|
|
add_fingerprint(user)
|
|
if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_HAND, user, modifiers) & COMPONENT_CANCEL_ATTACK_CHAIN)
|
|
. = TRUE
|
|
if(interaction_flags_atom & INTERACT_ATOM_ATTACK_HAND)
|
|
. = _try_interact(user)
|
|
|
|
/// When the user uses their hand on an item while holding right-click
|
|
/// Returns a SECONDARY_ATTACK_* value.
|
|
/atom/proc/attack_hand_secondary(mob/user, list/modifiers)
|
|
if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_HAND_SECONDARY, user, modifiers) & COMPONENT_CANCEL_ATTACK_CHAIN)
|
|
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
|
|
return SECONDARY_ATTACK_CALL_NORMAL
|
|
|
|
//Return a non FALSE value to cancel whatever called this from propagating, if it respects it.
|
|
/atom/proc/_try_interact(mob/user)
|
|
if(isAdminGhostAI(user)) //admin abuse
|
|
return interact(user)
|
|
if(can_interact(user))
|
|
return interact(user)
|
|
return FALSE
|
|
|
|
/atom/proc/can_interact(mob/user, require_adjacent_turf = TRUE)
|
|
if(!user.can_interact_with(src, interaction_flags_atom & INTERACT_ATOM_ALLOW_USER_LOCATION))
|
|
return FALSE
|
|
if((interaction_flags_atom & INTERACT_ATOM_REQUIRES_DEXTERITY) && !ISADVANCEDTOOLUSER(user))
|
|
to_chat(user, span_warning("You don't have the dexterity to do this!"))
|
|
return FALSE
|
|
if(!(interaction_flags_atom & INTERACT_ATOM_IGNORE_INCAPACITATED))
|
|
var/ignore_flags = NONE
|
|
if(interaction_flags_atom & INTERACT_ATOM_IGNORE_RESTRAINED)
|
|
ignore_flags |= INCAPABLE_RESTRAINTS
|
|
if(!(interaction_flags_atom & INTERACT_ATOM_CHECK_GRAB))
|
|
ignore_flags |= INCAPABLE_GRAB
|
|
|
|
if(INCAPACITATED_IGNORING(user, ignore_flags))
|
|
return FALSE
|
|
return TRUE
|
|
|
|
/atom/ui_status(mob/user, datum/ui_state/state)
|
|
. = ..()
|
|
//Check if both user and atom are at the same location
|
|
if(!can_interact(user))
|
|
. = min(., UI_UPDATE)
|
|
|
|
/atom/movable/can_interact(mob/user)
|
|
. = ..()
|
|
if(!.)
|
|
return
|
|
if(!anchored && (interaction_flags_atom & INTERACT_ATOM_REQUIRES_ANCHORED))
|
|
return FALSE
|
|
|
|
/atom/proc/interact(mob/user)
|
|
if(interaction_flags_atom & INTERACT_ATOM_NO_FINGERPRINT_INTERACT)
|
|
add_hiddenprint(user)
|
|
else
|
|
add_fingerprint(user)
|
|
if(interaction_flags_atom & INTERACT_ATOM_UI_INTERACT)
|
|
SEND_SIGNAL(src, COMSIG_ATOM_UI_INTERACT, user)
|
|
return ui_interact(user)
|
|
return FALSE
|
|
|
|
|
|
/mob/living/carbon/human/RangedAttack(atom/A, modifiers)
|
|
. = ..()
|
|
if(.)
|
|
return
|
|
|
|
if(isturf(A) && get_dist(src,A) <= 1)
|
|
Move_Pulled(A)
|
|
return TRUE
|
|
|
|
/*
|
|
Animals & All Unspecified
|
|
*/
|
|
|
|
/**
|
|
* Called when the unarmed attack hasn't been stopped by the LIVING_UNARMED_ATTACK_BLOCKED macro or the right_click_attack_chain proc.
|
|
* This will call an attack proc that can vary from mob type to mob type on the target.
|
|
*/
|
|
/mob/living/proc/resolve_unarmed_attack(atom/attack_target, list/modifiers)
|
|
attack_target.attack_animal(src, modifiers)
|
|
|
|
/**
|
|
* Called when an unarmed attack performed with right click hasn't been stopped by the LIVING_UNARMED_ATTACK_BLOCKED macro.
|
|
* This will call a secondary attack proc that can vary from mob type to mob type on the target.
|
|
* Sometimes, a target is interacted differently when right_clicked, in that case the secondary attack proc should return
|
|
* a SECONDARY_ATTACK_* value that's not SECONDARY_ATTACK_CALL_NORMAL.
|
|
* Otherwise, it should just return SECONDARY_ATTACK_CALL_NORMAL. Failure to do so will result in an exception (runtime error).
|
|
*/
|
|
/mob/living/proc/resolve_right_click_attack(atom/target, list/modifiers)
|
|
return target.attack_animal_secondary(src, modifiers)
|
|
|
|
/**
|
|
* Called when a simple animal is unarmed attacking / clicking on this atom.
|
|
*/
|
|
/atom/proc/attack_animal(mob/user, list/modifiers)
|
|
SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_ANIMAL, user, modifiers)
|
|
|
|
/**
|
|
* Called when a simple animal or basic mob right clicks an atom.
|
|
* Returns a SECONDARY_ATTACK_* value.
|
|
*/
|
|
/atom/proc/attack_animal_secondary(mob/user, list/modifiers)
|
|
return SECONDARY_ATTACK_CALL_NORMAL
|
|
|
|
///When a basic mob attacks something, either by AI or user.
|
|
/atom/proc/attack_basic_mob(mob/user, list/modifiers)
|
|
SHOULD_CALL_PARENT(TRUE)
|
|
if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_BASIC_MOB, user) & COMSIG_BASIC_ATTACK_CANCEL_CHAIN)
|
|
return
|
|
return handle_basic_attack(user, modifiers) //return value of attack animal, this is how much damage was dealt to the attacked thing
|
|
|
|
///This exists so stuff can override the default call of attack_animal for attack_basic_mob
|
|
///Remove this when simple animals are removed and everything can be handled on attack basic mob.
|
|
/atom/proc/handle_basic_attack(user, modifiers)
|
|
return attack_animal(user, modifiers)
|
|
|
|
///Attacked by monkey. It doesn't need its own *_secondary proc as it just uses attack_hand_secondary instead.
|
|
/atom/proc/attack_paw(mob/user, list/modifiers)
|
|
if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_PAW, user, modifiers) & COMPONENT_CANCEL_ATTACK_CHAIN)
|
|
return TRUE
|
|
if(interaction_flags_atom & INTERACT_ATOM_ATTACK_PAW)
|
|
. = _try_interact(user)
|
|
|
|
|
|
/*
|
|
Aliens
|
|
Defaults to same as monkey in most places
|
|
*/
|
|
/mob/living/carbon/alien/resolve_unarmed_attack(atom/attack_target, list/modifiers)
|
|
attack_target.attack_alien(src, modifiers)
|
|
|
|
/mob/living/carbon/alien/resolve_right_click_attack(atom/target, list/modifiers)
|
|
return target.attack_alien_secondary(src, modifiers)
|
|
|
|
/atom/proc/attack_alien(mob/living/carbon/alien/user, list/modifiers)
|
|
return attack_paw(user, modifiers)
|
|
|
|
/**
|
|
* Called when an alien right clicks an atom.
|
|
* Returns a SECONDARY_ATTACK_* value.
|
|
*/
|
|
/atom/proc/attack_alien_secondary(mob/living/carbon/alien/user, list/modifiers)
|
|
return SECONDARY_ATTACK_CALL_NORMAL
|
|
|
|
// Babby aliens
|
|
/mob/living/carbon/alien/larva/resolve_unarmed_attack(atom/attack_target, list/modifiers)
|
|
attack_target.attack_larva(src, modifiers)
|
|
|
|
/mob/living/carbon/alien/larva/resolve_right_click_attack(atom/target, list/modifiers)
|
|
return target.attack_larva_secondary(src, modifiers)
|
|
|
|
/mob/living/carbon/alien/larva/can_unarmed_attack() //We bite stuff, and our head is always free.
|
|
return TRUE
|
|
|
|
/atom/proc/attack_larva(mob/user, list/modifiers)
|
|
SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_LARVA, user, modifiers)
|
|
|
|
/**
|
|
* Called when an alien larva right clicks an atom.
|
|
* Returns a SECONDARY_ATTACK_* value.
|
|
*/
|
|
/atom/proc/attack_larva_secondary(mob/user, list/modifiers)
|
|
return SECONDARY_ATTACK_CALL_NORMAL
|
|
|
|
/*
|
|
Drones
|
|
*/
|
|
|
|
/mob/living/basic/drone/resolve_unarmed_attack(atom/attack_target, proximity_flag, list/modifiers)
|
|
attack_target.attack_drone(src, modifiers)
|
|
|
|
/mob/living/basic/drone/resolve_right_click_attack(atom/target, list/modifiers)
|
|
return target.attack_drone_secondary(src, modifiers)
|
|
|
|
/// Defaults to attack_hand. Override it when you don't want drones to do same stuff as humans.
|
|
/atom/proc/attack_drone(mob/living/basic/drone/user, list/modifiers)
|
|
attack_hand(user, modifiers)
|
|
|
|
/**
|
|
* Called when a maintenance drone right clicks an atom.
|
|
* Defaults to attack_hand_secondary.
|
|
* When overriding it, remember that it ought to return a SECONDARY_ATTACK_* value.
|
|
*/
|
|
/atom/proc/attack_drone_secondary(mob/living/basic/drone/user, list/modifiers)
|
|
return attack_hand_secondary(user, modifiers)
|
|
|
|
/*
|
|
Brain
|
|
*/
|
|
|
|
/mob/living/brain/UnarmedAttack(atom/attack_target, proximity_flag, list/modifiers)//Stops runtimes due to attack_animal being the default
|
|
return
|
|
|
|
|
|
/*
|
|
pAI
|
|
*/
|
|
|
|
/mob/living/silicon/pai/resolve_unarmed_attack(atom/attack_target, list/modifiers)
|
|
attack_target.attack_pai(src, modifiers)
|
|
|
|
/mob/living/silicon/pai/resolve_right_click_attack(atom/target, list/modifiers)
|
|
return target.attack_pai_secondary(src, modifiers)
|
|
|
|
/atom/proc/attack_pai(mob/user, list/modifiers)
|
|
return
|
|
|
|
/**
|
|
* Called when a pAI right clicks an atom.
|
|
* Returns a SECONDARY_ATTACK_* value.
|
|
*/
|
|
/atom/proc/attack_pai_secondary(mob/user, list/modifiers)
|
|
return SECONDARY_ATTACK_CALL_NORMAL
|
|
|
|
/*
|
|
Hostile animals
|
|
*/
|
|
|
|
/mob/living/simple_animal/hostile/resolve_unarmed_attack(atom/attack_target, list/modifiers)
|
|
GiveTarget(attack_target)
|
|
INVOKE_ASYNC(src, PROC_REF(AttackingTarget), attack_target)
|
|
|
|
/*
|
|
New Players:
|
|
Have no reason to click on anything at all.
|
|
*/
|
|
/mob/dead/new_player/ClickOn()
|
|
return
|