diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 63259fc65e..874901a0e4 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -58,14 +58,29 @@ siemens_coefficient = 0.7 body_parts_covered = FACE|EYES +// Vox mask, has special code for eating /obj/item/clothing/mask/gas/swat/vox name = "\improper alien mask" desc = "Clearly not designed for a human face." - body_parts_covered = 0 //Hack to allow vox to eat while wearing this mask. item_flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | PHORONGUARD phoronproof = 1 species_restricted = list(SPECIES_VOX) filtered_gases = list("oxygen", "sleeping_agent") + var/mask_open = FALSE // Controls if the Vox can eat through this mask + action_button_name = "Toggle Feeding Port" + +/obj/item/clothing/mask/gas/swat/vox/proc/feeding_port(mob/user) + if(user.canmove && !user.stat) + mask_open = !mask_open + if (mask_open) + body_parts_covered = body_parts_covered & ~FACE + to_chat(user, "Your mask moves to allow you to eat.") + else + body_parts_covered = initial(body_parts_covered) + to_chat(user, "Your mask moves to cover your mouth.") + +/obj/item/clothing/mask/gas/swat/vox/attack_self(mob/user) + feeding_port(user) /obj/item/clothing/mask/gas/syndicate name = "tactical mask" diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index 5b42e77294..1cd2f394be 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -34,7 +34,6 @@ 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) phoronproof = 1 - slowdown = 0.5 armor = list(melee = 60, bullet = 50, laser = 40,energy = 15, bomb = 30, bio = 100, rad = 50) siemens_coefficient = 0.2 heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index efdbea6476..b6e3e85596 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -51,7 +51,6 @@ siemens_coefficient = 0.2 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 diff --git a/code/modules/clothing/suits/aliens/vox.dm b/code/modules/clothing/suits/aliens/vox.dm index b17939950c..b658aa0586 100644 --- a/code/modules/clothing/suits/aliens/vox.dm +++ b/code/modules/clothing/suits/aliens/vox.dm @@ -2,7 +2,7 @@ name = "rusted metal armor" desc = "A hodgepodge of various pieces of metal scrapped together into a rudimentary vox-shaped piece of armor." allowed = list(/obj/item/weapon/gun, /obj/item/weapon/tank) - armor = list(melee = 70, bullet = 30, laser = 20,energy = 5, bomb = 40, bio = 0, rad = 0) //Higher melee armor versus lower everything else. + armor = list(melee = 60, bullet = 30, laser = 30,energy = 5, bomb = 40, bio = 0, rad = 0) //Higher melee armor versus lower everything else. icon_state = "vox-scrap" icon_state = "vox-scrap" body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS diff --git a/code/modules/clothing/under/xenos/vox.dm b/code/modules/clothing/under/xenos/vox.dm index 0997c5fa93..0c9942881f 100644 --- a/code/modules/clothing/under/xenos/vox.dm +++ b/code/modules/clothing/under/xenos/vox.dm @@ -1,8 +1,7 @@ /obj/item/clothing/under/vox has_sensor = 0 species_restricted = list(SPECIES_VOX) - valid_accessory_slots = "vox" - restricted_accessory_slots = "vox" + starting_accessories = list(/obj/item/clothing/accessory/storage/vox) // Dont' start with a backback, so free webbing phoronproof = 1 /obj/item/clothing/under/vox/vox_casual @@ -23,7 +22,6 @@ name = "alien mesh" desc = "An alien mesh. Seems to be made up mostly of pockets and writhing flesh." icon_state = "webbing-vox" - slot = "vox" slots = 3 diff --git a/code/modules/projectiles/guns/vox.dm b/code/modules/projectiles/guns/vox.dm index 631d255f77..ccbfe300ec 100644 --- a/code/modules/projectiles/guns/vox.dm +++ b/code/modules/projectiles/guns/vox.dm @@ -9,8 +9,8 @@ var/last_regen = 0 var/spike_gen_time = 150 - var/max_spikes = 3 - var/spikes = 3 + var/max_spikes = 5 + var/spikes = 5 release_force = 30 icon = 'icons/obj/gun.dmi' icon_state = "spikethrower3" @@ -35,7 +35,7 @@ /obj/item/weapon/gun/launcher/spikethrower/examine(mob/user) ..(user) - user << "It has [spikes] spike\s remaining." + to_chat(user, "It has [spikes] spike\s remaining.") /obj/item/weapon/gun/launcher/spikethrower/update_icon() icon_state = "spikethrower[spikes]" @@ -65,7 +65,7 @@ firemodes = list( list(mode_name="stunning", burst=1, fire_delay=null, move_delay=null, burst_accuracy=list(30), dispersion=null, projectile_type=/obj/item/projectile/beam/stun/darkmatter, charge_cost = 300), - list(mode_name="focused", burst=1, fire_delay=null, move_delay=null, burst_accuracy=list(30), dispersion=null, projectile_type=/obj/item/projectile/beam/darkmatter, charge_cost = 600), + list(mode_name="focused", burst=1, fire_delay=null, move_delay=null, burst_accuracy=list(30), dispersion=null, projectile_type=/obj/item/projectile/beam/darkmatter, charge_cost = 400), list(mode_name="scatter burst", burst=8, fire_delay=null, move_delay=4, burst_accuracy=list(0, 0, 0, 0, 0, 0, 0, 0), dispersion=list(3, 3, 3, 3, 3, 3, 3, 3, 3), projectile_type=/obj/item/projectile/energy/darkmatter, charge_cost = 300), ) @@ -112,7 +112,7 @@ embed_chance = 0 /* - * Vox Darkmatter Cannon + * Vox Sonic Cannon */ /obj/item/weapon/gun/energy/sonic name = "soundcannon" @@ -122,7 +122,7 @@ w_class = ITEMSIZE_HUGE cell_type = /obj/item/weapon/cell/device/weapon/recharge battery_lock = 1 - charge_cost = 600 + charge_cost = 400 projectile_type=/obj/item/projectile/sonic/weak diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index ddf2e1c64e..0a9ae62c72 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ