Mining Mobs - More mob behavior overhaul, kinetic gun tweaks, etc

Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/projectiles/ammunition/energy.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/special.dm
	icons/mob/animal.dmi
	icons/obj/projectiles.dmi
This commit is contained in:
Ergovisavi
2014-01-22 16:39:54 -05:00
committed by ZomgPonies
parent 9428677ab6
commit 78bea65a44
12 changed files with 327 additions and 266 deletions
@@ -182,7 +182,7 @@ obj/item/weapon/gun/energy/staff/focus
zoom = 0
/obj/item/weapon/gun/energy/sniperrifle/verb/zoom()
set category = "Special Verbs"
set category = "Object"
set name = "Zoom"
set popup_menu = 0
if(usr.stat || !(istype(usr,/mob/living/carbon/human)))
@@ -196,4 +196,20 @@ obj/item/weapon/gun/energy/staff/focus
usr << sound('sound/mecha/imag_enh.ogg',volume=50)
else
usr.client.view = world.view//world.view - default mob view size
return
return
/obj/item/weapon/gun/energy/kinetic_accelerator
name = "proto-kinetic accelerator"
desc = "According to Nanotrasen accounting, this is mining equipment. It's been modified to the legal limit on power output, and often serves as a miner's first defense against hostile alien life; it's not very powerful unless used in a low pressure environment."
icon_state = "freezegun"
item_state = "shotgun"
projectile_type = "/obj/item/projectile/kinetic"
cell_type = "/obj/item/weapon/cell/crap"
charge_cost = 500
fire_delay = 20
/obj/item/weapon/gun/energy/kinetic_accelerator/attack_self(var/mob/living/user/L)
power_supply.give(500)
playsound(src.loc, 'sound/weapons/shotgunpump.ogg', 60, 1)
return