Merge pull request #3767 from Tastyfish/silence

Tranquillité, Prospérité & Mimeré
This commit is contained in:
TheDZD
2016-03-08 19:32:29 -05:00
41 changed files with 837 additions and 361 deletions
+15 -7
View File
@@ -160,15 +160,23 @@
/obj/item/projectile/bullet/mime
damage = 20
damage = 0
stun = 5
weaken = 5
slur = 20
stutter = 20
/obj/item/projectile/bullet/mime/on_hit(var/atom/target, var/blocked = 0)
if(istype(target, /mob/living/carbon))
var/mob/living/carbon/M = target
M.silent = max(M.silent, 10)
..(target, blocked)
if(istype(target, /mob/living/carbon))
var/mob/living/carbon/M = target
M.silent = max(M.silent, 10)
else if(istype(target, /obj/mecha/combat/honker))
var/obj/mecha/chassis = target
chassis.occupant_message("A mimetech anti-honk bullet has hit \the [chassis]!")
chassis.use_power(chassis.get_charge() / 2)
for(var/obj/item/mecha_parts/mecha_equipment/weapon/honker in chassis.equipment)
honker.set_ready_state(0)
/obj/item/projectile/bullet/dart
name = "dart"