cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes it harder for Servants to accidentally fuck up

Browse Source
This commit is contained in:
Joan Lung
2017-02-17 12:25:46 -05:00
parent cebaa7061c
commit 6c6259bb43
4 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/obj_defense.dm
+7 -7
View File
@@ -92,11 +92,11 @@
/obj/proc/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1) //used by attack_alien, attack_animal, and attack_slime
user.do_attack_animation(src)
user.changeNext_move(CLICK_CD_MELEE)
take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user))
return take_damage(damage_amount, damage_type, damage_flag, sound_effect, get_dir(src, user))
/obj/attack_alien(mob/living/carbon/alien/humanoid/user)
playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)
attack_generic(user, 60, BRUTE, "melee", 0)
if(attack_generic(user, 60, BRUTE, "melee", 0))
playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)
/obj/attack_animal(mob/living/simple_animal/M)
if(!M.melee_damage_upper && !M.obj_damage)
@@ -106,12 +106,12 @@
var/play_soundeffect = 1
if(M.environment_smash)
play_soundeffect = 0
playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
if(M.obj_damage)
attack_generic(M, M.obj_damage, M.melee_damage_type, "melee", play_soundeffect)
. = attack_generic(M, M.obj_damage, M.melee_damage_type, "melee", play_soundeffect)
else
attack_generic(M, rand(M.melee_damage_lower,M.melee_damage_upper), M.melee_damage_type, "melee", play_soundeffect)
return 1
. = attack_generic(M, rand(M.melee_damage_lower,M.melee_damage_upper), M.melee_damage_type, "melee", play_soundeffect)
if(. && !play_soundeffect)
playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
/obj/attack_slime(mob/living/simple_animal/slime/user)
if(!user.is_adult)