mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-15 12:43:13 +00:00
Adding borg petting
Adding borg petting, because its fun. Help intent - Pets borg Disarm intent - Taps borg Grab intent - will do original functions(such as removing the battery when the panel is open) Harm intent - Punches borg
This commit is contained in:
@@ -685,11 +685,32 @@
|
|||||||
|
|
||||||
add_fingerprint(user)
|
add_fingerprint(user)
|
||||||
|
|
||||||
|
|
||||||
|
//YW changes, adding borg petting. Help intent pets, Disarm intent taps, Grab should remove the battery for replacement, and Harm is punching(no damage)
|
||||||
if(istype(user,/mob/living/carbon/human))
|
if(istype(user,/mob/living/carbon/human))
|
||||||
var/mob/living/carbon/human/H = user
|
var/mob/living/carbon/human/H = user
|
||||||
|
//if(H.species.can_shred(H))
|
||||||
|
// attack_generic(H, rand(30,50), "slashed")
|
||||||
|
// return
|
||||||
|
|
||||||
|
switch(H.a_intent)
|
||||||
|
if(I_HELP)
|
||||||
|
visible_message("<span class='notice'>[H] pets [src].</span>")
|
||||||
|
return
|
||||||
|
if(I_HURT)
|
||||||
|
H.do_attack_animation(src)
|
||||||
if(H.species.can_shred(H))
|
if(H.species.can_shred(H))
|
||||||
attack_generic(H, rand(30,50), "slashed")
|
attack_generic(H, rand(30,50), "slashed")
|
||||||
return
|
return
|
||||||
|
else
|
||||||
|
playsound(src.loc, 'sound/effects/bang.ogg', 10, 1)
|
||||||
|
visible_message("<span class='warning'>[H] punches [src], but doesn't leave a dent.</span>")
|
||||||
|
return
|
||||||
|
if(I_DISARM)
|
||||||
|
H.do_attack_animation(src)
|
||||||
|
playsound(src.loc, 'sound/effects/clang1.ogg', 10, 1)
|
||||||
|
visible_message("<span class='warning'>[H] taps [src].</span>")
|
||||||
|
return
|
||||||
|
|
||||||
if(opened && !wiresexposed && (!istype(user, /mob/living/silicon)))
|
if(opened && !wiresexposed && (!istype(user, /mob/living/silicon)))
|
||||||
var/datum/robot_component/cell_component = components["power cell"]
|
var/datum/robot_component/cell_component = components["power cell"]
|
||||||
|
|||||||
BIN
sound/effects/clang1.ogg
Normal file
BIN
sound/effects/clang1.ogg
Normal file
Binary file not shown.
Reference in New Issue
Block a user