mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-11 10:11:09 +00:00
## About The Pull Request People can now pet held mothroaches and pugs if they want to, or use items on them, hopefully without causing many issues. After all, it only took about a couple dozen lines of code to make... ...Oh, did the 527 files changed or the 850~ lines added/removed perhaps catch your eye? Made you wonder if I accidentally pushed the wrong branch? or skewed something up big time? Well, nuh uh. I just happen to be fed up with the melee attack chain still using stringized params instead of an array/list. It was frankly revolting to see how I'd have had to otherwise call `list2params` for what I'm trying to accomplish here, and make this PR another tessera to the immense stupidity of our attack chain procs calling `params2list` over and over and over instead of just using that one call instance from `ClickOn` as an argument. It's 2025, honey, wake up! I also tried to replace some of those single letter vars/args but there are just way too many of them. ## Why It's Good For The Game Improving old code. And I want to be able to pet mobroaches while holding them too. ## Changelog 🆑 qol: You can now interact with held mobs in more ways beside wearing them. /🆑
227 lines
7.0 KiB
Plaintext
227 lines
7.0 KiB
Plaintext
/*
|
|
Cyborg ClickOn()
|
|
|
|
Cyborgs have no range restriction on attack_robot(), because it is basically an AI click.
|
|
However, they do have a range restriction on item use, so they cannot do without the
|
|
adjacency code.
|
|
*/
|
|
|
|
/mob/living/silicon/robot/ClickOn(atom/A, params)
|
|
if(world.time <= next_click)
|
|
return
|
|
next_click = world.time + 1
|
|
|
|
if(check_click_intercept(params,A))
|
|
return
|
|
|
|
if(stat || (lockcharge) || IsParalyzed() || IsStun())
|
|
return
|
|
|
|
var/list/modifiers = params2list(params)
|
|
if(LAZYACCESS(modifiers, SHIFT_CLICK))
|
|
if(LAZYACCESS(modifiers, CTRL_CLICK))
|
|
CtrlShiftClickOn(A)
|
|
return
|
|
if(LAZYACCESS(modifiers, MIDDLE_CLICK))
|
|
ShiftMiddleClickOn(A)
|
|
return
|
|
ShiftClickOn(A)
|
|
return
|
|
if(LAZYACCESS(modifiers, MIDDLE_CLICK))
|
|
MiddleClickOn(A, params)
|
|
return
|
|
if(LAZYACCESS(modifiers, ALT_CLICK)) // alt and alt-gr (rightalt)
|
|
if(LAZYACCESS(modifiers, RIGHT_CLICK))
|
|
AltClickSecondaryOn(A)
|
|
else
|
|
A.borg_click_alt(src)
|
|
return
|
|
if(LAZYACCESS(modifiers, CTRL_CLICK))
|
|
CtrlClickOn(A)
|
|
return
|
|
|
|
if(next_move >= world.time)
|
|
return
|
|
|
|
face_atom(A) // change direction to face what you clicked on
|
|
|
|
var/obj/item/W = get_active_held_item()
|
|
|
|
//wireless interaction with an atom
|
|
if(!W && get_dist(src, A) <= interaction_range)
|
|
if(LAZYACCESS(modifiers, RIGHT_CLICK) && !module_active)
|
|
var/secondary_result = A.attack_robot_secondary(src, modifiers)
|
|
if(secondary_result == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN || secondary_result == SECONDARY_ATTACK_CONTINUE_CHAIN)
|
|
return
|
|
if (secondary_result != SECONDARY_ATTACK_CALL_NORMAL)
|
|
CRASH("attack_robot_secondary did not return a SECONDARY_ATTACK_* define.")
|
|
|
|
A.attack_robot(src, modifiers)
|
|
return
|
|
|
|
if(W)
|
|
if(incapacitated)
|
|
return
|
|
|
|
//while buckled, you can still connect to and control things like doors, but you can't use your modules
|
|
if(buckled)
|
|
to_chat(src, span_warning("You can't use modules while buckled to [buckled]!"))
|
|
return
|
|
|
|
//if your "hands" are blocked you shouldn't be able to use modules
|
|
if(HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
|
|
return
|
|
|
|
if(W == A)
|
|
W.attack_self(src)
|
|
return
|
|
|
|
// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents)
|
|
if(A == loc || (A in loc) || (A in contents))
|
|
W.melee_attack_chain(src, A, modifiers)
|
|
return
|
|
|
|
if(!isturf(loc))
|
|
return
|
|
|
|
// cyborg rightclick code, allowing borgos to use weapons at range
|
|
if(CanReach(A,W))
|
|
W.melee_attack_chain(src, A, modifiers)
|
|
return
|
|
else if(isturf(A) || isturf(A.loc))
|
|
A.base_ranged_item_interaction(src, W, modifiers)
|
|
|
|
//Give cyborgs hotkey clicks without breaking existing uses of hotkey clicks
|
|
// for non-doors/apcs
|
|
/mob/living/silicon/robot/CtrlShiftClickOn(atom/target)
|
|
target.BorgCtrlShiftClick(src)
|
|
|
|
/mob/living/silicon/robot/ShiftClickOn(atom/target)
|
|
target.BorgShiftClick(src)
|
|
|
|
/mob/living/silicon/robot/CtrlClickOn(atom/target)
|
|
target.BorgCtrlClick(src)
|
|
|
|
/atom/proc/BorgCtrlShiftClick(mob/living/silicon/robot/user) //forward to human click if not overridden
|
|
user.base_click_ctrl_shift(src)
|
|
|
|
/obj/machinery/door/airlock/BorgCtrlShiftClick(mob/living/silicon/robot/user) // Sets/Unsets Emergency Access Override Forwards to AI code.
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
AICtrlShiftClick(user)
|
|
else
|
|
..()
|
|
|
|
/atom/proc/BorgShiftClick(mob/living/silicon/robot/user) //forward to human click if not overridden
|
|
ShiftClick(user)
|
|
|
|
/obj/machinery/door/airlock/BorgShiftClick(mob/living/silicon/robot/user) // Opens and closes doors! Forwards to AI code.
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
AIShiftClick(user)
|
|
else
|
|
..()
|
|
|
|
/atom/proc/BorgCtrlClick(mob/living/silicon/robot/user) //forward to human click if not overridden
|
|
user.base_click_ctrl(src)
|
|
|
|
/obj/machinery/door/airlock/BorgCtrlClick(mob/living/silicon/robot/user) // Bolts doors. Forwards to AI code.
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
AICtrlClick(user)
|
|
else
|
|
..()
|
|
|
|
/obj/machinery/power/apc/BorgCtrlClick(mob/living/silicon/robot/user) // turns off/on APCs. Forwards to AI code.
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
AICtrlClick(user)
|
|
else
|
|
..()
|
|
|
|
/obj/machinery/power/apc/BorgCtrlShiftClick(mob/living/silicon/robot/user)
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
AICtrlShiftClick(user)
|
|
else
|
|
..()
|
|
|
|
/obj/machinery/power/apc/BorgShiftClick(mob/living/silicon/robot/user)
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
AIShiftClick(user)
|
|
else
|
|
..()
|
|
|
|
/obj/machinery/power/apc/borg_click_alt(mob/living/silicon/robot/user)
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
ai_click_alt(user)
|
|
else
|
|
..()
|
|
|
|
|
|
/obj/machinery/power/apc/attack_robot_secondary(mob/living/silicon/user, list/modifiers)
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
return attack_ai_secondary(user, modifiers)
|
|
else
|
|
..()
|
|
|
|
/obj/machinery/turretid/BorgCtrlClick(mob/living/silicon/robot/user) //turret control on/off. Forwards to AI code.
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
AICtrlClick(user)
|
|
else
|
|
..()
|
|
|
|
/atom/proc/borg_click_alt(mob/living/silicon/robot/user)
|
|
user.base_click_alt(src)
|
|
return
|
|
|
|
/obj/machinery/door/airlock/borg_click_alt(mob/living/silicon/robot/user) // Eletrifies doors. Forwards to AI code.
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
ai_click_alt(user)
|
|
else
|
|
..()
|
|
|
|
/obj/machinery/turretid/borg_click_alt(mob/living/silicon/robot/user) //turret lethal on/off. Forwards to AI code.
|
|
if(get_dist(src, user) <= user.interaction_range && !(user.control_disabled))
|
|
ai_click_alt(user)
|
|
else
|
|
..()
|
|
|
|
/*
|
|
As with AI, these are not used in click code,
|
|
because the code for robots is specific, not generic.
|
|
|
|
If you would like to add advanced features to robot
|
|
clicks, you can do so here, but you will have to
|
|
change attack_robot() above to the proper function
|
|
*/
|
|
/mob/living/silicon/robot/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
|
|
if(!can_unarmed_attack())
|
|
return
|
|
|
|
if(LAZYACCESS(modifiers, RIGHT_CLICK))
|
|
return A.attack_robot_secondary(src, modifiers)
|
|
|
|
return A.attack_robot(src, modifiers)
|
|
|
|
/**
|
|
* What happens when the cyborg holds left-click on an item.
|
|
*
|
|
* Arguments:
|
|
* * user The mob holding the right click
|
|
* * modifiers The list of the custom click modifiers
|
|
*/
|
|
/atom/proc/attack_robot(mob/user, modifiers)
|
|
if (SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_ROBOT, user, modifiers) & COMPONENT_CANCEL_ATTACK_CHAIN)
|
|
return
|
|
|
|
attack_ai(user)
|
|
|
|
/**
|
|
* What happens when the cyborg without active module holds right-click on an item. Returns a SECONDARY_ATTACK_* value.
|
|
*
|
|
* Arguments:
|
|
* * user The mob holding the right click
|
|
* * modifiers The list of the custom click modifiers
|
|
*/
|
|
/atom/proc/attack_robot_secondary(mob/user, list/modifiers)
|
|
if (SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_ROBOT_SECONDARY, user, modifiers) & COMPONENT_CANCEL_ATTACK_CHAIN)
|
|
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
|
|
|
|
return attack_ai_secondary(user, modifiers)
|