Merge pull request #5842 from Rykka-Stormheart/shep-dev-pois

Corrupt Maintenance Drone Hotfix
This commit is contained in:
Novacat
2019-09-11 00:25:42 -04:00
committed by GitHub
2 changed files with 21 additions and 3 deletions
@@ -30,7 +30,7 @@
maxHealth = 25
health = 25
movement_cooldown = 0
movement_sound = 'sound/effects/servostep.ogg'
movement_sound = 'sound/effects/servostep.ogg'
pass_flags = PASSTABLE
mob_swap_flags = 0
@@ -44,11 +44,28 @@
attack_sound = 'sound/weapons/bladeslice.ogg'
attacktext = list("cut", "sliced")
poison_per_bite = 5
poison_type = "welder fuel"
var/poison_type = "welder fuel" // The reagent that gets injected when it attacks.
var/poison_chance = 35 // Chance for injection to occur.
var/poison_per_bite = 5 // Amount added per injection.
ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive
/mob/living/simple_mob/mechanical/corrupt_maint_drone/apply_melee_effects(var/atom/A)
if(isliving(A))
var/mob/living/L = A
if(L.reagents)
var/target_zone = pick(BP_TORSO,BP_TORSO,BP_TORSO,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_HEAD)
if(L.can_inject(src, null, target_zone))
inject_poison(L, target_zone)
// Does actual poison injection, after all checks passed.
/mob/living/simple_mob/mechanical/corrupt_maint_drone/proc/inject_poison(mob/living/L, target_zone)
if(prob(poison_chance))
to_chat(L, "<span class='warning'>Something burns in your veins.</span>")
L.reagents.add_reagent(poison_type, poison_per_bite)
/mob/living/simple_mob/mechanical/corrupt_maint_drone/death()
..(null,"is smashed into pieces!")
qdel(src)
+1
View File
@@ -2452,6 +2452,7 @@
#include "code\modules\mob\living\simple_mob\subtypes\humanoid\mercs\mercs_vr.dm"
#include "code\modules\mob\living\simple_mob\subtypes\illusion\illusion.dm"
#include "code\modules\mob\living\simple_mob\subtypes\mechanical\combat_drone.dm"
#include "code\modules\mob\living\simple_mob\subtypes\mechanical\corrupt_maint_drone_vr.dm"
#include "code\modules\mob\living\simple_mob\subtypes\mechanical\disbot_vr.dm"
#include "code\modules\mob\living\simple_mob\subtypes\mechanical\golem.dm"
#include "code\modules\mob\living\simple_mob\subtypes\mechanical\mechanical.dm"