From d1735976601a88c43fbe700657a6234afb850721 Mon Sep 17 00:00:00 2001 From: RandomMarine Date: Fri, 7 Jul 2017 19:34:40 -0700 Subject: [PATCH 1/2] gives drones harm intent --- code/modules/mob/living/silicon/silicon_defense.dm | 5 +++++ code/modules/mob/living/simple_animal/animal_defense.dm | 5 +++++ .../mob/living/simple_animal/friendly/drone/_drone.dm | 1 + 3 files changed, 11 insertions(+) diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm index b09309d81f7..fb9b506994d 100644 --- a/code/modules/mob/living/silicon/silicon_defense.dm +++ b/code/modules/mob/living/silicon/silicon_defense.dm @@ -77,6 +77,11 @@ "[M] punches [src], but doesn't leave a dent.", null, COMBAT_MESSAGE_RANGE) return 0 +/mob/living/silicon/attack_drone(mob/living/simple_animal/drone/M) + if(M.a_intent == INTENT_HARM) + return + ..() + /mob/living/silicon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0, stun = TRUE) if(buckled_mobs) for(var/mob/living/M in buckled_mobs) diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm index fc7a451c3b2..f591bb3390e 100644 --- a/code/modules/mob/living/simple_animal/animal_defense.dm +++ b/code/modules/mob/living/simple_animal/animal_defense.dm @@ -80,6 +80,11 @@ damage = rand(20, 35) return attack_threshold_check(damage) +/mob/living/simple_animal/attack_drone(mob/living/simple_animal/drone/M) + if(M.a_intent == INTENT_HARM) //No kicking dogs even as a rogue drone. Use a weapon. + return + ..() + /mob/living/simple_animal/proc/attack_threshold_check(damage, damagetype = BRUTE, armorcheck = "melee") var/temp_damage = damage if(!damage_coeff[damagetype]) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index 08a83a3e086..5d9bc54be0b 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -22,6 +22,7 @@ icon_state = "drone_maint_grey" icon_living = "drone_maint_grey" icon_dead = "drone_maint_dead" + possible_a_intents = list(INTENT_HELP, INTENT_HARM) health = 30 maxHealth = 30 unsuitable_atmos_damage = 0 From 4b9ba464ce572f1656b8b7b2136dab41c19b73f8 Mon Sep 17 00:00:00 2001 From: RandomMarine Date: Sat, 8 Jul 2017 16:18:49 -0700 Subject: [PATCH 2/2] return of the return --- code/modules/mob/living/silicon/silicon_defense.dm | 2 +- code/modules/mob/living/simple_animal/animal_defense.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm index fb9b506994d..2f81f73feac 100644 --- a/code/modules/mob/living/silicon/silicon_defense.dm +++ b/code/modules/mob/living/silicon/silicon_defense.dm @@ -80,7 +80,7 @@ /mob/living/silicon/attack_drone(mob/living/simple_animal/drone/M) if(M.a_intent == INTENT_HARM) return - ..() + return ..() /mob/living/silicon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = 0, tesla_shock = 0, illusion = 0, stun = TRUE) if(buckled_mobs) diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm index f591bb3390e..69ccee5cb3a 100644 --- a/code/modules/mob/living/simple_animal/animal_defense.dm +++ b/code/modules/mob/living/simple_animal/animal_defense.dm @@ -83,7 +83,7 @@ /mob/living/simple_animal/attack_drone(mob/living/simple_animal/drone/M) if(M.a_intent == INTENT_HARM) //No kicking dogs even as a rogue drone. Use a weapon. return - ..() + return ..() /mob/living/simple_animal/proc/attack_threshold_check(damage, damagetype = BRUTE, armorcheck = "melee") var/temp_damage = damage