mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 02:57:48 +01:00
8da12bc5e2
* Basic card interactions * initial interactions sorted * nails down some interactions, radial menu * Some more qol and keybind changes * improves card interactions * Unum decks can be flipped, showing the top card * Decks can now be split and recombined * minor tweaks to multi-deck stuff * Clean up a bunch of interactions * more cleanups * more cleanups and documentation * remote attacking looks pretty good * minor cleanups * ci * parser errs * Remove some debug things, re-add signal after merge * Adds a whole bunch more qol. * Improves examine messages * ci * concealed cards will now show properly in radial * Fixes some weird proximity monitor and control issues * Address reviews, clean up examine a bit more * radial fixes * remove todos * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> * better documentation, adds label of who did what * b etter grammar * augh * missing icon state * Update code/game/gamemodes/wizard/magic_tarot.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> * Add sleep on proximity monitor setup to hopefully avoid mapload issues * been writing too much c lately * Try late initialize * late init * 🧌 * map load --------- Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
122 lines
2.6 KiB
Plaintext
122 lines
2.6 KiB
Plaintext
/*
|
|
Humans:
|
|
Adds an exception for gloves, to allow special glove types like the ninja ones.
|
|
|
|
Otherwise pretty standard.
|
|
*/
|
|
/mob/living/carbon/human/UnarmedAttack(atom/A, proximity)
|
|
// Special glove functions:
|
|
// If the gloves do anything, have them return 1 to stop
|
|
// normal attack_hand() here.
|
|
var/obj/item/clothing/gloves/G = gloves // not typecast specifically enough in defines
|
|
if(proximity && istype(G) && G.Touch(A, 1))
|
|
return
|
|
|
|
if(HAS_TRAIT(src, TRAIT_HULK))
|
|
if(proximity) //no telekinetic hulk attack
|
|
if(A.attack_hulk(src))
|
|
return
|
|
|
|
if(buckled && isstructure(buckled))
|
|
var/obj/structure/S = buckled
|
|
if(S.prevents_buckled_mobs_attacking())
|
|
return
|
|
|
|
if(SEND_SIGNAL(A, COMSIG_HUMAN_MELEE_UNARMED_ATTACKBY, src) & COMPONENT_CANCEL_ATTACK_CHAIN)
|
|
return
|
|
|
|
A.attack_hand(src)
|
|
|
|
/atom/proc/attack_hand(mob/user as mob)
|
|
if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_HAND, user) & COMPONENT_CANCEL_ATTACK_CHAIN)
|
|
return TRUE
|
|
|
|
/*
|
|
/mob/living/carbon/human/RestrainedClickOn(atom/A) -- Handled by carbons
|
|
return
|
|
*/
|
|
|
|
/mob/living/carbon/RestrainedClickOn(atom/A)
|
|
return 0
|
|
|
|
/mob/living/carbon/human/RangedAttack(atom/A, params)
|
|
. = ..()
|
|
if(.)
|
|
return
|
|
if(gloves)
|
|
var/obj/item/clothing/gloves/G = gloves
|
|
if(istype(G) && G.Touch(A, 0)) // for magic gloves
|
|
return
|
|
|
|
if(HAS_TRAIT(src, TRAIT_LASEREYES) && a_intent == INTENT_HARM)
|
|
LaserEyes(A)
|
|
|
|
if(HAS_TRAIT(src, TRAIT_TELEKINESIS) && telekinesis_range_check(src, A))
|
|
A.attack_tk(src)
|
|
|
|
if(isturf(A) && get_dist(src, A) <= 1)
|
|
Move_Pulled(A)
|
|
/*
|
|
Animals & All Unspecified
|
|
*/
|
|
/mob/living/UnarmedAttack(atom/A)
|
|
A.attack_animal(src)
|
|
|
|
/mob/living/simple_animal/hostile/UnarmedAttack(atom/A)
|
|
target = A
|
|
AttackingTarget()
|
|
|
|
/atom/proc/attack_animal(mob/user)
|
|
return
|
|
|
|
/mob/living/RestrainedClickOn(atom/A)
|
|
return
|
|
|
|
/*
|
|
Aliens
|
|
Defaults to same as monkey in most places
|
|
*/
|
|
/mob/living/carbon/alien/UnarmedAttack(atom/A)
|
|
A.attack_alien(src)
|
|
|
|
/atom/proc/attack_alien(mob/living/carbon/alien/user)
|
|
attack_hand(user)
|
|
|
|
/mob/living/carbon/alien/RestrainedClickOn(atom/A)
|
|
return
|
|
|
|
// Babby aliens
|
|
/mob/living/carbon/alien/larva/UnarmedAttack(atom/A)
|
|
A.attack_larva(src)
|
|
|
|
/atom/proc/attack_larva(mob/user)
|
|
return
|
|
|
|
|
|
/*
|
|
Slimes
|
|
Nothing happening here
|
|
*/
|
|
/mob/living/simple_animal/slime/UnarmedAttack(atom/A)
|
|
A.attack_slime(src)
|
|
|
|
/atom/proc/attack_slime(mob/user)
|
|
return
|
|
|
|
/mob/living/simple_animal/slime/RestrainedClickOn(atom/A)
|
|
return
|
|
|
|
/*
|
|
New Players:
|
|
Have no reason to click on anything at all.
|
|
*/
|
|
/mob/new_player/ClickOn()
|
|
return
|
|
|
|
/mob/new_player/can_use_clickbinds()
|
|
return FALSE
|
|
|
|
// pAIs are not intended to interact with anything in the world
|
|
/mob/living/silicon/pai/UnarmedAttack(atom/A)
|
|
return
|