Further tweaks to Vox and their toys

This commit is contained in:
Anewbe
2017-02-01 21:43:21 -06:00
parent fa18ec9909
commit cad668a72a
9 changed files with 13 additions and 2 deletions

View File

@@ -123,6 +123,7 @@
if(user.species.can_shred(user)) if(user.species.can_shred(user))
set_status(0) set_status(0)
user.do_attack_animation(src) user.do_attack_animation(src)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
visible_message("<span class='warning'>\The [user] slashes at [src]!</span>") visible_message("<span class='warning'>\The [user] slashes at [src]!</span>")
playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1) playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)
add_hiddenprint(user) add_hiddenprint(user)

View File

@@ -160,6 +160,8 @@
if(H.species.can_shred(H)) if(H.species.can_shred(H))
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1) playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
visible_message("<span class='danger'>[user] smashes against the [src.name].</span>", 1) visible_message("<span class='danger'>[user] smashes against the [src.name].</span>", 1)
user.do_attack_animation(src)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
take_damage(25) take_damage(25)
return return
return src.attackby(user, user) return src.attackby(user, user)

View File

@@ -514,6 +514,7 @@
if(H.species.can_shred(user)) if(H.species.can_shred(user))
if(!prob(src.deflect_chance)) if(!prob(src.deflect_chance))
src.take_damage(15) src.take_damage(15)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
user << "<span class='danger'>You slash at the armored suit!</span>" user << "<span class='danger'>You slash at the armored suit!</span>"

View File

@@ -34,6 +34,7 @@
item_flags = STOPPRESSUREDAMAGE | THICKMATERIAL | PHORONGUARD item_flags = STOPPRESSUREDAMAGE | THICKMATERIAL | PHORONGUARD
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank) allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank)
phoronproof = 1 phoronproof = 1
slowdown = 2
armor = list(melee = 60, bullet = 50, laser = 40,energy = 15, bomb = 30, bio = 30, rad = 30) armor = list(melee = 60, bullet = 50, laser = 40,energy = 15, bomb = 30, bio = 30, rad = 30)
siemens_coefficient = 0.2 siemens_coefficient = 0.2
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS

View File

@@ -49,6 +49,9 @@
item_flags = THICKMATERIAL item_flags = THICKMATERIAL
siemens_coefficient = 0.2 siemens_coefficient = 0.2
phoronproof = 1 phoronproof = 1
offline_slowdown = 5
slowdown = 2
allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit)
air_type = /obj/item/weapon/tank/vox air_type = /obj/item/weapon/tank/vox
@@ -108,7 +111,6 @@
icon_state = "voxstealth_rig" icon_state = "voxstealth_rig"
armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 100) armor = list(melee = 40, bullet = 30, laser = 30, energy = 15, bomb = 30, bio = 100, rad = 100)
emp_protection = 40 //change this to 30 if too high. emp_protection = 40 //change this to 30 if too high.
slowdown = 0
phoronproof = 1 phoronproof = 1
req_access = list(access_syndicate) req_access = list(access_syndicate)

View File

@@ -25,7 +25,7 @@
icon_state = "webbing-vox" icon_state = "webbing-vox"
slot = "vox" slot = "vox"
slots = 5 slots = 3
/obj/item/clothing/accessory/storage/vox/New() /obj/item/clothing/accessory/storage/vox/New()
..() ..()

View File

@@ -701,6 +701,7 @@
var/mob/living/carbon/human/H = user var/mob/living/carbon/human/H = user
if(H.species.can_shred(H)) if(H.species.can_shred(H))
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
user.visible_message("<span call='warning'>[user.name] slashes at the [src.name]!</span>", "<span class='notice'>You slash at the [src.name]!</span>") user.visible_message("<span call='warning'>[user.name] slashes at the [src.name]!</span>", "<span class='notice'>You slash at the [src.name]!</span>")
playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1) playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)

View File

@@ -527,6 +527,7 @@
if(istype(user,/mob/living/carbon/human)) if(istype(user,/mob/living/carbon/human))
var/mob/living/carbon/human/H = user var/mob/living/carbon/human/H = user
if(H.species.can_shred(H)) if(H.species.can_shred(H))
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
for(var/mob/M in viewers(src)) for(var/mob/M in viewers(src))
M.show_message("\red [user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) M.show_message("\red [user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
broken() broken()

View File

@@ -57,6 +57,7 @@
icon_state = "darkcannon" icon_state = "darkcannon"
item_state = "darkcannon" item_state = "darkcannon"
fire_sound = 'sound/weapons/eLuger.ogg' fire_sound = 'sound/weapons/eLuger.ogg'
w_class = ITEMSIZE_HUGE
charge_cost = 600 charge_cost = 600
projectile_type = /obj/item/projectile/beam/darkmatter projectile_type = /obj/item/projectile/beam/darkmatter
self_recharge = 1 self_recharge = 1
@@ -102,6 +103,7 @@
icon_state = "noise" icon_state = "noise"
item_state = "noise" item_state = "noise"
fire_sound = 'sound/effects/basscannon.ogg' fire_sound = 'sound/effects/basscannon.ogg'
w_class = ITEMSIZE_HUGE
self_recharge = 1 self_recharge = 1
charge_cost = 600 charge_cost = 600