cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 15:39:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Schlorrgo Kicking (#8620)

Browse Source
This commit is contained in:
Geeves
2020-04-10 15:35:36 -03:00
committed by GitHub
parent 7c44e8595e
commit 4be2fc6768
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/friendly/adhomai.dm
+19 -1
View File
@@ -128,4 +128,22 @@
meat_type = /obj/item/reagent_containers/food/snacks/meat/chicken
butchering_products = list(/obj/item/reagent_containers/food/snacks/spreads/lard = 5)
holder_type = /obj/item/holder/schlorrgo
holder_type = /obj/item/holder/schlorrgo
/mob/living/simple_animal/schlorrgo/unarmed_harm_attack(mob/living/carbon/human/user)
var/obj/item/organ/external/left_leg = user.get_organ(BP_L_LEG)
var/obj/item/organ/external/right_leg = user.get_organ(BP_R_LEG)
if(left_leg?.is_usable() && right_leg?.is_usable())
user.visible_message(SPAN_WARNING("[user] punts \the [src]!"))
user.do_attack_animation(src)
make_noise()
throw_at(get_edge_target_turf(user, get_dir(user, src)), 4, 1)
poke(TRUE)
else
..()
/mob/living/simple_animal/schlorrgo/turf_collision(var/turf/T, var/speed = THROWFORCE_SPEED_DIVISOR)
visible_message(SPAN_WARNING("[src] harmlessly bounces off \the [T]!"))
playsound(T, 'sound/effects/bangtaper.ogg', 50, 1, 1)
make_noise()
code/modules/mob/living/simple_animal/simple_animal.dm
+7 -4
View File
@@ -404,13 +404,16 @@ mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj)
poke(1)
if(I_HURT)
apply_damage(harm_intent_damage, BRUTE, used_weapon = "Attack by [M.name]")
M.visible_message("<span class='warning'>[M] [response_harm] \the [src]</span>")
M.do_attack_animation(src)
poke(1)
unarmed_harm_attack(M)
return
/mob/living/simple_animal/proc/unarmed_harm_attack(var/mob/living/carbon/human/user)
apply_damage(harm_intent_damage, BRUTE, used_weapon = "Attack by [user.name]")
user.visible_message(SPAN_WARNING("[user] [response_harm] \the [src]!"))
user.do_attack_animation(src)
poke(TRUE)
/mob/living/simple_animal/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/reagent_containers/glass/rag)) //You can't milk an udder with a rag.
attacked_with_item(O, user)