diff --git a/baystation12.dme b/baystation12.dme index 0389e40f4e..172161db96 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -548,6 +548,7 @@ #include "code\game\objects\items\weapons\RCD.dm" #include "code\game\objects\items\weapons\RSF.dm" #include "code\game\objects\items\weapons\scrolls.dm" +#include "code\game\objects\items\weapons\shards.dm" #include "code\game\objects\items\weapons\shields.dm" #include "code\game\objects\items\weapons\stunbaton.dm" #include "code\game\objects\items\weapons\surgery_tools.dm" diff --git a/code/WorkInProgress/Wrongnumber/weldbackpack.dm b/code/WorkInProgress/Wrongnumber/weldbackpack.dm index b0a9f87b23..18899745c9 100644 --- a/code/WorkInProgress/Wrongnumber/weldbackpack.dm +++ b/code/WorkInProgress/Wrongnumber/weldbackpack.dm @@ -34,13 +34,15 @@ user << "\blue The tank scoffs at your insolence. It only provides services to welders." return -/obj/item/weapon/weldpack/afterattack(obj/O as obj, mob/user as mob) - if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.reagents.total_volume < max_fuel) +/obj/item/weapon/weldpack/afterattack(obj/O as obj, mob/user as mob, proximity) + if(!proximity) // this replaces and improves the get_dist(src,O) <= 1 checks used previously + return + if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume < max_fuel) O.reagents.trans_to(src, max_fuel) user << "\blue You crack the cap off the top of the pack and fill it back up again from the tank." playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) return - else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && get_dist(src,O) <= 1 && src.reagents.total_volume == max_fuel) + else if (istype(O, /obj/structure/reagent_dispensers/fueltank) && src.reagents.total_volume == max_fuel) user << "\blue The pack is already full!" return diff --git a/code/WorkInProgress/computer3/computers/crew.dm b/code/WorkInProgress/computer3/computers/crew.dm index 2d89b336f8..b3ef9398ba 100644 --- a/code/WorkInProgress/computer3/computers/crew.dm +++ b/code/WorkInProgress/computer3/computers/crew.dm @@ -47,7 +47,7 @@ log += "[life_status] [damage_report]Not Available" if(3) var/area/player_area = get_area(H) - log += "[life_status] [damage_report][player_area.name] ([pos.x], [pos.y])" + log += "[life_status] [damage_report][sanitize(player_area.name)] ([pos.x], [pos.y])" logs += log logs = sortList(logs) for(var/log in logs) @@ -75,4 +75,4 @@ if(href_list["update"]) interact() //src.updateUsrDialog() - return \ No newline at end of file + return diff --git a/code/WorkInProgress/computer3/laptop.dm b/code/WorkInProgress/computer3/laptop.dm index b88f782c2c..006d3a4db5 100644 --- a/code/WorkInProgress/computer3/laptop.dm +++ b/code/WorkInProgress/computer3/laptop.dm @@ -55,15 +55,20 @@ del src return + if(!stored_computer.manipulating) + stored_computer.manipulating = 1 + stored_computer.loc = loc + stored_computer.stat &= ~MAINT + stored_computer.update_icon() + loc = null + usr << "You open \the [src]." - stored_computer.loc = loc - stored_computer.stat &= ~MAINT - stored_computer.update_icon() - loc = null - usr << "You open \the [src]." + spawn(5) + stored_computer.manipulating = 0 + del src + else + usr << "\red You are already opening the computer!" - spawn(5) - del src AltClick() if(Adjacent(usr)) @@ -112,6 +117,7 @@ pixel_y = -3 show_keyboard = 0 + var/manipulating = 0 // To prevent disappearing bug var/obj/item/device/laptop/portable = null New(var/L, var/built = 0) @@ -147,10 +153,11 @@ portable=new portable.stored_computer = src - portable.loc = loc - loc = portable - stat |= MAINT - usr << "You close \the [src]." + if(!manipulating) + portable.loc = loc + loc = portable + stat |= MAINT + usr << "You close \the [src]." auto_use_power() if(stat&MAINT) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index dd662e40c0..99190c6071 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -212,29 +212,6 @@ flags = FPRINT | TABLEPASS| CONDUCT matter = list("metal" = 3750) -/obj/item/weapon/shard - name = "shard" - icon = 'icons/obj/shards.dmi' - icon_state = "large" - sharp = 1 - edge = 1 - desc = "Could probably be used as ... a throwing weapon?" - w_class = 2.0 - force = 5.0 - throwforce = 8.0 - item_state = "shard-glass" - matter = list("glass" = 3750) - attack_verb = list("stabbed", "slashed", "sliced", "cut") - - suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his wrists with the shard of glass! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his throat with the shard of glass! It looks like \he's trying to commit suicide.") - return (BRUTELOSS) - -/obj/item/weapon/shard/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) - playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) - return ..() - /*/obj/item/weapon/syndicate_uplink name = "station bounced radio" desc = "Remain silent about this..." @@ -254,28 +231,6 @@ matter = list("metal" = 100 origin_tech = "magnets=2;syndicate=3"*/ -/obj/item/weapon/shard/shrapnel - name = "shrapnel" - icon = 'icons/obj/shards.dmi' - icon_state = "shrapnellarge" - desc = "A bunch of tiny bits of shattered metal." - -/obj/item/weapon/shard/shrapnel/New() - - src.icon_state = pick("shrapnellarge", "shrapnelmedium", "shrapnelsmall") - switch(src.icon_state) - if("shrapnelsmall") - src.pixel_x = rand(-12, 12) - src.pixel_y = rand(-12, 12) - if("shrapnelmedium") - src.pixel_x = rand(-8, 8) - src.pixel_y = rand(-8, 8) - if("shrapnellarge") - src.pixel_x = rand(-5, 5) - src.pixel_y = rand(-5, 5) - else - return - /obj/item/weapon/SWF_uplink name = "station-bounced radio" desc = "used to comunicate it appears." diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 285a2ac0e3..e988d86ee6 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -20,7 +20,7 @@ /datum/game_mode/cult name = "cult" config_tag = "cult" - restricted_jobs = list("Chaplain","AI", "Cyborg", "Lawyer", "Head of Security", "Captain") + restricted_jobs = list("Chaplain","AI", "Cyborg", "Internal Affairs Agent", "Head of Security", "Captain") protected_jobs = list("Security Officer", "Warden", "Detective") required_players = 5 required_players_secret = 15 diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 1fbc0d6f98..14b253f415 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -775,6 +775,7 @@ var/list/sacrificed = list() for(var/mob/living/carbon/C in orange(1,src)) if(iscultist(C) && !C.stat) users+=C + var/dam = round(15 / users.len) if(users.len>=3) var/mob/living/carbon/cultist = input("Choose the one who you want to free", "Followers of Geometer") as null|anything in (cultists - users) if(!cultist) @@ -804,7 +805,7 @@ var/list/sacrificed = list() if(istype(cultist.loc, /obj/machinery/dna_scannernew)&&cultist.loc:locked) cultist.loc:locked = 0 for(var/mob/living/carbon/C in users) - user.take_overall_damage(15, 0) + user.take_overall_damage(dam, 0) C.say("Khari[pick("'","`")]d! Gual'te nikka!") del(src) return fizzle() @@ -820,7 +821,7 @@ var/list/sacrificed = list() var/list/mob/living/carbon/users = new for(var/mob/living/carbon/C in orange(1,src)) if(iscultist(C) && !C.stat) - users+=C + users += C if(users.len>=3) var/mob/living/carbon/cultist = input("Choose the one who you want to summon", "Followers of Geometer") as null|anything in (cultists - user) if(!cultist) @@ -833,10 +834,16 @@ var/list/sacrificed = list() cultist.loc = src.loc cultist.lying = 1 cultist.regenerate_icons() - for(var/mob/living/carbon/human/C in orange(1,src)) + + var/dam = round(25 / (users.len/2)) //More people around the rune less damage everyone takes. Minimum is 3 cultists + + for(var/mob/living/carbon/human/C in users) if(iscultist(C) && !C.stat) C.say("N'ath reth sh'yro eth d[pick("'","`")]rekkathnor!") - C.take_overall_damage(25, 0) + C.take_overall_damage(dam, 0) + if(users.len <= 4) // You did the minimum, this is going to hurt more and we're going to stun you. + C.apply_effect(rand(3,6), STUN) + C.apply_effect(1, WEAKEN) user.visible_message("\red Rune disappears with a flash of red light, and in its place now a body lies.", \ "\red You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a body.", \ "\red You hear a pop and smell ozone.") diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 2f04f8266b..e436a38e86 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -14,7 +14,7 @@ /datum/game_mode/revolution name = "revolution" config_tag = "revolution" - restricted_jobs = list("Lawyer", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") + restricted_jobs = list("Internal Affairs Agent", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer") protected_jobs = list("Security Officer", "Warden", "Detective") required_players = 4 required_players_secret = 15 diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 71076aaf28..0625bcaa74 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -6,7 +6,7 @@ name = "traitor" config_tag = "traitor" restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances - protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain")//AI", Currently out of the list as malf does not work for shit + protected_jobs = list("Security Officer", "Warden", "Detective", "Internal Affairs Agent", "Head of Security", "Captain")//AI", Currently out of the list as malf does not work for shit required_players = 0 required_enemies = 1 recommended_enemies = 4 diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 9231e9fc57..e14092d438 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -17,7 +17,7 @@ access_tox_storage, access_teleporter, access_sec_doors, access_research, access_robotics, access_xenobiology, access_ai_upload, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch) - minimal_player_age = 7 + minimal_player_age = 14 equip(var/mob/living/carbon/human/H) if(!H) return 0 @@ -50,6 +50,8 @@ minimal_access = list(access_tox, access_tox_storage, access_research, access_xenoarch) alt_titles = list("Xenoarcheologist", "Anomalist", "Phoron Researcher", "Xenobotanist") + minimal_player_age = 14 + equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear) @@ -79,6 +81,8 @@ access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology) minimal_access = list(access_research, access_xenobiology) + minimal_player_age = 14 + equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear) @@ -108,6 +112,8 @@ minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access. alt_titles = list("Biomechanical Engineer","Mechatronic Engineer") + minimal_player_age = 7 + equip(var/mob/living/carbon/human/H) if(!H) return 0 H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear) @@ -123,4 +129,4 @@ H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) - return 1 \ No newline at end of file + return 1 diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index b73e2cbde2..b7a1236411 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -68,9 +68,16 @@ ) radio_connection.post_signal(src, signal) -/obj/machinery/meter/proc/status() - var/t = "" - if (src.target) +/obj/machinery/meter/examine() + var/t = "A gas flow meter. " + + if(get_dist(usr, src) > 3 && !(istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/dead))) + t += "\blue You are too far away to read it." + + else if(stat & (NOPOWER|BROKEN)) + t += "\red The display is off." + + else if(src.target) var/datum/gas_mixture/environment = target.return_air() if(environment) t += "The pressure gauge reads [round(environment.return_pressure(), 0.01)] kPa; [round(environment.temperature,0.01)]°K ([round(environment.temperature-T0C,0.01)]°C)" @@ -78,31 +85,16 @@ t += "The sensor error light is blinking." else t += "The connect error light is blinking." - return t - -/obj/machinery/meter/examine() - set src in view(3) - - var/t = "A gas flow meter. " - t += status() + usr << t - - /obj/machinery/meter/Click() - if(stat & (NOPOWER|BROKEN)) + if(istype(usr, /mob/living/silicon/ai)) // ghosts can call ..() for examine + examine() return 1 - - var/t = null - if (get_dist(usr, src) <= 3 || istype(usr, /mob/living/silicon/ai) || istype(usr, /mob/dead)) - t += status() - else - usr << "\blue You are too far away." - return 1 - - usr << t - return 1 + + return ..() /obj/machinery/meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) if (!istype(W, /obj/item/weapon/wrench)) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 60e7ac0484..120e274e63 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -19,7 +19,7 @@ var/noserver = "ALERT: No server detected." var/incorrectkey = "ALERT: Incorrect decryption key!" var/defaultmsg = "Welcome. Please select an option." - var/rebootmsg = "%$&(£: Critical %$$@ Error // !RestArting! - ?pLeaSe wAit!" + var/rebootmsg = "%$&(£: Critical %$$@ Error // !RestArting! - ?pLeaSe wAit!" //Computer properties var/screen = 0 // 0 = Main menu, 1 = Message Logs, 2 = Hacked screen, 3 = Custom Message var/hacking = 0 // Is it being hacked into by the AI/Cyborg @@ -36,6 +36,7 @@ /obj/machinery/computer/message_monitor/attackby(obj/item/weapon/O as obj, mob/living/user as mob) if(stat & (NOPOWER|BROKEN)) + ..() return if(!istype(user)) return @@ -52,7 +53,7 @@ var/obj/item/weapon/paper/monitorkey/MK = new/obj/item/weapon/paper/monitorkey MK.loc = src.loc // Will help make emagging the console not so easy to get away with. - MK.info += "

£%@%(*$%&(£&?*(%&£/{}" + MK.info += "

£%@%(*$%&(£&?*(%&£/{}" spawn(100*length(src.linkedServer.decryptkey)) UnmagConsole() message = rebootmsg else diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 50b17ddc33..fe569e2364 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -325,7 +325,8 @@ var/global/list/frozen_items = list() time_entered = world.time // Book keeping! - log_admin("[key_name_admin(M)] has entered a stasis pod.") + var/turf/location = get_turf(src) + log_admin("[key_name_admin(M)] has entered a stasis pod. (JMP)") message_admins("\blue [key_name_admin(M)] has entered a stasis pod.") //Despawning occurs when process() is called with an occupant without a client. diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 7c34359236..270833f5ed 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -538,23 +538,26 @@ About the new airlock wires panel: return ((src.wires & wireFlag) == 0) /obj/machinery/door/airlock/proc/canAIControl() - return ((src.aiControlDisabled!=1) && (!src.isAllPowerCut())); + return ((src.aiControlDisabled!=1) && (!src.isAllPowerLoss())); /obj/machinery/door/airlock/proc/canAIHack() - return ((src.aiControlDisabled==1) && (!hackProof) && (!src.isAllPowerCut())); + return ((src.aiControlDisabled==1) && (!hackProof) && (!src.isAllPowerLoss())); /obj/machinery/door/airlock/proc/arePowerSystemsOn() + if (stat & NOPOWER) + return 0 return (src.secondsMainPowerLost==0 || src.secondsBackupPowerLost==0) /obj/machinery/door/airlock/requiresID() return !(src.isWireCut(AIRLOCK_WIRE_IDSCAN) || aiDisabledIdScanner) -/obj/machinery/door/airlock/proc/isAllPowerCut() - var/retval=0 +/obj/machinery/door/airlock/proc/isAllPowerLoss() + if(stat & NOPOWER) + return 1 if(src.isWireCut(AIRLOCK_WIRE_MAIN_POWER1) || src.isWireCut(AIRLOCK_WIRE_MAIN_POWER2)) if(src.isWireCut(AIRLOCK_WIRE_BACKUP_POWER1) || src.isWireCut(AIRLOCK_WIRE_BACKUP_POWER2)) - retval=1 - return retval + return 1 + return 0 /obj/machinery/door/airlock/proc/regainMainPower() if(src.secondsMainPowerLost > 0) @@ -645,9 +648,11 @@ About the new airlock wires panel: else flick("door_closing", src) if("spark") - flick("door_spark", src) + if(density) + flick("door_spark", src) if("deny") - flick("door_deny", src) + if(density) + flick("door_deny", src) return /obj/machinery/door/airlock/attack_ai(mob/user as mob) @@ -878,7 +883,7 @@ About the new airlock wires panel: t1 += "Attach signaler" t1 += "
" - t1 += text("
\n[]
\n[]
\n[]
\n[]
\n[]
\n[]", (src.locked ? "The door bolts have fallen!" : "The door bolts look up."), (src.lights ? "The door bolt lights are on." : "The door bolt lights are off!"), ((src.arePowerSystemsOn() && !(stat & NOPOWER)) ? "The test light is on." : "The test light is off!"), (src.aiControlDisabled==0 ? "The 'AI control allowed' light is on." : "The 'AI control allowed' light is off."), (src.safe==0 ? "The 'Check Wiring' light is on." : "The 'Check Wiring' light is off."), (src.normalspeed==0 ? "The 'Check Timing Mechanism' light is on." : "The 'Check Timing Mechanism' light is off.")) + t1 += text("
\n[]
\n[]
\n[]
\n[]
\n[]
\n[]", (src.locked ? "The door bolts have fallen!" : "The door bolts look up."), (src.lights ? "The door bolt lights are on." : "The door bolt lights are off!"), ((src.arePowerSystemsOn()) ? "The test light is on." : "The test light is off!"), (src.aiControlDisabled==0 ? "The 'AI control allowed' light is on." : "The 'AI control allowed' light is off."), (src.safe==0 ? "The 'Check Wiring' light is on." : "The 'Check Wiring' light is off."), (src.normalspeed==0 ? "The 'Check Timing Mechanism' light is on." : "The 'Check Timing Mechanism' light is off.")) t1 += text("

Close

\n", src) @@ -1173,7 +1178,7 @@ About the new airlock wires panel: beingcrowbarred = 1 //derp, Agouri else beingcrowbarred = 0 - if( beingcrowbarred && (operating == -1 || density && welded && operating != 1 && src.p_open && (!src.arePowerSystemsOn() || stat & NOPOWER) && !src.locked) ) + if( beingcrowbarred && src.p_open && (operating == -1 || (density && welded && operating != 1 && !src.arePowerSystemsOn() && !src.locked)) ) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.") if(do_after(user,40)) @@ -1213,7 +1218,7 @@ About the new airlock wires panel: del(src) return - else if(arePowerSystemsOn() && !(stat & NOPOWER)) + else if(arePowerSystemsOn()) user << "\blue The airlock's motors resist your efforts to force it." else if(locked) user << "\blue The airlock's bolts prevent it from being forced." @@ -1250,7 +1255,7 @@ About the new airlock wires panel: if( operating || welded || locked ) return 0 if(!forced) - if( !arePowerSystemsOn() || (stat & NOPOWER) || isWireCut(AIRLOCK_WIRE_OPEN_DOOR) ) + if( !arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_OPEN_DOOR) ) return 0 use_power(50) if(istype(src, /obj/machinery/door/airlock/glass)) @@ -1265,7 +1270,7 @@ About the new airlock wires panel: if(operating || welded || locked) return if(!forced) - if( !arePowerSystemsOn() || (stat & NOPOWER) || isWireCut(AIRLOCK_WIRE_DOOR_BOLTS) ) + if( !arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_DOOR_BOLTS) ) return if(safe) for(var/turf/turf in locs) @@ -1307,7 +1312,7 @@ About the new airlock wires panel: return /obj/machinery/door/airlock/proc/lock(var/forced=0) - if (src.locked) return + if (operating || src.locked) return src.locked = 1 for(var/mob/M in range(1,src)) @@ -1315,9 +1320,9 @@ About the new airlock wires panel: update_icon() /obj/machinery/door/airlock/proc/unlock(var/forced=0) - if (!src.locked) return + if (operating || !src.locked) return - if(forced || src.arePowerSystemsOn()) //only can raise bolts if power's on + if (forced || (src.arePowerSystemsOn())) //only can raise bolts if power's on src.locked = 0 for(var/mob/M in range(1,src)) M.show_message("You hear a click from the bottom of the door.", 2) diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index afd2f72529..d27261fb6f 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -9,16 +9,19 @@ obj/machinery/door/airlock var/cur_command = null //the command the door is currently attempting to complete obj/machinery/door/airlock/proc/can_radio() - if( !arePowerSystemsOn() || (stat & NOPOWER) || isWireCut(AIRLOCK_WIRE_AI_CONTROL) ) + if(!arePowerSystemsOn()) return 0 return 1 obj/machinery/door/airlock/process() ..() - execute_current_command() + if (arePowerSystemsOn()) + execute_current_command() obj/machinery/door/airlock/receive_signal(datum/signal/signal) - if (!can_radio()) return + if (!arePowerSystemsOn()) return //no power + + if (!can_radio()) return //no radio if(!signal || signal.encryption) return @@ -28,6 +31,9 @@ obj/machinery/door/airlock/receive_signal(datum/signal/signal) execute_current_command() obj/machinery/door/airlock/proc/execute_current_command() + if(operating) + return //emagged or busy doing something else + if (!cur_command) return diff --git a/code/game/machinery/embedded_controller/docking_program_multi.dm b/code/game/machinery/embedded_controller/docking_program_multi.dm index 43906f9d5f..13b542ff05 100644 --- a/code/game/machinery/embedded_controller/docking_program_multi.dm +++ b/code/game/machinery/embedded_controller/docking_program_multi.dm @@ -197,7 +197,9 @@ //checks if we are ready for undocking /datum/computer/file/embedded_program/airlock/multi_docking/proc/ready_for_undocking() - return check_doors_secured() + var/ext_closed = check_exterior_door_secured() + var/int_closed = check_interior_door_secured() + return (ext_closed || int_closed) /datum/computer/file/embedded_program/airlock/multi_docking/proc/open_doors() toggleDoor(memory["interior_status"], tag_interior_door, memory["secure"], "open") diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index f9bc8d879b..b247f17919 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -17,6 +17,7 @@ return /obj/machinery/computer/teleporter/initialize() + ..() var/obj/machinery/teleport/station/station = locate(/obj/machinery/teleport/station, get_step(src, dir)) var/obj/machinery/teleport/hub/hub if(station) diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index a1de93987f..02d11f2251 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -14,7 +14,10 @@ /obj/item/clothing/suit/space/rig ) -/obj/item/device/modkit/afterattack(obj/O, mob/user as mob) +/obj/item/device/modkit/afterattack(obj/O, mob/user as mob, proximity) + if(!proximity) + return + if (!target_species) return //it shouldn't be null, okay? @@ -38,6 +41,7 @@ var/in_list = (target_species in I.species_restricted) if (excluding ^ in_list) user << "[I] is already modified." + return if(!isturf(O.loc)) user << "[O] must be safely placed on the ground for modification." diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index 3a062adca4..5d900fb3e7 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -6,7 +6,10 @@ var/list/modes = list("grey","red","blue","cyan","green","yellow","purple") var/mode = "grey" -/obj/item/device/pipe_painter/afterattack(atom/A, mob/user as mob) +/obj/item/device/pipe_painter/afterattack(atom/A, mob/user as mob, proximity) + if(!proximity) + return + if(!istype(A,/obj/machinery/atmospherics/pipe) || istype(A,/obj/machinery/atmospherics/pipe/tank) || istype(A,/obj/machinery/atmospherics/pipe/vent) || istype(A,/obj/machinery/atmospherics/pipe/simple/heat_exchanging) || istype(A,/obj/machinery/atmospherics/pipe/simple/insulated) || !in_range(user, A)) return var/obj/machinery/atmospherics/pipe/P = A diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 441dee233a..ffffe00490 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -386,7 +386,9 @@ REAGENT SCANNER var/details = 0 var/recent_fail = 0 -/obj/item/device/reagent_scanner/afterattack(obj/O, mob/user as mob) +/obj/item/device/reagent_scanner/afterattack(obj/O, mob/user as mob, proximity) + if(!proximity) + return if (user.stat) return if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index f2a5073536..ea2300f299 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -16,6 +16,7 @@ return 1 /obj/item/device/transfer_valve/attackby(obj/item/item, mob/user) + var/turf/location = get_turf(src) // For admin logs if(istype(item, /obj/item/weapon/tank)) if(tank_one && tank_two) user << "There are already two tanks attached, remove one first." @@ -31,6 +32,8 @@ user.drop_item() item.loc = src user << "You attach the tank to the transfer valve." + message_admins("[key_name_admin(user)] attached both tanks to a transfer valve. (JMP)") + log_game("[key_name_admin(user)] attached both tanks to a transfer valve.") update_icon() nanomanager.update_uis(src) // update all UIs attached to src @@ -51,7 +54,7 @@ A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb). bombers += "[key_name(user)] attached a [item] to a transfer valve." - message_admins("[key_name_admin(user)] attached a [item] to a transfer valve. (JMP)") + message_admins("[key_name_admin(user)] attached a [item] to a transfer valve. (JMP)") log_game("[key_name_admin(user)] attached a [item] to a transfer valve.") attacher = user nanomanager.update_uis(src) // update all UIs attached to src @@ -66,7 +69,7 @@ /obj/item/device/transfer_valve/attack_self(mob/user as mob) ui_interact(user) - + /obj/item/device/transfer_valve/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null) // this is the data which will be sent to the ui @@ -77,7 +80,7 @@ data["valveOpen"] = valve_open ? 1 : 0 // update the ui if it exists, returns null if no ui is passed/found - ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) + ui = nanomanager.try_update_ui(user, src, ui_key, ui, data) if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 9945c2a00a..d2825c82f7 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -52,15 +52,19 @@ use(1) else return 1 - else + + else if(!in_use) if(amount < 2) user << "\blue You need at least two rods to do this." return usr << "\blue Assembling grille..." + in_use = 1 if (!do_after(usr, 10)) + in_use = 0 return var/obj/structure/grille/F = new /obj/structure/grille/ ( usr.loc ) usr << "\blue You assemble a grille" + in_use = 0 F.add_fingerprint(usr) use(2) return diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 43ca384129..622390c363 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -236,77 +236,6 @@ return 0 -/* - * Glass shards - TODO: Move this into code/game/object/item/weapons - */ -/obj/item/weapon/shard/Bump() - - spawn( 0 ) - if (prob(20)) - src.force = 15 - else - src.force = 4 - ..() - return - return - -/obj/item/weapon/shard/New() - - src.icon_state = pick("large", "medium", "small") - switch(src.icon_state) - if("small") - src.pixel_x = rand(-12, 12) - src.pixel_y = rand(-12, 12) - if("medium") - src.pixel_x = rand(-8, 8) - src.pixel_y = rand(-8, 8) - if("large") - src.pixel_x = rand(-5, 5) - src.pixel_y = rand(-5, 5) - else - return - -/obj/item/weapon/shard/attackby(obj/item/weapon/W as obj, mob/user as mob) - ..() - if ( istype(W, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/WT = W - if(WT.remove_fuel(0, user)) - var/obj/item/stack/sheet/glass/NG = new (user.loc) - for (var/obj/item/stack/sheet/glass/G in user.loc) - if(G==NG) - continue - if(G.amount>=G.max_amount) - continue - G.attackby(NG, user) - usr << "You add the newly-formed glass to the stack. It now contains [NG.amount] sheets." - //SN src = null - del(src) - return - return ..() - -/obj/item/weapon/shard/HasEntered(AM as mob|obj) - if(ismob(AM)) - var/mob/M = AM - M << "\red You step in the broken glass!" - playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - - if(H.species.flags & IS_SYNTHETIC) - return - - if( !H.shoes && ( !H.wear_suit || !(H.wear_suit.body_parts_covered & FEET) ) ) - var/datum/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot")) - if(affecting.status & ORGAN_ROBOT) - return - H.Weaken(3) - if(affecting.take_damage(5, 0)) - H.UpdateDamageIcon() - H.updatehealth() - ..() - - - /* * Phoron Glass sheets diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index f1f5d8521e..b5c07a8f65 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -114,7 +114,9 @@ return ..() -/obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob) +/obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob, proximity) + if(!proximity) + return if(istype(A,/obj/item) && imp) var/obj/item/weapon/implant/compressed/c = imp if (c.scanned) diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm new file mode 100644 index 0000000000..089d731c58 --- /dev/null +++ b/code/game/objects/items/weapons/shards.dm @@ -0,0 +1,114 @@ +// Glass shards + +/obj/item/weapon/shard + name = "glass shard" + icon = 'icons/obj/shards.dmi' + icon_state = "large" + sharp = 1 + edge = 1 + desc = "Could probably be used as ... a throwing weapon?" + w_class = 2.0 + force = 5.0 + throwforce = 8.0 + item_state = "shard-glass" + matter = list("glass" = 3750) + attack_verb = list("stabbed", "slashed", "sliced", "cut") + +/obj/item/weapon/shard/suicide_act(mob/user) + viewers(user) << pick("\red [user] is slitting \his wrists with \the [src]! It looks like \he's trying to commit suicide.", \ + "\red [user] is slitting \his throat with \the [src]! It looks like \he's trying to commit suicide.") + return (BRUTELOSS) + +/obj/item/weapon/shard/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) + playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1) + return ..() + +/obj/item/weapon/shard/Bump() + + spawn( 0 ) + if (prob(20)) + src.force = 15 + else + src.force = 4 + ..() + return + return + +/obj/item/weapon/shard/New() + + src.icon_state = pick("large", "medium", "small") + switch(src.icon_state) + if("small") + src.pixel_x = rand(-12, 12) + src.pixel_y = rand(-12, 12) + if("medium") + src.pixel_x = rand(-8, 8) + src.pixel_y = rand(-8, 8) + if("large") + src.pixel_x = rand(-5, 5) + src.pixel_y = rand(-5, 5) + else + return + +/obj/item/weapon/shard/attackby(obj/item/weapon/W as obj, mob/user as mob) + ..() + if ( istype(W, /obj/item/weapon/weldingtool)) + var/obj/item/weapon/weldingtool/WT = W + if(WT.remove_fuel(0, user)) + var/obj/item/stack/sheet/glass/NG = new (user.loc) + for (var/obj/item/stack/sheet/glass/G in user.loc) + if(G==NG) + continue + if(G.amount>=G.max_amount) + continue + G.attackby(NG, user) + usr << "You add the newly-formed glass to the stack. It now contains [NG.amount] sheets." + //SN src = null + del(src) + return + return ..() + +/obj/item/weapon/shard/HasEntered(AM as mob|obj) + if(ismob(AM)) + var/mob/M = AM + M << "\red You step on \the [src]!" + playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds + if(ishuman(M)) + var/mob/living/carbon/human/H = M + + if(H.species.flags & IS_SYNTHETIC) + return + + if( !H.shoes && ( !H.wear_suit || !(H.wear_suit.body_parts_covered & FEET) ) ) + var/datum/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot")) + if(affecting.status & ORGAN_ROBOT) + return + H.Weaken(3) + if(affecting.take_damage(5, 0)) + H.UpdateDamageIcon() + H.updatehealth() + ..() + +// Shrapnel + +/obj/item/weapon/shard/shrapnel + name = "shrapnel" + icon = 'icons/obj/shards.dmi' + icon_state = "shrapnellarge" + desc = "A bunch of tiny bits of shattered metal." + +/obj/item/weapon/shard/shrapnel/New() + + src.icon_state = pick("shrapnellarge", "shrapnelmedium", "shrapnelsmall") + switch(src.icon_state) + if("shrapnelsmall") + src.pixel_x = rand(-12, 12) + src.pixel_y = rand(-12, 12) + if("shrapnelmedium") + src.pixel_x = rand(-8, 8) + src.pixel_y = rand(-8, 8) + if("shrapnellarge") + src.pixel_x = rand(-5, 5) + src.pixel_y = rand(-5, 5) + else + return \ No newline at end of file diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 64d72508d3..782a5a1745 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -65,7 +65,9 @@ O.show_message(text("\red [] waves [] over []'s head.", user, src, M), 1) return -/obj/item/weapon/nullrod/afterattack(atom/A, mob/user as mob) +/obj/item/weapon/nullrod/afterattack(atom/A, mob/user as mob, proximity) + if(!proximity) + return if (istype(A, /turf/simulated/floor)) user << "\blue You hit the floor with the [src]." call(/obj/effect/rune/proc/revealrunes)(src) @@ -231,7 +233,7 @@ update_icon(user) /obj/item/weapon/butterfly/switchblade - name = "/proper switchblade" + name = "switchblade" desc = "A classic switchblade with gold engraving. Just holding it makes you feel like a gangster." icon_state = "switchblade" diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 705351acfc..9c00ee3896 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -18,12 +18,17 @@ buckled_mob.dir = dir /obj/structure/stool/bed/chair/wheelchair/relaymove(mob/user, direction) + // Redundant check? if(user.stat || user.stunned || user.weakened || user.paralysis || user.lying || user.restrained()) if(user==pulling) pulling = null user.pulledby = null user << "\red You lost your grip!" return + if(buckled_mob && pulling && user == buckled_mob) + if(pulling.stat || pulling.stunned || pulling.weakened || pulling.paralysis || pulling.lying || pulling.restrained()) + pulling.pulledby = null + pulling = null if(user.pulling && (user == pulling)) pulling = null user.pulledby = null @@ -136,12 +141,12 @@ if(propelled || (pulling && (pulling.a_intent == "hurt"))) var/mob/living/occupant = buckled_mob unbuckle() - + if (pulling && (pulling.a_intent == "hurt")) occupant.throw_at(A, 3, 3, pulling) else if (propelled) occupant.throw_at(A, 3, propelled) - + occupant.apply_effect(6, STUN, 0) occupant.apply_effect(6, WEAKEN, 0) occupant.apply_effect(6, STUTTER, 0) diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index b3cdba6030..39c19c76fe 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -254,7 +254,6 @@ //send resources to the client. It's here in its own proc so we can move it around easiliy if need be /client/proc/send_resources() -// preload_vox() //Causes long delays with initial start window and subsequent windows when first logged in. getFiles( 'html/search.js', diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm old mode 100644 new mode 100755 index 173217bc0b..b25c6e1076 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -277,7 +277,7 @@ datum/preferences if(gear_datums[gear_name]) var/datum/gear/G = gear_datums[gear_name] total_cost += G.cost - dat += "[gear_name] \[remove\]
" + dat += "[G.display_name]
" dat += "Used: [total_cost] points." else @@ -285,6 +285,8 @@ datum/preferences if(total_cost < MAX_GEAR_COST) dat += " \[add\]" + if(gear && gear.len) + dat += " \[remove\]" dat += "

Occupation Choices
" dat += "\tSet Preferences
" @@ -892,10 +894,18 @@ datum/preferences user << "\red That item will exceed the maximum loadout cost of [MAX_GEAR_COST] points." else if(href_list["task"] == "remove") - var/to_remove = href_list["gear"] - if(!to_remove) return + + if(isnull(gear) || !islist(gear)) + gear = list() + if(!gear.len) + return + + var/choice = input(user, "Select gear to remove: ") as null|anything in gear + if(!choice) + return + for(var/gear_name in gear) - if(gear_name == to_remove) + if(gear_name == choice) gear -= gear_name break diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 12fea0ca24..111937764b 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -170,6 +170,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost, you won't be able to play this round for another 30 minutes! You can't change your mind so choose wisely!)","Are you sure you want to ghost?","Ghost","Stay in body") if(response != "Ghost") return //didn't want to ghost after-all resting = 1 + var/turf/location = get_turf(src) + message_admins("[key_name_admin(usr)] has ghosted. (JMP)") + log_game("[key_name_admin(usr)] has ghosted.") var/mob/dead/observer/ghost = ghostize(0) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3 ghost.timeofdeath = world.time // Because the living mob won't have a time of death and we want the respawn timer to work properly. return diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 968d9f853f..bd1cddb60f 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -1,6 +1,6 @@ /mob/living/carbon/Life() ..() - + // Increase germ_level regularly if(germ_level < GERM_LEVEL_AMBIENT && prob(30)) //if you're just standing there, you shouldn't get more germs beyond an ambient level germ_level++ @@ -14,7 +14,7 @@ src.nutrition -= HUNGER_FACTOR/10 if((FAT in src.mutations) && src.m_intent == "run" && src.bodytemperature <= 360) src.bodytemperature += 2 - + // Moving around increases germ_level faster if(germ_level < GERM_LEVEL_MOVE_CAP && prob(8)) germ_level++ @@ -104,9 +104,9 @@ shock_damage *= siemens_coeff if (shock_damage<1) return 0 - + src.apply_damage(shock_damage, BURN, def_zone, used_weapon="Electrocution") - + playsound(loc, "sparks", 50, 1, -1) if (shock_damage > 10) src.visible_message( @@ -211,8 +211,8 @@ if (istype(src,/mob/living/carbon/human) && src:w_uniform) var/mob/living/carbon/human/H = src H.w_uniform.add_fingerprint(M) - - if(lying) + + if(lying || src.sleeping) src.sleeping = max(0,src.sleeping-5) if(src.sleeping == 0) src.resting = 0 @@ -221,7 +221,7 @@ else M.visible_message("[M] hugs [src] to make [t_him] feel better!", \ "You hug [src] to make [t_him] feel better!") - + AdjustParalysis(-3) AdjustStunned(-3) AdjustWeakened(-3) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index e10c35efa7..2a9850171e 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -280,6 +280,7 @@ for(var/datum/wound/W in temp.wounds) if(W.internal && !temp.open) continue // can't see internal wounds var/this_wound_desc = W.desc + if(W.damage_type == BURN && W.salved) this_wound_desc = "salved [this_wound_desc]" if(W.bleeding()) this_wound_desc = "bleeding [this_wound_desc]" else if(W.bandaged) this_wound_desc = "bandaged [this_wound_desc]" if(W.germ_level > 600) this_wound_desc = "badly infected [this_wound_desc]" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 41a3125c18..2245411483 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -2,7 +2,7 @@ //NOTE: Breathing happens once per FOUR TICKS, unless the last breath fails. In which case it happens once per ONE TICK! So oxyloss healing is done once per 4 ticks while oxyloss damage is applied once per tick! #define HUMAN_MAX_OXYLOSS 1 //Defines how much oxyloss humans can get per tick. A tile with no air at all (such as space) applies this value, otherwise it's a percentage of it. -#define HUMAN_CRIT_MAX_OXYLOSS ( (last_tick_duration) /5) //The amount of damage you'll get when in critical condition. We want this to be a 5 minute deal = 300s. There are 100HP to get through, so (1/3)*last_tick_duration per second. Breaths however only happen every 4 ticks. +#define HUMAN_CRIT_MAX_OXYLOSS ( (last_tick_duration) /6) //The amount of damage you'll get when in critical condition. We want this to be a 5 minute deal = 300s. There are 50HP to get through, so (1/6)*last_tick_duration per second. Breaths however only happen every 4 ticks. #define HEAT_DAMAGE_LEVEL_1 2 //Amount of damage applied when your body temperature just passes the 360.15k safety point #define HEAT_DAMAGE_LEVEL_2 4 //Amount of damage applied when your body temperature passes the 400K point @@ -71,7 +71,7 @@ //No need to update all of these procs if the guy is dead. if(stat != DEAD && !in_stasis) - if(air_master.current_cycle%4==2 || failed_last_breath) //First, resolve location and get a breath + if(air_master.current_cycle%4==2 || failed_last_breath || (health < config.health_threshold_crit)) //First, resolve location and get a breath breathe() //Only try to take a breath every 4 ticks, unless suffocating else //Still give containing object the chance to interact @@ -550,7 +550,7 @@ breath.nitrogen += inhaled_gas_used if("phoron") breath.phoron += inhaled_gas_used - if("CO2") + if("carbon_dioxide") breath.carbon_dioxide += inhaled_gas_used // Too much exhaled gas in the air diff --git a/code/modules/mob/living/carbon/monkey/diona.dm b/code/modules/mob/living/carbon/monkey/diona.dm index 2469ded956..b0e885e6c9 100644 --- a/code/modules/mob/living/carbon/monkey/diona.dm +++ b/code/modules/mob/living/carbon/monkey/diona.dm @@ -108,7 +108,7 @@ var/list/trays = list() for(var/obj/machinery/hydroponics/tray in range(1)) - if(tray.nutrilevel < 10) + if(tray.nutrilevel < 10 && src.Adjacent(tray)) trays += tray var/obj/machinery/hydroponics/target = input("Select a tray:") as null|anything in trays @@ -127,7 +127,7 @@ var/list/trays = list() for(var/obj/machinery/hydroponics/tray in range(1)) - if(tray.weedlevel > 0) + if(tray.weedlevel > 0 && src.Adjacent(tray)) trays += tray var/obj/machinery/hydroponics/target = input("Select a tray:") as null|anything in trays @@ -186,7 +186,8 @@ var/list/choices = list() for(var/mob/living/carbon/human/H in oview(1,src)) - choices += H + if(src.Adjacent(H)) + choices += H var/mob/living/carbon/human/M = input(src,"Who do you wish to take a sample from?") in null|choices diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 4cfad2504a..e3de241980 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -309,6 +309,7 @@ dead_mob_list -= src living_mob_list += src tod = null + timeofdeath = 0 // restore us to conciousness stat = CONSCIOUS diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 71267a4d45..17dee12762 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -386,13 +386,6 @@ var/list/ai_list = list() // src << text ("Switching Law [L]'s report status to []", lawcheck[L+1]) checklaws() - //Uncomment this line of code if you are enabling the AI Vocal (VOX) announcements. -/* - if(href_list["say_word"]) - play_vox_word(href_list["say_word"], null, src) - return -*/ - if (href_list["lawi"]) // Toggling whether or not a law gets stated by the State Laws verb --NeoFite var/L = text2num(href_list["lawi"]) switch(ioncheck[L]) diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index 65118d811c..1e37639227 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -4,126 +4,3 @@ return //If there is a defined "parent" AI, it is actually an AI, and it is alive, anything the AI tries to say is said by the parent instead. ..(message) - -// These Verbs are commented out since we've disabled the AI vocal (VOX) announcements. -// If you re-enable them there is 3 lines in ai.dm Topic() that you need to uncomment as well. -// just search for VOX in there. - -/* -var/announcing_vox = 0 // Stores the time of the last announcement -var/const/VOX_CHANNEL = 200 -var/const/VOX_DELAY = 100 // 10 seconds -var/const/VOX_PATH = "sound/vox/" - -/mob/living/silicon/ai/verb/announcement_help() - - set name = "Announcement Help" - set desc = "Display a list of vocal words to announce to the crew." - set category = "AI Commands" - - - var/dat = "Here is a list of words you can type into the 'Announcement' button to create sentences to vocally announce to everyone on the same level at you.
\ - \ - WARNING:
Misuse of the announcement system will get you job banned.
" - - var/index = 0 - var/list/vox_words = flist(VOX_PATH) // flist will return a list of strings with all the files in the path - for(var/word in vox_words) - index++ - var/stripped_word = copytext(word, 1, length(word) - 3) // Remove the .wav - dat += "[capitalize(stripped_word)]" - if(index != vox_words.len) - dat += " / " - - src << browse(dat, "window=announce_help;size=500x400") - - -/mob/living/silicon/ai/verb/announcement() - - set name = "Announcement" - set desc = "Create a vocal announcement by typing in the available words to create a sentence." - set category = "AI Commands" - - if(announcing_vox > world.time) - src << "Please wait [round((announcing_vox - world.time) / 10)] seconds." - return - - var/message = input(src, "WARNING: Misuse of this verb can result in you being job banned. More help is available in 'Announcement Help'", "Announcement", src.last_announcement) as text - - last_announcement = message - - if(!message || announcing_vox > world.time) - return - - var/list/words = text2list(trim(message), " ") - var/list/incorrect_words = list() - - if(words.len > 30) - words.len = 30 - - // Detect incorrect words which aren't .wav files. - for(var/word in words) - word = trim(word) - if(!word) - words -= word - continue - if(!vox_word_exists(word)) - incorrect_words += word - - if(incorrect_words.len) - src << "These words are not available on the announcement system: [english_list(incorrect_words)]." - return - - announcing_vox = world.time + VOX_DELAY - - log_game("[key_name_admin(src)] made a vocal announcement with the following message: [message].") - - for(var/word in words) - play_vox_word(word, src.z, null) - - -/proc/play_vox_word(var/word, var/z_level, var/mob/only_listener) - - word = lowertext(word) - - if(vox_word_exists(word)) - - var/sound_file = get_vox_file(word) - var/sound/voice = sound(sound_file, wait = 1, channel = VOX_CHANNEL) - voice.status = SOUND_STREAM - - // If there is no single listener, broadcast to everyone in the same z level - if(!only_listener) - // Play voice for all mobs in the z level - for(var/mob/M in player_list) - if(M.client) - var/turf/T = get_turf(M) - if(T.z == z_level) - M << voice - else - only_listener << voice - return 1 - return 0 - - -/proc/vox_word_exists(var/word) - return fexists("[VOX_PATH][word].wav") - -/proc/get_vox_file(var/word) - if(vox_word_exists(word)) - return file("[VOX_PATH][word].wav") - -// Dynamically loading it has bad results with sounds overtaking each other, even with the wait variable. -// We send the file to the user when they login. - -/client/proc/preload_vox() - var/list/vox_files = flist(VOX_PATH) - for(var/file in vox_files) - // src << "Downloading [file]" - var/sound/S = sound("[VOX_PATH][file]") - src << browse_rsc(S) - - -*/ diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index 89812a15f4..618ac76d77 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -19,6 +19,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates /datum/paiController + var/inquirer = null var/list/pai_candidates = list() var/list/asked = list() @@ -224,6 +225,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates M << browse(dat, "window=paiRecruit;size=580x580;") proc/findPAI(var/obj/item/device/paicard/p, var/mob/user) + inquirer = user requestRecruits() var/list/available = list() for(var/datum/paiCandidate/c in paiController.pai_candidates) @@ -363,7 +365,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates if(!C) return asked.Add(C.key) asked[C.key] = world.time - var/response = alert(C, "Someone is requesting a pAI personality. Would you like to play as a personal AI?", "pAI Request", "Yes", "No", "Never for this round") + var/response = alert(C, "[inquirer] is requesting a pAI personality. Would you like to play as a personal AI?", "pAI Request", "Yes", "No", "Never for this round") if(!C) return //handle logouts that happen whilst the alert is waiting for a response. if(response == "Yes") recruitWindow(C.mob) @@ -372,4 +374,4 @@ var/datum/paiController/paiController // Global handler for pAI candidates if(warning == "Yes") asked[C.key] = INFINITY else - question(C) + question(C) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index dfe1a9db29..18adecccc3 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -69,9 +69,9 @@ /obj/item/weapon/gripper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) return -/obj/item/weapon/gripper/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag, params) +/obj/item/weapon/gripper/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, proximity, params) - if(!target || !flag) //Target is invalid or we are not adjacent. + if(!target || !proximity) //Target is invalid or we are not adjacent. return //There's some weirdness with items being lost inside the arm. Trying to fix all cases. ~Z @@ -80,25 +80,22 @@ wrapped = thing break - if(wrapped) //Already have an item. - + if(wrapped) //Already have an item. + + //Temporary put wrapped into user so target's attackby() checks pass. wrapped.loc = user - //Pass the attack on to the target. + + //Pass the attack on to the target. This might delete/relocate wrapped. target.attackby(wrapped,user) - - if(wrapped && src && wrapped.loc == user) + + //If wrapped did neither get deleted nor put into target, put it back into the gripper. + if(wrapped && user && (wrapped.loc == user)) wrapped.loc = src - - //Sanity/item use checks. - - if(!wrapped || !user) - return - - if(wrapped.loc != src.loc) + else wrapped = null return - if(istype(target,/obj/item)) //Check that we're not pocketing a mob. + else if(istype(target,/obj/item)) //Check that we're not pocketing a mob. //...and that the item is not in a container. if(!isturf(target.loc)) @@ -158,9 +155,9 @@ /obj/item/weapon/matter_decompiler/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) return -/obj/item/weapon/matter_decompiler/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag, params) +/obj/item/weapon/matter_decompiler/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, proximity, params) - if(!flag) return //Not adjacent. + if(!proximity) return //Not adjacent. //We only want to deal with using this on turfs. Specific items aren't important. var/turf/T = get_turf(target) @@ -357,4 +354,4 @@ stack = stack_plastic stack.amount++ - decompiler.stored_comms[type]--; \ No newline at end of file + decompiler.stored_comms[type]--; diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index ed66f1ae49..e0ebe671f1 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -1,9 +1,9 @@ /mob/living/silicon/robot/updatehealth() if(status_flags & GODMODE) - health = 200 + health = maxHealth stat = CONSCIOUS return - health = 200 - (getBruteLoss() + getFireLoss()) + health = maxHealth - (getBruteLoss() + getFireLoss()) return /mob/living/silicon/robot/getBruteLoss() @@ -145,4 +145,4 @@ brute -= (picked.brute_damage - brute_was) burn -= (picked.electronics_damage - burn_was) - parts -= picked \ No newline at end of file + parts -= picked diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index 931cb0556b..33748f056e 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -6,7 +6,9 @@ name = "RoboTray" desc = "An autoloading tray specialized for carrying refreshments." -/obj/item/weapon/tray/robotray/afterattack(atom/target, mob/user as mob) +/obj/item/weapon/tray/robotray/afterattack(atom/target, mob/user as mob, proximity) + if(!proximity) + return if ( !target ) return // pick up items, mostly copied from base tray pickup proc diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 0f18e02cf3..fd6e4bdc90 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -430,6 +430,9 @@ // And uncomment this, too. //new_character.dna.UpdateSE() + // Do the initial caching of the player's body icons. + new_character.regenerate_icons() + new_character.key = key //Manually transfer the key to log them in return new_character diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index d1bf4f170d..bf5307cc3c 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -155,14 +155,14 @@ // sync the organ's damage with its wounds src.update_damages() - + //If limb took enough damage, try to cut or tear it off if(body_part != UPPER_TORSO && body_part != LOWER_TORSO) //as hilarious as it is, getting hit on the chest too much shouldn't effectively gib you. if(config.limbs_can_break && brute_dam >= max_damage * config.organ_health_multiplier) if( (edge && prob(5 * brute)) || (brute > 20 && prob(2 * brute)) ) droplimb(1) return - + owner.updatehealth() var/result = update_icon() @@ -206,6 +206,9 @@ This function completely restores a damaged organ to perfect condition. perma_injury = 0 brute_dam = 0 burn_dam = 0 + germ_level = 0 + wounds.Cut() + number_wounds = 0 // handle internal organs for(var/datum/organ/internal/current_organ in internal_organs) @@ -265,25 +268,6 @@ This function completely restores a damaged organ to perfect condition. if(W) wounds += W -/datum/organ/external/proc/get_wound_type(var/type = CUT, var/damage) - //if you look a the names in the wound's stages list for each wound type you will see the logic behind these values - switch(type) - if(CUT) - if (damage <= 5) return /datum/wound/cut/small - if (damage <= 15) return /datum/wound/cut/deep - if (damage <= 25) return /datum/wound/cut/flesh - if (damage <= 50) return /datum/wound/cut/gaping - if (damage <= 60) return /datum/wound/cut/gaping_big - return /datum/wound/cut/massive - if(BRUISE) - return /datum/wound/bruise - if(BURN) - if (damage <= 5) return /datum/wound/burn/moderate - if (damage <= 15) return /datum/wound/burn/large - if (damage <= 30) return /datum/wound/burn/severe - if (damage <= 40) return /datum/wound/burn/deep - return /datum/wound/burn/carbonised - /**************************************************** PROCESSING & UPDATING ****************************************************/ @@ -394,10 +378,9 @@ Note that amputating the affected organ does in fact remove the infection from t if(germ_level >= INFECTION_LEVEL_ONE) //having an infection raises your body temperature - var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 1)* min(germ_level/INFECTION_LEVEL_TWO, 1) + owner.species.body_temperature - if (fever_temperature > owner.bodytemperature) - //need to make sure we raise temperature fast enough to get around environmental cooling preventing us from reaching fever_temperature - owner.bodytemperature += (fever_temperature - T20C)/BODYTEMP_COLD_DIVISOR + 1 + var/fever_temperature = (owner.species.heat_level_1 - owner.species.body_temperature - 5)* min(germ_level/INFECTION_LEVEL_TWO, 1) + owner.species.body_temperature + //need to make sure we raise temperature fast enough to get around environmental cooling preventing us from reaching fever_temperature + owner.bodytemperature += between(0, (fever_temperature - T20C)/BODYTEMP_COLD_DIVISOR + 1, fever_temperature - owner.bodytemperature) if(prob(round(germ_level/10))) if (antibiotics < 5) diff --git a/code/modules/organs/wound.dm b/code/modules/organs/wound.dm index d20fc0dbfb..4e66dbf8bb 100644 --- a/code/modules/organs/wound.dm +++ b/code/modules/organs/wound.dm @@ -7,7 +7,7 @@ var/current_stage = 0 // description of the wound - var/desc = "" + var/desc = "wound" //default in case something borks // amount of damage this wound causes var/damage = 0 @@ -207,6 +207,44 @@ return (damage_type == BRUISE && wound_damage() >= 20 || damage_type == CUT && wound_damage() >= 5) +/** WOUND DEFINITIONS **/ + +//Note that the MINIMUM damage before a wound can be applied should correspond to +//the damage amount for the stage with the same name as the wound. +//e.g. /datum/wound/cut/deep should only be applied for 15 damage and up, +//because in it's stages list, "deep cut" = 15. +/proc/get_wound_type(var/type = CUT, var/damage) + switch(type) + if(CUT) + switch(damage) + if(70 to INFINITY) + return /datum/wound/cut/massive + if(60 to 70) + return /datum/wound/cut/gaping_big + if(50 to 60) + return /datum/wound/cut/gaping + if(25 to 50) + return /datum/wound/cut/flesh + if(15 to 25) + return /datum/wound/cut/deep + if(0 to 15) + return /datum/wound/cut/small + if(BRUISE) + return /datum/wound/bruise + if(BURN) + switch(damage) + if(50 to INFINITY) + return /datum/wound/burn/carbonised + if(40 to 50) + return /datum/wound/burn/deep + if(30 to 40) + return /datum/wound/burn/severe + if(15 to 30) + return /datum/wound/burn/large + if(0 to 15) + return /datum/wound/burn/moderate + return null //no wound + /** CUTS **/ /datum/wound/cut/small // link wound descriptions to amounts of damage @@ -220,7 +258,7 @@ damage_type = CUT /datum/wound/cut/flesh - max_bleeding_stage = 3 + max_bleeding_stage = 4 stages = list("ugly ripped flesh wound" = 35, "ugly flesh wound" = 30, "flesh wound" = 25, "blood soaked clot" = 15, "large scab" = 5, "fresh skin" = 0) damage_type = CUT @@ -249,25 +287,26 @@ datum/wound/cut/massive /** BURNS **/ /datum/wound/burn/moderate - stages = list("ripped burn" = 10, "moderate burn" = 5, "moderate salved burn" = 2, "fresh skin" = 0) + stages = list("ripped burn" = 10, "moderate burn" = 5, "healing moderate burn" = 2, "fresh skin" = 0) damage_type = BURN /datum/wound/burn/large - stages = list("ripped large burn" = 20, "large burn" = 15, "large salved burn" = 5, "fresh skin" = 0) + stages = list("ripped large burn" = 20, "large burn" = 15, "healing large burn" = 5, "fresh skin" = 0) damage_type = BURN /datum/wound/burn/severe - stages = list("ripped severe burn" = 35, "severe burn" = 30, "severe salved burn" = 10, "burn scar" = 0) + stages = list("ripped severe burn" = 35, "severe burn" = 30, "healing severe burn" = 10, "burn scar" = 0) damage_type = BURN /datum/wound/burn/deep - stages = list("ripped deep burn" = 45, "deep burn" = 40, "deep salved burn" = 15, "large burn scar" = 0) + stages = list("ripped deep burn" = 45, "deep burn" = 40, "healing deep burn" = 15, "large burn scar" = 0) damage_type = BURN /datum/wound/burn/carbonised - stages = list("carbonised area" = 50, "treated carbonised area" = 20, "massive burn scar" = 0) + stages = list("carbonised area" = 50, "healing carbonised area" = 20, "massive burn scar" = 0) damage_type = BURN +/** INTERNAL BLEEDING **/ /datum/wound/internal_bleeding internal = 1 stages = list("severed vein" = 30, "cut vein" = 20, "damaged vein" = 10, "bruised vein" = 5) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 9baafac676..82c637cb68 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -35,6 +35,9 @@ /obj/machinery/power/smes/New() ..() spawn(5) + if(!powernet) + connect_to_network() + dir_loop: for(var/d in cardinal) var/turf/T = get_step(src, d) @@ -46,6 +49,8 @@ stat |= BROKEN return terminal.master = src + if(!terminal.powernet) + terminal.connect_to_network() updateicon() return diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 5a6e7d1d0f..d115faaf97 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1099,8 +1099,7 @@ datum else if(!alien || alien != IS_DIONA) M.adjustOxyLoss(-2*REM) - if(holder.has_reagent("lexorin")) - holder.remove_reagent("lexorin", 2*REM) + holder.remove_reagent("lexorin", 2*REM) ..() return @@ -1123,8 +1122,7 @@ datum else if(!alien || alien != IS_DIONA) M.adjustOxyLoss(-M.getOxyLoss()) - if(holder.has_reagent("lexorin")) - holder.remove_reagent("lexorin", 2*REM) + holder.remove_reagent("lexorin", 2*REM) ..() return @@ -1221,8 +1219,7 @@ datum M.AdjustParalysis(-1) M.AdjustStunned(-1) M.AdjustWeakened(-1) - if(holder.has_reagent("mindbreaker")) - holder.remove_reagent("mindbreaker", 5) + holder.remove_reagent("mindbreaker", 5) M.hallucination = max(0, M.hallucination - 10) if(prob(60)) M.adjustToxLoss(1) ..() @@ -1315,7 +1312,7 @@ datum var/datum/organ/internal/eyes/E = H.internal_organs_by_name["eyes"] if(istype(E)) if(E.damage > 0) - E.damage -= 1 + E.damage = max(E.damage - 1, 0) ..() return @@ -1336,7 +1333,7 @@ datum //Peridaxon is hard enough to get, it's probably fair to make this all internal organs for(var/datum/organ/internal/I in H.internal_organs) if(I.damage > 0) - I.damage -= 0.20 + I.damage = max(I.damage - 0.20, 0) ..() return @@ -1600,8 +1597,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - if(holder.has_reagent("inaprovaline")) - holder.remove_reagent("inaprovaline", 2*REM) + holder.remove_reagent("inaprovaline", 2*REM) ..() return reaction_obj(var/obj/O, var/volume) @@ -2039,7 +2035,7 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.nutrition -= nutriment_factor + M.nutrition = max(M.nutrition - nutriment_factor, 0) M.overeatduration = 0 if(M.nutrition < 0)//Prevent from going into negatives. M.nutrition = 0 @@ -2068,25 +2064,29 @@ datum description = "This is what makes chilis hot." reagent_state = LIQUID color = "#B31008" // rgb: 179, 16, 8 - + on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(!data) data = 1 - switch(data) - if(1 to 15) - M.bodytemperature += 5 * TEMPERATURE_DAMAGE_COEFFICIENT - if(holder.has_reagent("frostoil")) - holder.remove_reagent("frostoil", 5) - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature += rand(5,20) - if(15 to 25) - M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature += rand(10,20) - if(25 to INFINITY) - M.bodytemperature += 15 * TEMPERATURE_DAMAGE_COEFFICIENT - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature += rand(15,20) + if(!M) + M = holder.my_atom + if(!data) + data = 1 + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.species && !(H.species.flags & (NO_PAIN | IS_SYNTHETIC)) ) + switch(data) + if(1 to 2) + H << "\red Your insides feel uncomfortably hot !" + if(2 to 20) + if(prob(5)) + H << "\red Your insides feel uncomfortably hot !" + if(20 to INFINITY) + H.apply_effect(2,AGONY,0) + if(prob(5)) + H.visible_message("[H] [pick("dry heaves!","coughs!","splutters!")]") + H << "\red You feel like your insides are burning !" + else if(istype(M, /mob/living/carbon/slime)) + M.bodytemperature += rand(10,25) + holder.remove_reagent("frostoil", 5) holder.remove_reagent(src.id, FOOD_METABOLISM) data++ ..() @@ -2152,10 +2152,29 @@ datum victim.Weaken(5) //victim.Paralyse(10) //victim.drop_item() + on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(prob(5)) - M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]") + if(!M) + M = holder.my_atom + if(!data) + data = 1 + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.species && !(H.species.flags & (NO_PAIN | IS_SYNTHETIC)) ) + switch(data) + if(1) + H << "\red You feel like your insides are burning !" + if(2 to INFINITY) + H.apply_effect(4,AGONY,0) + if(prob(5)) + H.visible_message("[H] [pick("dry heaves!","coughs!","splutters!")]") + H << "\red You feel like your insides are burning !" + else if(istype(M, /mob/living/carbon/slime)) + M.bodytemperature += rand(15,30) + holder.remove_reagent("frostoil", 5) + holder.remove_reagent(src.id, FOOD_METABOLISM) + data++ + ..() return frostoil @@ -2166,25 +2185,14 @@ datum color = "#B31008" // rgb: 139, 166, 233 on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(!data) data = 1 - switch(data) - if(1 to 15) - M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT - if(holder.has_reagent("capsaicin")) - holder.remove_reagent("capsaicin", 5) - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature -= rand(5,20) - if(15 to 25) - M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature -= rand(10,20) - if(25 to INFINITY) - M.bodytemperature -= 15 * TEMPERATURE_DAMAGE_COEFFICIENT - if(prob(1)) M.emote("shiver") - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature -= rand(15,20) - data++ + if(!M) + M = holder.my_atom + M.bodytemperature = max(M.bodytemperature - 10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0) + if(prob(1)) + M.emote("shiver") + if(istype(M, /mob/living/carbon/slime)) + M.bodytemperature = max(M.bodytemperature - rand(10,20), 0) + holder.remove_reagent("capsaicin", 5) holder.remove_reagent(src.id, FOOD_METABOLISM) ..() return @@ -2593,8 +2601,7 @@ datum on_mob_life(var/mob/living/M as mob) if(M.getBruteLoss() && prob(20)) M.heal_organ_damage(1,0) - if(holder.has_reagent("capsaicin")) - holder.remove_reagent("capsaicin", 10*REAGENTS_METABOLISM) + holder.remove_reagent("capsaicin", 10*REAGENTS_METABOLISM) ..() return @@ -2637,7 +2644,7 @@ datum on_mob_life(var/mob/living/M as mob) ..() M.make_jittery(5) - if(adj_temp > 0 && holder.has_reagent("frostoil")) + if(adj_temp > 0) holder.remove_reagent("frostoil", 10*REAGENTS_METABOLISM) holder.remove_reagent(src.id, 0.1) @@ -2807,25 +2814,14 @@ datum adj_temp = -9 on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(!data) data = 1 - switch(data) - if(1 to 15) - M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT - if(holder.has_reagent("capsaicin")) - holder.remove_reagent("capsaicin", 5) - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature -= rand(5,20) - if(15 to 25) - M.bodytemperature -= 10 * TEMPERATURE_DAMAGE_COEFFICIENT - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature -= rand(10,20) - if(25 to INFINITY) - M.bodytemperature -= 15 * TEMPERATURE_DAMAGE_COEFFICIENT - if(prob(1)) M.emote("shiver") - if(istype(M, /mob/living/carbon/slime)) - M.bodytemperature -= rand(15,20) - data++ + if(!M) + M = holder.my_atom + if(prob(1)) + M.emote("shiver") + M.bodytemperature = max(M.bodytemperature - 10 * TEMPERATURE_DAMAGE_COEFFICIENT, 0) + if(istype(M, /mob/living/carbon/slime)) + M.bodytemperature = max(M.bodytemperature - rand(10,20), 0) + holder.remove_reagent("capsaicin", 5) holder.remove_reagent(src.id, FOOD_METABOLISM) ..() return diff --git a/code/modules/shuttles/escape_pods.dm b/code/modules/shuttles/escape_pods.dm index 7fe1d1c36c..dd7aafc67d 100644 --- a/code/modules/shuttles/escape_pods.dm +++ b/code/modules/shuttles/escape_pods.dm @@ -137,10 +137,3 @@ /datum/computer/file/embedded_program/docking/simple/escape_pod/prepare_for_undocking() eject_time = world.time + eject_delay*10 - -/* -/datum/computer/file/embedded_program/docking/simple/escape_pod/ready_for_undocking() - if (world.time < eject_time) - return 0 - return ..() -*/ \ No newline at end of file diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index 34a5d1e138..c931e9fc29 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -34,15 +34,14 @@ if (moving_status == SHUTTLE_IDLE) return //someone cancelled the launch - move(departing, interim, direction) - moving_status = SHUTTLE_INTRANSIT + move(departing, interim, direction) + arrive_time = world.time + travel_time*10 while (world.time < arrive_time) sleep(5) move(interim, destination, direction) - moving_status = SHUTTLE_IDLE /datum/shuttle/proc/dock() @@ -69,6 +68,8 @@ return 0 //just moves the shuttle from A to B, if it can be moved +//A note to anyone overriding move in a subtype. move() must absolutely not, under any circumstances, fail to move the shuttle. +//If you want to conditionally cancel shuttle launches, that logic must go in short_jump() or long_jump() /datum/shuttle/proc/move(var/area/origin, var/area/destination, var/direction=null) //world << "move_shuttle() called for [shuttle_tag] leaving [origin] en route to [destination]." diff --git a/code/modules/surgery/ribcage.dm b/code/modules/surgery/ribcage.dm index ab16f56915..c14d065cd9 100644 --- a/code/modules/surgery/ribcage.dm +++ b/code/modules/surgery/ribcage.dm @@ -202,7 +202,7 @@ var/is_chest_organ_damaged = 0 var/datum/organ/external/chest/chest = target.get_organ("chest") - for(var/datum/organ/internal/I in chest.internal_organs) + for(var/datum/organ/internal/I in chest.internal_organs) if(I.damage > 0) is_chest_organ_damaged = 1 break @@ -244,7 +244,7 @@ if(I && I.damage > 0) if(I.robotic < 2) user.visible_message("\blue [user] treats damage to [target]'s [I.name] with [tool_name].", \ - "You treat damage to [target]'s [I.name] with [tool_name]." ) + "\blue You treat damage to [target]'s [I.name] with [tool_name]." ) else user.visible_message("\blue [user] pokes [target]'s mechanical [I.name] with [tool_name]...", \ "\blue You poke [target]'s mechanical [I.name] with [tool_name]... \red For no effect, since it's robotic.") diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 5b0bccbaaa..b0116585ab 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -89,7 +89,7 @@ proc/do_surgery(mob/living/M, mob/living/user, obj/item/tool) //We had proper tools! (or RNG smiled.) and User did not move or change hands. if( prob(S.tool_quality(tool)) && do_mob(user, M, rand(S.min_duration, S.max_duration))) S.end_step(user, M, user.zone_sel.selecting, tool) //finish successfully - else //or + else if (tool in user.contents && user.Adjacent(M)) //or S.fail_step(user, M, user.zone_sel.selecting, tool) //malpractice~ return 1 //don't want to do weapony things after surgery return 0 diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm index 806a42a3f6..ea3f7b72e6 100644 --- a/code/modules/vehicles/cargo_train.dm +++ b/code/modules/vehicles/cargo_train.dm @@ -48,7 +48,7 @@ turn_off() //so engine verbs are correctly set /obj/vehicle/train/cargo/engine/Move() - if(on && cell.charge < power_use) + if(on && cell.charge < charge_use) turn_off() update_stats() if(load && is_train_head()) @@ -183,20 +183,7 @@ if(get_dist(usr,src) <= 1) usr << "The power light is [on ? "on" : "off"].\nThere are[key ? "" : " no"] keys in the ignition." - -/obj/vehicle/train/cargo/engine/verb/check_power() - set name = "Check power level" - set category = "Object" - set src in view(1) - - if(!istype(usr, /mob/living/carbon/human)) - return - - if(!cell) - usr << "There is no power cell installed in [src]." - return - - usr << "The power meter reads [round(cell.percent(), 0.01)]%" + usr << "The charge meter reads [cell? round(cell.percent(), 0.01) : 0]%" /obj/vehicle/train/cargo/engine/verb/start_engine() set name = "Start engine" @@ -214,7 +201,7 @@ if (on) usr << "You start [src]'s engine." else - if(cell.charge < power_use) + if(cell.charge < charge_use) usr << "[src] is out of power." else usr << "[src]'s engine won't start." @@ -288,13 +275,22 @@ // more engines increases this limit by car_limit per // engine. //------------------------------------------------------- -/obj/vehicle/train/cargo/engine/update_train_stats() - ..() +/obj/vehicle/train/cargo/engine/update_car(var/train_length, var/active_engines) + src.train_length = train_length + src.active_engines = active_engines - update_move_delay() + //Update move delay + if(!is_train_head() || !on) + move_delay = initial(move_delay) //so that engines that have been turned off don't lag behind + else + move_delay = max(0, (-car_limit * active_engines) + train_length - active_engines) //limits base overweight so you cant overspeed trains + move_delay *= (1 / max(1, active_engines)) * 2 //overweight penalty (scaled by the number of engines) + move_delay += config.run_speed //base reference speed + move_delay *= 1.1 //makes cargo trains 10% slower than running when not overweight -/obj/vehicle/train/cargo/trolley/update_train_stats() - ..() +/obj/vehicle/train/cargo/trolley/update_car(var/train_length, var/active_engines) + src.train_length = train_length + src.active_engines = active_engines if(!lead && !tow) anchored = 0 @@ -305,12 +301,3 @@ else anchored = 1 verbs -= /atom/movable/verb/pull - -/obj/vehicle/train/cargo/engine/proc/update_move_delay() - if(!is_train_head() || !on) - move_delay = initial(move_delay) //so that engines that have been turned off don't lag behind - else - move_delay = max(0, (-car_limit * active_engines) + train_length - active_engines) //limits base overweight so you cant overspeed trains - move_delay *= (1 / max(1, active_engines)) * 2 //overweight penalty (scaled by the number of engines) - move_delay += config.run_speed //base reference speed - move_delay *= 1.1 //makes cargo trains 10% slower than running when not overweight \ No newline at end of file diff --git a/code/modules/vehicles/train.dm b/code/modules/vehicles/train.dm index 9b0ae6653b..d8e372d818 100644 --- a/code/modules/vehicles/train.dm +++ b/code/modules/vehicles/train.dm @@ -62,7 +62,8 @@ // Vehicle procs //------------------------------------------- /obj/vehicle/train/explode() - tow.unattach() + if (tow) + tow.unattach() unattach() ..() @@ -142,6 +143,15 @@ if (T.tow) user << "\red [T] is already towing something." return + + //check for cycles. + var/obj/vehicle/train/next_car = T + while (next_car) + if (next_car == src) + user << "\red That seems very silly." + return + next_car = next_car.lead + //latch with src as the follower lead = T T.tow = src @@ -192,23 +202,28 @@ // size of the train, to limit super long trains. //------------------------------------------------------- /obj/vehicle/train/update_stats() - if(tow) - return tow.update_stats() //take us to the very end - else - update_train_stats() //we're at the end + //first, seek to the end of the train + var/obj/vehicle/train/T = src + while(T.tow) + //check for cyclic train. + if (T.tow == src) + lead.tow = null + lead.update_stats() + + lead = null + update_stats() + return + T = T.tow -/obj/vehicle/train/proc/update_train_stats() - if(powered && on) - active_engines = 1 //increment active engine count if this is a running engine - else - active_engines = 0 + //now walk back to the front. + var/active_engines = 0 + var/train_length = 0 + while(T) + train_length++ + if (powered && on) + active_engines++ + T.update_car(train_length, active_engines) + T = T.lead - train_length = 1 - - if(istype(tow)) - active_engines += tow.active_engines - train_length += tow.train_length - - //update the next section of train ahead of us - if(istype(lead)) - lead.update_train_stats() \ No newline at end of file +/obj/vehicle/train/proc/update_car(var/train_length, var/active_engines) + return diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm index 55ecdb2780..c018064349 100644 --- a/code/modules/vehicles/vehicle.dm +++ b/code/modules/vehicles/vehicle.dm @@ -22,7 +22,7 @@ var/movable = 1 var/obj/item/weapon/cell/cell - var/power_use = 5 //set this to adjust the amount of power the vehicle uses per move + var/charge_use = 5 //set this to adjust the amount of power the vehicle uses per move var/atom/movable/load //all vehicles can take a load, since they should all be a least drivable var/load_item_visible = 1 //set if the loaded item should be overlayed on the vehicle sprite @@ -39,7 +39,7 @@ /obj/vehicle/Move() if(world.time > l_move_time + move_delay) - if(on && powered && cell.charge < power_use) + if(on && powered && cell.charge < charge_use) turn_off() var/init_anc = anchored @@ -51,7 +51,7 @@ anchored = init_anc if(on && powered) - cell.use(power_use) + cell.use(charge_use) if(load) load.forceMove(loc)// = loc @@ -172,7 +172,7 @@ /obj/vehicle/proc/turn_on() if(stat) return 0 - if(powered && cell.charge < power_use) + if(powered && cell.charge < charge_use) return 0 on = 1 luminosity = initial(luminosity) @@ -228,7 +228,7 @@ turn_off() return - if(cell.charge < power_use) + if(cell.charge < charge_use) turn_off() return diff --git a/sound/music/halloween/ghosts.ogg b/sound/music/halloween/ghosts.ogg deleted file mode 100644 index 26c40917a5..0000000000 Binary files a/sound/music/halloween/ghosts.ogg and /dev/null differ diff --git a/sound/music/halloween/halloween.ogg b/sound/music/halloween/halloween.ogg deleted file mode 100644 index c739941be3..0000000000 Binary files a/sound/music/halloween/halloween.ogg and /dev/null differ diff --git a/sound/music/halloween/skeletons.ogg b/sound/music/halloween/skeletons.ogg deleted file mode 100644 index 2b0b6878bf..0000000000 Binary files a/sound/music/halloween/skeletons.ogg and /dev/null differ diff --git a/sound/vox/,.wav b/sound/vox/,.wav deleted file mode 100644 index 31a47dca60..0000000000 Binary files a/sound/vox/,.wav and /dev/null differ diff --git a/sound/vox/..wav b/sound/vox/..wav deleted file mode 100644 index 7eeb1eb9bc..0000000000 Binary files a/sound/vox/..wav and /dev/null differ diff --git a/sound/vox/a.wav b/sound/vox/a.wav deleted file mode 100644 index c6981d2902..0000000000 Binary files a/sound/vox/a.wav and /dev/null differ diff --git a/sound/vox/accelerating.wav b/sound/vox/accelerating.wav deleted file mode 100644 index e86b18a04b..0000000000 Binary files a/sound/vox/accelerating.wav and /dev/null differ diff --git a/sound/vox/accelerator.wav b/sound/vox/accelerator.wav deleted file mode 100644 index be097b6caa..0000000000 Binary files a/sound/vox/accelerator.wav and /dev/null differ diff --git a/sound/vox/accepted.wav b/sound/vox/accepted.wav deleted file mode 100644 index 59160849e2..0000000000 Binary files a/sound/vox/accepted.wav and /dev/null differ diff --git a/sound/vox/access.wav b/sound/vox/access.wav deleted file mode 100644 index 25fd098883..0000000000 Binary files a/sound/vox/access.wav and /dev/null differ diff --git a/sound/vox/acknowledge.wav b/sound/vox/acknowledge.wav deleted file mode 100644 index 14946cccf8..0000000000 Binary files a/sound/vox/acknowledge.wav and /dev/null differ diff --git a/sound/vox/acknowledged.wav b/sound/vox/acknowledged.wav deleted file mode 100644 index 232d9c3bf7..0000000000 Binary files a/sound/vox/acknowledged.wav and /dev/null differ diff --git a/sound/vox/acquired.wav b/sound/vox/acquired.wav deleted file mode 100644 index 7eecdf9140..0000000000 Binary files a/sound/vox/acquired.wav and /dev/null differ diff --git a/sound/vox/acquisition.wav b/sound/vox/acquisition.wav deleted file mode 100644 index 11be7dc475..0000000000 Binary files a/sound/vox/acquisition.wav and /dev/null differ diff --git a/sound/vox/across.wav b/sound/vox/across.wav deleted file mode 100644 index 1591e89700..0000000000 Binary files a/sound/vox/across.wav and /dev/null differ diff --git a/sound/vox/activate.wav b/sound/vox/activate.wav deleted file mode 100644 index 32a45cbf22..0000000000 Binary files a/sound/vox/activate.wav and /dev/null differ diff --git a/sound/vox/activated.wav b/sound/vox/activated.wav deleted file mode 100644 index 154e0389e8..0000000000 Binary files a/sound/vox/activated.wav and /dev/null differ diff --git a/sound/vox/activity.wav b/sound/vox/activity.wav deleted file mode 100644 index 5920e6dd38..0000000000 Binary files a/sound/vox/activity.wav and /dev/null differ diff --git a/sound/vox/adios.wav b/sound/vox/adios.wav deleted file mode 100644 index 86e268ca1f..0000000000 Binary files a/sound/vox/adios.wav and /dev/null differ diff --git a/sound/vox/administration.wav b/sound/vox/administration.wav deleted file mode 100644 index d85d67eabf..0000000000 Binary files a/sound/vox/administration.wav and /dev/null differ diff --git a/sound/vox/advanced.wav b/sound/vox/advanced.wav deleted file mode 100644 index 987cd05b2a..0000000000 Binary files a/sound/vox/advanced.wav and /dev/null differ diff --git a/sound/vox/after.wav b/sound/vox/after.wav deleted file mode 100644 index f63abdff55..0000000000 Binary files a/sound/vox/after.wav and /dev/null differ diff --git a/sound/vox/agent.wav b/sound/vox/agent.wav deleted file mode 100644 index 594932971e..0000000000 Binary files a/sound/vox/agent.wav and /dev/null differ diff --git a/sound/vox/alarm.wav b/sound/vox/alarm.wav deleted file mode 100644 index 296ca773d6..0000000000 Binary files a/sound/vox/alarm.wav and /dev/null differ diff --git a/sound/vox/alert.wav b/sound/vox/alert.wav deleted file mode 100644 index 1a749b7c74..0000000000 Binary files a/sound/vox/alert.wav and /dev/null differ diff --git a/sound/vox/alien.wav b/sound/vox/alien.wav deleted file mode 100644 index 5890955995..0000000000 Binary files a/sound/vox/alien.wav and /dev/null differ diff --git a/sound/vox/aligned.wav b/sound/vox/aligned.wav deleted file mode 100644 index 20bbe5bfa7..0000000000 Binary files a/sound/vox/aligned.wav and /dev/null differ diff --git a/sound/vox/all.wav b/sound/vox/all.wav deleted file mode 100644 index 5bfc4dee60..0000000000 Binary files a/sound/vox/all.wav and /dev/null differ diff --git a/sound/vox/alpha.wav b/sound/vox/alpha.wav deleted file mode 100644 index d64239ec88..0000000000 Binary files a/sound/vox/alpha.wav and /dev/null differ diff --git a/sound/vox/am.wav b/sound/vox/am.wav deleted file mode 100644 index c273e5231d..0000000000 Binary files a/sound/vox/am.wav and /dev/null differ diff --git a/sound/vox/amigo.wav b/sound/vox/amigo.wav deleted file mode 100644 index 03ec617c29..0000000000 Binary files a/sound/vox/amigo.wav and /dev/null differ diff --git a/sound/vox/ammunition.wav b/sound/vox/ammunition.wav deleted file mode 100644 index 148605c2ca..0000000000 Binary files a/sound/vox/ammunition.wav and /dev/null differ diff --git a/sound/vox/an.wav b/sound/vox/an.wav deleted file mode 100644 index 5755607e36..0000000000 Binary files a/sound/vox/an.wav and /dev/null differ diff --git a/sound/vox/and.wav b/sound/vox/and.wav deleted file mode 100644 index 6e155c09d9..0000000000 Binary files a/sound/vox/and.wav and /dev/null differ diff --git a/sound/vox/announcement.wav b/sound/vox/announcement.wav deleted file mode 100644 index 9d185ead91..0000000000 Binary files a/sound/vox/announcement.wav and /dev/null differ diff --git a/sound/vox/anomalous.wav b/sound/vox/anomalous.wav deleted file mode 100644 index 1db9a4fa09..0000000000 Binary files a/sound/vox/anomalous.wav and /dev/null differ diff --git a/sound/vox/antenna.wav b/sound/vox/antenna.wav deleted file mode 100644 index fa82d58cb9..0000000000 Binary files a/sound/vox/antenna.wav and /dev/null differ diff --git a/sound/vox/any.wav b/sound/vox/any.wav deleted file mode 100644 index 73bed24661..0000000000 Binary files a/sound/vox/any.wav and /dev/null differ diff --git a/sound/vox/apprehend.wav b/sound/vox/apprehend.wav deleted file mode 100644 index 874ef83963..0000000000 Binary files a/sound/vox/apprehend.wav and /dev/null differ diff --git a/sound/vox/approach.wav b/sound/vox/approach.wav deleted file mode 100644 index 5c5e1995df..0000000000 Binary files a/sound/vox/approach.wav and /dev/null differ diff --git a/sound/vox/are.wav b/sound/vox/are.wav deleted file mode 100644 index bacdb31e2a..0000000000 Binary files a/sound/vox/are.wav and /dev/null differ diff --git a/sound/vox/area.wav b/sound/vox/area.wav deleted file mode 100644 index f2ac3dd05a..0000000000 Binary files a/sound/vox/area.wav and /dev/null differ diff --git a/sound/vox/arm.wav b/sound/vox/arm.wav deleted file mode 100644 index 225abed39e..0000000000 Binary files a/sound/vox/arm.wav and /dev/null differ diff --git a/sound/vox/armed.wav b/sound/vox/armed.wav deleted file mode 100644 index 55e4a67c66..0000000000 Binary files a/sound/vox/armed.wav and /dev/null differ diff --git a/sound/vox/armor.wav b/sound/vox/armor.wav deleted file mode 100644 index 2ca51709d4..0000000000 Binary files a/sound/vox/armor.wav and /dev/null differ diff --git a/sound/vox/armory.wav b/sound/vox/armory.wav deleted file mode 100644 index 63fff9e39e..0000000000 Binary files a/sound/vox/armory.wav and /dev/null differ diff --git a/sound/vox/arrest.wav b/sound/vox/arrest.wav deleted file mode 100644 index cdc24ec627..0000000000 Binary files a/sound/vox/arrest.wav and /dev/null differ diff --git a/sound/vox/ass.wav b/sound/vox/ass.wav deleted file mode 100644 index 2b6698aa66..0000000000 Binary files a/sound/vox/ass.wav and /dev/null differ diff --git a/sound/vox/at.wav b/sound/vox/at.wav deleted file mode 100644 index 0b1b9396e5..0000000000 Binary files a/sound/vox/at.wav and /dev/null differ diff --git a/sound/vox/atomic.wav b/sound/vox/atomic.wav deleted file mode 100644 index 6a00304807..0000000000 Binary files a/sound/vox/atomic.wav and /dev/null differ diff --git a/sound/vox/attention.wav b/sound/vox/attention.wav deleted file mode 100644 index e9078e6d9e..0000000000 Binary files a/sound/vox/attention.wav and /dev/null differ diff --git a/sound/vox/authorize.wav b/sound/vox/authorize.wav deleted file mode 100644 index 3dcff1208b..0000000000 Binary files a/sound/vox/authorize.wav and /dev/null differ diff --git a/sound/vox/authorized.wav b/sound/vox/authorized.wav deleted file mode 100644 index 67672abf35..0000000000 Binary files a/sound/vox/authorized.wav and /dev/null differ diff --git a/sound/vox/automatic.wav b/sound/vox/automatic.wav deleted file mode 100644 index 8e676b0827..0000000000 Binary files a/sound/vox/automatic.wav and /dev/null differ diff --git a/sound/vox/away.wav b/sound/vox/away.wav deleted file mode 100644 index e1a3bee4d8..0000000000 Binary files a/sound/vox/away.wav and /dev/null differ diff --git a/sound/vox/b.wav b/sound/vox/b.wav deleted file mode 100644 index 751c7b7b1a..0000000000 Binary files a/sound/vox/b.wav and /dev/null differ diff --git a/sound/vox/back.wav b/sound/vox/back.wav deleted file mode 100644 index b2f4e56e40..0000000000 Binary files a/sound/vox/back.wav and /dev/null differ diff --git a/sound/vox/backman.wav b/sound/vox/backman.wav deleted file mode 100644 index 60e149eaee..0000000000 Binary files a/sound/vox/backman.wav and /dev/null differ diff --git a/sound/vox/bad.wav b/sound/vox/bad.wav deleted file mode 100644 index b59100564f..0000000000 Binary files a/sound/vox/bad.wav and /dev/null differ diff --git a/sound/vox/bag.wav b/sound/vox/bag.wav deleted file mode 100644 index ccbf3f851e..0000000000 Binary files a/sound/vox/bag.wav and /dev/null differ diff --git a/sound/vox/bailey.wav b/sound/vox/bailey.wav deleted file mode 100644 index deca97dc6b..0000000000 Binary files a/sound/vox/bailey.wav and /dev/null differ diff --git a/sound/vox/barracks.wav b/sound/vox/barracks.wav deleted file mode 100644 index c7cc651ced..0000000000 Binary files a/sound/vox/barracks.wav and /dev/null differ diff --git a/sound/vox/base.wav b/sound/vox/base.wav deleted file mode 100644 index a4c6c829e5..0000000000 Binary files a/sound/vox/base.wav and /dev/null differ diff --git a/sound/vox/bay.wav b/sound/vox/bay.wav deleted file mode 100644 index 769dfc38c2..0000000000 Binary files a/sound/vox/bay.wav and /dev/null differ diff --git a/sound/vox/be.wav b/sound/vox/be.wav deleted file mode 100644 index 38074711b4..0000000000 Binary files a/sound/vox/be.wav and /dev/null differ diff --git a/sound/vox/been.wav b/sound/vox/been.wav deleted file mode 100644 index 959f08ebf5..0000000000 Binary files a/sound/vox/been.wav and /dev/null differ diff --git a/sound/vox/before.wav b/sound/vox/before.wav deleted file mode 100644 index a7c2cdd5b2..0000000000 Binary files a/sound/vox/before.wav and /dev/null differ diff --git a/sound/vox/beyond.wav b/sound/vox/beyond.wav deleted file mode 100644 index d0641c009b..0000000000 Binary files a/sound/vox/beyond.wav and /dev/null differ diff --git a/sound/vox/biohazard.wav b/sound/vox/biohazard.wav deleted file mode 100644 index 6ee3aca426..0000000000 Binary files a/sound/vox/biohazard.wav and /dev/null differ diff --git a/sound/vox/biological.wav b/sound/vox/biological.wav deleted file mode 100644 index fef86450b1..0000000000 Binary files a/sound/vox/biological.wav and /dev/null differ diff --git a/sound/vox/birdwell.wav b/sound/vox/birdwell.wav deleted file mode 100644 index 6436f724f0..0000000000 Binary files a/sound/vox/birdwell.wav and /dev/null differ diff --git a/sound/vox/bizwarn.wav b/sound/vox/bizwarn.wav deleted file mode 100644 index ff392b491a..0000000000 Binary files a/sound/vox/bizwarn.wav and /dev/null differ diff --git a/sound/vox/black.wav b/sound/vox/black.wav deleted file mode 100644 index 52dd0881ae..0000000000 Binary files a/sound/vox/black.wav and /dev/null differ diff --git a/sound/vox/blast.wav b/sound/vox/blast.wav deleted file mode 100644 index fa8d79fbb4..0000000000 Binary files a/sound/vox/blast.wav and /dev/null differ diff --git a/sound/vox/blocked.wav b/sound/vox/blocked.wav deleted file mode 100644 index 5e086f4bce..0000000000 Binary files a/sound/vox/blocked.wav and /dev/null differ diff --git a/sound/vox/bloop.wav b/sound/vox/bloop.wav deleted file mode 100644 index 49cf90c523..0000000000 Binary files a/sound/vox/bloop.wav and /dev/null differ diff --git a/sound/vox/blue.wav b/sound/vox/blue.wav deleted file mode 100644 index 83a6e7c3eb..0000000000 Binary files a/sound/vox/blue.wav and /dev/null differ diff --git a/sound/vox/bottom.wav b/sound/vox/bottom.wav deleted file mode 100644 index 2330a74b28..0000000000 Binary files a/sound/vox/bottom.wav and /dev/null differ diff --git a/sound/vox/bravo.wav b/sound/vox/bravo.wav deleted file mode 100644 index 560af14f2c..0000000000 Binary files a/sound/vox/bravo.wav and /dev/null differ diff --git a/sound/vox/breach.wav b/sound/vox/breach.wav deleted file mode 100644 index 89a6178334..0000000000 Binary files a/sound/vox/breach.wav and /dev/null differ diff --git a/sound/vox/breached.wav b/sound/vox/breached.wav deleted file mode 100644 index f4028d18a8..0000000000 Binary files a/sound/vox/breached.wav and /dev/null differ diff --git a/sound/vox/break.wav b/sound/vox/break.wav deleted file mode 100644 index 124720295b..0000000000 Binary files a/sound/vox/break.wav and /dev/null differ diff --git a/sound/vox/bridge.wav b/sound/vox/bridge.wav deleted file mode 100644 index cbb0cb461d..0000000000 Binary files a/sound/vox/bridge.wav and /dev/null differ diff --git a/sound/vox/bust.wav b/sound/vox/bust.wav deleted file mode 100644 index 6af0f12c80..0000000000 Binary files a/sound/vox/bust.wav and /dev/null differ diff --git a/sound/vox/but.wav b/sound/vox/but.wav deleted file mode 100644 index 0728ed3e1e..0000000000 Binary files a/sound/vox/but.wav and /dev/null differ diff --git a/sound/vox/button.wav b/sound/vox/button.wav deleted file mode 100644 index bc583238ca..0000000000 Binary files a/sound/vox/button.wav and /dev/null differ diff --git a/sound/vox/buzwarn.wav b/sound/vox/buzwarn.wav deleted file mode 100644 index 82ddd2cdb3..0000000000 Binary files a/sound/vox/buzwarn.wav and /dev/null differ diff --git a/sound/vox/bypass.wav b/sound/vox/bypass.wav deleted file mode 100644 index b5155d37ff..0000000000 Binary files a/sound/vox/bypass.wav and /dev/null differ diff --git a/sound/vox/c.wav b/sound/vox/c.wav deleted file mode 100644 index 9fcfc5e745..0000000000 Binary files a/sound/vox/c.wav and /dev/null differ diff --git a/sound/vox/cable.wav b/sound/vox/cable.wav deleted file mode 100644 index d761092651..0000000000 Binary files a/sound/vox/cable.wav and /dev/null differ diff --git a/sound/vox/call.wav b/sound/vox/call.wav deleted file mode 100644 index aa06767b94..0000000000 Binary files a/sound/vox/call.wav and /dev/null differ diff --git a/sound/vox/called.wav b/sound/vox/called.wav deleted file mode 100644 index f0c2897c8d..0000000000 Binary files a/sound/vox/called.wav and /dev/null differ diff --git a/sound/vox/canal.wav b/sound/vox/canal.wav deleted file mode 100644 index b426a8f6a9..0000000000 Binary files a/sound/vox/canal.wav and /dev/null differ diff --git a/sound/vox/cap.wav b/sound/vox/cap.wav deleted file mode 100644 index 998505184b..0000000000 Binary files a/sound/vox/cap.wav and /dev/null differ diff --git a/sound/vox/captain.wav b/sound/vox/captain.wav deleted file mode 100644 index 61222de532..0000000000 Binary files a/sound/vox/captain.wav and /dev/null differ diff --git a/sound/vox/capture.wav b/sound/vox/capture.wav deleted file mode 100644 index c7bfaad64f..0000000000 Binary files a/sound/vox/capture.wav and /dev/null differ diff --git a/sound/vox/ceiling.wav b/sound/vox/ceiling.wav deleted file mode 100644 index 381db754ca..0000000000 Binary files a/sound/vox/ceiling.wav and /dev/null differ diff --git a/sound/vox/celsius.wav b/sound/vox/celsius.wav deleted file mode 100644 index ac59448a46..0000000000 Binary files a/sound/vox/celsius.wav and /dev/null differ diff --git a/sound/vox/center.wav b/sound/vox/center.wav deleted file mode 100644 index 35bdcb5224..0000000000 Binary files a/sound/vox/center.wav and /dev/null differ diff --git a/sound/vox/centi.wav b/sound/vox/centi.wav deleted file mode 100644 index efccef07e7..0000000000 Binary files a/sound/vox/centi.wav and /dev/null differ diff --git a/sound/vox/central.wav b/sound/vox/central.wav deleted file mode 100644 index 1c9c58be57..0000000000 Binary files a/sound/vox/central.wav and /dev/null differ diff --git a/sound/vox/chamber.wav b/sound/vox/chamber.wav deleted file mode 100644 index 38dbf9ffa7..0000000000 Binary files a/sound/vox/chamber.wav and /dev/null differ diff --git a/sound/vox/charlie.wav b/sound/vox/charlie.wav deleted file mode 100644 index 353ce195f3..0000000000 Binary files a/sound/vox/charlie.wav and /dev/null differ diff --git a/sound/vox/check.wav b/sound/vox/check.wav deleted file mode 100644 index 709f9a6555..0000000000 Binary files a/sound/vox/check.wav and /dev/null differ diff --git a/sound/vox/checkpoint.wav b/sound/vox/checkpoint.wav deleted file mode 100644 index 15aa5e4cc9..0000000000 Binary files a/sound/vox/checkpoint.wav and /dev/null differ diff --git a/sound/vox/chemical.wav b/sound/vox/chemical.wav deleted file mode 100644 index eeb32be385..0000000000 Binary files a/sound/vox/chemical.wav and /dev/null differ diff --git a/sound/vox/cleanup.wav b/sound/vox/cleanup.wav deleted file mode 100644 index a47ddb233a..0000000000 Binary files a/sound/vox/cleanup.wav and /dev/null differ diff --git a/sound/vox/clear.wav b/sound/vox/clear.wav deleted file mode 100644 index a23cfc5e2b..0000000000 Binary files a/sound/vox/clear.wav and /dev/null differ diff --git a/sound/vox/clearance.wav b/sound/vox/clearance.wav deleted file mode 100644 index a35e0699b8..0000000000 Binary files a/sound/vox/clearance.wav and /dev/null differ diff --git a/sound/vox/close.wav b/sound/vox/close.wav deleted file mode 100644 index 6a46d7fb06..0000000000 Binary files a/sound/vox/close.wav and /dev/null differ diff --git a/sound/vox/code.wav b/sound/vox/code.wav deleted file mode 100644 index 63bdfbe883..0000000000 Binary files a/sound/vox/code.wav and /dev/null differ diff --git a/sound/vox/coded.wav b/sound/vox/coded.wav deleted file mode 100644 index ec876b297f..0000000000 Binary files a/sound/vox/coded.wav and /dev/null differ diff --git a/sound/vox/collider.wav b/sound/vox/collider.wav deleted file mode 100644 index a26ff0a317..0000000000 Binary files a/sound/vox/collider.wav and /dev/null differ diff --git a/sound/vox/command.wav b/sound/vox/command.wav deleted file mode 100644 index ba0c7e852b..0000000000 Binary files a/sound/vox/command.wav and /dev/null differ diff --git a/sound/vox/communication.wav b/sound/vox/communication.wav deleted file mode 100644 index 35165357e6..0000000000 Binary files a/sound/vox/communication.wav and /dev/null differ diff --git a/sound/vox/complex.wav b/sound/vox/complex.wav deleted file mode 100644 index d2c01ccd57..0000000000 Binary files a/sound/vox/complex.wav and /dev/null differ diff --git a/sound/vox/computer.wav b/sound/vox/computer.wav deleted file mode 100644 index 89808c20d7..0000000000 Binary files a/sound/vox/computer.wav and /dev/null differ diff --git a/sound/vox/condition.wav b/sound/vox/condition.wav deleted file mode 100644 index b32c83668e..0000000000 Binary files a/sound/vox/condition.wav and /dev/null differ diff --git a/sound/vox/containment.wav b/sound/vox/containment.wav deleted file mode 100644 index 563cb4e15a..0000000000 Binary files a/sound/vox/containment.wav and /dev/null differ diff --git a/sound/vox/contamination.wav b/sound/vox/contamination.wav deleted file mode 100644 index d597267cdd..0000000000 Binary files a/sound/vox/contamination.wav and /dev/null differ diff --git a/sound/vox/control.wav b/sound/vox/control.wav deleted file mode 100644 index e7bf57bbd8..0000000000 Binary files a/sound/vox/control.wav and /dev/null differ diff --git a/sound/vox/coolant.wav b/sound/vox/coolant.wav deleted file mode 100644 index d4474b9d9d..0000000000 Binary files a/sound/vox/coolant.wav and /dev/null differ diff --git a/sound/vox/coomer.wav b/sound/vox/coomer.wav deleted file mode 100644 index 1e4b37929f..0000000000 Binary files a/sound/vox/coomer.wav and /dev/null differ diff --git a/sound/vox/core.wav b/sound/vox/core.wav deleted file mode 100644 index da6874b2e7..0000000000 Binary files a/sound/vox/core.wav and /dev/null differ diff --git a/sound/vox/correct.wav b/sound/vox/correct.wav deleted file mode 100644 index cde927b747..0000000000 Binary files a/sound/vox/correct.wav and /dev/null differ diff --git a/sound/vox/corridor.wav b/sound/vox/corridor.wav deleted file mode 100644 index defdcda2d1..0000000000 Binary files a/sound/vox/corridor.wav and /dev/null differ diff --git a/sound/vox/crew.wav b/sound/vox/crew.wav deleted file mode 100644 index 4f48a08cb1..0000000000 Binary files a/sound/vox/crew.wav and /dev/null differ diff --git a/sound/vox/cross.wav b/sound/vox/cross.wav deleted file mode 100644 index c393dffbf1..0000000000 Binary files a/sound/vox/cross.wav and /dev/null differ diff --git a/sound/vox/cryogenic.wav b/sound/vox/cryogenic.wav deleted file mode 100644 index eb1a62ae38..0000000000 Binary files a/sound/vox/cryogenic.wav and /dev/null differ diff --git a/sound/vox/d.wav b/sound/vox/d.wav deleted file mode 100644 index f977a49505..0000000000 Binary files a/sound/vox/d.wav and /dev/null differ diff --git a/sound/vox/dadeda.wav b/sound/vox/dadeda.wav deleted file mode 100644 index 2ac0ff589a..0000000000 Binary files a/sound/vox/dadeda.wav and /dev/null differ diff --git a/sound/vox/damage.wav b/sound/vox/damage.wav deleted file mode 100644 index 83fce3dcf0..0000000000 Binary files a/sound/vox/damage.wav and /dev/null differ diff --git a/sound/vox/damaged.wav b/sound/vox/damaged.wav deleted file mode 100644 index e9f2ff5dbb..0000000000 Binary files a/sound/vox/damaged.wav and /dev/null differ diff --git a/sound/vox/danger.wav b/sound/vox/danger.wav deleted file mode 100644 index 40ff8b8db9..0000000000 Binary files a/sound/vox/danger.wav and /dev/null differ diff --git a/sound/vox/day.wav b/sound/vox/day.wav deleted file mode 100644 index 92e3fe81da..0000000000 Binary files a/sound/vox/day.wav and /dev/null differ diff --git a/sound/vox/deactivated.wav b/sound/vox/deactivated.wav deleted file mode 100644 index f587f266dd..0000000000 Binary files a/sound/vox/deactivated.wav and /dev/null differ diff --git a/sound/vox/decompression.wav b/sound/vox/decompression.wav deleted file mode 100644 index a758f1bbd7..0000000000 Binary files a/sound/vox/decompression.wav and /dev/null differ diff --git a/sound/vox/decontamination.wav b/sound/vox/decontamination.wav deleted file mode 100644 index 9794de0a23..0000000000 Binary files a/sound/vox/decontamination.wav and /dev/null differ diff --git a/sound/vox/deeoo.wav b/sound/vox/deeoo.wav deleted file mode 100644 index 4f82a18b2a..0000000000 Binary files a/sound/vox/deeoo.wav and /dev/null differ diff --git a/sound/vox/defense.wav b/sound/vox/defense.wav deleted file mode 100644 index 9da8de137f..0000000000 Binary files a/sound/vox/defense.wav and /dev/null differ diff --git a/sound/vox/degrees.wav b/sound/vox/degrees.wav deleted file mode 100644 index 7e77561c14..0000000000 Binary files a/sound/vox/degrees.wav and /dev/null differ diff --git a/sound/vox/delta.wav b/sound/vox/delta.wav deleted file mode 100644 index 86052809f4..0000000000 Binary files a/sound/vox/delta.wav and /dev/null differ diff --git a/sound/vox/denied.wav b/sound/vox/denied.wav deleted file mode 100644 index 6b1167d41d..0000000000 Binary files a/sound/vox/denied.wav and /dev/null differ diff --git a/sound/vox/deploy.wav b/sound/vox/deploy.wav deleted file mode 100644 index 2f9aacd350..0000000000 Binary files a/sound/vox/deploy.wav and /dev/null differ diff --git a/sound/vox/deployed.wav b/sound/vox/deployed.wav deleted file mode 100644 index a85a076b18..0000000000 Binary files a/sound/vox/deployed.wav and /dev/null differ diff --git a/sound/vox/destroy.wav b/sound/vox/destroy.wav deleted file mode 100644 index 56cf437c66..0000000000 Binary files a/sound/vox/destroy.wav and /dev/null differ diff --git a/sound/vox/destroyed.wav b/sound/vox/destroyed.wav deleted file mode 100644 index 20308df2df..0000000000 Binary files a/sound/vox/destroyed.wav and /dev/null differ diff --git a/sound/vox/detain.wav b/sound/vox/detain.wav deleted file mode 100644 index 7d5f4e06f4..0000000000 Binary files a/sound/vox/detain.wav and /dev/null differ diff --git a/sound/vox/detected.wav b/sound/vox/detected.wav deleted file mode 100644 index 101429a614..0000000000 Binary files a/sound/vox/detected.wav and /dev/null differ diff --git a/sound/vox/detonation.wav b/sound/vox/detonation.wav deleted file mode 100644 index a696e97976..0000000000 Binary files a/sound/vox/detonation.wav and /dev/null differ diff --git a/sound/vox/device.wav b/sound/vox/device.wav deleted file mode 100644 index d5ecd2f67b..0000000000 Binary files a/sound/vox/device.wav and /dev/null differ diff --git a/sound/vox/did.wav b/sound/vox/did.wav deleted file mode 100644 index 0c52e31b72..0000000000 Binary files a/sound/vox/did.wav and /dev/null differ diff --git a/sound/vox/die.wav b/sound/vox/die.wav deleted file mode 100644 index b47622cfc7..0000000000 Binary files a/sound/vox/die.wav and /dev/null differ diff --git a/sound/vox/dimensional.wav b/sound/vox/dimensional.wav deleted file mode 100644 index f67956ddc7..0000000000 Binary files a/sound/vox/dimensional.wav and /dev/null differ diff --git a/sound/vox/dirt.wav b/sound/vox/dirt.wav deleted file mode 100644 index 08990c47d8..0000000000 Binary files a/sound/vox/dirt.wav and /dev/null differ diff --git a/sound/vox/disengaged.wav b/sound/vox/disengaged.wav deleted file mode 100644 index aa84ed27a6..0000000000 Binary files a/sound/vox/disengaged.wav and /dev/null differ diff --git a/sound/vox/dish.wav b/sound/vox/dish.wav deleted file mode 100644 index aeff92d205..0000000000 Binary files a/sound/vox/dish.wav and /dev/null differ diff --git a/sound/vox/disposal.wav b/sound/vox/disposal.wav deleted file mode 100644 index bfe38f6098..0000000000 Binary files a/sound/vox/disposal.wav and /dev/null differ diff --git a/sound/vox/distance.wav b/sound/vox/distance.wav deleted file mode 100644 index 670eacaabe..0000000000 Binary files a/sound/vox/distance.wav and /dev/null differ diff --git a/sound/vox/distortion.wav b/sound/vox/distortion.wav deleted file mode 100644 index 7fae33e244..0000000000 Binary files a/sound/vox/distortion.wav and /dev/null differ diff --git a/sound/vox/do.wav b/sound/vox/do.wav deleted file mode 100644 index d82a9ab107..0000000000 Binary files a/sound/vox/do.wav and /dev/null differ diff --git a/sound/vox/doctor.wav b/sound/vox/doctor.wav deleted file mode 100644 index f9cdc53805..0000000000 Binary files a/sound/vox/doctor.wav and /dev/null differ diff --git a/sound/vox/doop.wav b/sound/vox/doop.wav deleted file mode 100644 index 14bce15cea..0000000000 Binary files a/sound/vox/doop.wav and /dev/null differ diff --git a/sound/vox/door.wav b/sound/vox/door.wav deleted file mode 100644 index 629dee38e7..0000000000 Binary files a/sound/vox/door.wav and /dev/null differ diff --git a/sound/vox/down.wav b/sound/vox/down.wav deleted file mode 100644 index b677e031da..0000000000 Binary files a/sound/vox/down.wav and /dev/null differ diff --git a/sound/vox/dual.wav b/sound/vox/dual.wav deleted file mode 100644 index 4693b31d42..0000000000 Binary files a/sound/vox/dual.wav and /dev/null differ diff --git a/sound/vox/duct.wav b/sound/vox/duct.wav deleted file mode 100644 index d0e937fd80..0000000000 Binary files a/sound/vox/duct.wav and /dev/null differ diff --git a/sound/vox/e.wav b/sound/vox/e.wav deleted file mode 100644 index 6f991d0fcc..0000000000 Binary files a/sound/vox/e.wav and /dev/null differ diff --git a/sound/vox/east.wav b/sound/vox/east.wav deleted file mode 100644 index 296ce53d41..0000000000 Binary files a/sound/vox/east.wav and /dev/null differ diff --git a/sound/vox/echo.wav b/sound/vox/echo.wav deleted file mode 100644 index 3087ecbd9c..0000000000 Binary files a/sound/vox/echo.wav and /dev/null differ diff --git a/sound/vox/ed.wav b/sound/vox/ed.wav deleted file mode 100644 index 71303ffe0a..0000000000 Binary files a/sound/vox/ed.wav and /dev/null differ diff --git a/sound/vox/effect.wav b/sound/vox/effect.wav deleted file mode 100644 index a0128cf698..0000000000 Binary files a/sound/vox/effect.wav and /dev/null differ diff --git a/sound/vox/egress.wav b/sound/vox/egress.wav deleted file mode 100644 index 47fa437ce8..0000000000 Binary files a/sound/vox/egress.wav and /dev/null differ diff --git a/sound/vox/eight.wav b/sound/vox/eight.wav deleted file mode 100644 index 4fef5c2eb7..0000000000 Binary files a/sound/vox/eight.wav and /dev/null differ diff --git a/sound/vox/eighteen.wav b/sound/vox/eighteen.wav deleted file mode 100644 index 1aff299ad2..0000000000 Binary files a/sound/vox/eighteen.wav and /dev/null differ diff --git a/sound/vox/eighty.wav b/sound/vox/eighty.wav deleted file mode 100644 index a1f54835db..0000000000 Binary files a/sound/vox/eighty.wav and /dev/null differ diff --git a/sound/vox/electric.wav b/sound/vox/electric.wav deleted file mode 100644 index 48c4fe0176..0000000000 Binary files a/sound/vox/electric.wav and /dev/null differ diff --git a/sound/vox/electromagnetic.wav b/sound/vox/electromagnetic.wav deleted file mode 100644 index 886c76ef6b..0000000000 Binary files a/sound/vox/electromagnetic.wav and /dev/null differ diff --git a/sound/vox/elevator.wav b/sound/vox/elevator.wav deleted file mode 100644 index a4d4144849..0000000000 Binary files a/sound/vox/elevator.wav and /dev/null differ diff --git a/sound/vox/eleven.wav b/sound/vox/eleven.wav deleted file mode 100644 index 5473a25411..0000000000 Binary files a/sound/vox/eleven.wav and /dev/null differ diff --git a/sound/vox/eliminate.wav b/sound/vox/eliminate.wav deleted file mode 100644 index d4e51affb3..0000000000 Binary files a/sound/vox/eliminate.wav and /dev/null differ diff --git a/sound/vox/emergency.wav b/sound/vox/emergency.wav deleted file mode 100644 index 62bb34ef41..0000000000 Binary files a/sound/vox/emergency.wav and /dev/null differ diff --git a/sound/vox/energy.wav b/sound/vox/energy.wav deleted file mode 100644 index b66ed4db10..0000000000 Binary files a/sound/vox/energy.wav and /dev/null differ diff --git a/sound/vox/engage.wav b/sound/vox/engage.wav deleted file mode 100644 index 11a43c40a7..0000000000 Binary files a/sound/vox/engage.wav and /dev/null differ diff --git a/sound/vox/engaged.wav b/sound/vox/engaged.wav deleted file mode 100644 index a47cbb5977..0000000000 Binary files a/sound/vox/engaged.wav and /dev/null differ diff --git a/sound/vox/engine.wav b/sound/vox/engine.wav deleted file mode 100644 index f6ab907c5b..0000000000 Binary files a/sound/vox/engine.wav and /dev/null differ diff --git a/sound/vox/enter.wav b/sound/vox/enter.wav deleted file mode 100644 index f3f53ea821..0000000000 Binary files a/sound/vox/enter.wav and /dev/null differ diff --git a/sound/vox/entry.wav b/sound/vox/entry.wav deleted file mode 100644 index a027e1a7e5..0000000000 Binary files a/sound/vox/entry.wav and /dev/null differ diff --git a/sound/vox/environment.wav b/sound/vox/environment.wav deleted file mode 100644 index 6ab7d940cc..0000000000 Binary files a/sound/vox/environment.wav and /dev/null differ diff --git a/sound/vox/error.wav b/sound/vox/error.wav deleted file mode 100644 index 05b2bebf60..0000000000 Binary files a/sound/vox/error.wav and /dev/null differ diff --git a/sound/vox/escape.wav b/sound/vox/escape.wav deleted file mode 100644 index dbf3c954f5..0000000000 Binary files a/sound/vox/escape.wav and /dev/null differ diff --git a/sound/vox/evacuate.wav b/sound/vox/evacuate.wav deleted file mode 100644 index 2766662cd2..0000000000 Binary files a/sound/vox/evacuate.wav and /dev/null differ diff --git a/sound/vox/exchange.wav b/sound/vox/exchange.wav deleted file mode 100644 index 73426aea01..0000000000 Binary files a/sound/vox/exchange.wav and /dev/null differ diff --git a/sound/vox/exit.wav b/sound/vox/exit.wav deleted file mode 100644 index 85680b3212..0000000000 Binary files a/sound/vox/exit.wav and /dev/null differ diff --git a/sound/vox/expect.wav b/sound/vox/expect.wav deleted file mode 100644 index a562e53a9a..0000000000 Binary files a/sound/vox/expect.wav and /dev/null differ diff --git a/sound/vox/experiment.wav b/sound/vox/experiment.wav deleted file mode 100644 index 3f60c2181b..0000000000 Binary files a/sound/vox/experiment.wav and /dev/null differ diff --git a/sound/vox/experimental.wav b/sound/vox/experimental.wav deleted file mode 100644 index fbf75a59d3..0000000000 Binary files a/sound/vox/experimental.wav and /dev/null differ diff --git a/sound/vox/explode.wav b/sound/vox/explode.wav deleted file mode 100644 index 847e64562c..0000000000 Binary files a/sound/vox/explode.wav and /dev/null differ diff --git a/sound/vox/explosion.wav b/sound/vox/explosion.wav deleted file mode 100644 index a2e442ec2f..0000000000 Binary files a/sound/vox/explosion.wav and /dev/null differ diff --git a/sound/vox/exposure.wav b/sound/vox/exposure.wav deleted file mode 100644 index 37a933ca62..0000000000 Binary files a/sound/vox/exposure.wav and /dev/null differ diff --git a/sound/vox/exterminate.wav b/sound/vox/exterminate.wav deleted file mode 100644 index f1c3c233d6..0000000000 Binary files a/sound/vox/exterminate.wav and /dev/null differ diff --git a/sound/vox/extinguish.wav b/sound/vox/extinguish.wav deleted file mode 100644 index 1fc83d9e7e..0000000000 Binary files a/sound/vox/extinguish.wav and /dev/null differ diff --git a/sound/vox/extinguisher.wav b/sound/vox/extinguisher.wav deleted file mode 100644 index eed3164bfc..0000000000 Binary files a/sound/vox/extinguisher.wav and /dev/null differ diff --git a/sound/vox/extreme.wav b/sound/vox/extreme.wav deleted file mode 100644 index 0fc3adfb50..0000000000 Binary files a/sound/vox/extreme.wav and /dev/null differ diff --git a/sound/vox/f.wav b/sound/vox/f.wav deleted file mode 100644 index 0f06b33886..0000000000 Binary files a/sound/vox/f.wav and /dev/null differ diff --git a/sound/vox/facility.wav b/sound/vox/facility.wav deleted file mode 100644 index 812445e3dd..0000000000 Binary files a/sound/vox/facility.wav and /dev/null differ diff --git a/sound/vox/fahrenheit.wav b/sound/vox/fahrenheit.wav deleted file mode 100644 index 96411aabdc..0000000000 Binary files a/sound/vox/fahrenheit.wav and /dev/null differ diff --git a/sound/vox/failed.wav b/sound/vox/failed.wav deleted file mode 100644 index f717b05375..0000000000 Binary files a/sound/vox/failed.wav and /dev/null differ diff --git a/sound/vox/failure.wav b/sound/vox/failure.wav deleted file mode 100644 index dd662fc5a6..0000000000 Binary files a/sound/vox/failure.wav and /dev/null differ diff --git a/sound/vox/farthest.wav b/sound/vox/farthest.wav deleted file mode 100644 index fcca7a432e..0000000000 Binary files a/sound/vox/farthest.wav and /dev/null differ diff --git a/sound/vox/fast.wav b/sound/vox/fast.wav deleted file mode 100644 index 821885a739..0000000000 Binary files a/sound/vox/fast.wav and /dev/null differ diff --git a/sound/vox/feet.wav b/sound/vox/feet.wav deleted file mode 100644 index 5adc5dbd62..0000000000 Binary files a/sound/vox/feet.wav and /dev/null differ diff --git a/sound/vox/field.wav b/sound/vox/field.wav deleted file mode 100644 index 6cc1ab42f8..0000000000 Binary files a/sound/vox/field.wav and /dev/null differ diff --git a/sound/vox/fifteen.wav b/sound/vox/fifteen.wav deleted file mode 100644 index 63ca382128..0000000000 Binary files a/sound/vox/fifteen.wav and /dev/null differ diff --git a/sound/vox/fifth.wav b/sound/vox/fifth.wav deleted file mode 100644 index 3886e043bf..0000000000 Binary files a/sound/vox/fifth.wav and /dev/null differ diff --git a/sound/vox/fifty.wav b/sound/vox/fifty.wav deleted file mode 100644 index 80f7b11103..0000000000 Binary files a/sound/vox/fifty.wav and /dev/null differ diff --git a/sound/vox/final.wav b/sound/vox/final.wav deleted file mode 100644 index d4c807af6e..0000000000 Binary files a/sound/vox/final.wav and /dev/null differ diff --git a/sound/vox/fine.wav b/sound/vox/fine.wav deleted file mode 100644 index f74d8fbfaa..0000000000 Binary files a/sound/vox/fine.wav and /dev/null differ diff --git a/sound/vox/fire.wav b/sound/vox/fire.wav deleted file mode 100644 index ce0a45d9c6..0000000000 Binary files a/sound/vox/fire.wav and /dev/null differ diff --git a/sound/vox/first.wav b/sound/vox/first.wav deleted file mode 100644 index 18a7fdf7af..0000000000 Binary files a/sound/vox/first.wav and /dev/null differ diff --git a/sound/vox/five.wav b/sound/vox/five.wav deleted file mode 100644 index aa23cbe9cf..0000000000 Binary files a/sound/vox/five.wav and /dev/null differ diff --git a/sound/vox/flooding.wav b/sound/vox/flooding.wav deleted file mode 100644 index 7b9f5bcc69..0000000000 Binary files a/sound/vox/flooding.wav and /dev/null differ diff --git a/sound/vox/floor.wav b/sound/vox/floor.wav deleted file mode 100644 index b086549164..0000000000 Binary files a/sound/vox/floor.wav and /dev/null differ diff --git a/sound/vox/fool.wav b/sound/vox/fool.wav deleted file mode 100644 index 327b3f5b59..0000000000 Binary files a/sound/vox/fool.wav and /dev/null differ diff --git a/sound/vox/for.wav b/sound/vox/for.wav deleted file mode 100644 index 84f793dece..0000000000 Binary files a/sound/vox/for.wav and /dev/null differ diff --git a/sound/vox/forbidden.wav b/sound/vox/forbidden.wav deleted file mode 100644 index f4d742505e..0000000000 Binary files a/sound/vox/forbidden.wav and /dev/null differ diff --git a/sound/vox/force.wav b/sound/vox/force.wav deleted file mode 100644 index 3745c71418..0000000000 Binary files a/sound/vox/force.wav and /dev/null differ diff --git a/sound/vox/forms.wav b/sound/vox/forms.wav deleted file mode 100644 index 642e201abc..0000000000 Binary files a/sound/vox/forms.wav and /dev/null differ diff --git a/sound/vox/found.wav b/sound/vox/found.wav deleted file mode 100644 index 59da4031fc..0000000000 Binary files a/sound/vox/found.wav and /dev/null differ diff --git a/sound/vox/four.wav b/sound/vox/four.wav deleted file mode 100644 index a614cbcdc5..0000000000 Binary files a/sound/vox/four.wav and /dev/null differ diff --git a/sound/vox/fourteen.wav b/sound/vox/fourteen.wav deleted file mode 100644 index aa0846855b..0000000000 Binary files a/sound/vox/fourteen.wav and /dev/null differ diff --git a/sound/vox/fourth.wav b/sound/vox/fourth.wav deleted file mode 100644 index 5c9071d292..0000000000 Binary files a/sound/vox/fourth.wav and /dev/null differ diff --git a/sound/vox/fourty.wav b/sound/vox/fourty.wav deleted file mode 100644 index 6bb8fb3e12..0000000000 Binary files a/sound/vox/fourty.wav and /dev/null differ diff --git a/sound/vox/foxtrot.wav b/sound/vox/foxtrot.wav deleted file mode 100644 index ece21be942..0000000000 Binary files a/sound/vox/foxtrot.wav and /dev/null differ diff --git a/sound/vox/freeman.wav b/sound/vox/freeman.wav deleted file mode 100644 index 26a9ae229b..0000000000 Binary files a/sound/vox/freeman.wav and /dev/null differ diff --git a/sound/vox/freezer.wav b/sound/vox/freezer.wav deleted file mode 100644 index 32da861548..0000000000 Binary files a/sound/vox/freezer.wav and /dev/null differ diff --git a/sound/vox/from.wav b/sound/vox/from.wav deleted file mode 100644 index 46541abe65..0000000000 Binary files a/sound/vox/from.wav and /dev/null differ diff --git a/sound/vox/front.wav b/sound/vox/front.wav deleted file mode 100644 index 46d600144d..0000000000 Binary files a/sound/vox/front.wav and /dev/null differ diff --git a/sound/vox/fuel.wav b/sound/vox/fuel.wav deleted file mode 100644 index 1b2256b006..0000000000 Binary files a/sound/vox/fuel.wav and /dev/null differ diff --git a/sound/vox/g.wav b/sound/vox/g.wav deleted file mode 100644 index 37f5ce8010..0000000000 Binary files a/sound/vox/g.wav and /dev/null differ diff --git a/sound/vox/get.wav b/sound/vox/get.wav deleted file mode 100644 index 9dd512d512..0000000000 Binary files a/sound/vox/get.wav and /dev/null differ diff --git a/sound/vox/go.wav b/sound/vox/go.wav deleted file mode 100644 index 665989a94f..0000000000 Binary files a/sound/vox/go.wav and /dev/null differ diff --git a/sound/vox/going.wav b/sound/vox/going.wav deleted file mode 100644 index 308b1b6890..0000000000 Binary files a/sound/vox/going.wav and /dev/null differ diff --git a/sound/vox/good.wav b/sound/vox/good.wav deleted file mode 100644 index bf15c9c2b4..0000000000 Binary files a/sound/vox/good.wav and /dev/null differ diff --git a/sound/vox/goodbye.wav b/sound/vox/goodbye.wav deleted file mode 100644 index 2599ca560c..0000000000 Binary files a/sound/vox/goodbye.wav and /dev/null differ diff --git a/sound/vox/gordon.wav b/sound/vox/gordon.wav deleted file mode 100644 index 51c7195091..0000000000 Binary files a/sound/vox/gordon.wav and /dev/null differ diff --git a/sound/vox/got.wav b/sound/vox/got.wav deleted file mode 100644 index b2b47c9d2e..0000000000 Binary files a/sound/vox/got.wav and /dev/null differ diff --git a/sound/vox/government.wav b/sound/vox/government.wav deleted file mode 100644 index 17e7fa8fbf..0000000000 Binary files a/sound/vox/government.wav and /dev/null differ diff --git a/sound/vox/granted.wav b/sound/vox/granted.wav deleted file mode 100644 index 661bf0506f..0000000000 Binary files a/sound/vox/granted.wav and /dev/null differ diff --git a/sound/vox/great.wav b/sound/vox/great.wav deleted file mode 100644 index 8640b88fb6..0000000000 Binary files a/sound/vox/great.wav and /dev/null differ diff --git a/sound/vox/green.wav b/sound/vox/green.wav deleted file mode 100644 index 0eb5558231..0000000000 Binary files a/sound/vox/green.wav and /dev/null differ diff --git a/sound/vox/grenade.wav b/sound/vox/grenade.wav deleted file mode 100644 index 7b2d80ed6d..0000000000 Binary files a/sound/vox/grenade.wav and /dev/null differ diff --git a/sound/vox/guard.wav b/sound/vox/guard.wav deleted file mode 100644 index e715dc641c..0000000000 Binary files a/sound/vox/guard.wav and /dev/null differ diff --git a/sound/vox/gulf.wav b/sound/vox/gulf.wav deleted file mode 100644 index 95b3e9fc4f..0000000000 Binary files a/sound/vox/gulf.wav and /dev/null differ diff --git a/sound/vox/gun.wav b/sound/vox/gun.wav deleted file mode 100644 index 86e3ac1cbb..0000000000 Binary files a/sound/vox/gun.wav and /dev/null differ diff --git a/sound/vox/guthrie.wav b/sound/vox/guthrie.wav deleted file mode 100644 index 362ab46d60..0000000000 Binary files a/sound/vox/guthrie.wav and /dev/null differ diff --git a/sound/vox/handling.wav b/sound/vox/handling.wav deleted file mode 100644 index b9c7c5f581..0000000000 Binary files a/sound/vox/handling.wav and /dev/null differ diff --git a/sound/vox/hangar.wav b/sound/vox/hangar.wav deleted file mode 100644 index e937054af9..0000000000 Binary files a/sound/vox/hangar.wav and /dev/null differ diff --git a/sound/vox/has.wav b/sound/vox/has.wav deleted file mode 100644 index 625a110f07..0000000000 Binary files a/sound/vox/has.wav and /dev/null differ diff --git a/sound/vox/have.wav b/sound/vox/have.wav deleted file mode 100644 index c5f0794a1f..0000000000 Binary files a/sound/vox/have.wav and /dev/null differ diff --git a/sound/vox/hazard.wav b/sound/vox/hazard.wav deleted file mode 100644 index b311552c76..0000000000 Binary files a/sound/vox/hazard.wav and /dev/null differ diff --git a/sound/vox/head.wav b/sound/vox/head.wav deleted file mode 100644 index ed8e9d88c6..0000000000 Binary files a/sound/vox/head.wav and /dev/null differ diff --git a/sound/vox/health.wav b/sound/vox/health.wav deleted file mode 100644 index e3158318f4..0000000000 Binary files a/sound/vox/health.wav and /dev/null differ diff --git a/sound/vox/heat.wav b/sound/vox/heat.wav deleted file mode 100644 index ca0b345225..0000000000 Binary files a/sound/vox/heat.wav and /dev/null differ diff --git a/sound/vox/helicopter.wav b/sound/vox/helicopter.wav deleted file mode 100644 index 22e5449443..0000000000 Binary files a/sound/vox/helicopter.wav and /dev/null differ diff --git a/sound/vox/helium.wav b/sound/vox/helium.wav deleted file mode 100644 index fbb8197cb0..0000000000 Binary files a/sound/vox/helium.wav and /dev/null differ diff --git a/sound/vox/hello.wav b/sound/vox/hello.wav deleted file mode 100644 index 7e61fec55e..0000000000 Binary files a/sound/vox/hello.wav and /dev/null differ diff --git a/sound/vox/help.wav b/sound/vox/help.wav deleted file mode 100644 index 5bef919ee9..0000000000 Binary files a/sound/vox/help.wav and /dev/null differ diff --git a/sound/vox/here.wav b/sound/vox/here.wav deleted file mode 100644 index e6d74f47f7..0000000000 Binary files a/sound/vox/here.wav and /dev/null differ diff --git a/sound/vox/hide.wav b/sound/vox/hide.wav deleted file mode 100644 index f7bb32b283..0000000000 Binary files a/sound/vox/hide.wav and /dev/null differ diff --git a/sound/vox/high.wav b/sound/vox/high.wav deleted file mode 100644 index 832bf16040..0000000000 Binary files a/sound/vox/high.wav and /dev/null differ diff --git a/sound/vox/highest.wav b/sound/vox/highest.wav deleted file mode 100644 index ef4b2caf39..0000000000 Binary files a/sound/vox/highest.wav and /dev/null differ diff --git a/sound/vox/hit.wav b/sound/vox/hit.wav deleted file mode 100644 index d70619a3f5..0000000000 Binary files a/sound/vox/hit.wav and /dev/null differ diff --git a/sound/vox/hole.wav b/sound/vox/hole.wav deleted file mode 100644 index afb46f59ad..0000000000 Binary files a/sound/vox/hole.wav and /dev/null differ diff --git a/sound/vox/hostile.wav b/sound/vox/hostile.wav deleted file mode 100644 index 4dc88f26c6..0000000000 Binary files a/sound/vox/hostile.wav and /dev/null differ diff --git a/sound/vox/hot.wav b/sound/vox/hot.wav deleted file mode 100644 index 7ced07279b..0000000000 Binary files a/sound/vox/hot.wav and /dev/null differ diff --git a/sound/vox/hotel.wav b/sound/vox/hotel.wav deleted file mode 100644 index dde78cf2a1..0000000000 Binary files a/sound/vox/hotel.wav and /dev/null differ diff --git a/sound/vox/hour.wav b/sound/vox/hour.wav deleted file mode 100644 index d428bd779e..0000000000 Binary files a/sound/vox/hour.wav and /dev/null differ diff --git a/sound/vox/hours.wav b/sound/vox/hours.wav deleted file mode 100644 index 63a2470427..0000000000 Binary files a/sound/vox/hours.wav and /dev/null differ diff --git a/sound/vox/hundred.wav b/sound/vox/hundred.wav deleted file mode 100644 index 8d3a8a0b4a..0000000000 Binary files a/sound/vox/hundred.wav and /dev/null differ diff --git a/sound/vox/hydro.wav b/sound/vox/hydro.wav deleted file mode 100644 index 9653b7bf73..0000000000 Binary files a/sound/vox/hydro.wav and /dev/null differ diff --git a/sound/vox/i.wav b/sound/vox/i.wav deleted file mode 100644 index b98a48fd29..0000000000 Binary files a/sound/vox/i.wav and /dev/null differ diff --git a/sound/vox/idiot.wav b/sound/vox/idiot.wav deleted file mode 100644 index 8c19f9d7a4..0000000000 Binary files a/sound/vox/idiot.wav and /dev/null differ diff --git a/sound/vox/illegal.wav b/sound/vox/illegal.wav deleted file mode 100644 index 6087e6ba7d..0000000000 Binary files a/sound/vox/illegal.wav and /dev/null differ diff --git a/sound/vox/immediate.wav b/sound/vox/immediate.wav deleted file mode 100644 index 19fab3c842..0000000000 Binary files a/sound/vox/immediate.wav and /dev/null differ diff --git a/sound/vox/immediately.wav b/sound/vox/immediately.wav deleted file mode 100644 index f2716edf0e..0000000000 Binary files a/sound/vox/immediately.wav and /dev/null differ diff --git a/sound/vox/in.wav b/sound/vox/in.wav deleted file mode 100644 index e15bb9a6d5..0000000000 Binary files a/sound/vox/in.wav and /dev/null differ diff --git a/sound/vox/inches.wav b/sound/vox/inches.wav deleted file mode 100644 index fc8e89ce7b..0000000000 Binary files a/sound/vox/inches.wav and /dev/null differ diff --git a/sound/vox/india.wav b/sound/vox/india.wav deleted file mode 100644 index 991f9af5e0..0000000000 Binary files a/sound/vox/india.wav and /dev/null differ diff --git a/sound/vox/ing.wav b/sound/vox/ing.wav deleted file mode 100644 index 0728905c34..0000000000 Binary files a/sound/vox/ing.wav and /dev/null differ diff --git a/sound/vox/inoperative.wav b/sound/vox/inoperative.wav deleted file mode 100644 index 6822cc5fc3..0000000000 Binary files a/sound/vox/inoperative.wav and /dev/null differ diff --git a/sound/vox/inside.wav b/sound/vox/inside.wav deleted file mode 100644 index 03cb903c24..0000000000 Binary files a/sound/vox/inside.wav and /dev/null differ diff --git a/sound/vox/inspection.wav b/sound/vox/inspection.wav deleted file mode 100644 index 3aecb74626..0000000000 Binary files a/sound/vox/inspection.wav and /dev/null differ diff --git a/sound/vox/inspector.wav b/sound/vox/inspector.wav deleted file mode 100644 index 06a54a3670..0000000000 Binary files a/sound/vox/inspector.wav and /dev/null differ diff --git a/sound/vox/interchange.wav b/sound/vox/interchange.wav deleted file mode 100644 index c7814162b4..0000000000 Binary files a/sound/vox/interchange.wav and /dev/null differ diff --git a/sound/vox/intruder.wav b/sound/vox/intruder.wav deleted file mode 100644 index a32958f0be..0000000000 Binary files a/sound/vox/intruder.wav and /dev/null differ diff --git a/sound/vox/invallid.wav b/sound/vox/invallid.wav deleted file mode 100644 index fbf3b4e524..0000000000 Binary files a/sound/vox/invallid.wav and /dev/null differ diff --git a/sound/vox/invasion.wav b/sound/vox/invasion.wav deleted file mode 100644 index 0024f331d4..0000000000 Binary files a/sound/vox/invasion.wav and /dev/null differ diff --git a/sound/vox/is.wav b/sound/vox/is.wav deleted file mode 100644 index 0eecb1a7b7..0000000000 Binary files a/sound/vox/is.wav and /dev/null differ diff --git a/sound/vox/it.wav b/sound/vox/it.wav deleted file mode 100644 index 1e96daf6bb..0000000000 Binary files a/sound/vox/it.wav and /dev/null differ diff --git a/sound/vox/johnson.wav b/sound/vox/johnson.wav deleted file mode 100644 index 1cef742cf6..0000000000 Binary files a/sound/vox/johnson.wav and /dev/null differ diff --git a/sound/vox/juliet.wav b/sound/vox/juliet.wav deleted file mode 100644 index 88a78517ca..0000000000 Binary files a/sound/vox/juliet.wav and /dev/null differ diff --git a/sound/vox/key.wav b/sound/vox/key.wav deleted file mode 100644 index ba42b393db..0000000000 Binary files a/sound/vox/key.wav and /dev/null differ diff --git a/sound/vox/kill.wav b/sound/vox/kill.wav deleted file mode 100644 index 9ae66ac5f6..0000000000 Binary files a/sound/vox/kill.wav and /dev/null differ diff --git a/sound/vox/kilo.wav b/sound/vox/kilo.wav deleted file mode 100644 index e30904cafb..0000000000 Binary files a/sound/vox/kilo.wav and /dev/null differ diff --git a/sound/vox/kit.wav b/sound/vox/kit.wav deleted file mode 100644 index b6cf53a547..0000000000 Binary files a/sound/vox/kit.wav and /dev/null differ diff --git a/sound/vox/lab.wav b/sound/vox/lab.wav deleted file mode 100644 index 8b2518fe57..0000000000 Binary files a/sound/vox/lab.wav and /dev/null differ diff --git a/sound/vox/lambda.wav b/sound/vox/lambda.wav deleted file mode 100644 index a238ac9d96..0000000000 Binary files a/sound/vox/lambda.wav and /dev/null differ diff --git a/sound/vox/laser.wav b/sound/vox/laser.wav deleted file mode 100644 index 7617aa65d7..0000000000 Binary files a/sound/vox/laser.wav and /dev/null differ diff --git a/sound/vox/last.wav b/sound/vox/last.wav deleted file mode 100644 index 458d13af62..0000000000 Binary files a/sound/vox/last.wav and /dev/null differ diff --git a/sound/vox/launch.wav b/sound/vox/launch.wav deleted file mode 100644 index 66fd2224ce..0000000000 Binary files a/sound/vox/launch.wav and /dev/null differ diff --git a/sound/vox/leak.wav b/sound/vox/leak.wav deleted file mode 100644 index 0ec0fc786d..0000000000 Binary files a/sound/vox/leak.wav and /dev/null differ diff --git a/sound/vox/leave.wav b/sound/vox/leave.wav deleted file mode 100644 index ce45698813..0000000000 Binary files a/sound/vox/leave.wav and /dev/null differ diff --git a/sound/vox/left.wav b/sound/vox/left.wav deleted file mode 100644 index 2621d07fbd..0000000000 Binary files a/sound/vox/left.wav and /dev/null differ diff --git a/sound/vox/legal.wav b/sound/vox/legal.wav deleted file mode 100644 index 928033759d..0000000000 Binary files a/sound/vox/legal.wav and /dev/null differ diff --git a/sound/vox/level.wav b/sound/vox/level.wav deleted file mode 100644 index 1f01010dd0..0000000000 Binary files a/sound/vox/level.wav and /dev/null differ diff --git a/sound/vox/lever.wav b/sound/vox/lever.wav deleted file mode 100644 index a863fdc77a..0000000000 Binary files a/sound/vox/lever.wav and /dev/null differ diff --git a/sound/vox/lie.wav b/sound/vox/lie.wav deleted file mode 100644 index 01b8749a0c..0000000000 Binary files a/sound/vox/lie.wav and /dev/null differ diff --git a/sound/vox/lieutenant.wav b/sound/vox/lieutenant.wav deleted file mode 100644 index f749f2782a..0000000000 Binary files a/sound/vox/lieutenant.wav and /dev/null differ diff --git a/sound/vox/life.wav b/sound/vox/life.wav deleted file mode 100644 index fd739b4593..0000000000 Binary files a/sound/vox/life.wav and /dev/null differ diff --git a/sound/vox/light.wav b/sound/vox/light.wav deleted file mode 100644 index 69be049955..0000000000 Binary files a/sound/vox/light.wav and /dev/null differ diff --git a/sound/vox/lima.wav b/sound/vox/lima.wav deleted file mode 100644 index d0cf4d0581..0000000000 Binary files a/sound/vox/lima.wav and /dev/null differ diff --git a/sound/vox/liquid.wav b/sound/vox/liquid.wav deleted file mode 100644 index 9f77a868e7..0000000000 Binary files a/sound/vox/liquid.wav and /dev/null differ diff --git a/sound/vox/loading.wav b/sound/vox/loading.wav deleted file mode 100644 index f5404ef81b..0000000000 Binary files a/sound/vox/loading.wav and /dev/null differ diff --git a/sound/vox/locate.wav b/sound/vox/locate.wav deleted file mode 100644 index 6b605a8d2d..0000000000 Binary files a/sound/vox/locate.wav and /dev/null differ diff --git a/sound/vox/located.wav b/sound/vox/located.wav deleted file mode 100644 index 19fb575525..0000000000 Binary files a/sound/vox/located.wav and /dev/null differ diff --git a/sound/vox/location.wav b/sound/vox/location.wav deleted file mode 100644 index 149b0ec027..0000000000 Binary files a/sound/vox/location.wav and /dev/null differ diff --git a/sound/vox/lock.wav b/sound/vox/lock.wav deleted file mode 100644 index a62efba6b9..0000000000 Binary files a/sound/vox/lock.wav and /dev/null differ diff --git a/sound/vox/locked.wav b/sound/vox/locked.wav deleted file mode 100644 index 8d197f2502..0000000000 Binary files a/sound/vox/locked.wav and /dev/null differ diff --git a/sound/vox/locker.wav b/sound/vox/locker.wav deleted file mode 100644 index e6f9dfe299..0000000000 Binary files a/sound/vox/locker.wav and /dev/null differ diff --git a/sound/vox/lockout.wav b/sound/vox/lockout.wav deleted file mode 100644 index b2cd0fb64d..0000000000 Binary files a/sound/vox/lockout.wav and /dev/null differ diff --git a/sound/vox/lower.wav b/sound/vox/lower.wav deleted file mode 100644 index a654c1d424..0000000000 Binary files a/sound/vox/lower.wav and /dev/null differ diff --git a/sound/vox/lowest.wav b/sound/vox/lowest.wav deleted file mode 100644 index 63fdaf93f0..0000000000 Binary files a/sound/vox/lowest.wav and /dev/null differ diff --git a/sound/vox/magnetic.wav b/sound/vox/magnetic.wav deleted file mode 100644 index 68deeeae9c..0000000000 Binary files a/sound/vox/magnetic.wav and /dev/null differ diff --git a/sound/vox/main.wav b/sound/vox/main.wav deleted file mode 100644 index 4657274912..0000000000 Binary files a/sound/vox/main.wav and /dev/null differ diff --git a/sound/vox/maintenance.wav b/sound/vox/maintenance.wav deleted file mode 100644 index ebca04c9d6..0000000000 Binary files a/sound/vox/maintenance.wav and /dev/null differ diff --git a/sound/vox/malfunction.wav b/sound/vox/malfunction.wav deleted file mode 100644 index 51d999b41f..0000000000 Binary files a/sound/vox/malfunction.wav and /dev/null differ diff --git a/sound/vox/man.wav b/sound/vox/man.wav deleted file mode 100644 index 64525a4f23..0000000000 Binary files a/sound/vox/man.wav and /dev/null differ diff --git a/sound/vox/mass.wav b/sound/vox/mass.wav deleted file mode 100644 index c7825984aa..0000000000 Binary files a/sound/vox/mass.wav and /dev/null differ diff --git a/sound/vox/materials.wav b/sound/vox/materials.wav deleted file mode 100644 index c983ae71a8..0000000000 Binary files a/sound/vox/materials.wav and /dev/null differ diff --git a/sound/vox/maximum.wav b/sound/vox/maximum.wav deleted file mode 100644 index f1dbc8062d..0000000000 Binary files a/sound/vox/maximum.wav and /dev/null differ diff --git a/sound/vox/may.wav b/sound/vox/may.wav deleted file mode 100644 index a238738703..0000000000 Binary files a/sound/vox/may.wav and /dev/null differ diff --git a/sound/vox/medical.wav b/sound/vox/medical.wav deleted file mode 100644 index ece7f0c4c5..0000000000 Binary files a/sound/vox/medical.wav and /dev/null differ diff --git a/sound/vox/men.wav b/sound/vox/men.wav deleted file mode 100644 index 594523da0a..0000000000 Binary files a/sound/vox/men.wav and /dev/null differ diff --git a/sound/vox/mercy.wav b/sound/vox/mercy.wav deleted file mode 100644 index 8416b25dae..0000000000 Binary files a/sound/vox/mercy.wav and /dev/null differ diff --git a/sound/vox/mesa.wav b/sound/vox/mesa.wav deleted file mode 100644 index fcb1d9843c..0000000000 Binary files a/sound/vox/mesa.wav and /dev/null differ diff --git a/sound/vox/message.wav b/sound/vox/message.wav deleted file mode 100644 index b0b769db72..0000000000 Binary files a/sound/vox/message.wav and /dev/null differ diff --git a/sound/vox/meter.wav b/sound/vox/meter.wav deleted file mode 100644 index ca063bddad..0000000000 Binary files a/sound/vox/meter.wav and /dev/null differ diff --git a/sound/vox/micro.wav b/sound/vox/micro.wav deleted file mode 100644 index 7869b97cec..0000000000 Binary files a/sound/vox/micro.wav and /dev/null differ diff --git a/sound/vox/middle.wav b/sound/vox/middle.wav deleted file mode 100644 index b58a5878a9..0000000000 Binary files a/sound/vox/middle.wav and /dev/null differ diff --git a/sound/vox/mike.wav b/sound/vox/mike.wav deleted file mode 100644 index a008bdefed..0000000000 Binary files a/sound/vox/mike.wav and /dev/null differ diff --git a/sound/vox/miles.wav b/sound/vox/miles.wav deleted file mode 100644 index 9b04a790ea..0000000000 Binary files a/sound/vox/miles.wav and /dev/null differ diff --git a/sound/vox/military.wav b/sound/vox/military.wav deleted file mode 100644 index 8387dc3b6c..0000000000 Binary files a/sound/vox/military.wav and /dev/null differ diff --git a/sound/vox/milli.wav b/sound/vox/milli.wav deleted file mode 100644 index cc0b3e4c97..0000000000 Binary files a/sound/vox/milli.wav and /dev/null differ diff --git a/sound/vox/million.wav b/sound/vox/million.wav deleted file mode 100644 index 6409eb0760..0000000000 Binary files a/sound/vox/million.wav and /dev/null differ diff --git a/sound/vox/minefield.wav b/sound/vox/minefield.wav deleted file mode 100644 index 2af1c21367..0000000000 Binary files a/sound/vox/minefield.wav and /dev/null differ diff --git a/sound/vox/minimum.wav b/sound/vox/minimum.wav deleted file mode 100644 index ee184ce4fc..0000000000 Binary files a/sound/vox/minimum.wav and /dev/null differ diff --git a/sound/vox/minutes.wav b/sound/vox/minutes.wav deleted file mode 100644 index 2e9fb914ed..0000000000 Binary files a/sound/vox/minutes.wav and /dev/null differ diff --git a/sound/vox/mister.wav b/sound/vox/mister.wav deleted file mode 100644 index 27507cfb09..0000000000 Binary files a/sound/vox/mister.wav and /dev/null differ diff --git a/sound/vox/mode.wav b/sound/vox/mode.wav deleted file mode 100644 index e1060e9661..0000000000 Binary files a/sound/vox/mode.wav and /dev/null differ diff --git a/sound/vox/motor.wav b/sound/vox/motor.wav deleted file mode 100644 index 7d1dbaeba4..0000000000 Binary files a/sound/vox/motor.wav and /dev/null differ diff --git a/sound/vox/motorpool.wav b/sound/vox/motorpool.wav deleted file mode 100644 index ae5a6af0d6..0000000000 Binary files a/sound/vox/motorpool.wav and /dev/null differ diff --git a/sound/vox/move.wav b/sound/vox/move.wav deleted file mode 100644 index 1bc2172297..0000000000 Binary files a/sound/vox/move.wav and /dev/null differ diff --git a/sound/vox/must.wav b/sound/vox/must.wav deleted file mode 100644 index 3e6e965bec..0000000000 Binary files a/sound/vox/must.wav and /dev/null differ diff --git a/sound/vox/nearest.wav b/sound/vox/nearest.wav deleted file mode 100644 index 3f84ee7241..0000000000 Binary files a/sound/vox/nearest.wav and /dev/null differ diff --git a/sound/vox/nice.wav b/sound/vox/nice.wav deleted file mode 100644 index 8bd140649f..0000000000 Binary files a/sound/vox/nice.wav and /dev/null differ diff --git a/sound/vox/nine.wav b/sound/vox/nine.wav deleted file mode 100644 index b85745edf9..0000000000 Binary files a/sound/vox/nine.wav and /dev/null differ diff --git a/sound/vox/nineteen.wav b/sound/vox/nineteen.wav deleted file mode 100644 index c6da48310b..0000000000 Binary files a/sound/vox/nineteen.wav and /dev/null differ diff --git a/sound/vox/ninety.wav b/sound/vox/ninety.wav deleted file mode 100644 index 74e2e02d41..0000000000 Binary files a/sound/vox/ninety.wav and /dev/null differ diff --git a/sound/vox/no.wav b/sound/vox/no.wav deleted file mode 100644 index ced1b6617c..0000000000 Binary files a/sound/vox/no.wav and /dev/null differ diff --git a/sound/vox/nominal.wav b/sound/vox/nominal.wav deleted file mode 100644 index f0656302d1..0000000000 Binary files a/sound/vox/nominal.wav and /dev/null differ diff --git a/sound/vox/north.wav b/sound/vox/north.wav deleted file mode 100644 index 4867fdc7bc..0000000000 Binary files a/sound/vox/north.wav and /dev/null differ diff --git a/sound/vox/not.wav b/sound/vox/not.wav deleted file mode 100644 index 626cd17774..0000000000 Binary files a/sound/vox/not.wav and /dev/null differ diff --git a/sound/vox/november.wav b/sound/vox/november.wav deleted file mode 100644 index 212efe5f9a..0000000000 Binary files a/sound/vox/november.wav and /dev/null differ diff --git a/sound/vox/now.wav b/sound/vox/now.wav deleted file mode 100644 index 0619087d59..0000000000 Binary files a/sound/vox/now.wav and /dev/null differ diff --git a/sound/vox/number.wav b/sound/vox/number.wav deleted file mode 100644 index cfec10a75e..0000000000 Binary files a/sound/vox/number.wav and /dev/null differ diff --git a/sound/vox/objective.wav b/sound/vox/objective.wav deleted file mode 100644 index 14ea571aa6..0000000000 Binary files a/sound/vox/objective.wav and /dev/null differ diff --git a/sound/vox/observation.wav b/sound/vox/observation.wav deleted file mode 100644 index 9141789671..0000000000 Binary files a/sound/vox/observation.wav and /dev/null differ diff --git a/sound/vox/of.wav b/sound/vox/of.wav deleted file mode 100644 index 7cf5427dfb..0000000000 Binary files a/sound/vox/of.wav and /dev/null differ diff --git a/sound/vox/officer.wav b/sound/vox/officer.wav deleted file mode 100644 index 9017915aef..0000000000 Binary files a/sound/vox/officer.wav and /dev/null differ diff --git a/sound/vox/ok.wav b/sound/vox/ok.wav deleted file mode 100644 index 66011aed6d..0000000000 Binary files a/sound/vox/ok.wav and /dev/null differ diff --git a/sound/vox/on.wav b/sound/vox/on.wav deleted file mode 100644 index 2b97a1fd46..0000000000 Binary files a/sound/vox/on.wav and /dev/null differ diff --git a/sound/vox/one.wav b/sound/vox/one.wav deleted file mode 100644 index 57f2b3f14d..0000000000 Binary files a/sound/vox/one.wav and /dev/null differ diff --git a/sound/vox/open.wav b/sound/vox/open.wav deleted file mode 100644 index be98260bb9..0000000000 Binary files a/sound/vox/open.wav and /dev/null differ diff --git a/sound/vox/operating.wav b/sound/vox/operating.wav deleted file mode 100644 index b218069420..0000000000 Binary files a/sound/vox/operating.wav and /dev/null differ diff --git a/sound/vox/operations.wav b/sound/vox/operations.wav deleted file mode 100644 index 37c9d75e0e..0000000000 Binary files a/sound/vox/operations.wav and /dev/null differ diff --git a/sound/vox/operative.wav b/sound/vox/operative.wav deleted file mode 100644 index 70f99029cd..0000000000 Binary files a/sound/vox/operative.wav and /dev/null differ diff --git a/sound/vox/option.wav b/sound/vox/option.wav deleted file mode 100644 index a5199b71de..0000000000 Binary files a/sound/vox/option.wav and /dev/null differ diff --git a/sound/vox/order.wav b/sound/vox/order.wav deleted file mode 100644 index c5a2548340..0000000000 Binary files a/sound/vox/order.wav and /dev/null differ diff --git a/sound/vox/organic.wav b/sound/vox/organic.wav deleted file mode 100644 index 78dc879d7c..0000000000 Binary files a/sound/vox/organic.wav and /dev/null differ diff --git a/sound/vox/oscar.wav b/sound/vox/oscar.wav deleted file mode 100644 index 32db2392d5..0000000000 Binary files a/sound/vox/oscar.wav and /dev/null differ diff --git a/sound/vox/out.wav b/sound/vox/out.wav deleted file mode 100644 index 4aca4d7070..0000000000 Binary files a/sound/vox/out.wav and /dev/null differ diff --git a/sound/vox/outside.wav b/sound/vox/outside.wav deleted file mode 100644 index 62993ea5e4..0000000000 Binary files a/sound/vox/outside.wav and /dev/null differ diff --git a/sound/vox/over.wav b/sound/vox/over.wav deleted file mode 100644 index 8068c74f73..0000000000 Binary files a/sound/vox/over.wav and /dev/null differ diff --git a/sound/vox/overload.wav b/sound/vox/overload.wav deleted file mode 100644 index d932cb3ded..0000000000 Binary files a/sound/vox/overload.wav and /dev/null differ diff --git a/sound/vox/override.wav b/sound/vox/override.wav deleted file mode 100644 index 132667e7ea..0000000000 Binary files a/sound/vox/override.wav and /dev/null differ diff --git a/sound/vox/pacify.wav b/sound/vox/pacify.wav deleted file mode 100644 index 6a596197d7..0000000000 Binary files a/sound/vox/pacify.wav and /dev/null differ diff --git a/sound/vox/pain.wav b/sound/vox/pain.wav deleted file mode 100644 index bdb30dded8..0000000000 Binary files a/sound/vox/pain.wav and /dev/null differ diff --git a/sound/vox/pal.wav b/sound/vox/pal.wav deleted file mode 100644 index 28eb17ce99..0000000000 Binary files a/sound/vox/pal.wav and /dev/null differ diff --git a/sound/vox/panel.wav b/sound/vox/panel.wav deleted file mode 100644 index ce1f22fd23..0000000000 Binary files a/sound/vox/panel.wav and /dev/null differ diff --git a/sound/vox/percent.wav b/sound/vox/percent.wav deleted file mode 100644 index 9e775863ae..0000000000 Binary files a/sound/vox/percent.wav and /dev/null differ diff --git a/sound/vox/perimeter.wav b/sound/vox/perimeter.wav deleted file mode 100644 index 91a8d95d91..0000000000 Binary files a/sound/vox/perimeter.wav and /dev/null differ diff --git a/sound/vox/permitted.wav b/sound/vox/permitted.wav deleted file mode 100644 index 015d10eaa8..0000000000 Binary files a/sound/vox/permitted.wav and /dev/null differ diff --git a/sound/vox/personnel.wav b/sound/vox/personnel.wav deleted file mode 100644 index 665a3215c9..0000000000 Binary files a/sound/vox/personnel.wav and /dev/null differ diff --git a/sound/vox/pipe.wav b/sound/vox/pipe.wav deleted file mode 100644 index 53abe7db8b..0000000000 Binary files a/sound/vox/pipe.wav and /dev/null differ diff --git a/sound/vox/plant.wav b/sound/vox/plant.wav deleted file mode 100644 index 8fc84c60ac..0000000000 Binary files a/sound/vox/plant.wav and /dev/null differ diff --git a/sound/vox/platform.wav b/sound/vox/platform.wav deleted file mode 100644 index 72ca2c179f..0000000000 Binary files a/sound/vox/platform.wav and /dev/null differ diff --git a/sound/vox/please.wav b/sound/vox/please.wav deleted file mode 100644 index 4dc346e3e0..0000000000 Binary files a/sound/vox/please.wav and /dev/null differ diff --git a/sound/vox/point.wav b/sound/vox/point.wav deleted file mode 100644 index 26e4ca508b..0000000000 Binary files a/sound/vox/point.wav and /dev/null differ diff --git a/sound/vox/portal.wav b/sound/vox/portal.wav deleted file mode 100644 index 2f093e9924..0000000000 Binary files a/sound/vox/portal.wav and /dev/null differ diff --git a/sound/vox/power.wav b/sound/vox/power.wav deleted file mode 100644 index 3256e3ee99..0000000000 Binary files a/sound/vox/power.wav and /dev/null differ diff --git a/sound/vox/presence.wav b/sound/vox/presence.wav deleted file mode 100644 index c7a3b8f1e0..0000000000 Binary files a/sound/vox/presence.wav and /dev/null differ diff --git a/sound/vox/press.wav b/sound/vox/press.wav deleted file mode 100644 index 138ef0f2eb..0000000000 Binary files a/sound/vox/press.wav and /dev/null differ diff --git a/sound/vox/primary.wav b/sound/vox/primary.wav deleted file mode 100644 index ed107abdd1..0000000000 Binary files a/sound/vox/primary.wav and /dev/null differ diff --git a/sound/vox/proceed.wav b/sound/vox/proceed.wav deleted file mode 100644 index ec5ba2f438..0000000000 Binary files a/sound/vox/proceed.wav and /dev/null differ diff --git a/sound/vox/processing.wav b/sound/vox/processing.wav deleted file mode 100644 index 3470d8eb07..0000000000 Binary files a/sound/vox/processing.wav and /dev/null differ diff --git a/sound/vox/progress.wav b/sound/vox/progress.wav deleted file mode 100644 index ab2ef1914f..0000000000 Binary files a/sound/vox/progress.wav and /dev/null differ diff --git a/sound/vox/proper.wav b/sound/vox/proper.wav deleted file mode 100644 index fb799ae067..0000000000 Binary files a/sound/vox/proper.wav and /dev/null differ diff --git a/sound/vox/propulsion.wav b/sound/vox/propulsion.wav deleted file mode 100644 index cc60270a56..0000000000 Binary files a/sound/vox/propulsion.wav and /dev/null differ diff --git a/sound/vox/prosecute.wav b/sound/vox/prosecute.wav deleted file mode 100644 index 9d76be850b..0000000000 Binary files a/sound/vox/prosecute.wav and /dev/null differ diff --git a/sound/vox/protective.wav b/sound/vox/protective.wav deleted file mode 100644 index be17714e62..0000000000 Binary files a/sound/vox/protective.wav and /dev/null differ diff --git a/sound/vox/push.wav b/sound/vox/push.wav deleted file mode 100644 index db91cb1229..0000000000 Binary files a/sound/vox/push.wav and /dev/null differ diff --git a/sound/vox/quantum.wav b/sound/vox/quantum.wav deleted file mode 100644 index 3e5ee45d7b..0000000000 Binary files a/sound/vox/quantum.wav and /dev/null differ diff --git a/sound/vox/quebec.wav b/sound/vox/quebec.wav deleted file mode 100644 index 6323a992cb..0000000000 Binary files a/sound/vox/quebec.wav and /dev/null differ diff --git a/sound/vox/question.wav b/sound/vox/question.wav deleted file mode 100644 index cf6de8dd52..0000000000 Binary files a/sound/vox/question.wav and /dev/null differ diff --git a/sound/vox/questioning.wav b/sound/vox/questioning.wav deleted file mode 100644 index 51f08488dc..0000000000 Binary files a/sound/vox/questioning.wav and /dev/null differ diff --git a/sound/vox/quick.wav b/sound/vox/quick.wav deleted file mode 100644 index 82c6c493d7..0000000000 Binary files a/sound/vox/quick.wav and /dev/null differ diff --git a/sound/vox/quit.wav b/sound/vox/quit.wav deleted file mode 100644 index 1ee00b87a1..0000000000 Binary files a/sound/vox/quit.wav and /dev/null differ diff --git a/sound/vox/radiation.wav b/sound/vox/radiation.wav deleted file mode 100644 index 5551f24b44..0000000000 Binary files a/sound/vox/radiation.wav and /dev/null differ diff --git a/sound/vox/radioactive.wav b/sound/vox/radioactive.wav deleted file mode 100644 index 84b3b4a180..0000000000 Binary files a/sound/vox/radioactive.wav and /dev/null differ diff --git a/sound/vox/rads.wav b/sound/vox/rads.wav deleted file mode 100644 index 13802ea302..0000000000 Binary files a/sound/vox/rads.wav and /dev/null differ diff --git a/sound/vox/rapid.wav b/sound/vox/rapid.wav deleted file mode 100644 index fdfdd10faa..0000000000 Binary files a/sound/vox/rapid.wav and /dev/null differ diff --git a/sound/vox/reach.wav b/sound/vox/reach.wav deleted file mode 100644 index 5b2ec24bd4..0000000000 Binary files a/sound/vox/reach.wav and /dev/null differ diff --git a/sound/vox/reached.wav b/sound/vox/reached.wav deleted file mode 100644 index 22bd766019..0000000000 Binary files a/sound/vox/reached.wav and /dev/null differ diff --git a/sound/vox/reactor.wav b/sound/vox/reactor.wav deleted file mode 100644 index c8fb909be0..0000000000 Binary files a/sound/vox/reactor.wav and /dev/null differ diff --git a/sound/vox/red.wav b/sound/vox/red.wav deleted file mode 100644 index 777e546648..0000000000 Binary files a/sound/vox/red.wav and /dev/null differ diff --git a/sound/vox/relay.wav b/sound/vox/relay.wav deleted file mode 100644 index bef9fb0927..0000000000 Binary files a/sound/vox/relay.wav and /dev/null differ diff --git a/sound/vox/released.wav b/sound/vox/released.wav deleted file mode 100644 index ba56d6d955..0000000000 Binary files a/sound/vox/released.wav and /dev/null differ diff --git a/sound/vox/remaining.wav b/sound/vox/remaining.wav deleted file mode 100644 index 0c393ee9d1..0000000000 Binary files a/sound/vox/remaining.wav and /dev/null differ diff --git a/sound/vox/renegade.wav b/sound/vox/renegade.wav deleted file mode 100644 index 0dc4518edc..0000000000 Binary files a/sound/vox/renegade.wav and /dev/null differ diff --git a/sound/vox/repair.wav b/sound/vox/repair.wav deleted file mode 100644 index be2fe5418e..0000000000 Binary files a/sound/vox/repair.wav and /dev/null differ diff --git a/sound/vox/report.wav b/sound/vox/report.wav deleted file mode 100644 index 685c387894..0000000000 Binary files a/sound/vox/report.wav and /dev/null differ diff --git a/sound/vox/reports.wav b/sound/vox/reports.wav deleted file mode 100644 index 19e8f0478b..0000000000 Binary files a/sound/vox/reports.wav and /dev/null differ diff --git a/sound/vox/required.wav b/sound/vox/required.wav deleted file mode 100644 index c5bbf850b4..0000000000 Binary files a/sound/vox/required.wav and /dev/null differ diff --git a/sound/vox/research.wav b/sound/vox/research.wav deleted file mode 100644 index d7385867da..0000000000 Binary files a/sound/vox/research.wav and /dev/null differ diff --git a/sound/vox/resevoir.wav b/sound/vox/resevoir.wav deleted file mode 100644 index 7b67635b92..0000000000 Binary files a/sound/vox/resevoir.wav and /dev/null differ diff --git a/sound/vox/resistance.wav b/sound/vox/resistance.wav deleted file mode 100644 index 1f3f90b0f9..0000000000 Binary files a/sound/vox/resistance.wav and /dev/null differ diff --git a/sound/vox/right.wav b/sound/vox/right.wav deleted file mode 100644 index 0c920c843d..0000000000 Binary files a/sound/vox/right.wav and /dev/null differ diff --git a/sound/vox/rocket.wav b/sound/vox/rocket.wav deleted file mode 100644 index 57d7e6a8e0..0000000000 Binary files a/sound/vox/rocket.wav and /dev/null differ diff --git a/sound/vox/roger.wav b/sound/vox/roger.wav deleted file mode 100644 index 426014be23..0000000000 Binary files a/sound/vox/roger.wav and /dev/null differ diff --git a/sound/vox/romeo.wav b/sound/vox/romeo.wav deleted file mode 100644 index 42590922e4..0000000000 Binary files a/sound/vox/romeo.wav and /dev/null differ diff --git a/sound/vox/room.wav b/sound/vox/room.wav deleted file mode 100644 index da12c55fea..0000000000 Binary files a/sound/vox/room.wav and /dev/null differ diff --git a/sound/vox/round.wav b/sound/vox/round.wav deleted file mode 100644 index 76d30382eb..0000000000 Binary files a/sound/vox/round.wav and /dev/null differ diff --git a/sound/vox/run.wav b/sound/vox/run.wav deleted file mode 100644 index f2baec69b1..0000000000 Binary files a/sound/vox/run.wav and /dev/null differ diff --git a/sound/vox/safe.wav b/sound/vox/safe.wav deleted file mode 100644 index 65d52fbcdc..0000000000 Binary files a/sound/vox/safe.wav and /dev/null differ diff --git a/sound/vox/safety.wav b/sound/vox/safety.wav deleted file mode 100644 index b24e8951b2..0000000000 Binary files a/sound/vox/safety.wav and /dev/null differ diff --git a/sound/vox/sargeant.wav b/sound/vox/sargeant.wav deleted file mode 100644 index e26c6a301e..0000000000 Binary files a/sound/vox/sargeant.wav and /dev/null differ diff --git a/sound/vox/satellite.wav b/sound/vox/satellite.wav deleted file mode 100644 index 45187b819b..0000000000 Binary files a/sound/vox/satellite.wav and /dev/null differ diff --git a/sound/vox/save.wav b/sound/vox/save.wav deleted file mode 100644 index db09e27539..0000000000 Binary files a/sound/vox/save.wav and /dev/null differ diff --git a/sound/vox/science.wav b/sound/vox/science.wav deleted file mode 100644 index cb1f2d7236..0000000000 Binary files a/sound/vox/science.wav and /dev/null differ diff --git a/sound/vox/scream.wav b/sound/vox/scream.wav deleted file mode 100644 index 66afd0983d..0000000000 Binary files a/sound/vox/scream.wav and /dev/null differ diff --git a/sound/vox/screen.wav b/sound/vox/screen.wav deleted file mode 100644 index bb375266bb..0000000000 Binary files a/sound/vox/screen.wav and /dev/null differ diff --git a/sound/vox/search.wav b/sound/vox/search.wav deleted file mode 100644 index 023072d989..0000000000 Binary files a/sound/vox/search.wav and /dev/null differ diff --git a/sound/vox/second.wav b/sound/vox/second.wav deleted file mode 100644 index dbed0caa0a..0000000000 Binary files a/sound/vox/second.wav and /dev/null differ diff --git a/sound/vox/secondary.wav b/sound/vox/secondary.wav deleted file mode 100644 index af29ac286c..0000000000 Binary files a/sound/vox/secondary.wav and /dev/null differ diff --git a/sound/vox/seconds.wav b/sound/vox/seconds.wav deleted file mode 100644 index a631ea1db0..0000000000 Binary files a/sound/vox/seconds.wav and /dev/null differ diff --git a/sound/vox/sector.wav b/sound/vox/sector.wav deleted file mode 100644 index 2318ccf631..0000000000 Binary files a/sound/vox/sector.wav and /dev/null differ diff --git a/sound/vox/secure.wav b/sound/vox/secure.wav deleted file mode 100644 index 17fe6225ff..0000000000 Binary files a/sound/vox/secure.wav and /dev/null differ diff --git a/sound/vox/secured.wav b/sound/vox/secured.wav deleted file mode 100644 index 8007a48c0d..0000000000 Binary files a/sound/vox/secured.wav and /dev/null differ diff --git a/sound/vox/security.wav b/sound/vox/security.wav deleted file mode 100644 index 16435fdf51..0000000000 Binary files a/sound/vox/security.wav and /dev/null differ diff --git a/sound/vox/select.wav b/sound/vox/select.wav deleted file mode 100644 index 9b89d52bb0..0000000000 Binary files a/sound/vox/select.wav and /dev/null differ diff --git a/sound/vox/selected.wav b/sound/vox/selected.wav deleted file mode 100644 index d4124f579a..0000000000 Binary files a/sound/vox/selected.wav and /dev/null differ diff --git a/sound/vox/service.wav b/sound/vox/service.wav deleted file mode 100644 index 3f6957d2e0..0000000000 Binary files a/sound/vox/service.wav and /dev/null differ diff --git a/sound/vox/seven.wav b/sound/vox/seven.wav deleted file mode 100644 index eca99c196a..0000000000 Binary files a/sound/vox/seven.wav and /dev/null differ diff --git a/sound/vox/seventeen.wav b/sound/vox/seventeen.wav deleted file mode 100644 index 9526b8a4e3..0000000000 Binary files a/sound/vox/seventeen.wav and /dev/null differ diff --git a/sound/vox/seventy.wav b/sound/vox/seventy.wav deleted file mode 100644 index 1b45ce6afe..0000000000 Binary files a/sound/vox/seventy.wav and /dev/null differ diff --git a/sound/vox/severe.wav b/sound/vox/severe.wav deleted file mode 100644 index fed84eea85..0000000000 Binary files a/sound/vox/severe.wav and /dev/null differ diff --git a/sound/vox/sewage.wav b/sound/vox/sewage.wav deleted file mode 100644 index 60978963e2..0000000000 Binary files a/sound/vox/sewage.wav and /dev/null differ diff --git a/sound/vox/sewer.wav b/sound/vox/sewer.wav deleted file mode 100644 index 5071a1d64a..0000000000 Binary files a/sound/vox/sewer.wav and /dev/null differ diff --git a/sound/vox/shield.wav b/sound/vox/shield.wav deleted file mode 100644 index 0ab01e0a6a..0000000000 Binary files a/sound/vox/shield.wav and /dev/null differ diff --git a/sound/vox/shipment.wav b/sound/vox/shipment.wav deleted file mode 100644 index 9b9014c51d..0000000000 Binary files a/sound/vox/shipment.wav and /dev/null differ diff --git a/sound/vox/shock.wav b/sound/vox/shock.wav deleted file mode 100644 index d4451bdf3c..0000000000 Binary files a/sound/vox/shock.wav and /dev/null differ diff --git a/sound/vox/shoot.wav b/sound/vox/shoot.wav deleted file mode 100644 index 5661ceb9c9..0000000000 Binary files a/sound/vox/shoot.wav and /dev/null differ diff --git a/sound/vox/shower.wav b/sound/vox/shower.wav deleted file mode 100644 index c32a9e42e0..0000000000 Binary files a/sound/vox/shower.wav and /dev/null differ diff --git a/sound/vox/shut.wav b/sound/vox/shut.wav deleted file mode 100644 index 6f68340502..0000000000 Binary files a/sound/vox/shut.wav and /dev/null differ diff --git a/sound/vox/side.wav b/sound/vox/side.wav deleted file mode 100644 index 4f4091a4e5..0000000000 Binary files a/sound/vox/side.wav and /dev/null differ diff --git a/sound/vox/sierra.wav b/sound/vox/sierra.wav deleted file mode 100644 index 0e52a6ec56..0000000000 Binary files a/sound/vox/sierra.wav and /dev/null differ diff --git a/sound/vox/sight.wav b/sound/vox/sight.wav deleted file mode 100644 index 5d479cab75..0000000000 Binary files a/sound/vox/sight.wav and /dev/null differ diff --git a/sound/vox/silo.wav b/sound/vox/silo.wav deleted file mode 100644 index daf9f28be1..0000000000 Binary files a/sound/vox/silo.wav and /dev/null differ diff --git a/sound/vox/six.wav b/sound/vox/six.wav deleted file mode 100644 index aa6bb638e3..0000000000 Binary files a/sound/vox/six.wav and /dev/null differ diff --git a/sound/vox/sixteen.wav b/sound/vox/sixteen.wav deleted file mode 100644 index 6f2db2ad9d..0000000000 Binary files a/sound/vox/sixteen.wav and /dev/null differ diff --git a/sound/vox/sixty.wav b/sound/vox/sixty.wav deleted file mode 100644 index 19610c7f79..0000000000 Binary files a/sound/vox/sixty.wav and /dev/null differ diff --git a/sound/vox/slime.wav b/sound/vox/slime.wav deleted file mode 100644 index 4d1d3cf6a4..0000000000 Binary files a/sound/vox/slime.wav and /dev/null differ diff --git a/sound/vox/slow.wav b/sound/vox/slow.wav deleted file mode 100644 index 75101b7de4..0000000000 Binary files a/sound/vox/slow.wav and /dev/null differ diff --git a/sound/vox/soldier.wav b/sound/vox/soldier.wav deleted file mode 100644 index c84ce20178..0000000000 Binary files a/sound/vox/soldier.wav and /dev/null differ diff --git a/sound/vox/some.wav b/sound/vox/some.wav deleted file mode 100644 index c4ba34efff..0000000000 Binary files a/sound/vox/some.wav and /dev/null differ diff --git a/sound/vox/someone.wav b/sound/vox/someone.wav deleted file mode 100644 index 6f6183e1f7..0000000000 Binary files a/sound/vox/someone.wav and /dev/null differ diff --git a/sound/vox/something.wav b/sound/vox/something.wav deleted file mode 100644 index 4601140095..0000000000 Binary files a/sound/vox/something.wav and /dev/null differ diff --git a/sound/vox/son.wav b/sound/vox/son.wav deleted file mode 100644 index f23495127e..0000000000 Binary files a/sound/vox/son.wav and /dev/null differ diff --git a/sound/vox/sorry.wav b/sound/vox/sorry.wav deleted file mode 100644 index 4c0725b938..0000000000 Binary files a/sound/vox/sorry.wav and /dev/null differ diff --git a/sound/vox/south.wav b/sound/vox/south.wav deleted file mode 100644 index 3a5ba00410..0000000000 Binary files a/sound/vox/south.wav and /dev/null differ diff --git a/sound/vox/squad.wav b/sound/vox/squad.wav deleted file mode 100644 index 71739d1498..0000000000 Binary files a/sound/vox/squad.wav and /dev/null differ diff --git a/sound/vox/square.wav b/sound/vox/square.wav deleted file mode 100644 index f08f73a5f4..0000000000 Binary files a/sound/vox/square.wav and /dev/null differ diff --git a/sound/vox/stairway.wav b/sound/vox/stairway.wav deleted file mode 100644 index ab84571c82..0000000000 Binary files a/sound/vox/stairway.wav and /dev/null differ diff --git a/sound/vox/status.wav b/sound/vox/status.wav deleted file mode 100644 index 42fe8b7822..0000000000 Binary files a/sound/vox/status.wav and /dev/null differ diff --git a/sound/vox/sterile.wav b/sound/vox/sterile.wav deleted file mode 100644 index d95753222b..0000000000 Binary files a/sound/vox/sterile.wav and /dev/null differ diff --git a/sound/vox/sterilization.wav b/sound/vox/sterilization.wav deleted file mode 100644 index f53240310c..0000000000 Binary files a/sound/vox/sterilization.wav and /dev/null differ diff --git a/sound/vox/storage.wav b/sound/vox/storage.wav deleted file mode 100644 index 18954a4f79..0000000000 Binary files a/sound/vox/storage.wav and /dev/null differ diff --git a/sound/vox/sub.wav b/sound/vox/sub.wav deleted file mode 100644 index d25510d3c0..0000000000 Binary files a/sound/vox/sub.wav and /dev/null differ diff --git a/sound/vox/subsurface.wav b/sound/vox/subsurface.wav deleted file mode 100644 index cb19be3a88..0000000000 Binary files a/sound/vox/subsurface.wav and /dev/null differ diff --git a/sound/vox/sudden.wav b/sound/vox/sudden.wav deleted file mode 100644 index b5eb4088ac..0000000000 Binary files a/sound/vox/sudden.wav and /dev/null differ diff --git a/sound/vox/suit.wav b/sound/vox/suit.wav deleted file mode 100644 index d099c95843..0000000000 Binary files a/sound/vox/suit.wav and /dev/null differ diff --git a/sound/vox/superconducting.wav b/sound/vox/superconducting.wav deleted file mode 100644 index ad4fcc8f9d..0000000000 Binary files a/sound/vox/superconducting.wav and /dev/null differ diff --git a/sound/vox/supercooled.wav b/sound/vox/supercooled.wav deleted file mode 100644 index 936562ed4f..0000000000 Binary files a/sound/vox/supercooled.wav and /dev/null differ diff --git a/sound/vox/supply.wav b/sound/vox/supply.wav deleted file mode 100644 index 4b33c8e9b7..0000000000 Binary files a/sound/vox/supply.wav and /dev/null differ diff --git a/sound/vox/surface.wav b/sound/vox/surface.wav deleted file mode 100644 index 0b02d732a9..0000000000 Binary files a/sound/vox/surface.wav and /dev/null differ diff --git a/sound/vox/surrender.wav b/sound/vox/surrender.wav deleted file mode 100644 index f0a17b395a..0000000000 Binary files a/sound/vox/surrender.wav and /dev/null differ diff --git a/sound/vox/surround.wav b/sound/vox/surround.wav deleted file mode 100644 index c9afd86f9c..0000000000 Binary files a/sound/vox/surround.wav and /dev/null differ diff --git a/sound/vox/surrounded.wav b/sound/vox/surrounded.wav deleted file mode 100644 index 3cbf513481..0000000000 Binary files a/sound/vox/surrounded.wav and /dev/null differ diff --git a/sound/vox/switch.wav b/sound/vox/switch.wav deleted file mode 100644 index f5ffcc7a6b..0000000000 Binary files a/sound/vox/switch.wav and /dev/null differ diff --git a/sound/vox/system.wav b/sound/vox/system.wav deleted file mode 100644 index 078727a081..0000000000 Binary files a/sound/vox/system.wav and /dev/null differ diff --git a/sound/vox/systems.wav b/sound/vox/systems.wav deleted file mode 100644 index c880250830..0000000000 Binary files a/sound/vox/systems.wav and /dev/null differ diff --git a/sound/vox/tactical.wav b/sound/vox/tactical.wav deleted file mode 100644 index 6b1aca650b..0000000000 Binary files a/sound/vox/tactical.wav and /dev/null differ diff --git a/sound/vox/take.wav b/sound/vox/take.wav deleted file mode 100644 index 70644f5220..0000000000 Binary files a/sound/vox/take.wav and /dev/null differ diff --git a/sound/vox/talk.wav b/sound/vox/talk.wav deleted file mode 100644 index 3ff83c48c9..0000000000 Binary files a/sound/vox/talk.wav and /dev/null differ diff --git a/sound/vox/tango.wav b/sound/vox/tango.wav deleted file mode 100644 index 37b6f4fe19..0000000000 Binary files a/sound/vox/tango.wav and /dev/null differ diff --git a/sound/vox/tank.wav b/sound/vox/tank.wav deleted file mode 100644 index 9608b0d749..0000000000 Binary files a/sound/vox/tank.wav and /dev/null differ diff --git a/sound/vox/target.wav b/sound/vox/target.wav deleted file mode 100644 index bd004147bf..0000000000 Binary files a/sound/vox/target.wav and /dev/null differ diff --git a/sound/vox/team.wav b/sound/vox/team.wav deleted file mode 100644 index d0e47d4e10..0000000000 Binary files a/sound/vox/team.wav and /dev/null differ diff --git a/sound/vox/temperature.wav b/sound/vox/temperature.wav deleted file mode 100644 index e9b51dada7..0000000000 Binary files a/sound/vox/temperature.wav and /dev/null differ diff --git a/sound/vox/temporal.wav b/sound/vox/temporal.wav deleted file mode 100644 index d0398a0f8c..0000000000 Binary files a/sound/vox/temporal.wav and /dev/null differ diff --git a/sound/vox/ten.wav b/sound/vox/ten.wav deleted file mode 100644 index fd0f353f6b..0000000000 Binary files a/sound/vox/ten.wav and /dev/null differ diff --git a/sound/vox/terminal.wav b/sound/vox/terminal.wav deleted file mode 100644 index 5ffe39101e..0000000000 Binary files a/sound/vox/terminal.wav and /dev/null differ diff --git a/sound/vox/terminated.wav b/sound/vox/terminated.wav deleted file mode 100644 index 1c972f092c..0000000000 Binary files a/sound/vox/terminated.wav and /dev/null differ diff --git a/sound/vox/termination.wav b/sound/vox/termination.wav deleted file mode 100644 index f093cd31a1..0000000000 Binary files a/sound/vox/termination.wav and /dev/null differ diff --git a/sound/vox/test.wav b/sound/vox/test.wav deleted file mode 100644 index f7c9b461fc..0000000000 Binary files a/sound/vox/test.wav and /dev/null differ diff --git a/sound/vox/that.wav b/sound/vox/that.wav deleted file mode 100644 index f9e8c92873..0000000000 Binary files a/sound/vox/that.wav and /dev/null differ diff --git a/sound/vox/the.wav b/sound/vox/the.wav deleted file mode 100644 index 3a07ea3be8..0000000000 Binary files a/sound/vox/the.wav and /dev/null differ diff --git a/sound/vox/then.wav b/sound/vox/then.wav deleted file mode 100644 index 1c2ec53386..0000000000 Binary files a/sound/vox/then.wav and /dev/null differ diff --git a/sound/vox/there.wav b/sound/vox/there.wav deleted file mode 100644 index 0e25880076..0000000000 Binary files a/sound/vox/there.wav and /dev/null differ diff --git a/sound/vox/third.wav b/sound/vox/third.wav deleted file mode 100644 index 962f2f9697..0000000000 Binary files a/sound/vox/third.wav and /dev/null differ diff --git a/sound/vox/thirteen.wav b/sound/vox/thirteen.wav deleted file mode 100644 index 1c392cfa3e..0000000000 Binary files a/sound/vox/thirteen.wav and /dev/null differ diff --git a/sound/vox/thirty.wav b/sound/vox/thirty.wav deleted file mode 100644 index d7a34d4351..0000000000 Binary files a/sound/vox/thirty.wav and /dev/null differ diff --git a/sound/vox/this.wav b/sound/vox/this.wav deleted file mode 100644 index b8f51ea151..0000000000 Binary files a/sound/vox/this.wav and /dev/null differ diff --git a/sound/vox/those.wav b/sound/vox/those.wav deleted file mode 100644 index ef7db90721..0000000000 Binary files a/sound/vox/those.wav and /dev/null differ diff --git a/sound/vox/thousand.wav b/sound/vox/thousand.wav deleted file mode 100644 index b1f9df6edd..0000000000 Binary files a/sound/vox/thousand.wav and /dev/null differ diff --git a/sound/vox/threat.wav b/sound/vox/threat.wav deleted file mode 100644 index 75cefae187..0000000000 Binary files a/sound/vox/threat.wav and /dev/null differ diff --git a/sound/vox/three.wav b/sound/vox/three.wav deleted file mode 100644 index 097504d605..0000000000 Binary files a/sound/vox/three.wav and /dev/null differ diff --git a/sound/vox/through.wav b/sound/vox/through.wav deleted file mode 100644 index 78053bdf90..0000000000 Binary files a/sound/vox/through.wav and /dev/null differ diff --git a/sound/vox/time.wav b/sound/vox/time.wav deleted file mode 100644 index 856529d6a4..0000000000 Binary files a/sound/vox/time.wav and /dev/null differ diff --git a/sound/vox/to.wav b/sound/vox/to.wav deleted file mode 100644 index 5189cf2d58..0000000000 Binary files a/sound/vox/to.wav and /dev/null differ diff --git a/sound/vox/top.wav b/sound/vox/top.wav deleted file mode 100644 index 0747e8965a..0000000000 Binary files a/sound/vox/top.wav and /dev/null differ diff --git a/sound/vox/topside.wav b/sound/vox/topside.wav deleted file mode 100644 index 6f6f54b973..0000000000 Binary files a/sound/vox/topside.wav and /dev/null differ diff --git a/sound/vox/touch.wav b/sound/vox/touch.wav deleted file mode 100644 index 6712dc18a3..0000000000 Binary files a/sound/vox/touch.wav and /dev/null differ diff --git a/sound/vox/towards.wav b/sound/vox/towards.wav deleted file mode 100644 index ff04147f15..0000000000 Binary files a/sound/vox/towards.wav and /dev/null differ diff --git a/sound/vox/track.wav b/sound/vox/track.wav deleted file mode 100644 index 5247acabd0..0000000000 Binary files a/sound/vox/track.wav and /dev/null differ diff --git a/sound/vox/train.wav b/sound/vox/train.wav deleted file mode 100644 index ced1a9850c..0000000000 Binary files a/sound/vox/train.wav and /dev/null differ diff --git a/sound/vox/transportation.wav b/sound/vox/transportation.wav deleted file mode 100644 index 302241aeb0..0000000000 Binary files a/sound/vox/transportation.wav and /dev/null differ diff --git a/sound/vox/truck.wav b/sound/vox/truck.wav deleted file mode 100644 index 1692a9c7dd..0000000000 Binary files a/sound/vox/truck.wav and /dev/null differ diff --git a/sound/vox/tunnel.wav b/sound/vox/tunnel.wav deleted file mode 100644 index f158042a9d..0000000000 Binary files a/sound/vox/tunnel.wav and /dev/null differ diff --git a/sound/vox/turn.wav b/sound/vox/turn.wav deleted file mode 100644 index 407d2cdbe8..0000000000 Binary files a/sound/vox/turn.wav and /dev/null differ diff --git a/sound/vox/turret.wav b/sound/vox/turret.wav deleted file mode 100644 index ec42293ebb..0000000000 Binary files a/sound/vox/turret.wav and /dev/null differ diff --git a/sound/vox/twelve.wav b/sound/vox/twelve.wav deleted file mode 100644 index d9fbcc2558..0000000000 Binary files a/sound/vox/twelve.wav and /dev/null differ diff --git a/sound/vox/twenty.wav b/sound/vox/twenty.wav deleted file mode 100644 index e6d7d8092d..0000000000 Binary files a/sound/vox/twenty.wav and /dev/null differ diff --git a/sound/vox/two.wav b/sound/vox/two.wav deleted file mode 100644 index 14f432fd5c..0000000000 Binary files a/sound/vox/two.wav and /dev/null differ diff --git a/sound/vox/unauthorized.wav b/sound/vox/unauthorized.wav deleted file mode 100644 index 7d3236f491..0000000000 Binary files a/sound/vox/unauthorized.wav and /dev/null differ diff --git a/sound/vox/under.wav b/sound/vox/under.wav deleted file mode 100644 index dc30e4711c..0000000000 Binary files a/sound/vox/under.wav and /dev/null differ diff --git a/sound/vox/uniform.wav b/sound/vox/uniform.wav deleted file mode 100644 index 899c7f029a..0000000000 Binary files a/sound/vox/uniform.wav and /dev/null differ diff --git a/sound/vox/unlocked.wav b/sound/vox/unlocked.wav deleted file mode 100644 index 0e48489db5..0000000000 Binary files a/sound/vox/unlocked.wav and /dev/null differ diff --git a/sound/vox/until.wav b/sound/vox/until.wav deleted file mode 100644 index 68f5ea47e4..0000000000 Binary files a/sound/vox/until.wav and /dev/null differ diff --git a/sound/vox/up.wav b/sound/vox/up.wav deleted file mode 100644 index 1816546702..0000000000 Binary files a/sound/vox/up.wav and /dev/null differ diff --git a/sound/vox/upper.wav b/sound/vox/upper.wav deleted file mode 100644 index 8b59156651..0000000000 Binary files a/sound/vox/upper.wav and /dev/null differ diff --git a/sound/vox/uranium.wav b/sound/vox/uranium.wav deleted file mode 100644 index 2ab47d6085..0000000000 Binary files a/sound/vox/uranium.wav and /dev/null differ diff --git a/sound/vox/us.wav b/sound/vox/us.wav deleted file mode 100644 index 23b56e9357..0000000000 Binary files a/sound/vox/us.wav and /dev/null differ diff --git a/sound/vox/usa.wav b/sound/vox/usa.wav deleted file mode 100644 index 591233e624..0000000000 Binary files a/sound/vox/usa.wav and /dev/null differ diff --git a/sound/vox/use.wav b/sound/vox/use.wav deleted file mode 100644 index 35be617775..0000000000 Binary files a/sound/vox/use.wav and /dev/null differ diff --git a/sound/vox/used.wav b/sound/vox/used.wav deleted file mode 100644 index 3385240fd9..0000000000 Binary files a/sound/vox/used.wav and /dev/null differ diff --git a/sound/vox/user.wav b/sound/vox/user.wav deleted file mode 100644 index 91ccb15af6..0000000000 Binary files a/sound/vox/user.wav and /dev/null differ diff --git a/sound/vox/vacate.wav b/sound/vox/vacate.wav deleted file mode 100644 index bed5d702e4..0000000000 Binary files a/sound/vox/vacate.wav and /dev/null differ diff --git a/sound/vox/valid.wav b/sound/vox/valid.wav deleted file mode 100644 index 40c3f1e4f6..0000000000 Binary files a/sound/vox/valid.wav and /dev/null differ diff --git a/sound/vox/vapor.wav b/sound/vox/vapor.wav deleted file mode 100644 index d067f69827..0000000000 Binary files a/sound/vox/vapor.wav and /dev/null differ diff --git a/sound/vox/vent.wav b/sound/vox/vent.wav deleted file mode 100644 index b4efa86991..0000000000 Binary files a/sound/vox/vent.wav and /dev/null differ diff --git a/sound/vox/ventillation.wav b/sound/vox/ventillation.wav deleted file mode 100644 index d56679dda1..0000000000 Binary files a/sound/vox/ventillation.wav and /dev/null differ diff --git a/sound/vox/victor.wav b/sound/vox/victor.wav deleted file mode 100644 index 8245a2abf4..0000000000 Binary files a/sound/vox/victor.wav and /dev/null differ diff --git a/sound/vox/violated.wav b/sound/vox/violated.wav deleted file mode 100644 index c597d1dfe2..0000000000 Binary files a/sound/vox/violated.wav and /dev/null differ diff --git a/sound/vox/violation.wav b/sound/vox/violation.wav deleted file mode 100644 index 98ed5dd0b9..0000000000 Binary files a/sound/vox/violation.wav and /dev/null differ diff --git a/sound/vox/voltage.wav b/sound/vox/voltage.wav deleted file mode 100644 index 140e1dd6a2..0000000000 Binary files a/sound/vox/voltage.wav and /dev/null differ diff --git a/sound/vox/vox_login.wav b/sound/vox/vox_login.wav deleted file mode 100644 index 5679acfce8..0000000000 Binary files a/sound/vox/vox_login.wav and /dev/null differ diff --git a/sound/vox/walk.wav b/sound/vox/walk.wav deleted file mode 100644 index fd8d85f84d..0000000000 Binary files a/sound/vox/walk.wav and /dev/null differ diff --git a/sound/vox/wall.wav b/sound/vox/wall.wav deleted file mode 100644 index e8e9a5fb4a..0000000000 Binary files a/sound/vox/wall.wav and /dev/null differ diff --git a/sound/vox/want.wav b/sound/vox/want.wav deleted file mode 100644 index 3d130ce8fe..0000000000 Binary files a/sound/vox/want.wav and /dev/null differ diff --git a/sound/vox/wanted.wav b/sound/vox/wanted.wav deleted file mode 100644 index a292d2d33b..0000000000 Binary files a/sound/vox/wanted.wav and /dev/null differ diff --git a/sound/vox/warm.wav b/sound/vox/warm.wav deleted file mode 100644 index 518f2905f4..0000000000 Binary files a/sound/vox/warm.wav and /dev/null differ diff --git a/sound/vox/warn.wav b/sound/vox/warn.wav deleted file mode 100644 index 7580146005..0000000000 Binary files a/sound/vox/warn.wav and /dev/null differ diff --git a/sound/vox/warning.wav b/sound/vox/warning.wav deleted file mode 100644 index 87db6c164b..0000000000 Binary files a/sound/vox/warning.wav and /dev/null differ diff --git a/sound/vox/waste.wav b/sound/vox/waste.wav deleted file mode 100644 index 245c44d682..0000000000 Binary files a/sound/vox/waste.wav and /dev/null differ diff --git a/sound/vox/water.wav b/sound/vox/water.wav deleted file mode 100644 index c29d7acf55..0000000000 Binary files a/sound/vox/water.wav and /dev/null differ diff --git a/sound/vox/we.wav b/sound/vox/we.wav deleted file mode 100644 index d7ba93484d..0000000000 Binary files a/sound/vox/we.wav and /dev/null differ diff --git a/sound/vox/weapon.wav b/sound/vox/weapon.wav deleted file mode 100644 index 3e95e9efc4..0000000000 Binary files a/sound/vox/weapon.wav and /dev/null differ diff --git a/sound/vox/west.wav b/sound/vox/west.wav deleted file mode 100644 index 09f58088c9..0000000000 Binary files a/sound/vox/west.wav and /dev/null differ diff --git a/sound/vox/whiskey.wav b/sound/vox/whiskey.wav deleted file mode 100644 index 11ef7b3aa0..0000000000 Binary files a/sound/vox/whiskey.wav and /dev/null differ diff --git a/sound/vox/white.wav b/sound/vox/white.wav deleted file mode 100644 index 6d4ec3e138..0000000000 Binary files a/sound/vox/white.wav and /dev/null differ diff --git a/sound/vox/wilco.wav b/sound/vox/wilco.wav deleted file mode 100644 index 862aa8d97d..0000000000 Binary files a/sound/vox/wilco.wav and /dev/null differ diff --git a/sound/vox/will.wav b/sound/vox/will.wav deleted file mode 100644 index 327d81c9d0..0000000000 Binary files a/sound/vox/will.wav and /dev/null differ diff --git a/sound/vox/with.wav b/sound/vox/with.wav deleted file mode 100644 index f1db548cd7..0000000000 Binary files a/sound/vox/with.wav and /dev/null differ diff --git a/sound/vox/without.wav b/sound/vox/without.wav deleted file mode 100644 index 7f3096df12..0000000000 Binary files a/sound/vox/without.wav and /dev/null differ diff --git a/sound/vox/woop.wav b/sound/vox/woop.wav deleted file mode 100644 index 62fa99cb3b..0000000000 Binary files a/sound/vox/woop.wav and /dev/null differ diff --git a/sound/vox/xeno.wav b/sound/vox/xeno.wav deleted file mode 100644 index 6b77a20b7a..0000000000 Binary files a/sound/vox/xeno.wav and /dev/null differ diff --git a/sound/vox/yankee.wav b/sound/vox/yankee.wav deleted file mode 100644 index 62bf15a40b..0000000000 Binary files a/sound/vox/yankee.wav and /dev/null differ diff --git a/sound/vox/yards.wav b/sound/vox/yards.wav deleted file mode 100644 index 33c3c4c3e3..0000000000 Binary files a/sound/vox/yards.wav and /dev/null differ diff --git a/sound/vox/year.wav b/sound/vox/year.wav deleted file mode 100644 index 12dca8e86b..0000000000 Binary files a/sound/vox/year.wav and /dev/null differ diff --git a/sound/vox/yellow.wav b/sound/vox/yellow.wav deleted file mode 100644 index bed92f5f9f..0000000000 Binary files a/sound/vox/yellow.wav and /dev/null differ diff --git a/sound/vox/yes.wav b/sound/vox/yes.wav deleted file mode 100644 index 799bb2b775..0000000000 Binary files a/sound/vox/yes.wav and /dev/null differ diff --git a/sound/vox/you.wav b/sound/vox/you.wav deleted file mode 100644 index 7ba9be75a8..0000000000 Binary files a/sound/vox/you.wav and /dev/null differ diff --git a/sound/vox/your.wav b/sound/vox/your.wav deleted file mode 100644 index 9e29c2418b..0000000000 Binary files a/sound/vox/your.wav and /dev/null differ diff --git a/sound/vox/yourself.wav b/sound/vox/yourself.wav deleted file mode 100644 index 582c3b7ed6..0000000000 Binary files a/sound/vox/yourself.wav and /dev/null differ diff --git a/sound/vox/zero.wav b/sound/vox/zero.wav deleted file mode 100644 index 9b6c39722d..0000000000 Binary files a/sound/vox/zero.wav and /dev/null differ diff --git a/sound/vox/zone.wav b/sound/vox/zone.wav deleted file mode 100644 index 68f9b8952c..0000000000 Binary files a/sound/vox/zone.wav and /dev/null differ diff --git a/sound/vox/zulu.wav b/sound/vox/zulu.wav deleted file mode 100644 index 32d6605218..0000000000 Binary files a/sound/vox/zulu.wav and /dev/null differ